This is an automated email from the ASF dual-hosted git repository. xiangfu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push: new 1c4512e Move all prestodb dependencies into a separated module (#8266) 1c4512e is described below commit 1c4512ec88a302d5702a2334afb90fa79aac188d Author: Xiang Fu <xiangfu.1...@gmail.com> AuthorDate: Tue Mar 1 13:30:50 2022 -0800 Move all prestodb dependencies into a separated module (#8266) * Move all prestodb dependencies into a separated module * fixing pom * Move presto-pinot-driver under prestodb-pinot-dependencies --- pinot-common/pom.xml | 6 - pinot-connectors/pom.xml | 15 +- .../pinot-common-jdk8}/pom.xml | 133 +------ .../pinot-common-jdk8/src | 1 + .../pinot-core-jdk8}/pom.xml | 52 +-- .../pinot-core-jdk8/src | 1 + .../pinot-segment-local-jdk8}/pom.xml | 51 +-- .../pinot-segment-local-jdk8/src | 1 + .../pinot-segment-spi-jdk8}/pom.xml | 41 +-- .../pinot-segment-spi-jdk8/src | 1 + .../pinot-spi-jdk8}/pom.xml | 73 +--- .../prestodb-pinot-dependencies/pinot-spi-jdk8/src | 1 + .../prestodb-pinot-dependencies}/pom.xml | 62 ++-- .../presto-pinot-driver/pom.xml | 381 +++++++-------------- .../presto/PinotScatterGatherQueryClient.java | 0 .../presto/grpc/PinotStreamingQueryClient.java | 0 .../apache/pinot/connector/presto/grpc/Utils.java | 0 pinot-core/pom.xml | 6 - .../pinot-input-format/pinot-avro-base/pom.xml | 6 - .../pinot-input-format/pinot-avro/pom.xml | 9 - pinot-plugins/pinot-input-format/pinot-csv/pom.xml | 9 - .../pinot-input-format/pinot-json/pom.xml | 9 - pinot-plugins/pinot-metrics/pinot-yammer/pom.xml | 9 - pinot-segment-local/pom.xml | 9 - pinot-segment-spi/pom.xml | 9 - pinot-spi/pom.xml | 6 - 26 files changed, 219 insertions(+), 672 deletions(-) diff --git a/pinot-common/pom.xml b/pinot-common/pom.xml index f334538..e1dbbae 100644 --- a/pinot-common/pom.xml +++ b/pinot-common/pom.xml @@ -341,12 +341,6 @@ </build> </profile> <profile> - <id>presto-driver</id> - <properties> - <jdk.version>8</jdk.version> - </properties> - </profile> - <profile> <id>profile-buildthrift</id> <activation> <file> diff --git a/pinot-connectors/pom.xml b/pinot-connectors/pom.xml index 3c16822..8b525c4 100644 --- a/pinot-connectors/pom.xml +++ b/pinot-connectors/pom.xml @@ -39,10 +39,17 @@ <modules> <module>pinot-spark-connector</module> - <module>presto-pinot-driver</module> </modules> - <dependencies> - </dependencies> - + <profiles> + <profile> + <id>presto-driver</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <modules> + <module>prestodb-pinot-dependencies</module> + </modules> + </profile> + </profiles> </project> diff --git a/pinot-common/pom.xml b/pinot-connectors/prestodb-pinot-dependencies/pinot-common-jdk8/pom.xml similarity index 67% copy from pinot-common/pom.xml copy to pinot-connectors/prestodb-pinot-dependencies/pinot-common-jdk8/pom.xml index f334538..3144dfb 100644 --- a/pinot-common/pom.xml +++ b/pinot-connectors/prestodb-pinot-dependencies/pinot-common-jdk8/pom.xml @@ -22,33 +22,25 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>pinot</artifactId> + <artifactId>prestodb-pinot-dependencies</artifactId> <groupId>org.apache.pinot</groupId> <version>0.10.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>pinot-common</artifactId> - <name>Pinot Common</name> + + <artifactId>pinot-common-jdk8</artifactId> + <name>Pinot Common JDK 8</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> </properties> <build> <!-- Antlr stuff --> <plugins> <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.antlr</groupId> <artifactId>antlr4-maven-plugin</artifactId> <version>${antlr.version}</version> @@ -62,10 +54,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> - <plugin> <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> </plugin> @@ -74,11 +62,13 @@ <dependencies> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-spi</artifactId> + <artifactId>pinot-spi-jdk8</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-segment-spi</artifactId> + <artifactId>pinot-segment-spi-jdk8</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.pinot</groupId> @@ -302,107 +292,4 @@ <artifactId>audience-annotations</artifactId> </dependency> </dependencies> - <profiles> - <profile> - <id>build-shaded-jar</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <relocations> - <relocation> - <pattern>com.google.common.base</pattern> - <shadedPattern>shaded.com.google.common.base</shadedPattern> - </relocation> - <relocation> - <pattern>com.google.common.cache</pattern> - <shadedPattern>shaded.com.google.common.cache</shadedPattern> - </relocation> - <relocation> - <pattern>org.apache.http</pattern> - <shadedPattern>shaded.org.apache.http</shadedPattern> - </relocation> - </relocations> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>presto-driver</id> - <properties> - <jdk.version>8</jdk.version> - </properties> - </profile> - <profile> - <id>profile-buildthrift</id> - <activation> - <file> - <exists>/usr/local/bin/thrift</exists> - </file> - <property> - <name>buildThrift</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>generate-sources</id> - <phase>generate-sources</phase> - <configuration> - <tasks> - <delete dir="target/generated-sources/gen-javabean"/> - <mkdir dir="target/generated-sources"/> - <exec executable="/usr/local/bin/thrift"> - <arg value="--gen"/> - <arg value="java:beans"/> - <arg value="-o"/> - <arg value="target/generated-sources"/> - <arg value="src/thrift/query.thrift"/> - </exec> - <exec executable="/usr/local/bin/thrift"> - <arg value="--gen"/> - <arg value="java:beans"/> - <arg value="-o"/> - <arg value="target/generated-sources"/> - <arg value="src/thrift/request.thrift"/> - </exec> - <exec executable="/usr/local/bin/thrift"> - <arg value="--gen"/> - <arg value="java:beans"/> - <arg value="-o"/> - <arg value="target/generated-sources"/> - <arg value="src/thrift/response.thrift"/> - </exec> - <copy todir="src/main/java/"> - <fileset dir="target/generated-sources/gen-javabean"/> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> diff --git a/pinot-connectors/prestodb-pinot-dependencies/pinot-common-jdk8/src b/pinot-connectors/prestodb-pinot-dependencies/pinot-common-jdk8/src new file mode 120000 index 0000000..a138637 --- /dev/null +++ b/pinot-connectors/prestodb-pinot-dependencies/pinot-common-jdk8/src @@ -0,0 +1 @@ +../../../pinot-common/src \ No newline at end of file diff --git a/pinot-core/pom.xml b/pinot-connectors/prestodb-pinot-dependencies/pinot-core-jdk8/pom.xml similarity index 89% copy from pinot-core/pom.xml copy to pinot-connectors/prestodb-pinot-dependencies/pinot-core-jdk8/pom.xml index 90bb06e..fa90058 100644 --- a/pinot-core/pom.xml +++ b/pinot-connectors/prestodb-pinot-dependencies/pinot-core-jdk8/pom.xml @@ -22,37 +22,21 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>pinot</artifactId> + <artifactId>prestodb-pinot-dependencies</artifactId> <groupId>org.apache.pinot</groupId> <version>0.10.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>pinot-core</artifactId> - <name>Pinot Core</name> + + <artifactId>pinot-core-jdk8</artifactId> + <name>Pinot Core JDK 8</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> </properties> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> - </plugins> - </build> <dependencies> <dependency> <groupId>com.uber</groupId> @@ -64,19 +48,23 @@ </dependency> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-spi</artifactId> + <artifactId>pinot-spi-jdk8</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-segment-spi</artifactId> + <artifactId>pinot-common-jdk8</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-segment-local</artifactId> + <artifactId>pinot-segment-spi-jdk8</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-common</artifactId> + <artifactId>pinot-segment-local-jdk8</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>joda-time</groupId> @@ -187,14 +175,14 @@ <!-- test --> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-common</artifactId> + <artifactId>pinot-common-jdk8</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-segment-local</artifactId> + <artifactId>pinot-segment-local-jdk8</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -234,7 +222,7 @@ </dependency> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-spi</artifactId> + <artifactId>pinot-spi-jdk8</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -295,11 +283,5 @@ </plugins> </build> </profile> - <profile> - <id>presto-driver</id> - <properties> - <jdk.version>8</jdk.version> - </properties> - </profile> </profiles> </project> diff --git a/pinot-connectors/prestodb-pinot-dependencies/pinot-core-jdk8/src b/pinot-connectors/prestodb-pinot-dependencies/pinot-core-jdk8/src new file mode 120000 index 0000000..020b801 --- /dev/null +++ b/pinot-connectors/prestodb-pinot-dependencies/pinot-core-jdk8/src @@ -0,0 +1 @@ +../../../pinot-core/src \ No newline at end of file diff --git a/pinot-segment-local/pom.xml b/pinot-connectors/prestodb-pinot-dependencies/pinot-segment-local-jdk8/pom.xml similarity index 81% copy from pinot-segment-local/pom.xml copy to pinot-connectors/prestodb-pinot-dependencies/pinot-segment-local-jdk8/pom.xml index e1bab72..debd65f 100644 --- a/pinot-segment-local/pom.xml +++ b/pinot-connectors/prestodb-pinot-dependencies/pinot-segment-local-jdk8/pom.xml @@ -23,58 +23,36 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>pinot</artifactId> + <artifactId>prestodb-pinot-dependencies</artifactId> <groupId>org.apache.pinot</groupId> <version>0.10.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>pinot-segment-local</artifactId> - <name>Pinot local segment implementations</name> + + <artifactId>pinot-segment-local-jdk8</artifactId> + <name>Pinot local segment implementations JDK 8</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> </properties> - <profiles> - <profile> - <id>presto-driver</id> - <properties> - <jdk.version>8</jdk.version> - </properties> - </profile> - </profiles> - - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> - </plugins> - </build> <dependencies> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-spi</artifactId> + <artifactId>pinot-spi-jdk8</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-common</artifactId> + <artifactId>pinot-common-jdk8</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-segment-spi</artifactId> + <artifactId>pinot-segment-spi-jdk8</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.xerial.larray</groupId> @@ -148,7 +126,7 @@ </dependency> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-spi</artifactId> + <artifactId>pinot-spi-jdk8</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -156,12 +134,11 @@ <dependency> <groupId>org.apache.pinot</groupId> <artifactId>pinot-yammer</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-common</artifactId> + <artifactId>pinot-common-jdk8</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> diff --git a/pinot-connectors/prestodb-pinot-dependencies/pinot-segment-local-jdk8/src b/pinot-connectors/prestodb-pinot-dependencies/pinot-segment-local-jdk8/src new file mode 120000 index 0000000..538a29d --- /dev/null +++ b/pinot-connectors/prestodb-pinot-dependencies/pinot-segment-local-jdk8/src @@ -0,0 +1 @@ +../../../pinot-segment-local/src \ No newline at end of file diff --git a/pinot-segment-spi/pom.xml b/pinot-connectors/prestodb-pinot-dependencies/pinot-segment-spi-jdk8/pom.xml similarity index 73% copy from pinot-segment-spi/pom.xml copy to pinot-connectors/prestodb-pinot-dependencies/pinot-segment-spi-jdk8/pom.xml index 89a56d9..b447af6 100644 --- a/pinot-segment-spi/pom.xml +++ b/pinot-connectors/prestodb-pinot-dependencies/pinot-segment-spi-jdk8/pom.xml @@ -23,51 +23,26 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>pinot</artifactId> + <artifactId>prestodb-pinot-dependencies</artifactId> <groupId>org.apache.pinot</groupId> <version>0.10.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>pinot-segment-spi</artifactId> - <name>Pinot Segment Service Provider Interface</name> + + <artifactId>pinot-segment-spi-jdk8</artifactId> + <name>Pinot Segment Service Provider Interface JDK 8</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> </properties> - <profiles> - <profile> - <id>presto-driver</id> - <properties> - <jdk.version>8</jdk.version> - </properties> - </profile> - </profiles> - - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> - </plugins> - </build> - <dependencies> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-spi</artifactId> + <artifactId>pinot-spi-jdk8</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.roaringbitmap</groupId> diff --git a/pinot-connectors/prestodb-pinot-dependencies/pinot-segment-spi-jdk8/src b/pinot-connectors/prestodb-pinot-dependencies/pinot-segment-spi-jdk8/src new file mode 120000 index 0000000..51033e5 --- /dev/null +++ b/pinot-connectors/prestodb-pinot-dependencies/pinot-segment-spi-jdk8/src @@ -0,0 +1 @@ +../../../pinot-segment-spi/src \ No newline at end of file diff --git a/pinot-spi/pom.xml b/pinot-connectors/prestodb-pinot-dependencies/pinot-spi-jdk8/pom.xml similarity index 67% copy from pinot-spi/pom.xml copy to pinot-connectors/prestodb-pinot-dependencies/pinot-spi-jdk8/pom.xml index 95c6bb3..9957213 100644 --- a/pinot-spi/pom.xml +++ b/pinot-connectors/prestodb-pinot-dependencies/pinot-spi-jdk8/pom.xml @@ -22,41 +22,21 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>pinot</artifactId> + <artifactId>prestodb-pinot-dependencies</artifactId> <groupId>org.apache.pinot</groupId> <version>0.10.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>pinot-spi</artifactId> - <name>Pinot Service Provider Interface</name> + + <artifactId>pinot-spi-jdk8</artifactId> + <name>Pinot Service Provider Interface JDK 8</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkCount>1</forkCount> - <reuseForks>true</reuseForks> - </configuration> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> <dependencies> <dependency> <groupId>commons-configuration</groupId> @@ -150,45 +130,4 @@ <artifactId>reflections</artifactId> </dependency> </dependencies> - <profiles> - <profile> - <id>build-shaded-jar</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <relocations> - <relocation> - <pattern>com.google.common.base</pattern> - <shadedPattern>shaded.com.google.common.base</shadedPattern> - </relocation> - <relocation> - <pattern>com.fasterxml.jackson</pattern> - <shadedPattern>shaded.com.fasterxml.jackson</shadedPattern> - </relocation> - </relocations> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>presto-driver</id> - <properties> - <jdk.version>8</jdk.version> - </properties> - </profile> - </profiles> </project> diff --git a/pinot-connectors/prestodb-pinot-dependencies/pinot-spi-jdk8/src b/pinot-connectors/prestodb-pinot-dependencies/pinot-spi-jdk8/src new file mode 120000 index 0000000..bbdd792 --- /dev/null +++ b/pinot-connectors/prestodb-pinot-dependencies/pinot-spi-jdk8/src @@ -0,0 +1 @@ +../../../pinot-spi/src \ No newline at end of file diff --git a/pinot-plugins/pinot-metrics/pinot-yammer/pom.xml b/pinot-connectors/prestodb-pinot-dependencies/pom.xml similarity index 63% copy from pinot-plugins/pinot-metrics/pinot-yammer/pom.xml copy to pinot-connectors/prestodb-pinot-dependencies/pom.xml index 17e7b8a..ae16d13 100644 --- a/pinot-plugins/pinot-metrics/pinot-yammer/pom.xml +++ b/pinot-connectors/prestodb-pinot-dependencies/pom.xml @@ -19,36 +19,54 @@ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>pinot-metrics</artifactId> + <artifactId>pinot-connectors</artifactId> <groupId>org.apache.pinot</groupId> <version>0.10.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>pinot-yammer</artifactId> - <name>Pinot Yammer Metrics</name> + <artifactId>prestodb-pinot-dependencies</artifactId> + <packaging>pom</packaging> + <name>PrestoDB Pinot Dependencies</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/../../..</pinot.root> - <phase.prop>package</phase.prop> + <pinot.root>${basedir}/../..</pinot.root> + <jdk.version>8</jdk.version> </properties> - <profiles> - <profile> - <id>presto-driver</id> - <properties> - <jdk.version>8</jdk.version> - </properties> - </profile> - </profiles> + <modules> + <module>pinot-spi-jdk8</module> + <module>pinot-common-jdk8</module> + <module>pinot-core-jdk8</module> + <module>pinot-segment-spi-jdk8</module> + <module>pinot-segment-local-jdk8</module> + <module>presto-pinot-driver</module> + </modules> + <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + </plugin> + <plugin> <artifactId>maven-jar-plugin</artifactId> <executions> <execution> @@ -58,22 +76,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> </plugins> </build> - - <dependencies> - <dependency> - <groupId>org.apache.pinot</groupId> - <artifactId>pinot-spi</artifactId> - </dependency> - <dependency> - <groupId>com.yammer.metrics</groupId> - <artifactId>metrics-core</artifactId> - <version>2.2.0</version> - </dependency> - </dependencies> </project> diff --git a/pinot-connectors/presto-pinot-driver/pom.xml b/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/pom.xml similarity index 59% rename from pinot-connectors/presto-pinot-driver/pom.xml rename to pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/pom.xml index 05d4490..f6018da 100644 --- a/pinot-connectors/presto-pinot-driver/pom.xml +++ b/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/pom.xml @@ -24,9 +24,10 @@ <packaging>jar</packaging> <parent> - <artifactId>pinot-connectors</artifactId> + <artifactId>prestodb-pinot-dependencies</artifactId> <groupId>org.apache.pinot</groupId> <version>0.10.0-SNAPSHOT</version> + <relativePath>..</relativePath> </parent> <name>Presto Pinot Driver</name> @@ -34,8 +35,9 @@ <artifactId>presto-pinot-driver</artifactId> <properties> - <pinot.root>${basedir}/../..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> <shadeBase>org.apache.pinot.\$internal</shadeBase> + <jdk.version>8</jdk.version> </properties> <dependencies> @@ -52,7 +54,8 @@ <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-spi</artifactId> + <artifactId>pinot-spi-jdk8</artifactId> + <version>${project.version}</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -142,7 +145,8 @@ </dependency> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-common</artifactId> + <artifactId>pinot-common-jdk8</artifactId> + <version>${project.version}</version> <exclusions> <exclusion> <groupId>org.checkerframework</groupId> @@ -269,7 +273,8 @@ <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-core</artifactId> + <artifactId>pinot-core-jdk8</artifactId> + <version>${project.version}</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -359,93 +364,6 @@ </dependency> <dependency> - <groupId>org.apache.pinot</groupId> - <artifactId>pinot-yammer</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.antlr</groupId> - <artifactId>antlr4-annotations</artifactId> - </exclusion> - <exclusion> - <groupId>it.unimi.dsi</groupId> - <artifactId>fastutil</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.kafka</groupId> - <artifactId>kafka-clients</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.kafka</groupId> - <artifactId>kafka_2.10</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - </exclusion> - <exclusion> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - </exclusion> - <exclusion> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </exclusion> - <exclusion> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - </exclusion> - <exclusion> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analyzers-common</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>org.apache.helix</groupId> <artifactId>helix-core</artifactId> <exclusions> @@ -562,177 +480,110 @@ </dependency> </dependencies> - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <executions> - <execution> - <id>default-install</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <skipMain>true</skipMain> - </configuration> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <executions> - <execution> - <id>default-jar</id> - <phase>none</phase> - </execution> - <execution> - <id>test-jar</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> - <profile> - <id>presto-driver</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <jdk.version>8</jdk.version> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>3.2.1</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <createSourcesJar>true</createSourcesJar> - <shadeSourcesContent>true</shadeSourcesContent> - <dependencyReducedPomLocation>${project.build.directory}/pom.xml</dependencyReducedPomLocation> - <promoteTransitiveDependencies>true</promoteTransitiveDependencies> - <artifactSet> - <includes> - <include>com.google.guava:*</include> - <include>com.google.protobuf:*</include> - <include>com.yammer.metrics:*</include> - <include>commons-*:*</include> - <include>io.grpc:*</include> - <include>io.netty:*</include> - <include>org.apache.commons:*</include> - <include>org.apache.pinot:*</include> - <include>org.apache.http:*</include> - <include>org.antlr:*</include> - <include>org.apache.thrift:*</include> - <include>org.reflections:*</include> - </includes> - </artifactSet> - <relocations> - <!-- everything except the stuff in pinot-spi, pinot-common is shaded --> - <relocation> - <pattern>org.apache.pinot.pql</pattern> - <shadedPattern>${shadeBase}.org.apache.pinot.pql</shadedPattern> - </relocation> - <relocation> - <pattern>com.google</pattern> - <shadedPattern>${shadeBase}.com.google</shadedPattern> - </relocation> - <relocation> - <pattern>org.antlr</pattern> - <shadedPattern>${shadeBase}.org.antlr</shadedPattern> - </relocation> - <relocation> - <pattern>org.apache.commons</pattern> - <shadedPattern>${shadeBase}.org.apache.commons</shadedPattern> - </relocation> - <relocation> - <pattern>org.apache.http</pattern> - <shadedPattern>${shadeBase}.org.apache.http</shadedPattern> - </relocation> - <relocation> - <pattern>org.apache.thrift</pattern> - <shadedPattern>${shadeBase}.org.apache.thrift</shadedPattern> - </relocation> - <relocation> - <pattern>io.netty</pattern> - <shadedPattern>${shadeBase}.io.netty</shadedPattern> - </relocation> - <relocation> - <pattern>org.jboss</pattern> - <shadedPattern>${shadeBase}.org.jboss</shadedPattern> - </relocation> - <relocation> - <pattern>com.yammer</pattern> - <shadedPattern>${shadeBase}.com.yammer</shadedPattern> - </relocation> - <relocation> - <pattern>org.reflections</pattern> - <shadedPattern>${shadeBase}.org.reflections</shadedPattern> - </relocation> - </relocations> - <!-- exclude signed Manifests --> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - <exclude>META-INF/maven/**</exclude> - </excludes> - </filter> - </filters> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>3.0.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>3.2.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <createSourcesJar>true</createSourcesJar> + <shadeSourcesContent>true</shadeSourcesContent> + <dependencyReducedPomLocation>${project.build.directory}/pom.xml</dependencyReducedPomLocation> + <promoteTransitiveDependencies>true</promoteTransitiveDependencies> + <artifactSet> + <includes> + <include>com.google.guava:*</include> + <include>com.google.protobuf:*</include> + <include>com.yammer.metrics:*</include> + <include>commons-*:*</include> + <include>io.grpc:*</include> + <include>io.netty:*</include> + <include>org.apache.commons:*</include> + <include>org.apache.pinot:*</include> + <include>org.apache.http:*</include> + <include>org.antlr:*</include> + <include>org.apache.thrift:*</include> + <include>org.reflections:*</include> + </includes> + </artifactSet> + <relocations> + <!-- everything except the stuff in pinot-spi, pinot-common is shaded --> + <relocation> + <pattern>org.apache.pinot.pql</pattern> + <shadedPattern>${shadeBase}.org.apache.pinot.pql</shadedPattern> + </relocation> + <relocation> + <pattern>com.google</pattern> + <shadedPattern>${shadeBase}.com.google</shadedPattern> + </relocation> + <relocation> + <pattern>org.antlr</pattern> + <shadedPattern>${shadeBase}.org.antlr</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.commons</pattern> + <shadedPattern>${shadeBase}.org.apache.commons</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.http</pattern> + <shadedPattern>${shadeBase}.org.apache.http</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.thrift</pattern> + <shadedPattern>${shadeBase}.org.apache.thrift</shadedPattern> + </relocation> + <relocation> + <pattern>io.netty</pattern> + <shadedPattern>${shadeBase}.io.netty</shadedPattern> + </relocation> + <relocation> + <pattern>org.jboss</pattern> + <shadedPattern>${shadeBase}.org.jboss</shadedPattern> + </relocation> + <relocation> + <pattern>com.yammer</pattern> + <shadedPattern>${shadeBase}.com.yammer</shadedPattern> + </relocation> + <relocation> + <pattern>org.reflections</pattern> + <shadedPattern>${shadeBase}.org.reflections</shadedPattern> + </relocation> + </relocations> + <!-- exclude signed Manifests --> + <filters> + <filter> + <artifact>*:*</artifact> + <excludes> + <exclude>META-INF/*.SF</exclude> + <exclude>META-INF/*.DSA</exclude> + <exclude>META-INF/*.RSA</exclude> + <exclude>META-INF/maven/**</exclude> + </excludes> + </filter> + </filters> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> </project> diff --git a/pinot-connectors/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/PinotScatterGatherQueryClient.java b/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/PinotScatterGatherQueryClient.java similarity index 100% rename from pinot-connectors/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/PinotScatterGatherQueryClient.java rename to pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/PinotScatterGatherQueryClient.java diff --git a/pinot-connectors/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/grpc/PinotStreamingQueryClient.java b/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/grpc/PinotStreamingQueryClient.java similarity index 100% rename from pinot-connectors/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/grpc/PinotStreamingQueryClient.java rename to pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/grpc/PinotStreamingQueryClient.java diff --git a/pinot-connectors/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/grpc/Utils.java b/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/grpc/Utils.java similarity index 100% rename from pinot-connectors/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/grpc/Utils.java rename to pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/grpc/Utils.java diff --git a/pinot-core/pom.xml b/pinot-core/pom.xml index 90bb06e..4355d28 100644 --- a/pinot-core/pom.xml +++ b/pinot-core/pom.xml @@ -295,11 +295,5 @@ </plugins> </build> </profile> - <profile> - <id>presto-driver</id> - <properties> - <jdk.version>8</jdk.version> - </properties> - </profile> </profiles> </project> diff --git a/pinot-plugins/pinot-input-format/pinot-avro-base/pom.xml b/pinot-plugins/pinot-input-format/pinot-avro-base/pom.xml index 911704e..e541e01 100644 --- a/pinot-plugins/pinot-input-format/pinot-avro-base/pom.xml +++ b/pinot-plugins/pinot-input-format/pinot-avro-base/pom.xml @@ -87,11 +87,5 @@ </plugins> </build> </profile> - <profile> - <id>presto-driver</id> - <properties> - <jdk.version>8</jdk.version> - </properties> - </profile> </profiles> </project> diff --git a/pinot-plugins/pinot-input-format/pinot-avro/pom.xml b/pinot-plugins/pinot-input-format/pinot-avro/pom.xml index 9706fc7..13d6aaa 100644 --- a/pinot-plugins/pinot-input-format/pinot-avro/pom.xml +++ b/pinot-plugins/pinot-input-format/pinot-avro/pom.xml @@ -37,15 +37,6 @@ <phase.prop>package</phase.prop> </properties> - <profiles> - <profile> - <id>presto-driver</id> - <properties> - <jdk.version>8</jdk.version> - </properties> - </profile> - </profiles> - <dependencies> <dependency> <groupId>org.apache.pinot</groupId> diff --git a/pinot-plugins/pinot-input-format/pinot-csv/pom.xml b/pinot-plugins/pinot-input-format/pinot-csv/pom.xml index d02a438..9f9e2c0 100644 --- a/pinot-plugins/pinot-input-format/pinot-csv/pom.xml +++ b/pinot-plugins/pinot-input-format/pinot-csv/pom.xml @@ -37,15 +37,6 @@ <phase.prop>package</phase.prop> </properties> - <profiles> - <profile> - <id>presto-driver</id> - <properties> - <jdk.version>8</jdk.version> - </properties> - </profile> - </profiles> - <dependencies> <dependency> <groupId>org.apache.commons</groupId> diff --git a/pinot-plugins/pinot-input-format/pinot-json/pom.xml b/pinot-plugins/pinot-input-format/pinot-json/pom.xml index 07bcd67..384beac 100644 --- a/pinot-plugins/pinot-input-format/pinot-json/pom.xml +++ b/pinot-plugins/pinot-input-format/pinot-json/pom.xml @@ -37,15 +37,6 @@ <phase.prop>package</phase.prop> </properties> - <profiles> - <profile> - <id>presto-driver</id> - <properties> - <jdk.version>8</jdk.version> - </properties> - </profile> - </profiles> - <dependencies> <dependency> <groupId>commons-lang</groupId> diff --git a/pinot-plugins/pinot-metrics/pinot-yammer/pom.xml b/pinot-plugins/pinot-metrics/pinot-yammer/pom.xml index 17e7b8a..dfaa069 100644 --- a/pinot-plugins/pinot-metrics/pinot-yammer/pom.xml +++ b/pinot-plugins/pinot-metrics/pinot-yammer/pom.xml @@ -37,15 +37,6 @@ <phase.prop>package</phase.prop> </properties> - <profiles> - <profile> - <id>presto-driver</id> - <properties> - <jdk.version>8</jdk.version> - </properties> - </profile> - </profiles> - <build> <plugins> <plugin> diff --git a/pinot-segment-local/pom.xml b/pinot-segment-local/pom.xml index e1bab72..c116f4d 100644 --- a/pinot-segment-local/pom.xml +++ b/pinot-segment-local/pom.xml @@ -36,15 +36,6 @@ <pinot.root>${basedir}/..</pinot.root> </properties> - <profiles> - <profile> - <id>presto-driver</id> - <properties> - <jdk.version>8</jdk.version> - </properties> - </profile> - </profiles> - <build> <plugins> <plugin> diff --git a/pinot-segment-spi/pom.xml b/pinot-segment-spi/pom.xml index 89a56d9..7bf7200 100644 --- a/pinot-segment-spi/pom.xml +++ b/pinot-segment-spi/pom.xml @@ -36,15 +36,6 @@ <pinot.root>${basedir}/..</pinot.root> </properties> - <profiles> - <profile> - <id>presto-driver</id> - <properties> - <jdk.version>8</jdk.version> - </properties> - </profile> - </profiles> - <build> <plugins> <plugin> diff --git a/pinot-spi/pom.xml b/pinot-spi/pom.xml index 95c6bb3..0ce13de 100644 --- a/pinot-spi/pom.xml +++ b/pinot-spi/pom.xml @@ -184,11 +184,5 @@ </plugins> </build> </profile> - <profile> - <id>presto-driver</id> - <properties> - <jdk.version>8</jdk.version> - </properties> - </profile> </profiles> </project> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org