Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feature] read doris via arrow flight sql #227

Merged
merged 5 commits into from
Aug 27, 2024
Merged

[feature] read doris via arrow flight sql #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
78c3512
arrow reader
gnehil Aug 1, 2024
d66a011
modify log name
gnehil Aug 13, 2024
e1b07d6
add license header
gnehil Aug 16, 2024
972b048
resolve dep conflict
gnehil Aug 16, 2024
43c0d06
resolve code err
gnehil Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 118 additions & 12 deletions spark-doris-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@
<scala.version>2.12.10</scala.version>
<scala.major.version>2.12</scala.major.version>
<libthrift.version>0.16.0</libthrift.version>
<arrow.version>13.0.0</arrow.version>
<arrow.version>15.0.2</arrow.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.scm.id>github</project.scm.id>
<netty.version>4.1.77.Final</netty.version>
<netty.version>4.1.104.Final</netty.version>
<fasterxml.jackson.version>2.13.5</fasterxml.jackson.version>
<thrift-service.version>1.0.1</thrift-service.version>
<testcontainers.version>1.17.6</testcontainers.version>
Expand All @@ -94,12 +94,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${netty.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.spark</groupId>
Expand Down Expand Up @@ -248,6 +242,93 @@
<version>4.5.13</version>
</dependency>

<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-hive_${scala.major.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.arrow.adbc</groupId>
<artifactId>adbc-driver-flight-sql</artifactId>
<version>0.13.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.arrow</groupId>
<artifactId>flight-sql-jdbc-core</artifactId>
</exclusion>
<exclusion>
<artifactId>arrow-memory-netty</artifactId>
<groupId>org.apache.arrow</groupId>
</exclusion>
<exclusion>
<artifactId>arrow-memory-core</artifactId>
<groupId>org.apache.arrow</groupId>
</exclusion>
<exclusion>
<artifactId>arrow-format</artifactId>
<groupId>org.apache.arrow</groupId>
</exclusion>
<exclusion>
<artifactId>arrow-vector</artifactId>
<groupId>org.apache.arrow</groupId>
</exclusion>
<exclusion>
<artifactId>grpc-netty</artifactId>
<groupId>io.grpc</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>1.60.0</version>
<exclusions>
<exclusion>
<artifactId>netty-codec-http2</artifactId>
<groupId>io.netty</groupId>
</exclusion>
<exclusion>
<artifactId>netty-handler-proxy</artifactId>
<groupId>io.netty</groupId>
</exclusion>
<exclusion>
<artifactId>netty-transport-native-unix-common</artifactId>
<groupId>io.netty</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>${netty.version}</version>
</dependency>

<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>flight-sql-jdbc-core</artifactId>
<version>${arrow.version}</version>
</dependency>

<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.22.3</version>
</dependency>

</dependencies>

<build>
Expand Down Expand Up @@ -291,7 +372,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.2.1</version>
<version>3.4.1</version>
<executions>
<execution>
<id>scala-compile-first</id>
Expand All @@ -317,8 +398,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>3.4.1</version>
<configuration>
<filters>
<filter>
<!-- Do not copy the signatures in the META-INF folder.
Otherwise, this might cause SecurityExceptions when using the JAR. -->
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
<artifactSet>
<excludes>
<exclude>com.google.code.findbugs:*</exclude>
Expand Down Expand Up @@ -355,7 +448,20 @@
<pattern>org.apache.http</pattern>
<shadedPattern>org.apache.doris.shaded.org.apache.http</shadedPattern>
</relocation>
<relocation>
<pattern>io.grpc</pattern>
<shadedPattern>org.apache.doris.shaded.io.grpc</shadedPattern>
</relocation>
<relocation>
<pattern>com.google</pattern>
<shadedPattern>org.apache.doris.shaded.com.google</shadedPattern>
</relocation>
</relocations>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
<!-- <minimizeJar>true</minimizeJar> -->
</configuration>
<executions>
<execution>
Expand All @@ -370,8 +476,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
Expand Down
5 changes: 5 additions & 0 deletions spark-doris-connector/src/main/java/org/apache/doris/spark/cfg/ConfigurationOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,9 @@ public interface ConfigurationOptions {
"off_mode"
)));

String DORIS_READ_MODE = "doris.read.mode";
String DORIS_READ_MODE_DEFAULT = "thrift";

String DORIS_ARROW_FLIGHT_SQL_PORT = "doris.arrow-flight-sql.port";

}
19 changes: 14 additions & 5 deletions spark-doris-connector/src/main/java/org/apache/doris/spark/cfg/SparkSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,14 @@

package org.apache.doris.spark.cfg;

import java.util.Properties;

import org.apache.spark.SparkConf;

import com.google.common.base.Preconditions;

import org.apache.spark.SparkConf;
import scala.Option;
import scala.Serializable;
import scala.Tuple2;

import java.util.Properties;

public class SparkSettings extends Settings implements Serializable {

private final SparkConf cfg;
Expand All @@ -36,6 +34,16 @@ public SparkSettings(SparkConf cfg) {
this.cfg = cfg;
}

public static SparkSettings fromProperties(Properties props) {
SparkConf sparkConf = new SparkConf();
props.forEach((k, v) -> {
if (k instanceof String) {
sparkConf.set((String) k, v.toString());
}
});
return new SparkSettings(sparkConf);
}

public SparkSettings copy() {
return new SparkSettings(cfg.clone());
}
Expand Down Expand Up @@ -74,4 +82,5 @@ public Properties asProperties() {

return props;
}

}
34 changes: 17 additions & 17 deletions spark-doris-connector/src/main/java/org/apache/doris/spark/rest/PartitionDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@

