Trino 465 - Ensure module instances are not shared by multiple JDBC c…

…atalogs
wAVeckx · Nov 26, 2024 · fa282cd · fa282cd
1 parent d72aa5c
commit fa282cd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
 
     <artifactId>trino-jtopen</artifactId>
-    <version>464</version>
+    <version>465</version>
     <packaging>trino-plugin</packaging>
     <description>Trino - JTOpen Connector</description>
 
@@ -28,7 +28,7 @@
         <dep.airlift.version>285</dep.airlift.version>
         <dep.slice.version>2.3</dep.slice.version>
         <dep.opentelemetry.version>1.44.1</dep.opentelemetry.version>
-        <dep.opentelemetry-instrumentation.version>2.9.0</dep.opentelemetry-instrumentation.version>
+        <dep.opentelemetry-instrumentation.version>2.10.0</dep.opentelemetry-instrumentation.version>
         <dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
         <dep.guava.version>33.3.1-jre</dep.guava.version>
         <dep.guice.version>7.0.0</dep.guice.version>

diff --git a/src/main/java/io/trino/plugin/jtopen/JTOpenClient.java b/src/main/java/io/trino/plugin/jtopen/JTOpenClient.java
@@ -27,6 +27,7 @@
 import io.trino.plugin.jdbc.JdbcColumnHandle;
 import io.trino.plugin.jdbc.JdbcExpression;
 import io.trino.plugin.jdbc.JdbcJoinCondition;
+import io.trino.plugin.jdbc.JdbcMetadata;
 import io.trino.plugin.jdbc.JdbcOutputTableHandle;
 import io.trino.plugin.jdbc.JdbcProcedureHandle;
 import io.trino.plugin.jdbc.JdbcProcedureHandle.ProcedureQuery;
@@ -698,7 +699,7 @@ private TableStatistics readTableStatistics(ConnectorSession session, JdbcTableH
 
             Map<String, Map<String, Long>> allColumnStatistics = statisticsDao.getAllColumnStatistics(table);
 
-            for (JdbcColumnHandle column : this.getColumns(session, table)) {
+            for (JdbcColumnHandle column : JdbcMetadata.getColumns(session, this, table)) {
                 String columnName = column.getColumnName();
                 Map<String, Long> columnStatistics = allColumnStatistics.getOrDefault(columnName, new HashMap<>());
 

diff --git a/src/main/java/io/trino/plugin/jtopen/JTOpenPlugin.java b/src/main/java/io/trino/plugin/jtopen/JTOpenPlugin.java
@@ -20,6 +20,6 @@ public class JTOpenPlugin
 {
     public JTOpenPlugin()
     {
-        super("jtopen", new JTOpenClientModule());
+        super("jtopen", JTOpenClientModule::new);
     }
 }