Merge branch 'main' into repo_review_dependencies

Author: chernser

.github/workflows/run_examples.yml

@@ -0,0 +1,63 @@
+name: Run Examples
+
+on:
+  workflow_dispatch:
+    
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.event.number || github.sha }}
+  cancel-in-progress: true
+
+jobs:
+  compile:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    name: Compile (JDK 8)
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - name: Check out PR
+        run: |
+          git fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 \
+            origin pull/${{ github.event.inputs.pr }}/merge:merged-pr && git checkout merged-pr
+        if: github.event.inputs.pr != ''
+      - name: Install JDK 8 and Maven
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: |
+            8
+            21
+          cache: "maven"
+      - name: Save Repo Artifacts
+        id: save-repo-artifacts
+        uses: actions/cache/save@v4
+        with:
+            path: ~/.m2/repository/com/clickhouse
+            key: ${{ github.run_id  }}-ch-artifacts
+      - name: Build and install libraries
+        run: mvn --batch-mode --no-transfer-progress --show-version --strict-checksums --threads 2 -Dmaven.wagon.rto=30000 -Dj8 -DskipITs install
+      - name: Compile examples
+        run: |
+          cd examples/jdbc
+          mvn clean compile
+          echo "Run Id ${{ github.run_id }}"
+  run-examples:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    name: Run Examples
+    needs: compile
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - name: Restore Repo Artifacts
+        id: restore-repo-artifacts
+        uses: actions/cache/restore@v4
+        with:
+            path: ~/.m2/repository/com/clickhouse
+            key: ${{ github.run_id  }}-ch-artifacts
+      - name: Run Examples
+        run: |
+          docker run -d --name demo-service-db -e CLICKHOUSE_USER=default -e CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=1 -e CLICKHOUSE_PASSWORD=secret -p 8123:8123 clickhouse/clickhouse-server:24.8
+          cd examples/jdbc
+          mvn --batch-mode --no-transfer-progress --show-version clean compile
+          mvn exec:java -Dexec.mainClass="com.clickhouse.examples.jdbc.Basic" -DchPassword=secret -DfailOnError=true

README.md

@@ -53,6 +53,18 @@ Historically, there are two versions of both components. The previous version of
 
 ## Important
 
+### Artifact Changes in 0.9.0 (June) 
+
+We are going to retire some JDBC artifacts (actually only classifiers) in *0.9.0*. Here is the list:   
+| Artifact | Classifier | Comments |
+|-----------------|---------|----------------------|
+| clickhouse-jdbc | shaded  | Use one with `all` classifier instead |  
+| clickhouse-jdbc | http    |                      |
+| clickhouse-jdbc | shaded-all | Use one with `all` classifier instead |
+
+Artifact `com.clickhouse:clickhouse-jdbc` remains untouched. 
+Artifact `com.clickhouse:clickhouse-jdbc:0.9.0:all` will contain all required classes.  
+
 ### Upcoming deprecations:
 | Component                      | Version | Comment                                          |
 |--------------------------------|---------|--------------------------------------------------|

clickhouse-client/pom.xml

