Co-mingle Drivers

Paultagoras · Paultagoras · commit 81b66d15b215 · 2024-11-07T15:12:08.000-05:00
diff --git a/clickhouse-jdbc/pom.xml b/clickhouse-jdbc/pom.xml
@@ -58,6 +58,11 @@
             <artifactId>gson</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>com.clickhouse</groupId>
+            <artifactId>jdbc-v2</artifactId>
+            <version>${revision}</version>
+        </dependency>
         <dependency>
             <groupId>io.opencensus</groupId>
             <artifactId>opencensus-impl</artifactId>
diff --git a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/ClickHouseDataSource.java b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/ClickHouseDataSource.java
@@ -8,6 +8,8 @@
 import com.clickhouse.jdbc.internal.ClickHouseJdbcUrlParser.ConnectionInfo;
 
 import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
 import java.util.Properties;
@@ -43,7 +45,12 @@ public ClickHouseDataSource(String url, Properties properties) throws SQLExcepti
 
     @Override
     public ClickHouseConnection getConnection() throws SQLException {
-        return new ClickHouseConnectionImpl(connInfo);
+        return (ClickHouseConnection) DriverManager.getConnection(url, props);
+        //return new ClickHouseConnectionImpl(connInfo);
+    }
+
+    public Connection getGenericConnection() throws SQLException {
+        return DriverManager.getConnection(url, props);
     }
 
     @Override
