Skip to content

Commit 917a29b

Browse files
pdabre12Pratik Joseph Dabre
pdabre12
authored and
Pratik Joseph Dabre
committed
Fix plugin packaging
1 parent 6d36242 commit 917a29b

File tree

4 files changed

+317
-16
lines changed

4 files changed

+317
-16
lines changed

‎presto-product-tests/conf/docker/common/compose-commons.sh‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,6 @@ if [[ -z "${PRESTO_SERVER_DIR:-}" ]]; then
3939
source "${PRODUCT_TESTS_ROOT}/target/classes/presto.env"
4040
PRESTO_SERVER_DIR="${PROJECT_ROOT}/presto-server/target/presto-server-${PRESTO_VERSION}/"
4141
fi
42-
43-
# The following plugin results in a function signature conflict when loaded in Java/ sidecar disabled native clusters.
44-
# This plugin is only meant for sidecar enabled native clusters, hence exclude it.
45-
PLUGIN_TO_EXCLUDE="native-sql-invoked-functions-plugin"
46-
47-
if [[ -d "${PRESTO_SERVER_DIR}/plugin/${PLUGIN_TO_EXCLUDE}" ]]; then
48-
echo "Excluding plugin: $PLUGIN_TO_EXCLUDE"
49-
rm -rf "${PRESTO_SERVER_DIR}/plugin/${PLUGIN_TO_EXCLUDE}"
50-
fi
51-
5242
export_canonical_path PRESTO_SERVER_DIR
5343

5444
if [[ -z "${PRESTO_CLI_JAR:-}" ]]; then

‎presto-server/pom.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
<plugin>
3434
<groupId>ca.vanzyl.provisio.maven.plugins</groupId>
3535
<artifactId>provisio-maven-plugin</artifactId>
36+
<configuration>
37+
<descriptorDirectory>${provisio.descriptorDirectory}</descriptorDirectory>
38+
</configuration>
3639
</plugin>
3740
</plugins>
3841
<pluginManagement>
@@ -61,5 +64,24 @@
6164
<air.check.skip-modernizer>true</air.check.skip-modernizer>
6265
</properties>
6366
</profile>
67+
68+
<!-- Java cluster build -->
69+
<profile>
70+
<id>java</id>
71+
<activation>
72+
<activeByDefault>true</activeByDefault>
73+
</activation>
74+
<properties>
75+
<provisio.descriptorDirectory>${project.basedir}/src/main/provisio/java</provisio.descriptorDirectory>
76+
</properties>
77+
</profile>
78+
79+
<!-- Sidecar cluster build -->
80+
<profile>
81+
<id>sidecar</id>
82+
<properties>
83+
<provisio.descriptorDirectory>${project.basedir}/src/main/provisio/sidecar</provisio.descriptorDirectory>
84+
</properties>
85+
</profile>
6486
</profiles>
6587
</project>

‎presto-server/src/main/provisio/java/presto.xml‎