package org.apache.doris.spark.rest;

import org.apache.doris.spark.cfg.PropertiesSettings;
import org.apache.doris.spark.cfg.Settings;
import org.apache.doris.spark.exception.IllegalArgumentException;

import java.io.Serializable;
import java.util.Collections;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;

import org.apache.doris.spark.cfg.PropertiesSettings;
import org.apache.doris.spark.cfg.Settings;
import org.apache.doris.spark.exception.IllegalArgumentException;

/**
* Doris RDD partition info.
*/
Expand Down Expand Up @@ -124,12 +124,12 @@ public boolean equals(Object o) {
return false;
}
PartitionDefinition that = (PartitionDefinition) o;
return Objects.equals(database, that.database) &&
Objects.equals(table, that.table) &&
Objects.equals(beAddress, that.beAddress) &&
Objects.equals(tabletIds, that.tabletIds) &&
Objects.equals(queryPlan, that.queryPlan) &&
Objects.equals(serializedSettings, that.serializedSettings);
return Objects.equals(database, that.database)
&& Objects.equals(table, that.table)
&& Objects.equals(beAddress, that.beAddress)
&& Objects.equals(tabletIds, that.tabletIds)
&& Objects.equals(queryPlan, that.queryPlan)
&& Objects.equals(serializedSettings, that.serializedSettings);
}

@Override
Expand All @@ -144,12 +144,12 @@ public int hashCode() {

@Override
public String toString() {
return "PartitionDefinition{" +
", database='" + database + '\'' +
", table='" + table + '\'' +
", beAddress='" + beAddress + '\'' +
", tabletIds=" + tabletIds +
", queryPlan='" + queryPlan + '\'' +
'}';
return "PartitionDefinition{"
+ ", database='" + database + '\''
+ ", table='" + table + '\''
+ ", beAddress='" + beAddress + '\''
+ ", tabletIds=" + tabletIds
+ ", queryPlan='" + queryPlan + '\''
+ '}';
}
}
25 changes: 7 additions & 18 deletions spark-doris-connector/src/main/java/org/apache/doris/spark/rest/RestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.apache.doris.spark.rest.models.Schema;
import org.apache.doris.spark.rest.models.Tablet;
import org.apache.doris.spark.sql.SchemaUtils;
import org.apache.doris.spark.sql.Utils;
import org.apache.doris.spark.util.HttpUtil;
import org.apache.doris.spark.util.URLs;

Expand All @@ -51,7 +52,6 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.json.JsonMapper;
import com.google.common.annotations.VisibleForTesting;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpStatus;
Expand All @@ -64,6 +64,7 @@
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.util.EntityUtils;
import org.slf4j.Logger;
import scala.Option;

import java.io.IOException;
import java.io.Serializable;
Expand Down Expand Up @@ -227,23 +228,11 @@ public static List<PartitionDefinition> findPartitions(Settings cfg, Logger logg
String[] tableIdentifiers =
parseIdentifier(cfg.getProperty(ConfigurationOptions.DORIS_TABLE_IDENTIFIER), logger);
String readFields = cfg.getProperty(ConfigurationOptions.DORIS_READ_FIELD, "*");
if (!"*".equals(readFields)) {
String[] readFieldArr = readFields.split(",");
String[] bitmapColumns = cfg.getProperty(SchemaUtils.DORIS_BITMAP_COLUMNS(), "").split(",");
String[] hllColumns = cfg.getProperty(SchemaUtils.DORIS_HLL_COLUMNS(), "").split(",");
for (int i = 0; i < readFieldArr.length; i++) {
String readFieldName = readFieldArr[i].replaceAll("`", "");
if (ArrayUtils.contains(bitmapColumns, readFieldName)
|| ArrayUtils.contains(hllColumns, readFieldName)) {
readFieldArr[i] = "'READ UNSUPPORTED' AS " + readFieldArr[i];
}
}
readFields = StringUtils.join(readFieldArr, ",");
}
String sql = "select " + readFields + " from `" + tableIdentifiers[0] + "`.`" + tableIdentifiers[1] + "`";
if (!StringUtils.isEmpty(cfg.getProperty(ConfigurationOptions.DORIS_FILTER_QUERY))) {
sql += " where " + cfg.getProperty(ConfigurationOptions.DORIS_FILTER_QUERY);
}
String[] bitmapColumns = cfg.getProperty(SchemaUtils.DORIS_BITMAP_COLUMNS(), "").split(",");
String[] hllColumns = cfg.getProperty(SchemaUtils.DORIS_HLL_COLUMNS(), "").split(",");
String sql = Utils.generateQueryStatement(readFields.split(","), bitmapColumns, hllColumns,
"`" + tableIdentifiers[0] + "`.`" + tableIdentifiers[1] + "`",
cfg.getProperty(ConfigurationOptions.DORIS_FILTER_QUERY, ""), Option.empty());
logger.debug("Query SQL Sending to Doris FE is: '{}'.", sql);

String finalSql = sql;
Expand Down
Loading
Loading