extract clickhouse-data from clickhouse-client

.github/workflows/analysis.yml

@@ -45,7 +45,7 @@ jobs:
           distribution: "temurin"
           java-version: |
             8
-            11
+            17
           cache: "maven"
       - name: Setup Toolchain
         shell: bash
@@ -57,7 +57,7 @@ jobs:
             <toolchain>
               <type>jdk</type>
               <provides>
-                <version>11</version>
+                <version>17</version>
               </provides>
               <configuration>
                 <jdkHome>${{ env.JAVA_HOME }}</jdkHome>
@@ -79,12 +79,12 @@ jobs:
       - name: Build and install
         run: |
           find . -type f -name "simplelogger.*" -exec rm -fv '{}' \;
-          mvn -q --batch-mode --projects '!clickhouse-benchmark' -Drelease -DclickhouseVersion=22.8 -DskipTests install
+          mvn -q --batch-mode --projects '!clickhouse-benchmark' -DclickhouseVersion=22.8 -DskipTests install
       - name: Analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          mvn --batch-mode --projects '!clickhouse-benchmark' -Drelease -DclickhouseVersion=22.8 \
+          mvn --batch-mode --projects '!clickhouse-benchmark' -DclickhouseVersion=22.8 \
             -Panalysis verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
         continue-on-error: true

.github/workflows/build.yml

@@ -54,7 +54,7 @@ jobs:
           java-version: 8
           cache: "maven"
       - name: Build and install libraries
