This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 40a58b9e424 [branch-2.1][regression test](jdbc catalog) Enable
CLICKHOUSE_ALWAYS_RUN_INITDB_SCRIPTS for clickhouse docker (#39667)
40a58b9e424 is described below
commit 40a58b9e4242cf06c42d50fa0cd18ac858b75682
Author: zy-kkk <[email protected]>
AuthorDate: Fri Aug 23 09:59:03 2024 +0800
[branch-2.1][regression test](jdbc catalog) Enable
CLICKHOUSE_ALWAYS_RUN_INITDB_SCRIPTS for clickhouse docker (#39667)
pick (#39425) #39693
---
.../docker-compose/clickhouse/clickhouse.yaml.tpl | 3 ++-
.../jdbc/test_clickhouse_jdbc_catalog.out | Bin 5528 -> 4381 bytes
.../jdbc/test_clickhouse_jdbc_catalog.groovy | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker/thirdparties/docker-compose/clickhouse/clickhouse.yaml.tpl
b/docker/thirdparties/docker-compose/clickhouse/clickhouse.yaml.tpl
index ba0501f3792..c4dd3d651c1 100644
--- a/docker/thirdparties/docker-compose/clickhouse/clickhouse.yaml.tpl
+++ b/docker/thirdparties/docker-compose/clickhouse/clickhouse.yaml.tpl
@@ -19,10 +19,11 @@ version: "2.1"
services:
doris--clickhouse:
- image: "clickhouse/clickhouse-server:23.3"
+ image: "clickhouse/clickhouse-server:23.8"
restart: always
environment:
CLICKHOUSE_PASSWORD: 123456
+ CLICKHOUSE_ALWAYS_RUN_INITDB_SCRIPTS: "true" # Add this line to always
run init scripts
ulimits:
nofile:
soft: 262144
diff --git
a/regression-test/data/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.out
b/regression-test/data/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.out
index bb8a4a18681..22f85579a83 100644
Binary files
a/regression-test/data/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.out
and
b/regression-test/data/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.out
differ
diff --git
a/regression-test/suites/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.groovy
b/regression-test/suites/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.groovy
index f92663660af..b1550ed971e 100644
---
a/regression-test/suites/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.groovy
+++
b/regression-test/suites/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.groovy
@@ -69,7 +69,6 @@ suite("test_clickhouse_jdbc_catalog",
"p0,external,clickhouse,external_docker,ex
order_qt_query_ctas_arr_null """ select * from
internal.${internal_db_name}.ck_arr_null order by id; """
sql """ insert into internal.${internal_db_name}.${inDorisTable}
select * from student; """
order_qt_in_tb """ select id, name, age from
internal.${internal_db_name}.${inDorisTable} order by id; """
- order_qt_system """ show tables from `system`; """
order_qt_filter """ select k1,k2 from type where 1 = 1 order by 1 ;
"""
order_qt_filter2 """ select k1,k2 from type where 1 = 1 and k1 =
true order by 1 ; """
order_qt_filter3 """ select k1,k2 from type where k1 = true order by
1 ; """
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]