Skip to content

Commit 74a6f85

Browse files
zhicwuzhicwu
authored
Merge pull request #114 from zhicwu/concurrency-issue
Fix concurrency issue
2 parents 6a65322 + c66aaf9 commit 74a6f85

File tree

14 files changed

+29
-26
lines changed

14 files changed

+29
-26
lines changed

‎NOTICE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,4 @@ This project includes:
6767
vertx-web under The Apache Software License, Version 2.0 or Eclipse Public License - v 2.0
6868
vertx-web-client under The Apache Software License, Version 2.0 or Eclipse Public License - v 1.0
6969
vertx-web-common under The Apache Software License, Version 2.0 or Eclipse Public License - v 1.0
70-
Visible Assertions under MIT
7170

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ Assuming you started a test environment using docker-compose, please refer to ex
264264
"drivers/mariadb",
265265
"D:\\drivers\\mariadb",
266266
"/mnt/d/drivers/mariadb",
267-
"https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/2.7.2/mariadb-java-client-2.7.2.jar"
267+
"https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/2.7.4/mariadb-java-client-2.7.4.jar"
268268
],
269269
"driverClassName": "org.mariadb.jdbc.Driver",
270270
...

‎all-in-one.Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ RUN apt-get update \
5858
&& apt-get clean \
5959
&& rm -rf /*.deb /var/lib/apt/lists/* /tmp/* /var/tmp/* \
6060
&& wget -q -P /etc/clickhouse-jdbc-bridge/drivers/clickhouse \
61-
https://repo1.maven.org/maven2/ru/yandex/clickhouse/clickhouse-jdbc/0.2.5/clickhouse-jdbc-0.2.5-shaded.jar \
61+
https://repo1.maven.org/maven2/ru/yandex/clickhouse/clickhouse-jdbc/0.3.1-patch/clickhouse-jdbc-0.3.1-patch-shaded.jar \
6262
&& wget -q -P /etc/clickhouse-jdbc-bridge/drivers/mariadb \
63-
https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/2.7.2/mariadb-java-client-2.7.2.jar \
63+
https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/2.7.4/mariadb-java-client-2.7.4.jar \
6464
&& wget -q -P /etc/clickhouse-jdbc-bridge/drivers/mysql5 \
6565
https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.49/mysql-connector-java-5.1.49.jar \
6666
&& wget -q -P /etc/clickhouse-jdbc-bridge/drivers/mysql8 \
67-
https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.23/mysql-connector-java-8.0.23.jar \
67+
https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.26/mysql-connector-java-8.0.26.jar \
6868
&& wget -q -P /etc/clickhouse-jdbc-bridge/drivers/postgres \
69-
https://repo1.maven.org/maven2/org/postgresql/postgresql/42.2.18/postgresql-42.2.18.jar \
69+
https://repo1.maven.org/maven2/org/postgresql/postgresql/42.2.23/postgresql-42.2.23.jar \
7070
&& sed -i -e 's|\(^[[:space:]]*\)\(exec.*clickhouse-server.*$\)|\1exec -c clickhouse-jdbc-bridge >/dev/null \&\n\1\2|' /entrypoint.sh \
7171
&& echo '{\n\
7272
"$schema": "../datasource-schema.json",\n\

‎docker/README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ The latest tag points to the latest release from `master` branch. Branch tags li
1212
```bash
1313
docker run -d --name ch-jdbc-bridge -p9019:9019 \
1414
-e MAVEN_REPO_URL="https://repo1.maven.org/maven2" \
15-
-e JDBC_DRIVERS="org/mariadb/jdbc/mariadb-java-client/2.7.2/mariadb-java-client-2.7.2.jar,org/postgresql/postgresql/42.2.18/postgresql-42.2.18.jar" yandex/clickhouse-jdbc-bridge
15+
-e JDBC_DRIVERS="org/mariadb/jdbc/mariadb-java-client/2.7.4/mariadb-java-client-2.7.4.jar,org/postgresql/postgresql/42.2.23/postgresql-42.2.23.jar" yandex/clickhouse-jdbc-bridge
1616
```
1717
If you prefer to use JDBC drivers and named datasources on host, you can use the following commands:
1818
```bash
1919
wget -P drivers \
20-
https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/2.7.2/mariadb-java-client-2.7.2.jar \
21-
https://repo1.maven.org/maven2/org/postgresql/postgresql/42.2.18/postgresql-42.2.18.jar
20+
https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/2.7.4/mariadb-java-client-2.7.4.jar \
21+
https://repo1.maven.org/maven2/org/postgresql/postgresql/42.2.23/postgresql-42.2.23.jar
2222
wget -P datasources \
2323
https://raw.githubusercontent.com/ClickHouse/clickhouse-jdbc-bridge/master/misc/quick-start/jdbc-bridge/config/datasources/mariadb10.json \
2424
https://raw.githubusercontent.com/ClickHouse/clickhouse-jdbc-bridge/master/misc/quick-start/jdbc-bridge/config/datasources/postgres13.json
@@ -75,6 +75,7 @@ In order to customize the container, please refer to directory structure and sup
7575
Environment Variable | Java System Property | Default Value | Remark
7676
-- | -- | -- | --
7777
CONFIG_DIR | jdbc-bridge.config.dir | config | Configuration directory
78+
SERIAL_MODE | jdbc-bridge.serial.mode | false | Whether run query in serial mode or not
7879
CUSTOM_DRIVER_LOADER | jdbc-bridge.driver.loader | true | Whether use custom driver class loader or not
7980
DATASOURCE_CONFIG_DIR | jdbc-bridge.datasource.config.dir | datasources | Directory for named datasources
8081
DEFAULT_VALUE | jdbc-bridge.type.default | false | Whether support default expression in column definition or not

‎misc/perf-test/jdbc-bridge/config/datasources/mariadb.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "../../../../../docker/config/datasource.jschema",
33
"mariadb": {
44
"driverUrls": [
5-
"https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/2.7.2/mariadb-java-client-2.7.2.jar"
5+
"https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/2.7.4/mariadb-java-client-2.7.4.jar"
66
],
77
"driverClassName": "org.mariadb.jdbc.Driver",
88
"jdbcUrl": "jdbc:mariadb://mariadb:3306/test?useSSL=false&useCompression=false&rewriteBatchedStatements=true",

‎misc/quick-start/docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ services:
6969
# Below are all default settings just for demonstration
7070
environment:
7171
CONFIG_DIR: config # configuration directory
72+
SERIAL_MODE: "false" # whether run query in serial mode or not
7273
HTTPD_CONFIG_FILE: httpd.json # httpd configuration file
7374
SERVER_CONFIG_FILE: server.json # server configuration file
7475
VERTX_CONFIG_FILE: vertx.json # vertx configuration file

‎misc/quick-start/jdbc-bridge/config/datasources/ch-server.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"ch-server": {
44
"aliases": ["self"],
55
"driverUrls": [
6-
"https://repo1.maven.org/maven2/ru/yandex/clickhouse/clickhouse-jdbc/0.2.5/clickhouse-jdbc-0.2.5-shaded.jar"
6+
"https://repo1.maven.org/maven2/ru/yandex/clickhouse/clickhouse-jdbc/0.3.1-patch/clickhouse-jdbc-0.3.1-patch-shaded.jar"
77
],
88
"driverClassName": "ru.yandex.clickhouse.ClickHouseDriver",
99
"jdbcUrl": "jdbc:clickhouse://ch-server:8123/system",

‎misc/quick-start/jdbc-bridge/config/datasources/elasticsearch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "../../../../../docker/config/datasource.jschema",
33
"elasticsearch": {
44
"driverUrls": [
5-
"https://repo1.maven.org/maven2/com/amazon/opendistroforelasticsearch/client/opendistro-sql-jdbc/1.12.0.0/opendistro-sql-jdbc-1.12.0.0.jar"
5+
"https://repo1.maven.org/maven2/com/amazon/opendistroforelasticsearch/client/opendistro-sql-jdbc/1.13.0.0/opendistro-sql-jdbc-1.13.0.0.jar"
66
],
77
"readOnly": true,
88
"connectionTestQuery": "",

‎misc/quick-start/jdbc-bridge/config/datasources/mariadb10.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "../../../../../docker/config/datasource.jschema",
33
"mariadb10": {
44
"driverUrls": [
5-
"https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/2.7.2/mariadb-java-client-2.7.2.jar"
5+
"https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/2.7.4/mariadb-java-client-2.7.4.jar"
66
],
77
"driverClassName": "org.mariadb.jdbc.Driver",
88
"jdbcUrl": "jdbc:mariadb://db-mariadb10/test?useSSL=false&useCompression=false&useOldAliasMetadataBehavior=true&allowMultiQueries=true",

‎misc/quick-start/jdbc-bridge/config/datasources/mysql8.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "../../../../../docker/config/datasource.jschema",
33
"mysql8": {
44
"driverUrls": [
5-
"https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.23/mysql-connector-java-8.0.23.jar"
5+
"https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.26/mysql-connector-java-8.0.26.jar"
66
],
77
"driverClassName": "com.mysql.cj.jdbc.Driver",
88
"jdbcUrl": "jdbc:mysql://db-mysql8/test?allowPublicKeyRetrieval=true&useSSL=false&useCompression=false&useOldAliasMetadataBehavior=true&allowMultiQueries=true",

0 commit comments

Comments
 (0)