diff --git a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/ClickHouseDriver.java b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/ClickHouseDriver.java
@@ -69,6 +69,11 @@ public static String getFrameworksDetected() {
     }
 
     static {
+        String versionString = System.getProperty("com.clickhouse.jdbc.version", "v2");
+        boolean useV2 = versionString != null && versionString.equalsIgnoreCase("v2");
+
+        System.out.println("Static block. Use V2: " + useV2);
+
         String str = ClickHouseDriver.class.getPackage().getImplementationVersion();
         if (str != null && !str.isEmpty()) {
             char[] chars = str.toCharArray();
@@ -85,14 +90,6 @@ public static String getFrameworksDetected() {
         driverVersion = ClickHouseVersion.of(driverVersionString);
         specVersion = ClickHouseVersion.of(ClickHouseDriver.class.getPackage().getSpecificationVersion());
 
-        try {
-            DriverManager.registerDriver(new ClickHouseDriver());
-        } catch (SQLException e) {
-            throw new IllegalStateException(e);
-        }
-
-        log.debug("ClickHouse Driver %s(JDBC: %s) registered", driverVersion, specVersion);
-
         // client-specific options
         Map<Object, ClickHouseOption> m = new LinkedHashMap<>();
         try {
@@ -111,6 +108,30 @@ public static String getFrameworksDetected() {
         }
 
         clientSpecificOptions = Collections.unmodifiableMap(m);
+
+        if (useV2) {
+            com.clickhouse.jdbc.Driver.load();
+        } else {
+            load();
+        }
+    }
+
+    public static void load() {
+        try {
+            DriverManager.registerDriver(new ClickHouseDriver());
+        } catch (SQLException e) {
+            throw new IllegalStateException(e);
+        }
+
+        log.debug("ClickHouse Driver %s(JDBC: %s) registered", driverVersion, specVersion);
+    }
+
+    public static void unload() {
+        try {
+            DriverManager.deregisterDriver(new ClickHouseDriver());
+        } catch (SQLException e) {
+            throw new IllegalStateException(e);
+        }
     }
 
     public static Map<ClickHouseOption, Serializable> toClientOptions(Properties props) {
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/GenericJDBCTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/GenericJDBCTest.java
@@ -0,0 +1,66 @@
+package com.clickhouse.jdbc;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.sql.*;
+import java.util.Properties;
+
+public class GenericJDBCTest extends JdbcIntegrationTest {
+    public Connection getConnection(Properties properties) throws SQLException {
+        if (properties == null) {
+            properties = new Properties();
+        }
+
+        return newDataSource(properties).getGenericConnection();
+    }
+
+    @Test
+    public void connectionTest() throws SQLException {
+        try (Connection connection = getConnection(null)) {
+            Assert.assertNotNull(connection);
+            Assert.assertTrue(connection.isValid(1));
+        }
+    }
+
+    @Test
+    public void connectionWithPropertiesTest() throws SQLException {
+        Properties properties = new Properties();
+        properties.setProperty("user", "default");
+        properties.setProperty("password", "123456");
+
+        try (Connection connection = getConnection(properties)) {
+            Assert.assertNotNull(connection);
+            Assert.assertTrue(connection.isValid(1));
+        }
+    }
+
+    @Test
+    public void basicStatementTest() {
+        try (Connection connection = getConnection(null);
+             Statement statement = connection.createStatement()) {
+            Assert.assertNotNull(statement);
+            ResultSet resultSet = statement.executeQuery("SELECT 1");
+            Assert.assertNotNull(resultSet);
+            Assert.assertTrue(resultSet.next());
+            Assert.assertEquals(resultSet.getInt(1), 1);
+        } catch (SQLException e) {
+            Assert.fail("Failed to create statement", e);
+        }
+    }
+
+    @Test
+    public void basicPreparedStatementTest() {
+        try (Connection connection = getConnection(null);
+             PreparedStatement statement = connection.prepareStatement("SELECT ?")) {
+            Assert.assertNotNull(statement);
+            statement.setInt(1, 1);
+            ResultSet resultSet = statement.executeQuery();
+            Assert.assertNotNull(resultSet);
+            Assert.assertTrue(resultSet.next());
+            Assert.assertEquals(resultSet.getInt(1), 1);
+        } catch (SQLException e) {
+            Assert.fail("Failed to create statement", e);
+        }
+    }
+}
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/ConnectionImpl.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/ConnectionImpl.java
@@ -4,16 +4,16 @@
 import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
 import com.clickhouse.client.api.query.QueryResponse;
 import com.clickhouse.jdbc.internal.JdbcConfiguration;
-import com.clickhouse.logging.Logger;
-import com.clickhouse.logging.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.sql.*;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 
-public class ConnectionImpl implements Connection, JdbcWrapper {
+public class ConnectionImpl implements Connection, JdbcV2Wrapper {
     private static final Logger log = LoggerFactory.getLogger(ConnectionImpl.class);
 
     protected final String url;
@@ -25,6 +25,8 @@ public class ConnectionImpl implements Connection, JdbcWrapper {
     private String schema;
 
     public ConnectionImpl(String url, Properties info) {
+        log.debug("Creating connection to {}", url);
+
         this.url = url;
         this.config = new JdbcConfiguration(url, info);
         this.client = new Client.Builder()
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/DataSourceImpl.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/DataSourceImpl.java
@@ -10,7 +10,7 @@
 import java.util.Properties;
 import java.util.logging.Logger;
 
-public class DataSourceImpl implements DataSource, JdbcWrapper {
+public class DataSourceImpl implements DataSource, JdbcV2Wrapper {
     private String url;
     private Properties info;
 
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/Driver.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/Driver.java
@@ -4,8 +4,8 @@
 import java.util.*;
 
 import com.clickhouse.jdbc.internal.JdbcConfiguration;
-import com.clickhouse.logging.Logger;
-import com.clickhouse.logging.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * JDBC driver for ClickHouse.
@@ -25,13 +25,27 @@ public class Driver implements java.sql.Driver {
         driverVersion = tempDriverVersion;
         log.info("ClickHouse JDBC driver version: {}", driverVersion);
 
+        //Load the driver
+        //load(); //Commented out to avoid loading the driver multiple times, because we're referenced in V1
+    }
+
+    public static void load() {
         try {
             DriverManager.registerDriver(new Driver());
         } catch (SQLException e) {
             log.error("Failed to register ClickHouse JDBC driver", e);
         }
     }
 
+    public static void unload() {
+        try {
+            DriverManager.deregisterDriver(new Driver());
+        } catch (SQLException e) {
+            log.error("Failed to deregister ClickHouse JDBC driver", e);
+        }
+    }
+
+
 
     @Override
     public Connection connect(String url, Properties info) throws SQLException {
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/JdbcV2Wrapper.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/JdbcV2Wrapper.java
@@ -3,7 +3,7 @@
 import java.sql.SQLException;
 import java.sql.Wrapper;
 
-public interface JdbcWrapper extends Wrapper {
+public interface JdbcV2Wrapper extends Wrapper {
     default boolean isWrapperFor(Class<?> iface) throws SQLException {
         return iface != null && iface.isAssignableFrom(getClass());
     }
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/PreparedStatementImpl.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/PreparedStatementImpl.java
@@ -15,7 +15,7 @@
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
-public class PreparedStatementImpl extends StatementImpl implements PreparedStatement, JdbcWrapper {
+public class PreparedStatementImpl extends StatementImpl implements PreparedStatement, JdbcV2Wrapper {
     private static final Logger LOG = LoggerFactory.getLogger(PreparedStatementImpl.class);
 
     public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/ResultSetImpl.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/ResultSetImpl.java
@@ -17,10 +17,10 @@
 import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
 import com.clickhouse.client.api.metadata.TableSchema;
 import com.clickhouse.client.api.query.QueryResponse;
-import com.clickhouse.logging.Logger;
-import com.clickhouse.logging.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class ResultSetImpl implements ResultSet, JdbcWrapper {
+public class ResultSetImpl implements ResultSet, JdbcV2Wrapper {
     private static final Logger log = LoggerFactory.getLogger(ResultSetImpl.class);
     private QueryResponse response;
     protected ClickHouseBinaryFormatReader reader;
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java
@@ -17,7 +17,7 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-public class StatementImpl implements Statement, JdbcWrapper {
+public class StatementImpl implements Statement, JdbcV2Wrapper {
     private static final Logger LOG = LoggerFactory.getLogger(StatementImpl.class);
 
     ConnectionImpl connection;
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/JdbcConfiguration.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/JdbcConfiguration.java
@@ -90,7 +90,13 @@ private Map<String, String> parseUrl(String urlString) {
         urlProperties.put("host", url.getHost());
         urlProperties.put("port", String.valueOf(url.getPort() == -1 ? 8443 : url.getPort()));
         urlProperties.put("protocol", url.getProtocol());
-        urlProperties.put("database", url.getPath().substring(1));
+
+        try {
+            urlProperties.put("database", url.getPath().substring(1));
+        } catch (StringIndexOutOfBoundsException e) {
+            urlProperties.put("database", "default");
+        }
+
         urlProperties.put("queryParams", url.getQuery());
 
         return urlProperties;
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/metadata/DatabaseMetaData.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/metadata/DatabaseMetaData.java
@@ -9,13 +9,12 @@
 
 import com.clickhouse.jdbc.ConnectionImpl;
 import com.clickhouse.jdbc.Driver;
-import com.clickhouse.jdbc.JdbcWrapper;
-import com.clickhouse.jdbc.ResultSetImpl;
+import com.clickhouse.jdbc.JdbcV2Wrapper;
 import com.clickhouse.jdbc.internal.JdbcUtils;
 import com.clickhouse.logging.Logger;
 import com.clickhouse.logging.LoggerFactory;
 
-public class DatabaseMetaData implements java.sql.DatabaseMetaData, JdbcWrapper {
+public class DatabaseMetaData implements java.sql.DatabaseMetaData, JdbcV2Wrapper {
     private static final Logger log = LoggerFactory.getLogger(DatabaseMetaData.class);
     ConnectionImpl connection;
 
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/metadata/ParameterMetaData.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/metadata/ParameterMetaData.java
@@ -1,14 +1,13 @@
 package com.clickhouse.jdbc.metadata;
 
 import com.clickhouse.data.ClickHouseColumn;
-import com.clickhouse.data.ClickHouseDataType;
-import com.clickhouse.jdbc.JdbcWrapper;
+import com.clickhouse.jdbc.JdbcV2Wrapper;
 import com.clickhouse.jdbc.internal.JdbcUtils;
 
 import java.sql.SQLException;
 import java.util.List;
 
-public class ParameterMetaData implements java.sql.ParameterMetaData, JdbcWrapper {
+public class ParameterMetaData implements java.sql.ParameterMetaData, JdbcV2Wrapper {
     private final List<ClickHouseColumn> params;
 
     protected ParameterMetaData(List<ClickHouseColumn> params) {
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/metadata/ResultSetMetaData.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/metadata/ResultSetMetaData.java
@@ -4,11 +4,11 @@
 
 import com.clickhouse.client.api.metadata.TableSchema;
 import com.clickhouse.data.ClickHouseColumn;
-import com.clickhouse.jdbc.JdbcWrapper;
+import com.clickhouse.jdbc.JdbcV2Wrapper;
 import com.clickhouse.jdbc.ResultSetImpl;
 import com.clickhouse.jdbc.internal.JdbcUtils;
 
-public class ResultSetMetaData implements java.sql.ResultSetMetaData, JdbcWrapper {
+public class ResultSetMetaData implements java.sql.ResultSetMetaData, JdbcV2Wrapper {
     private final ResultSetImpl resultSet;
     public ResultSetMetaData(ResultSetImpl resultSet) {
         this.resultSet = resultSet;

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`import java.sql.SQLException;`
`4`	`4`	`import java.sql.Wrapper;`
`5`	`5`
`6`		`-public interface JdbcWrapper extends Wrapper {`
	`6`	`+public interface JdbcV2Wrapper extends Wrapper {`
`7`	`7`	`default boolean isWrapperFor(Class<?> iface) throws SQLException {`
`8`	`8`	`return iface != null && iface.isAssignableFrom(getClass());`
`9`	`9`	`}`