Skip to content

Commit b14ba78

Browse files
zhicwuzhicwu
authored
Merge pull request #1197 from zhicwu/master
extract clickhouse-data from clickhouse-client
2 parents 07b9dcc + a2a8af0 commit b14ba78

File tree

322 files changed

+5307
-2679
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

322 files changed

+5307
-2679
lines changed

‎.github/workflows/analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
distribution: "temurin"
4646
java-version: |
4747
8
48-
11
48+
17
4949
cache: "maven"
5050
- name: Setup Toolchain
5151
shell: bash
@@ -57,7 +57,7 @@ jobs:
5757
<toolchain>
5858
<type>jdk</type>
5959
<provides>
60-
<version>11</version>
60+
<version>17</version>
6161
</provides>
6262
<configuration>
6363
<jdkHome>${{ env.JAVA_HOME }}</jdkHome>
@@ -79,12 +79,12 @@ jobs:
7979
- name: Build and install
8080
run: |
8181
find . -type f -name "simplelogger.*" -exec rm -fv '{}' \;
82-
mvn -q --batch-mode --projects '!clickhouse-benchmark' -Drelease -DclickhouseVersion=22.8 -DskipTests install
82+
mvn -q --batch-mode --projects '!clickhouse-benchmark' -DclickhouseVersion=22.8 -DskipTests install
8383
- name: Analyze
8484
env:
8585
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
8686
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
8787
run: |
88-
mvn --batch-mode --projects '!clickhouse-benchmark' -Drelease -DclickhouseVersion=22.8 \
88+
mvn --batch-mode --projects '!clickhouse-benchmark' -DclickhouseVersion=22.8 \
8989
-Panalysis verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
9090
continue-on-error: true