Lines changed: 295 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,295 @@
1+
<runtime>
2+
<!-- Target -->
3+
<archive name="${project.artifactId}-${project.version}.tar.gz" hardLinkIncludes="**/*.jar" />
4+
5+
<!-- Notices -->
6+
<fileSet to="/">
7+
<directory path="${basedir}">
8+
<include>NOTICE</include>
9+
<include>README.txt</include>
10+
</directory>
11+
</fileSet>
12+
13+
<!-- Launcher -->
14+
<artifactSet to="bin">
15+
<artifact id="com.facebook.airlift:launcher:tar.gz:bin:${dep.packaging.version}">
16+
<unpack />
17+
</artifact>
18+
<artifact id="com.facebook.airlift:launcher:tar.gz:properties:${dep.packaging.version}">
19+
<unpack filter="true" />
20+
</artifact>
21+
</artifactSet>
22+
23+
<!-- Server -->
24+
<artifactSet to="lib">
25+
<artifact id="${project.groupId}:presto-main-base:${project.version}" />
26+
</artifactSet>
27+
<artifactSet to="lib">
28+
<artifact id="${project.groupId}:presto-main:${project.version}" />
29+
</artifactSet>
30+
31+
<!-- Plugins -->
32+
<artifactSet to="plugin/resource-group-managers">
33+
<artifact id="${project.groupId}:presto-resource-group-managers:zip:${project.version}">
34+
<unpack />
35+
</artifact>
36+
</artifactSet>
37+
38+
<artifactSet to="plugin/password-authenticators">
39+
<artifact id="${project.groupId}:presto-password-authenticators:zip:${project.version}">
40+
<unpack />
41+
</artifact>
42+
</artifactSet>
43+
44+
<artifactSet to="plugin/file-session-property-manager">
45+
<artifact id="${project.groupId}:presto-file-session-property-manager:zip:${project.version}">
46+
<unpack />
47+
</artifact>
48+
</artifactSet>
49+
50+
<artifactSet to="plugin/db-session-property-manager">
51+
<artifact id="${project.groupId}:presto-db-session-property-manager:zip:${project.version}">
52+
<unpack />
53+
</artifact>
54+
</artifactSet>
55+
56+
<artifactSet to="plugin/ttl-fetchers">
57+
<artifact id="${project.groupId}:presto-node-ttl-fetchers:zip:${project.version}">
58+
<unpack />
59+
</artifact>
60+
</artifactSet>
61+
62+
<artifactSet to="plugin/cluster-ttl-providers">
63+
<artifact id="${project.groupId}:presto-cluster-ttl-providers:zip:${project.version}">
64+
<unpack />
65+
</artifact>
66+
</artifactSet>
67+
68+
<artifactSet to="plugin/function-namespace-managers">
69+
<artifact id="${project.groupId}:presto-function-namespace-managers:zip:${project.version}">
70+
<unpack />
71+
</artifact>
72+
</artifactSet>
73+
74+
<artifactSet to="plugin/jmx">
75+
<artifact id="${project.groupId}:presto-jmx:zip:${project.version}">
76+
<unpack />
77+
</artifact>
78+
</artifactSet>
79+
80+
<artifactSet to="plugin/cassandra">
81+
<artifact id="${project.groupId}:presto-cassandra:zip:${project.version}">
82+
<unpack />
83+
</artifact>
84+
</artifactSet>
85+
86+
<artifactSet to="plugin/pinot">
87+
<artifact id="${project.groupId}:presto-pinot:zip:${project.version}">
88+
<unpack />
89+
</artifact>
90+
</artifactSet>
91+
92+
<artifactSet to="plugin/example-http">
93+
<artifact id="${project.groupId}:presto-example-http:zip:${project.version}">
94+
<unpack />
95+
</artifact>
96+
</artifactSet>
97+
98+
<artifactSet to="plugin/hana">
99+
<artifact id="${project.groupId}:presto-hana:zip:${project.version}">
100+
<unpack />
101+
</artifact>
102+
</artifactSet>
103+
104+
<artifactSet to="plugin/hive-hadoop2">
105+
<artifact id="${project.groupId}:presto-hive-hadoop2:zip:${project.version}">
106+
<unpack />
107+
</artifact>
108+
</artifactSet>
109+
110+
<artifactSet to="plugin/memory">
111+
<artifact id="${project.groupId}:presto-memory:zip:${project.version}">
112+
<unpack />
113+
</artifact>
114+
</artifactSet>
115+
116+
<artifactSet to="plugin/blackhole">
117+
<artifact id="${project.groupId}:presto-blackhole:zip:${project.version}">
118+
<unpack />
119+
</artifact>
120+
</artifactSet>
121+
122+
<artifactSet to="plugin/kafka">
123+
<artifact id="${project.groupId}:presto-kafka:zip:${project.version}">
124+
<unpack />
125+
</artifact>
126+
</artifactSet>
127+
128+
<artifactSet to="plugin/kudu">
129+
<artifact id="${project.groupId}:presto-kudu:zip:${project.version}">
130+
<unpack />
131+
</artifact>
132+
</artifactSet>
133+
134+
<artifactSet to="plugin/atop">
135+
<artifact id="${project.groupId}:presto-atop:zip:${project.version}">
136+
<unpack />
137+
</artifact>
138+
</artifactSet>
139+
140+
<artifactSet to="plugin/ml">
141+
<artifact id="${project.groupId}:presto-ml:zip:${project.version}">
142+
<unpack />
143+
</artifact>
144+
</artifactSet>
145+
146+
<artifactSet to="plugin/mysql">
147+
<artifact id="${project.groupId}:presto-mysql:zip:${project.version}">
148+
<unpack />
149+
</artifact>
150+
</artifactSet>
151+
152+
<artifactSet to="plugin/singlestore">
153+
<artifact id="${project.groupId}:presto-singlestore:zip:${project.version}">
154+
<unpack />
155+
</artifact>
156+
</artifactSet>
157+
158+
<artifactSet to="plugin/oracle">
159+
<artifact id="${project.groupId}:presto-oracle:zip:${project.version}">
160+
<unpack />
161+
</artifact>
162+
</artifactSet>
163+
164+
<artifactSet to="plugin/postgresql">
165+
<artifact id="${project.groupId}:presto-postgresql:zip:${project.version}">
166+
<unpack />
167+
</artifact>
168+
</artifactSet>
169+
170+
<artifactSet to="plugin/prometheus">
171+
<artifact id="${project.groupId}:presto-prometheus:zip:${project.version}">
172+
<unpack />
173+
</artifact>
174+
</artifactSet>
175+
176+
<artifactSet to="plugin/redshift">
177+
<artifact id="${project.groupId}:presto-redshift:zip:${project.version}">
178+
<unpack />
179+
</artifact>
180+
</artifactSet>
181+
182+
<artifactSet to="plugin/sqlserver">
183+
<artifact id="${project.groupId}:presto-sqlserver:zip:${project.version}">
184+
<unpack />
185+
</artifact>
186+
</artifactSet>
187+
188+
<artifactSet to="plugin/redis">
189+
<artifact id="${project.groupId}:presto-redis:zip:${project.version}">
190+
<unpack />
191+
</artifact>
192+
</artifactSet>
193+
194+
<artifactSet to="plugin/tpch">
195+
<artifact id="${project.groupId}:presto-tpch:zip:${project.version}">
196+
<unpack />
197+
</artifact>
198+
</artifactSet>
199+
200+
<artifactSet to="plugin/tpcds">
201+
<artifact id="${project.groupId}:presto-tpcds:zip:${project.version}">
202+
<unpack />
203+
</artifact>
204+
</artifactSet>
205+
206+
<artifactSet to="plugin/teradata-functions">
207+
<artifact id="${project.groupId}:presto-teradata-functions:zip:${project.version}">
208+
<unpack />
209+
</artifact>
210+
</artifactSet>
211+
212+
<artifactSet to="plugin/mongodb">
213+
<artifact id="${project.groupId}:presto-mongodb:zip:${project.version}">
214+
<unpack />
215+
</artifact>
216+
</artifactSet>
217+
218+
<artifactSet to="plugin/localfile">
219+
<artifact id="${project.groupId}:presto-local-file:zip:${project.version}">
220+
<unpack />
221+
</artifact>
222+
</artifactSet>
223+
224+
<artifactSet to="plugin/accumulo">
225+
<artifact id="${project.groupId}:presto-accumulo:zip:${project.version}">
226+
<unpack />
227+
</artifact>
228+
</artifactSet>
229+
230+
<artifactSet to="plugin/presto-thrift">
231+
<artifact id="${project.groupId}:presto-thrift-connector:zip:${project.version}">
232+
<unpack />
233+
</artifact>
234+
</artifactSet>
235+
236+
<artifactSet to="plugin/presto-elasticsearch">
237+
<artifact id="${project.groupId}:presto-elasticsearch:zip:${project.version}">
238+
<unpack />
239+
</artifact>
240+
</artifactSet>
241+
242+
<artifactSet to="plugin/presto-druid">
243+
<artifact id="${project.groupId}:presto-druid:zip:${project.version}">
244+
<unpack />
245+
</artifact>
246+
</artifactSet>
247+
248+
<artifactSet to="plugin/presto-bigquery">
249+
<artifact id="${project.groupId}:presto-bigquery:zip:${project.version}">
250+
<unpack />
251+
</artifact>
252+
</artifactSet>
253+
254+
<artifactSet to="plugin/iceberg">
255+
<artifact id="${project.groupId}:presto-iceberg:zip:${project.version}">
256+
<unpack />
257+
</artifact>
258+
</artifactSet>
259+
260+
<artifactSet to="plugin/hive-function-namespace">
261+
<artifact id="${project.groupId}:presto-hive-function-namespace:zip:${project.version}">
262+
<unpack />
263+
</artifact>
264+
</artifactSet>
265+
266+
<artifactSet to="plugin/delta">
267+
<artifact id="${project.groupId}:presto-delta:zip:${project.version}">
268+
<unpack />
269+
</artifact>
270+
</artifactSet>
271+
272+
<artifactSet to="plugin/hudi">
273+
<artifact id="${project.groupId}:presto-hudi:zip:${project.version}">
274+
<unpack />
275+
</artifact>
276+
</artifactSet>
277+
278+
<artifactSet to="plugin/clickhouse">
279+
<artifact id="${project.groupId}:presto-clickhouse:zip:${project.version}">
280+
<unpack />
281+
</artifact>
282+
</artifactSet>
283+
284+
<artifactSet to="plugin/native-sidecar-plugin">
285+
<artifact id="${project.groupId}:presto-native-sidecar-plugin:zip:${project.version}">
286+
<unpack />
287+
</artifact>
288+
</artifactSet>
289+
290+
<artifactSet to="plugin/sql-invoked-functions-plugin">
291+
<artifact id="${project.groupId}:presto-sql-invoked-functions-plugin:zip:${project.version}">
292+
<unpack />
293+
</artifact>
294+
</artifactSet>
295+
</runtime>

‎presto-server/src/main/provisio/presto.xml‎ renamed to ‎presto-server/src/main/provisio/sidecar/presto.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,6 @@
287287
</artifact>
288288
</artifactSet>
289289

290-
<artifactSet to="plugin/sql-invoked-functions-plugin">
291-
<artifact id="${project.groupId}:presto-sql-invoked-functions-plugin:zip:${project.version}">
292-
<unpack />
293-
</artifact>
294-
</artifactSet>
295-
296290
<artifactSet to="plugin/native-sql-invoked-functions-plugin">
297291
<artifact id="${project.groupId}:presto-native-sql-invoked-functions-plugin:zip:${project.version}">
298292
<unpack />

0 commit comments

Comments
 (0)