Move Hive plugin to Hive module

findepi · Dec 9, 2023 · 15cc6e5 · 15cc6e5
1 parent e9416da
commit 15cc6e5
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 240 deletions.
diff --git a/.github/config/labeler-config.yml b/.github/config/labeler-config.yml
@@ -3,7 +3,6 @@
   - lib/trino-orc/**
   - lib/trino-parquet/**
   - lib/trino-hive-formats/**
-  - plugin/trino-hive-hadoop2/**
   - plugin/trino-hive/**
   - testing/trino-product-tests/**
   - lib/trino-filesystem/**
@@ -20,7 +19,6 @@ delta-lake:
 
 hive:
   - plugin/trino-hive/**
-  - plugin/trino-hive-hadoop2/**
 
 hudi:
   - plugin/trino-hudi/**

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -301,7 +301,7 @@ jobs:
       - name: Install Hive Module
         run: |
           export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
-          $MAVEN clean install ${MAVEN_FAST_INSTALL} ${MAVEN_GIB} -Dgib.logImpactedTo=gib-impacted.log -am -pl :trino-hive-hadoop2
+          $MAVEN clean install ${MAVEN_FAST_INSTALL} ${MAVEN_GIB} -Dgib.logImpactedTo=gib-impacted.log -am -pl :trino-hive
       - name: Run Hive AWS Tests
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.TRINO_AWS_ACCESS_KEY_ID }}

diff --git a/client/trino-jdbc/pom.xml b/client/trino-jdbc/pom.xml
@@ -193,7 +193,7 @@
 
         <dependency>
             <groupId>io.trino</groupId>
-            <artifactId>trino-hive-hadoop2</artifactId>
+            <artifactId>trino-hive</artifactId>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

diff --git a/core/trino-server/src/main/provisio/trino.xml b/core/trino-server/src/main/provisio/trino.xml
@@ -114,7 +114,7 @@
     </artifactSet>
 
     <artifactSet to="plugin/hive">
-        <artifact id="${project.groupId}:trino-hive-hadoop2:zip:${project.version}">
+        <artifact id="${project.groupId}:trino-hive:zip:${project.version}">
             <unpack />
         </artifact>
         <artifact id="${project.groupId}:trino-hdfs:zip:${project.version}">

diff --git a/plugin/trino-hive-hadoop2/pom.xml b/plugin/trino-hive-hadoop2/pom.xml
diff --git a/plugin/trino-hive/pom.xml b/plugin/trino-hive/pom.xml
@@ -10,6 +10,7 @@
     </parent>
 
     <artifactId>trino-hive</artifactId>
+    <packaging>trino-plugin</packaging>
     <description>Trino - Hive Connector</description>
 
     <properties>
@@ -121,16 +122,6 @@
             <artifactId>units</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-context</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.opentelemetry.instrumentation</groupId>
             <artifactId>opentelemetry-aws-sdk-1.11</artifactId>
@@ -259,14 +250,20 @@
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -318,6 +315,12 @@
             <scope>runtime</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>junit-extensions</artifactId>

diff --git a/...ugin/hive/CanonicalizeHiveTimezoneId.java → ...ugin/hive/CanonicalizeHiveTimezoneId.java b/...ugin/hive/CanonicalizeHiveTimezoneId.java → ...ugin/hive/CanonicalizeHiveTimezoneId.java
diff --git a/...java/io/trino/plugin/hive/HivePlugin.java → ...java/io/trino/plugin/hive/HivePlugin.java b/...java/io/trino/plugin/hive/HivePlugin.java → ...java/io/trino/plugin/hive/HivePlugin.java
diff --git a/.../io/trino/plugin/hive/TestHivePlugin.java → .../io/trino/plugin/hive/TestHivePlugin.java b/.../io/trino/plugin/hive/TestHivePlugin.java → .../io/trino/plugin/hive/TestHivePlugin.java
diff --git a/pom.xml b/pom.xml
@@ -77,7 +77,6 @@
         <module>plugin/trino-geospatial</module>
         <module>plugin/trino-google-sheets</module>
         <module>plugin/trino-hive</module>
-        <module>plugin/trino-hive-hadoop2</module>
         <module>plugin/trino-http-event-listener</module>
         <module>plugin/trino-hudi</module>
         <module>plugin/trino-iceberg</module>
@@ -1139,12 +1138,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>io.trino</groupId>
-                <artifactId>trino-hive-hadoop2</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>io.trino</groupId>
                 <artifactId>trino-hudi</artifactId>

diff --git a/testing/trino-server-dev/etc/config.properties b/testing/trino-server-dev/etc/config.properties
@@ -37,7 +37,7 @@ plugin.bundles=\
   ../../plugin/trino-memory/pom.xml,\
   ../../plugin/trino-jmx/pom.xml,\
   ../../plugin/trino-raptor-legacy/pom.xml,\
-  ../../plugin/trino-hive-hadoop2/pom.xml,\
+  ../../plugin/trino-hive/pom.xml,\
   ../../plugin/trino-hudi/pom.xml,\
   ../../plugin/trino-example-http/pom.xml,\
   ../../plugin/trino-kafka/pom.xml, \