‎.github/workflows/build.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
java-version: 8
5555
cache: "maven"
5656
- name: Build and install libraries
57-
run: mvn --batch-mode --show-version --strict-checksums --threads C1 -Dmaven.wagon.rto=30000 -DskipITs install
57+
run: mvn --batch-mode --show-version --strict-checksums --threads C1 -Dmaven.wagon.rto=30000 -Dj8 -DskipITs install
5858
- name: Compile examples
5959
run: for d in $(ls -d `pwd`/examples/*/); do cd $d && mvn clean compile; done
6060

@@ -87,7 +87,7 @@ jobs:
8787
&& clickhouse client --version
8888
- name: Test CLI client
8989
run: |
90-
mvn --also-make --batch-mode --projects clickhouse-cli-client -DclickhouseVersion=22.8 -DskipUTs verify
90+
mvn --also-make --batch-mode --projects clickhouse-cli-client -DclickhouseVersion=22.8 -Dj8 -DskipUTs verify
9191
- name: Upload test results
9292
uses: actions/upload-artifact@v2
9393
if: failure()
@@ -121,7 +121,7 @@ jobs:
121121
distribution: "temurin"
122122
java-version: |
123123
8
124-
11
124+
17
125125
cache: "maven"
126126
- name: Setup Toolchain
127127
shell: bash
@@ -133,7 +133,7 @@ jobs:
133133
<toolchain>
134134
<type>jdk</type>
135135
<provides>
136-
<version>11</version>
136+
<version>17</version>
137137
</provides>
138138
<configuration>
139139
<jdkHome>${{ env.JAVA_HOME }}</jdkHome>
@@ -143,7 +143,7 @@ jobs:
143143
EOF
144144
- name: Test Java client
145145
run: |
146-
mvn --also-make --batch-mode --projects clickhouse-cli-client,clickhouse-grpc-client,clickhouse-http-client -Drelease -DclickhouseVersion=${{ matrix.clickhouse }} verify
146+
mvn --also-make --batch-mode --projects clickhouse-cli-client,clickhouse-grpc-client,clickhouse-http-client -DclickhouseVersion=${{ matrix.clickhouse }} verify
147147
- name: Upload test results
148148
uses: actions/upload-artifact@v2
149149
if: failure()
@@ -181,7 +181,7 @@ jobs:
181181
distribution: "temurin"
182182
java-version: |
183183
8
184-
11
184+
17
185185
cache: "maven"
186186
- name: Setup Toolchain
187187
shell: bash
@@ -193,7 +193,7 @@ jobs:
193193
<toolchain>
194194
<type>jdk</type>
195195
<provides>
196-
<version>11</version>
196+
<version>17</version>
197197
</provides>
198198
<configuration>
199199
<jdkHome>${{ env.JAVA_HOME }}</jdkHome>
@@ -202,10 +202,10 @@ jobs:
202202
</toolchains>
203203
EOF
204204
- name: Install Java client
205-
run: mvn --also-make --batch-mode --projects clickhouse-cli-client,clickhouse-grpc-client,clickhouse-http-client -Drelease -DskipTests install
205+
run: mvn --also-make --batch-mode --projects clickhouse-cli-client,clickhouse-grpc-client,clickhouse-http-client -DskipTests install
206206
- name: Test JDBC driver
207207
run: |
208-
mvn --batch-mode --projects clickhouse-jdbc -Drelease -DclickhouseVersion=${{ matrix.clickhouse }} -Dprotocol=${{ matrix.protocol }} verify
208+
mvn --batch-mode --projects clickhouse-jdbc -DclickhouseVersion=${{ matrix.clickhouse }} -Dprotocol=${{ matrix.protocol }} verify
209209
- name: Upload test results
210210
uses: actions/upload-artifact@v2
211211
if: failure()
@@ -241,7 +241,7 @@ jobs:
241241
distribution: "temurin"
242242
java-version: |
243243
8
244-
11
244+
17
245245
cache: "maven"
246246
- name: Setup Toolchain
247247
shell: bash
@@ -253,7 +253,7 @@ jobs:
253253
<toolchain>
254254
<type>jdk</type>
255255
<provides>
256-
<version>11</version>
256+
<version>17</version>
257257
</provides>
258258
<configuration>
259259
<jdkHome>${{ env.JAVA_HOME }}</jdkHome>
@@ -262,10 +262,10 @@ jobs:
262262
</toolchains>
263263
EOF
264264
- name: Install Java client
265-
run: mvn --also-make --batch-mode --projects clickhouse-jdbc -Drelease -DskipTests install
265+
run: mvn --also-make --batch-mode --projects clickhouse-jdbc -DskipTests install
266266
- name: Test R2DBC ${{ matrix.r2dbc }}
267267
run: |
268-
mvn --batch-mode --projects clickhouse-r2dbc -Drelease -DclickhouseVersion=${{ matrix.clickhouse }} \
268+
mvn --batch-mode --projects clickhouse-r2dbc -DclickhouseVersion=${{ matrix.clickhouse }} \
269269
-D'r2dbc-spi.version=${{ matrix.r2dbc }}' -Dprotocol=${{ matrix.protocol }} verify
270270
- name: Upload test results
271271
uses: actions/upload-artifact@v2
@@ -315,12 +315,12 @@ jobs:
315315
java-version: 8
316316
cache: "maven"
317317
- name: Install Java client
318-
run: mvn --also-make --batch-mode --projects clickhouse-cli-client,clickhouse-grpc-client,clickhouse-http-client -DskipTests install
318+
run: mvn --also-make --batch-mode --projects clickhouse-cli-client,clickhouse-grpc-client,clickhouse-http-client -Dj8 -DskipTests install
319319
- name: Test JDBC and R2DBC drivers
320320
run: |
321321
mvn --batch-mode --projects clickhouse-jdbc,clickhouse-r2dbc -DclickhouseVersion=22.8 \
322322
-DclickhouseTimezone=${{ matrix.serverTz }} -Duser.timezone=${{ matrix.clientTz }} \
323-
-DskipUTs verify
323+
-Dj8 -DskipUTs verify
324324
- name: Upload test results
325325
uses: actions/upload-artifact@v2
326326
if: failure()

‎.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
distribution: 'temurin'
2323
java-version: |
2424
8
25-
11
25+
17
2626
cache: 'maven'
2727
- name: Setup Toolchain
2828
shell: bash
@@ -34,7 +34,7 @@ jobs:
3434
<toolchain>
3535
<type>jdk</type>
3636
<provides>
37-
<version>11</version>
37+
<version>17</version>
3838
</provides>
3939
<configuration>
4040
<jdkHome>${{ env.JAVA_HOME }}</jdkHome>

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
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).
66

7-
![image](https://user-images.githubusercontent.com/4270380/210317525-d548fbe5-8f66-4cc9-b34c-fd09d289b08e.png)
7+
![image](https://user-images.githubusercontent.com/4270380/212460181-2b806482-bc1c-492c-bd69-cdeb2c8845b5.png)
88

99
## Features
1010

@@ -140,7 +140,7 @@ More examples can be found at [here](../../tree/master/examples/jdbc).
140140

141141
## Build with Maven
142142

143-
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.
143+
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.
144144

145145
```xml
146146
<?xml version="1.0" encoding="UTF8"?>
@@ -194,7 +194,7 @@ To benchmark JDBC drivers:
194194

195195
```bash
196196
cd clickhouse-benchmark
197-
mvn -Drelease clean package
197+
mvn clean package
198198
# single thread mode
199199
java -DdbHost=localhost -jar target/benchmarks.jar -t 1 \
200200
-p client=clickhouse-jdbc -p connection=reuse \

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
import com.clickhouse.client.ClickHouseClientBuilder;
1717
import com.clickhouse.client.ClickHouseCredentials;
1818
import com.clickhouse.client.ClickHouseException;
19-
import com.clickhouse.client.ClickHouseCompression;
20-
import com.clickhouse.client.ClickHouseFormat;
2119
import com.clickhouse.client.ClickHouseNode;
2220
import com.clickhouse.client.ClickHouseProtocol;
23-
import com.clickhouse.client.ClickHouseRecord;
2421
import com.clickhouse.client.ClickHouseRequest;
2522
import com.clickhouse.client.ClickHouseResponse;
26-
import com.clickhouse.client.ClickHouseValue;
2723
import com.clickhouse.client.config.ClickHouseClientOption;
2824
import com.clickhouse.client.grpc.config.ClickHouseGrpcOption;
25+
import com.clickhouse.data.ClickHouseCompression;
26+
import com.clickhouse.data.ClickHouseFormat;
27+
import com.clickhouse.data.ClickHouseRecord;
28+
import com.clickhouse.data.ClickHouseValue;
2929

3030
@State(Scope.Thread)
3131
public class ClientState extends BaseState {

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,23 @@
2828
import org.openjdk.jmh.annotations.Warmup;
2929
import org.openjdk.jmh.infra.Blackhole;
3030
import com.clickhouse.benchmark.BaseState;
31-
import com.clickhouse.client.ClickHouseEnum;
32-
import com.clickhouse.client.ClickHouseValue;
33-
import com.clickhouse.client.ClickHouseValues;
34-
import com.clickhouse.client.data.ClickHouseBigDecimalValue;
35-
import com.clickhouse.client.data.ClickHouseBigIntegerValue;
36-
import com.clickhouse.client.data.ClickHouseByteValue;
37-
import com.clickhouse.client.data.ClickHouseDateTimeValue;
38-
import com.clickhouse.client.data.ClickHouseDateValue;
39-
import com.clickhouse.client.data.ClickHouseDoubleValue;
40-
import com.clickhouse.client.data.ClickHouseEnumValue;
41-
import com.clickhouse.client.data.ClickHouseFloatValue;
42-
import com.clickhouse.client.data.ClickHouseIntegerValue;
43-
import com.clickhouse.client.data.ClickHouseIpv4Value;
44-
import com.clickhouse.client.data.ClickHouseIpv6Value;
45-
import com.clickhouse.client.data.ClickHouseLongValue;
46-
import com.clickhouse.client.data.ClickHouseShortValue;
47-
import com.clickhouse.client.data.ClickHouseStringValue;
31+
import com.clickhouse.data.ClickHouseEnum;
32+
import com.clickhouse.data.ClickHouseValue;
33+
import com.clickhouse.data.ClickHouseValues;
34+
import com.clickhouse.data.value.ClickHouseBigDecimalValue;
35+
import com.clickhouse.data.value.ClickHouseBigIntegerValue;
36+
import com.clickhouse.data.value.ClickHouseByteValue;
37+
import com.clickhouse.data.value.ClickHouseDateTimeValue;
38+
import com.clickhouse.data.value.ClickHouseDateValue;
39+
import com.clickhouse.data.value.ClickHouseDoubleValue;
40+
import com.clickhouse.data.value.ClickHouseEnumValue;
41+
import com.clickhouse.data.value.ClickHouseFloatValue;
42+
import com.clickhouse.data.value.ClickHouseIntegerValue;
43+
import com.clickhouse.data.value.ClickHouseIpv4Value;
44+
import com.clickhouse.data.value.ClickHouseIpv6Value;
45+
import com.clickhouse.data.value.ClickHouseLongValue;
46+
import com.clickhouse.data.value.ClickHouseShortValue;
47+
import com.clickhouse.data.value.ClickHouseStringValue;
4848

4949
@State(Scope.Benchmark)
5050
@Warmup(iterations = 10, timeUnit = TimeUnit.SECONDS, time = 1)

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
2121
import org.openjdk.jmh.annotations.Warmup;
2222
import org.openjdk.jmh.infra.Blackhole;
2323
import com.clickhouse.benchmark.BaseState;
24-
import com.clickhouse.client.ClickHouseByteBuffer;
2524
import com.clickhouse.client.ClickHouseClient;
2625
import com.clickhouse.client.ClickHouseConfig;
27-
import com.clickhouse.client.ClickHouseDataStreamFactory;
28-
import com.clickhouse.client.ClickHouseInputStream;
29-
import com.clickhouse.client.ClickHouseOutputStream;
30-
import com.clickhouse.client.ClickHousePipedOutputStream;
31-
import com.clickhouse.client.config.ClickHouseBufferingMode;
3226
import com.clickhouse.client.config.ClickHouseClientOption;
33-
import com.clickhouse.client.config.ClickHouseOption;
34-
import com.clickhouse.client.data.BinaryStreamUtils;
27+
import com.clickhouse.config.ClickHouseBufferingMode;
28+
import com.clickhouse.config.ClickHouseOption;
29+
import com.clickhouse.data.ClickHouseByteBuffer;
30+
import com.clickhouse.data.ClickHouseDataStreamFactory;
31+
import com.clickhouse.data.ClickHouseInputStream;
32+
import com.clickhouse.data.ClickHouseOutputStream;
33+
import com.clickhouse.data.ClickHousePipedOutputStream;
34+
import com.clickhouse.data.format.BinaryStreamUtils;
3535

3636
@State(Scope.Benchmark)
3737
@Warmup(iterations = 10, timeUnit = TimeUnit.SECONDS, time = 1)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
import com.clickhouse.benchmark.BaseState;
1515
import com.clickhouse.client.ClickHouseClient;
1616
import com.clickhouse.client.ClickHouseConfig;
17-
import com.clickhouse.client.ClickHouseInputStream;
18-
import com.clickhouse.client.ClickHouseOutputStream;
19-
import com.clickhouse.client.config.ClickHouseBufferingMode;
2017
import com.clickhouse.client.config.ClickHouseClientOption;
21-
import com.clickhouse.client.config.ClickHouseOption;
18+
import com.clickhouse.config.ClickHouseBufferingMode;
19+
import com.clickhouse.config.ClickHouseOption;
20+
import com.clickhouse.data.ClickHouseInputStream;
21+
import com.clickhouse.data.ClickHouseOutputStream;
2222

2323
import org.openjdk.jmh.annotations.Benchmark;
2424
import org.openjdk.jmh.annotations.BenchmarkMode;

0 commit comments

Comments
 (0)