Bump Coral dependency version to 2.0.55

Co-authored-by: Marius Grama <[email protected]>
trinodb · Mar 8, 2022 · d8f7ac8 · d8f7ac8 · mosabua · Mar 8, 2022
1 parent bafb4ac
commit d8f7ac8
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/plugin/trino-hive/pom.xml b/plugin/trino-hive/pom.xml
@@ -195,6 +195,11 @@
             <classifier>shaded</classifier>
         </dependency>
 
+        <dependency>
+            <groupId>com.linkedin.coral</groupId>
+            <artifactId>coral-common</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.linkedin.coral</groupId>
             <artifactId>coral-hive</artifactId>

diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ViewReaderUtil.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/ViewReaderUtil.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.hive;
 
-import com.linkedin.coral.hive.hive2rel.HiveMetastoreClient;
+import com.linkedin.coral.common.HiveMetastoreClient;
 import com.linkedin.coral.hive.hive2rel.HiveToRelConverter;
 import com.linkedin.coral.trino.rel2trino.RelToTrinoConverter;
 import io.airlift.json.JsonCodec;
@@ -184,7 +184,7 @@ public HiveViewReader(HiveMetastoreClient hiveMetastoreClient, TypeManager typeM
         public ConnectorViewDefinition decodeViewData(String viewSql, Table table, CatalogName catalogName)
         {
             try {
-                HiveToRelConverter hiveToRelConverter = HiveToRelConverter.create(metastoreClient);
+                HiveToRelConverter hiveToRelConverter = new HiveToRelConverter(metastoreClient);
                 RelNode rel = hiveToRelConverter.convertView(table.getDatabaseName(), table.getTableName());
                 RelToTrinoConverter relToTrino = new RelToTrinoConverter();
                 String trinoSql = relToTrino.convert(rel);

diff --git a/...ve/src/main/java/io/trino/plugin/hive/metastore/CoralSemiTransactionalHiveMSCAdapter.java b/...ve/src/main/java/io/trino/plugin/hive/metastore/CoralSemiTransactionalHiveMSCAdapter.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.hive.metastore;
 
-import com.linkedin.coral.hive.hive2rel.HiveMetastoreClient;
+import com.linkedin.coral.common.HiveMetastoreClient;
 import io.trino.plugin.hive.CoralTableRedirectionResolver;
 import io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil;
 import io.trino.spi.connector.SchemaTableName;

diff --git a/pom.xml b/pom.xml
@@ -64,7 +64,7 @@
         <dep.testcontainers.version>1.16.3</dep.testcontainers.version>
         <dep.duct-tape.version>1.0.8</dep.duct-tape.version>
         <dep.docker-java.version>3.2.12</dep.docker-java.version>
-        <dep.coral.version>1.0.121</dep.coral.version>
+        <dep.coral.version>2.0.55</dep.coral.version>
         <dep.confluent.version>5.5.2</dep.confluent.version>
 
         <dep.docker.images.version>53</dep.docker.images.version>
@@ -1117,7 +1117,7 @@
 
             <dependency>
                 <groupId>com.linkedin.coral</groupId>
-                <artifactId>coral-hive</artifactId>
+                <artifactId>coral-common</artifactId>
                 <version>${dep.coral.version}</version>
                 <exclusions>
                     <exclusion>
@@ -1131,10 +1131,33 @@
                 </exclusions>
             </dependency>
 
+            <dependency>
+                <groupId>com.linkedin.coral</groupId>
+                <artifactId>coral-hive</artifactId>
+                <version>${dep.coral.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.linkedin.coral</groupId>
                 <artifactId>coral-trino</artifactId>
                 <version>${dep.coral.version}</version>
+                <exclusions>
+                    <!--
+                        The `trino-parser` library is being used internally within the `coral-trino` library for
+                        parsing Trino SQL statements. This functionality is irrelevant in the context of
+                        using Coral for Hive view translations within Trino.
+                        This dependency is excluded because `trino-parser` does not guarantee API or behavioral
+                        backwards compatibility.
+                        Trino cannot provide the version on which `coral-trino` library depends on, because the
+                        current version of `trino-parser` is used in tests of this module.
+                        The dependency is therefore intentionally excluded to avoid breaking in an unexpected way,
+                        or silent correctness issues.
+                    -->
+                    <exclusion>
+                        <groupId>io.trino</groupId>
+                        <artifactId>trino-parser</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>