From fa282cdaa21ad06192ecbaf99130fcce7c81c25b Mon Sep 17 00:00:00 2001
From: Tim Eckley <wAVeckx@users.noreply.github.com>
Date: Tue, 26 Nov 2024 11:54:46 -0500
Subject: [PATCH] Trino 465 - Ensure module instances are not shared by
 multiple JDBC catalogs

---
 pom.xml                                                | 4 ++--
 src/main/java/io/trino/plugin/jtopen/JTOpenClient.java | 3 ++-
 src/main/java/io/trino/plugin/jtopen/JTOpenPlugin.java | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index ebeba16..3fa30cd 100644
--- 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
index b77386a..b402f4d 100644
--- 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
index 260dde7..6d60991 100644
--- 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);
     }
 }