From 751cdc915454f59251fca2733afa7f00707e1d3a Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Sun, 21 May 2023 23:57:28 +0800 Subject: [PATCH] Test: Use ClickHouse 23.3 in default --- clickhouse-core/src/testFixtures/conf/clickhouse-cluster/.env | 2 +- .../scala/xenon/clickhouse/base/ClickHouseClusterMixIn.scala | 2 +- .../scala/xenon/clickhouse/base/ClickHouseSingleMixIn.scala | 2 +- docker/.env | 2 +- docker/.env-dev | 2 +- mkdocs.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clickhouse-core/src/testFixtures/conf/clickhouse-cluster/.env b/clickhouse-core/src/testFixtures/conf/clickhouse-cluster/.env index 3deae3d7..d0885aab 100644 --- a/clickhouse-core/src/testFixtures/conf/clickhouse-cluster/.env +++ b/clickhouse-core/src/testFixtures/conf/clickhouse-cluster/.env @@ -12,5 +12,5 @@ # limitations under the License. # -CLICKHOUSE_IMAGE=clickhouse/clickhouse-server:22.3.3.44 +CLICKHOUSE_IMAGE=clickhouse/clickhouse-server:23.3 ZOOKEEPER_VERSION=3.6.3 diff --git a/clickhouse-core/src/testFixtures/scala/xenon/clickhouse/base/ClickHouseClusterMixIn.scala b/clickhouse-core/src/testFixtures/scala/xenon/clickhouse/base/ClickHouseClusterMixIn.scala index 154b3786..49c06a98 100644 --- a/clickhouse-core/src/testFixtures/scala/xenon/clickhouse/base/ClickHouseClusterMixIn.scala +++ b/clickhouse-core/src/testFixtures/scala/xenon/clickhouse/base/ClickHouseClusterMixIn.scala @@ -31,7 +31,7 @@ trait ClickHouseClusterMixIn extends AnyFunSuite with ForAllTestContainer { protected val CLICKHOUSE_IMAGE: String = Utils.load( "CLICKHOUSE_IMAGE", - "clickhouse/clickhouse-server:22.3.3.44" + "clickhouse/clickhouse-server:23.3" ) protected val clickhouseVersion: ClickHouseVersion = ClickHouseVersion.of(CLICKHOUSE_IMAGE.split(":").last) diff --git a/clickhouse-core/src/testFixtures/scala/xenon/clickhouse/base/ClickHouseSingleMixIn.scala b/clickhouse-core/src/testFixtures/scala/xenon/clickhouse/base/ClickHouseSingleMixIn.scala index 5110573e..e1b7beb6 100644 --- a/clickhouse-core/src/testFixtures/scala/xenon/clickhouse/base/ClickHouseSingleMixIn.scala +++ b/clickhouse-core/src/testFixtures/scala/xenon/clickhouse/base/ClickHouseSingleMixIn.scala @@ -23,7 +23,7 @@ import xenon.clickhouse.Utils trait ClickHouseSingleMixIn extends AnyFunSuite with ForAllTestContainer { // format: off - val CLICKHOUSE_IMAGE: String = Utils.load("CLICKHOUSE_IMAGE", "clickhouse/clickhouse-server:22.3.3.44") + val CLICKHOUSE_IMAGE: String = Utils.load("CLICKHOUSE_IMAGE", "clickhouse/clickhouse-server:23.3") val CLICKHOUSE_USER: String = Utils.load("CLICKHOUSE_USER", "default") val CLICKHOUSE_PASSWORD: String = Utils.load("CLICKHOUSE_PASSWORD", "") val CLICKHOUSE_DB: String = Utils.load("CLICKHOUSE_DB", "") diff --git a/docker/.env b/docker/.env index 53370983..eff2093b 100644 --- a/docker/.env +++ b/docker/.env @@ -15,7 +15,7 @@ # latest stable version PROJECT_VERSION=0.7.0 -CLICKHOUSE_IMAGE=clickhouse/clickhouse-server:22.3.3.44 +CLICKHOUSE_IMAGE=clickhouse/clickhouse-server:23.3 AWS_JAVA_SDK_VERSION=1.12.239 CLICKHOUSE_JDBC_VERSION=0.4.5 HADOOP_VERSION=3.3.1 diff --git a/docker/.env-dev b/docker/.env-dev index 2e46ce26..bd3cada8 100644 --- a/docker/.env-dev +++ b/docker/.env-dev @@ -15,7 +15,7 @@ # current developing version PROJECT_VERSION=0.8.0-SNAPSHOT -CLICKHOUSE_IMAGE=clickhouse/clickhouse-server:22.3.3.44 +CLICKHOUSE_IMAGE=clickhouse/clickhouse-server:23.3 AWS_JAVA_SDK_VERSION=1.12.239 CLICKHOUSE_JDBC_VERSION=0.4.6 HADOOP_VERSION=3.3.1 diff --git a/mkdocs.yml b/mkdocs.yml index fa989c78..ef1319df 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -42,7 +42,7 @@ markdown_extensions: extra: version: 0.8.0-SNAPSHOT stable_version: 0.7.0 - clickhouse_version: 22.3.3.44 + clickhouse_version: 23.3 clickhouse_jdbc_version: 0.4.5 scala_binary_version: 2.12 spark_binary_version: 3.3