-        run: mvn --batch-mode --show-version --strict-checksums --threads C1 -Dmaven.wagon.rto=30000 -DskipITs install
+        run: mvn --batch-mode --show-version --strict-checksums --threads C1 -Dmaven.wagon.rto=30000 -Dj8 -DskipITs install
       - name: Compile examples
         run: for d in $(ls -d `pwd`/examples/*/); do cd $d && mvn clean compile; done
 
@@ -87,7 +87,7 @@ jobs:
             && clickhouse client --version
       - name: Test CLI client
         run: |
-          mvn --also-make --batch-mode --projects clickhouse-cli-client -DclickhouseVersion=22.8 -DskipUTs verify
+          mvn --also-make --batch-mode --projects clickhouse-cli-client -DclickhouseVersion=22.8 -Dj8 -DskipUTs verify
       - name: Upload test results
         uses: actions/upload-artifact@v2
         if: failure()
@@ -121,7 +121,7 @@ jobs:
           distribution: "temurin"
           java-version: |
             8
-            11
+            17
           cache: "maven"
       - name: Setup Toolchain
         shell: bash
@@ -133,7 +133,7 @@ jobs:
             <toolchain>
               <type>jdk</type>
               <provides>
-                <version>11</version>
+                <version>17</version>
               </provides>
               <configuration>
                 <jdkHome>${{ env.JAVA_HOME }}</jdkHome>
@@ -143,7 +143,7 @@ jobs:
           EOF
       - name: Test Java client
         run: |
-          mvn --also-make --batch-mode --projects clickhouse-cli-client,clickhouse-grpc-client,clickhouse-http-client -Drelease -DclickhouseVersion=${{ matrix.clickhouse }} verify
+          mvn --also-make --batch-mode --projects clickhouse-cli-client,clickhouse-grpc-client,clickhouse-http-client -DclickhouseVersion=${{ matrix.clickhouse }} verify
       - name: Upload test results
         uses: actions/upload-artifact@v2
         if: failure()
@@ -181,7 +181,7 @@ jobs:
           distribution: "temurin"
           java-version: |
             8
-            11
+            17
           cache: "maven"
       - name: Setup Toolchain
         shell: bash
@@ -193,7 +193,7 @@ jobs:
             <toolchain>
               <type>jdk</type>
               <provides>
-                <version>11</version>
+                <version>17</version>
               </provides>
               <configuration>
                 <jdkHome>${{ env.JAVA_HOME }}</jdkHome>
@@ -202,10 +202,10 @@ jobs:
           </toolchains>
           EOF
       - name: Install Java client
-        run: mvn --also-make --batch-mode --projects clickhouse-cli-client,clickhouse-grpc-client,clickhouse-http-client -Drelease -DskipTests install
+        run: mvn --also-make --batch-mode --projects clickhouse-cli-client,clickhouse-grpc-client,clickhouse-http-client -DskipTests install
       - name: Test JDBC driver
         run: |
-          mvn --batch-mode --projects clickhouse-jdbc -Drelease -DclickhouseVersion=${{ matrix.clickhouse }} -Dprotocol=${{ matrix.protocol }} verify
+          mvn --batch-mode --projects clickhouse-jdbc -DclickhouseVersion=${{ matrix.clickhouse }} -Dprotocol=${{ matrix.protocol }} verify
       - name: Upload test results
         uses: actions/upload-artifact@v2
         if: failure()
@@ -241,7 +241,7 @@ jobs:
           distribution: "temurin"
           java-version: |
             8
-            11
+            17
           cache: "maven"
       - name: Setup Toolchain
         shell: bash
@@ -253,7 +253,7 @@ jobs:
             <toolchain>
               <type>jdk</type>
               <provides>
-                <version>11</version>
+                <version>17</version>
               </provides>
               <configuration>
                 <jdkHome>${{ env.JAVA_HOME }}</jdkHome>
@@ -262,10 +262,10 @@ jobs:
           </toolchains>
           EOF
       - name: Install Java client
-        run: mvn --also-make --batch-mode --projects clickhouse-jdbc -Drelease -DskipTests install
+        run: mvn --also-make --batch-mode --projects clickhouse-jdbc -DskipTests install
       - name: Test R2DBC ${{ matrix.r2dbc }}
         run: |
-          mvn --batch-mode --projects clickhouse-r2dbc -Drelease -DclickhouseVersion=${{ matrix.clickhouse }} \
+          mvn --batch-mode --projects clickhouse-r2dbc -DclickhouseVersion=${{ matrix.clickhouse }} \
             -D'r2dbc-spi.version=${{ matrix.r2dbc }}' -Dprotocol=${{ matrix.protocol }} verify
       - name: Upload test results
         uses: actions/upload-artifact@v2
@@ -315,12 +315,12 @@ jobs:
           java-version: 8
           cache: "maven"
       - name: Install Java client
-        run: mvn --also-make --batch-mode --projects clickhouse-cli-client,clickhouse-grpc-client,clickhouse-http-client -DskipTests install
+        run: mvn --also-make --batch-mode --projects clickhouse-cli-client,clickhouse-grpc-client,clickhouse-http-client -Dj8 -DskipTests install
       - name: Test JDBC and R2DBC drivers
         run: |
           mvn --batch-mode --projects clickhouse-jdbc,clickhouse-r2dbc -DclickhouseVersion=22.8 \
             -DclickhouseTimezone=${{ matrix.serverTz }} -Duser.timezone=${{ matrix.clientTz }} \
-            -DskipUTs verify
+            -Dj8 -DskipUTs verify
       - name: Upload test results
         uses: actions/upload-artifact@v2
         if: failure()

.github/workflows/release.yml

@@ -22,7 +22,7 @@ jobs:
           distribution: 'temurin'
           java-version: |
             8
-            11
+            17
           cache: 'maven'
       - name: Setup Toolchain
         shell: bash
@@ -34,7 +34,7 @@ jobs:
             <toolchain>
               <type>jdk</type>
               <provides>
-                <version>11</version>
+                <version>17</version>
               </provides>
               <configuration>
                 <jdkHome>${{ env.JAVA_HOME }}</jdkHome>

README.md

@@ -4,7 +4,7 @@
 
 Java libraries for connecting to ClickHouse and processing data in various formats. Java client is async, lightweight, and low-overhead library for ClickHouse; while JDBC and R2DBC drivers are built on top of the Java client with more dependencies and features. Java 8 or higher is required to use the libraries. In addition, please use ClickHouse 20.7+ or any of [active releases](https://github.com/ClickHouse/ClickHouse/pulls?q=is%3Aopen+is%3Apr+label%3Arelease).
 
-![image](https://user-images.githubusercontent.com/4270380/210317525-d548fbe5-8f66-4cc9-b34c-fd09d289b08e.png)
+![image](https://user-images.githubusercontent.com/4270380/212460181-2b806482-bc1c-492c-bd69-cdeb2c8845b5.png)
 
 ## Features
 
@@ -140,7 +140,7 @@ More examples can be found at [here](../../tree/master/examples/jdbc).
 
 ## Build with Maven
 
-Use `mvn -DskipITs clean verify` to compile and generate packages if you're using JDK 8. To create a multi-release jar (see [JEP-238](https://openjdk.java.net/jeps/238)), please use JDK 11+ with `~/.m2/toolchains.xml` like below, and run `mvn -Drelease -DskipITs clean verify` instead.
+Use `mvn -Dj8 -DskipITs clean verify` to compile and generate packages if you're using JDK 8. To create a multi-release jar (see [JEP-238](https://openjdk.java.net/jeps/238)), please use JDK 11+ with `~/.m2/toolchains.xml` like below, and run `mvn -DskipITs clean verify` instead.
 
 ```xml
 <?xml version="1.0" encoding="UTF8"?>
@@ -194,7 +194,7 @@ To benchmark JDBC drivers:
 
 ```bash
 cd clickhouse-benchmark
-mvn -Drelease clean package
+mvn clean package
 # single thread mode
 java -DdbHost=localhost -jar target/benchmarks.jar -t 1 \
     -p client=clickhouse-jdbc -p connection=reuse \

clickhouse-benchmark/src/main/java/com/clickhouse/benchmark/client/ClientState.java

@@ -16,16 +16,16 @@
 import com.clickhouse.client.ClickHouseClientBuilder;
 import com.clickhouse.client.ClickHouseCredentials;
 import com.clickhouse.client.ClickHouseException;
-import com.clickhouse.client.ClickHouseCompression;
-import com.clickhouse.client.ClickHouseFormat;
 import com.clickhouse.client.ClickHouseNode;
 import com.clickhouse.client.ClickHouseProtocol;
-import com.clickhouse.client.ClickHouseRecord;
 import com.clickhouse.client.ClickHouseRequest;
 import com.clickhouse.client.ClickHouseResponse;
-import com.clickhouse.client.ClickHouseValue;
 import com.clickhouse.client.config.ClickHouseClientOption;
 import com.clickhouse.client.grpc.config.ClickHouseGrpcOption;
+import com.clickhouse.data.ClickHouseCompression;
+import com.clickhouse.data.ClickHouseFormat;
+import com.clickhouse.data.ClickHouseRecord;
+import com.clickhouse.data.ClickHouseValue;
 
 @State(Scope.Thread)
 public class ClientState extends BaseState {

clickhouse-benchmark/src/main/java/com/clickhouse/benchmark/misc/FactoryBenchmark.java

@@ -28,23 +28,23 @@
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.infra.Blackhole;
 import com.clickhouse.benchmark.BaseState;
-import com.clickhouse.client.ClickHouseEnum;
-import com.clickhouse.client.ClickHouseValue;
-import com.clickhouse.client.ClickHouseValues;
-import com.clickhouse.client.data.ClickHouseBigDecimalValue;
-import com.clickhouse.client.data.ClickHouseBigIntegerValue;
-import com.clickhouse.client.data.ClickHouseByteValue;
-import com.clickhouse.client.data.ClickHouseDateTimeValue;
-import com.clickhouse.client.data.ClickHouseDateValue;
-import com.clickhouse.client.data.ClickHouseDoubleValue;
-import com.clickhouse.client.data.ClickHouseEnumValue;
-import com.clickhouse.client.data.ClickHouseFloatValue;
-import com.clickhouse.client.data.ClickHouseIntegerValue;
-import com.clickhouse.client.data.ClickHouseIpv4Value;
-import com.clickhouse.client.data.ClickHouseIpv6Value;
-import com.clickhouse.client.data.ClickHouseLongValue;
-import com.clickhouse.client.data.ClickHouseShortValue;
-import com.clickhouse.client.data.ClickHouseStringValue;
+import com.clickhouse.data.ClickHouseEnum;
+import com.clickhouse.data.ClickHouseValue;
+import com.clickhouse.data.ClickHouseValues;
+import com.clickhouse.data.value.ClickHouseBigDecimalValue;
+import com.clickhouse.data.value.ClickHouseBigIntegerValue;
+import com.clickhouse.data.value.ClickHouseByteValue;
+import com.clickhouse.data.value.ClickHouseDateTimeValue;
+import com.clickhouse.data.value.ClickHouseDateValue;
+import com.clickhouse.data.value.ClickHouseDoubleValue;
+import com.clickhouse.data.value.ClickHouseEnumValue;
+import com.clickhouse.data.value.ClickHouseFloatValue;
+import com.clickhouse.data.value.ClickHouseIntegerValue;
+import com.clickhouse.data.value.ClickHouseIpv4Value;
+import com.clickhouse.data.value.ClickHouseIpv6Value;
+import com.clickhouse.data.value.ClickHouseLongValue;
+import com.clickhouse.data.value.ClickHouseShortValue;
+import com.clickhouse.data.value.ClickHouseStringValue;
 
 @State(Scope.Benchmark)
 @Warmup(iterations = 10, timeUnit = TimeUnit.SECONDS, time = 1)

clickhouse-benchmark/src/main/java/com/clickhouse/benchmark/misc/QueueBenchmark.java

@@ -21,17 +21,17 @@
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.infra.Blackhole;
 import com.clickhouse.benchmark.BaseState;
-import com.clickhouse.client.ClickHouseByteBuffer;
 import com.clickhouse.client.ClickHouseClient;
 import com.clickhouse.client.ClickHouseConfig;
-import com.clickhouse.client.ClickHouseDataStreamFactory;
-import com.clickhouse.client.ClickHouseInputStream;
-import com.clickhouse.client.ClickHouseOutputStream;
-import com.clickhouse.client.ClickHousePipedOutputStream;
-import com.clickhouse.client.config.ClickHouseBufferingMode;
 import com.clickhouse.client.config.ClickHouseClientOption;
-import com.clickhouse.client.config.ClickHouseOption;
-import com.clickhouse.client.data.BinaryStreamUtils;
+import com.clickhouse.config.ClickHouseBufferingMode;
+import com.clickhouse.config.ClickHouseOption;
+import com.clickhouse.data.ClickHouseByteBuffer;
+import com.clickhouse.data.ClickHouseDataStreamFactory;
+import com.clickhouse.data.ClickHouseInputStream;
+import com.clickhouse.data.ClickHouseOutputStream;
+import com.clickhouse.data.ClickHousePipedOutputStream;
+import com.clickhouse.data.format.BinaryStreamUtils;
 
 @State(Scope.Benchmark)
 @Warmup(iterations = 10, timeUnit = TimeUnit.SECONDS, time = 1)

clickhouse-benchmark/src/main/java/com/clickhouse/benchmark/misc/StreamBenchmark.java

@@ -14,11 +14,11 @@
 import com.clickhouse.benchmark.BaseState;
 import com.clickhouse.client.ClickHouseClient;
 import com.clickhouse.client.ClickHouseConfig;
-import com.clickhouse.client.ClickHouseInputStream;
-import com.clickhouse.client.ClickHouseOutputStream;
-import com.clickhouse.client.config.ClickHouseBufferingMode;
 import com.clickhouse.client.config.ClickHouseClientOption;
-import com.clickhouse.client.config.ClickHouseOption;
+import com.clickhouse.config.ClickHouseBufferingMode;
+import com.clickhouse.config.ClickHouseOption;
+import com.clickhouse.data.ClickHouseInputStream;
+import com.clickhouse.data.ClickHouseOutputStream;
 
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;