@@ -87,6 +87,7 @@
                         <configuration>
                             <excludes>
                                 <exclude>META-INF/services/*</exclude>
+                                <exclude>com/clickhouse/client/ClickHouseTestClient.class</exclude>
                             </excludes>
                         </configuration>
                     </execution>

clickhouse-data/src/test/java/com/clickhouse/data/ClickHouseSimpleRecordTest.java

@@ -28,9 +28,9 @@ public void testNullInput() {
     public void testMismatchedColumnsAndValues() {
 
         Assert.assertThrows(IllegalArgumentException.class, () -> ClickHouseSimpleRecord
-                .of(Map.of("a", 0), new ClickHouseValue[0]));
+                .of(Collections.singletonMap("a", 0), new ClickHouseValue[0]));
 
-        ClickHouseSimpleRecord record = new ClickHouseSimpleRecord(Map.of("a", 0),
+        ClickHouseSimpleRecord record = new ClickHouseSimpleRecord(Collections.singletonMap("a", 0),
                 new ClickHouseValue[0]);
         Assert.assertEquals(record.getValues(), new ClickHouseValue[0]);
     }

examples/jdbc/src/main/java/com/clickhouse/examples/jdbc/Basic.java

@@ -21,27 +21,23 @@ public class Basic {
     private static final Logger log = LoggerFactory.getLogger(Basic.class);
     static final String TABLE_NAME = "jdbc_example_basic";
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
         String url = System.getProperty("chUrl", "jdbc:ch://localhost:8123");
 
         // Set user and password if needed
         Properties properties = new Properties();
         properties.setProperty("user", System.getProperty("chUser", "default"));
         properties.setProperty("password", System.getProperty("chPassword", ""));
 
-        try {
-            createTable(url, properties);
-            insertDateWithPreparedStatement(url, properties);
-            printInsertedData(url, properties);
+        createTable(url, properties);
+        insertDateWithPreparedStatement(url, properties);
+        printInsertedData(url, properties);
 
-            //Customizing client settings
-            setClientSettings(properties);
+        //Customizing client settings
+        setClientSettings(properties);
 
-            //Using HikariCP with ClickHouseDataSource
-            usedPooledConnection(url, properties);
-        } catch (SQLException e) {
-            log.error("Error", e);
-        }
+        //Using HikariCP with ClickHouseDataSource
+        usedPooledConnection(url, properties);
     }
 
     static void createTable(String url, Properties properties) throws SQLException {

jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/ClickHouseParser.g4

@@ -382,6 +382,7 @@ topClause
 
 fromClause
     : FROM joinExpr
+    | FROM identifier LPAREN QUERY RPAREN
     ;
 
 arrayJoinClause

jdbc-v2/src/main/java/com/clickhouse/jdbc/ConnectionImpl.java

@@ -33,16 +33,18 @@
 import java.sql.SQLWarning;
 import java.sql.SQLXML;
 import java.sql.Savepoint;
-import java.sql.ShardingKey;
 import java.sql.Statement;
 import java.sql.Struct;
+import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.Executor;
+import java.util.stream.Collectors;
 
 public class ConnectionImpl implements Connection, JdbcV2Wrapper {
     private static final Logger log = LoggerFactory.getLogger(ConnectionImpl.class);
@@ -548,7 +550,9 @@ public Properties getClientInfo() throws SQLException {
     @Override
     public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
         try {
-            return new com.clickhouse.jdbc.types.Array(List.of(elements), typeName, JdbcUtils.convertToSqlType(ClickHouseDataType.valueOf(typeName)).getVendorTypeNumber());
+            List<Object> list =
+                    (elements == null || elements.length == 0) ? Collections.emptyList() : Arrays.stream(elements, 0, elements.length).collect(Collectors.toList());
+            return new com.clickhouse.jdbc.types.Array(list, typeName, JdbcUtils.convertToSqlType(ClickHouseDataType.valueOf(typeName)).getVendorTypeNumber());
         } catch (Exception e) {
             throw new SQLException("Failed to create array", ExceptionUtils.SQL_STATE_CLIENT_ERROR, e);
         }
@@ -601,36 +605,6 @@ public int getNetworkTimeout() throws SQLException {
         return -1;
     }
 
-    @Override
-    public void beginRequest() throws SQLException {
-        Connection.super.beginRequest();
-    }
-
-    @Override
-    public void endRequest() throws SQLException {
-        Connection.super.endRequest();
-    }
-
-    @Override
-    public boolean setShardingKeyIfValid(ShardingKey shardingKey, ShardingKey superShardingKey, int timeout) throws SQLException {
-        return Connection.super.setShardingKeyIfValid(shardingKey, superShardingKey, timeout);
-    }
-
-    @Override
-    public boolean setShardingKeyIfValid(ShardingKey shardingKey, int timeout) throws SQLException {
-        return Connection.super.setShardingKeyIfValid(shardingKey, timeout);
-    }
-
-    @Override
-    public void setShardingKey(ShardingKey shardingKey, ShardingKey superShardingKey) throws SQLException {
-        Connection.super.setShardingKey(shardingKey, superShardingKey);
-    }
-
-    @Override
-    public void setShardingKey(ShardingKey shardingKey) throws SQLException {
-        Connection.super.setShardingKey(shardingKey);
-    }
-
     /**
      * Returns instance of the client used to execute queries by this connection.
      * @return - client instance

jdbc-v2/src/main/java/com/clickhouse/jdbc/DataSourceImpl.java

@@ -5,10 +5,8 @@
 import javax.sql.DataSource;
 import java.io.PrintWriter;
 import java.sql.Connection;
-import java.sql.ConnectionBuilder;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
-import java.sql.ShardingKeyBuilder;
 import java.util.Properties;
 import java.util.logging.Logger;
 
@@ -78,18 +76,8 @@ public int getLoginTimeout() throws SQLException {
         throw new SQLFeatureNotSupportedException("Method not supported", ExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
     }
 
-    @Override
-    public ConnectionBuilder createConnectionBuilder() throws SQLException {
-        return DataSource.super.createConnectionBuilder();
-    }
-
     @Override
     public Logger getParentLogger() throws SQLFeatureNotSupportedException {
         throw new SQLFeatureNotSupportedException("Method not supported", ExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
     }
-
-    @Override
-    public ShardingKeyBuilder createShardingKeyBuilder() throws SQLException {
-        return DataSource.super.createShardingKeyBuilder();
-    }
 }

jdbc-v2/src/main/java/com/clickhouse/jdbc/PreparedStatementImpl.java

@@ -403,21 +403,29 @@ public ResultSetMetaData getMetaData() throws SQLException {
 
     private static final Pattern REPLACE_Q_MARK_PATTERN = Pattern.compile("(\"[^\"]*\"|`[^`]*`|'[^']*')|(\\?)");
 
-    public static String replaceQuestionMarks(String sql, String replacement) {
+    public static String replaceQuestionMarks(String sql, final String replacement) {
         Matcher matcher = REPLACE_Q_MARK_PATTERN.matcher(sql);
 
         StringBuilder result = new StringBuilder();
 
+        int lastPos = 0;
         while (matcher.find()) {
-            if (matcher.group(1) != null) {
+            String text;
+            if ((text = matcher.group(1)) != null) {
                 // Quoted string — keep as-is
-                matcher.appendReplacement(result, Matcher.quoteReplacement(matcher.group(1)));
+                String str = Matcher.quoteReplacement(text);
+                result.append(sql, lastPos, matcher.start()).append(str);
+                lastPos = matcher.end();
             } else if (matcher.group(2) != null) {
                 // Question mark outside quotes — replace it
-                matcher.appendReplacement(result, Matcher.quoteReplacement(replacement));
+                String str = Matcher.quoteReplacement(replacement);
+                result.append(sql, lastPos, matcher.start()).append(str);
+                lastPos = matcher.end();
             }
         }
-        matcher.appendTail(result);
+
+        // Add rest of the `sql`
+        result.append(sql, lastPos, sql.length());
         return result.toString();
     }
 

jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java

@@ -526,30 +526,6 @@ public long executeLargeUpdate(String sql, String[] columnNames) throws SQLExcep
         return executeUpdate(sql, columnNames);
     }
 
-    @Override
-    public String enquoteLiteral(String val) throws SQLException {
-        checkClosed();
-        return Statement.super.enquoteLiteral(val);
-    }
-
-    @Override
-    public String enquoteIdentifier(String identifier, boolean alwaysQuote) throws SQLException {
-        checkClosed();
-        return Statement.super.enquoteIdentifier(identifier, alwaysQuote);
-    }
-
-    @Override
-    public boolean isSimpleIdentifier(String identifier) throws SQLException {
-        checkClosed();
-        return Statement.super.isSimpleIdentifier(identifier);
-    }
-
-    @Override
-    public String enquoteNCharLiteral(String val) throws SQLException {
-        checkClosed();
-        return Statement.super.enquoteNCharLiteral(val);
-    }
-
     /**
      * Return query ID of last executed statement. It is not guaranteed when statements is used concurrently.
      * @return query ID