adapt logs

YotillaAntoni · Jan 14, 2025 · 143df5b · 143df5b
1 parent b1ec1b3
commit 143df5b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DriverConnectionFactory.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DriverConnectionFactory.java
@@ -61,11 +61,26 @@ public DriverConnectionFactory(
     public Connection openConnection(ConnectorSession session)
             throws SQLException
     {
-        log.info("Open connection " + COUNTER.incrementAndGet());
+        log.info("Driver open connection " + COUNTER.incrementAndGet());
         Properties properties = getCredentialProperties(session.getIdentity());
         Connection connection = dataSource.getConnection(properties);
         checkState(connection != null, "Driver returned null connection, make sure the connection URL '%s' is valid for the driver %s", connectionUrl, driver);
-        return connection;
+
+        return new ForwardingConnection() {
+            @Override
+            protected Connection delegate() throws SQLException {
+                return connection;
+            }
+
+            @Override
+            public void close() throws SQLException {
+                try {
+                    connection.close();
+                } finally {
+                    log.info("Driver close connection " + COUNTER.decrementAndGet());
+                }
+            }
+        };
     }
 
     private Properties getCredentialProperties(ConnectorIdentity identity)

diff --git a/plugin/trino-exasol/src/test/java/io/trino/plugin/exasol/TestingExasolServer.java b/plugin/trino-exasol/src/test/java/io/trino/plugin/exasol/TestingExasolServer.java
@@ -96,7 +96,7 @@ private void executeAsSys(@Language("SQL") String sql)
 
     public void execute(@Language("SQL") String sql, String user, String password)
     {
-        log.info("Get connection " + COUNTER.incrementAndGet());
+        log.info("Server get connection " + COUNTER.incrementAndGet());
         try (Connection connection = DriverManager.getConnection(getJdbcUrl(), getProperties(user, password));
                 Statement statement = connection.createStatement()) {
             statement.execute(sql);
@@ -105,7 +105,7 @@ public void execute(@Language("SQL") String sql, String user, String password)
             throw new RuntimeException("Failed to execute statement '" + sql + "'", e);
         }
         finally {
-            log.info("Close connection " + COUNTER.decrementAndGet());
+            log.info("Server close connection " + COUNTER.decrementAndGet());
         }
     }