Skip to content

Commit 47a7080

Browse files
ZacBlancorschlussel
authored andcommitted
Split maven modules with dependency on jetty http server
This commit splits presto-main into presto-main and presto-main-base. presto-main is now the "main" module which builds the PrestoServer binary which includes the airlift http-server dependency. presto-main-base is all of the internal classes required to run presto and does not depend on jetty. This is in preparation to upgrade to Java 17 within Presto. The latest supported versions of Jetty require Java 17. This change allows us to maintain Presto-On-Spark compatibility with Java 8 as long as we keep the presto-main module compiling to java 8.
1 parent 50d79c6 commit 47a7080

3,394 files changed

Lines changed: 1063 additions & 462 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ jobs:
5757
- ":presto-hive -P test-hive-pushdown-filter-queries-advanced"
5858
- ":presto-hive -P test-hive-repartitioning"
5959
- ":presto-hive -P test-hive-parquet"
60+
- ":presto-main-base"
6061
- ":presto-main"
6162
- ":presto-mongodb -P test-mongo-distributed-queries"
6263
- ":presto-redis -P test-redis-integration-smoke-test"

pom.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
<module>presto-bytecode</module>
148148
<module>presto-client</module>
149149
<module>presto-parser</module>
150+
<module>presto-main-base</module>
150151
<module>presto-main</module>
151152
<module>presto-ml</module>
152153
<module>presto-geospatial-toolkit</module>
@@ -774,6 +775,19 @@
774775
<type>test-jar</type>
775776
</dependency>
776777

778+
<dependency>
779+
<groupId>com.facebook.presto</groupId>
780+
<artifactId>presto-main-base</artifactId>
781+
<version>${project.version}</version>
782+
</dependency>
783+
784+
<dependency>
785+
<groupId>com.facebook.presto</groupId>
786+
<artifactId>presto-main-base</artifactId>
787+
<version>${project.version}</version>
788+
<type>test-jar</type>
789+
</dependency>
790+
777791
<dependency>
778792
<groupId>com.facebook.presto</groupId>
779793
<artifactId>presto-hive-metastore</artifactId>
@@ -1043,6 +1057,12 @@
10431057
<version>${project.version}</version>
10441058
</dependency>
10451059

1060+
<dependency>
1061+
<groupId>com.facebook.presto</groupId>
1062+
<artifactId>presto-function-namespace-managers-common</artifactId>
1063+
<version>${project.version}</version>
1064+
</dependency>
1065+
10461066
<dependency>
10471067
<groupId>com.facebook.presto</groupId>
10481068
<artifactId>presto-grpc-api</artifactId>

presto-accumulo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@
331331

332332
<dependency>
333333
<groupId>com.facebook.presto</groupId>
334-
<artifactId>presto-main</artifactId>
334+
<artifactId>presto-main-base</artifactId>
335335
<scope>test</scope>
336336
</dependency>
337337

presto-atop/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,13 @@
137137

138138
<dependency>
139139
<groupId>com.facebook.presto</groupId>
140-
<artifactId>presto-main</artifactId>
140+
<artifactId>presto-main-base</artifactId>
141141
<scope>test</scope>
142142
</dependency>
143143

144144
<dependency>
145145
<groupId>com.facebook.presto</groupId>
146-
<artifactId>presto-main</artifactId>
146+
<artifactId>presto-main-base</artifactId>
147147
<type>test-jar</type>
148148
<scope>test</scope>
149149
</dependency>

presto-base-arrow-flight/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,12 @@
180180
<scope>test</scope>
181181
</dependency>
182182

183+
<dependency>
184+
<groupId>com.facebook.presto</groupId>
185+
<artifactId>presto-main-base</artifactId>
186+
<scope>test</scope>
187+
</dependency>
188+
183189
<dependency>
184190
<groupId>com.facebook.presto</groupId>
185191
<artifactId>presto-main</artifactId>

presto-base-jdbc/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,13 @@
162162

163163
<dependency>
164164
<groupId>com.facebook.presto</groupId>
165-
<artifactId>presto-main</artifactId>
165+
<artifactId>presto-main-base</artifactId>
166166
<scope>test</scope>
167167
</dependency>
168168

169169
<dependency>
170170
<groupId>com.facebook.presto</groupId>
171-
<artifactId>presto-main</artifactId>
171+
<artifactId>presto-main-base</artifactId>
172172
<scope>test</scope>
173173
<type>test-jar</type>
174174
</dependency>

presto-benchmark-runner/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@
8787
<artifactId>presto-main</artifactId>
8888
</dependency>
8989

90+
<dependency>
91+
<groupId>com.facebook.presto</groupId>
92+
<artifactId>presto-main-base</artifactId>
93+
</dependency>
94+
9095
<dependency>
9196
<groupId>com.facebook.presto</groupId>
9297
<artifactId>presto-thrift-connector</artifactId>

presto-benchmark/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
<dependency>
3535
<groupId>com.facebook.presto</groupId>
36-
<artifactId>presto-main</artifactId>
36+
<artifactId>presto-main-base</artifactId>
3737
</dependency>
3838

3939
<dependency>

presto-benchto-benchmarks/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@
6262

6363
<dependency>
6464
<groupId>com.facebook.presto</groupId>
65-
<artifactId>presto-main</artifactId>
65+
<artifactId>presto-main-base</artifactId>
6666
<type>test-jar</type>
6767
<scope>test</scope>
6868
</dependency>
6969

7070
<dependency>
7171
<groupId>com.facebook.presto</groupId>
72-
<artifactId>presto-main</artifactId>
72+
<artifactId>presto-main-base</artifactId>
7373
<scope>test</scope>
7474
</dependency>
7575

presto-bigquery/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,12 @@
348348
<scope>test</scope>
349349
</dependency>
350350

351+
<dependency>
352+
<groupId>com.facebook.presto</groupId>
353+
<artifactId>presto-main-base</artifactId>
354+
<scope>test</scope>
355+
</dependency>
356+
351357
<dependency>
352358
<groupId>com.facebook.presto</groupId>
353359
<artifactId>presto-main</artifactId>

0 commit comments

Comments
 (0)