Skip to content

Commit 488dec8

Browse files
pdabre12Pratik Joseph Dabre
authored andcommitted
Split Provisio plugin packaging into plugins and native-plugins directory
1 parent 07a1a88 commit 488dec8

File tree

3 files changed

+81
-16
lines changed

3 files changed

+81
-16
lines changed

presto-docs/src/main/sphinx/plugin/native-sidecar-plugin.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ Property Name Description
2626
``coordinator-sidecar-enabled`` Enables sidecar in the coordinator true
2727
``native-execution-enabled`` Enables native execution true
2828
``presto.default-namespace`` Sets the default function namespace `native.default`
29+
``plugin.dir`` Specifies which directory under installation root `{root-directory}/native-plugins/`
30+
to scan for plugins at startup.
2931
============================================ ===================================================================== ==============================
3032

3133
.. _sidecar-worker-properties:

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/src/main/provisio/presto.xml

Lines changed: 79 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<artifact id="${project.groupId}:presto-main:${project.version}" />
2929
</artifactSet>
3030

31-
<!-- Plugins -->
31+
<!-- Java Plugins -->
3232
<artifactSet to="plugin/resource-group-managers">
3333
<artifact id="${project.groupId}:presto-resource-group-managers:zip:${project.version}">
3434
<unpack />
@@ -281,19 +281,92 @@
281281
</artifact>
282282
</artifactSet>
283283

284-
<artifactSet to="plugin/native-sidecar-plugin">
285-
<artifact id="${project.groupId}:presto-native-sidecar-plugin:zip:${project.version}">
284+
<artifactSet to="plugin/sql-invoked-functions-plugin">
285+
<artifact id="${project.groupId}:presto-sql-invoked-functions-plugin:zip:${project.version}">
286286
<unpack />
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}">
290+
<!-- Native Plugins -->
291+
<artifactSet to="native-plugin/resource-group-managers">
292+
<artifact id="${project.groupId}:presto-resource-group-managers:zip:${project.version}">
293+
<unpack />
294+
</artifact>
295+
</artifactSet>
296+
297+
<artifactSet to="native-plugin/password-authenticators">
298+
<artifact id="${project.groupId}:presto-password-authenticators:zip:${project.version}">
299+
<unpack />
300+
</artifact>
301+
</artifactSet>
302+
303+
<artifactSet to="native-plugin/file-session-property-manager">
304+
<artifact id="${project.groupId}:presto-file-session-property-manager:zip:${project.version}">
305+
<unpack />
306+
</artifact>
307+
</artifactSet>
308+
309+
<artifactSet to="native-plugin/db-session-property-manager">
310+
<artifact id="${project.groupId}:presto-db-session-property-manager:zip:${project.version}">
311+
<unpack />
312+
</artifact>
313+
</artifactSet>
314+
315+
<artifactSet to="native-plugin/function-namespace-managers">
316+
<artifact id="${project.groupId}:presto-function-namespace-managers:zip:${project.version}">
317+
<unpack />
318+
</artifact>
319+
</artifactSet>
320+
321+
<artifactSet to="native-plugin/jmx">
322+
<artifact id="${project.groupId}:presto-jmx:zip:${project.version}">
323+
<unpack />
324+
</artifact>
325+
</artifactSet>
326+
327+
<artifactSet to="native-plugin/hive-hadoop2">
328+
<artifact id="${project.groupId}:presto-hive-hadoop2:zip:${project.version}">
329+
<unpack />
330+
</artifact>
331+
</artifactSet>
332+
333+
<artifactSet to="native-plugin/ml">
334+
<artifact id="${project.groupId}:presto-ml:zip:${project.version}">
335+
<unpack />
336+
</artifact>
337+
</artifactSet>
338+
339+
<artifactSet to="native-plugin/prometheus">
340+
<artifact id="${project.groupId}:presto-prometheus:zip:${project.version}">
341+
<unpack />
342+
</artifact>
343+
</artifactSet>
344+
345+
<artifactSet to="native-plugin/tpch">
346+
<artifact id="${project.groupId}:presto-tpch:zip:${project.version}">
347+
<unpack />
348+
</artifact>
349+
</artifactSet>
350+
351+
<artifactSet to="native-plugin/tpcds">
352+
<artifact id="${project.groupId}:presto-tpcds:zip:${project.version}">
353+
<unpack />
354+
</artifact>
355+
</artifactSet>
356+
357+
<artifactSet to="native-plugin/iceberg">
358+
<artifact id="${project.groupId}:presto-iceberg:zip:${project.version}">
359+
<unpack />
360+
</artifact>
361+
</artifactSet>
362+
363+
<artifactSet to="native-plugin/native-sidecar-plugin">
364+
<artifact id="${project.groupId}:presto-native-sidecar-plugin:zip:${project.version}">
292365
<unpack />
293366
</artifact>
294367
</artifactSet>
295368

296-
<artifactSet to="plugin/native-sql-invoked-functions-plugin">
369+
<artifactSet to="native-plugin/native-sql-invoked-functions-plugin">
297370
<artifact id="${project.groupId}:presto-native-sql-invoked-functions-plugin:zip:${project.version}">
298371
<unpack />
299372
</artifact>

0 commit comments

Comments
 (0)