This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new e373cd4efad [test](jdbc catalog) reopen and fix db2 catalog test case
(#35966)
e373cd4efad is described below
commit e373cd4efad8982bcd7ea31806b981b3f22cabd2
Author: zy-kkk <zhongy...@gmail.com>
AuthorDate: Thu Jun 20 18:37:11 2024 +0800
[test](jdbc catalog) reopen and fix db2 catalog test case (#35966)
Change the download address of db2 image, reopen the test and fix the
Result close problem in the test
---
.../thirdparties/docker-compose/db2/db2.yaml.tpl | 4 +-
docker/thirdparties/run-thirdparties-docker.sh | 2 +-
.../pipeline/external/conf/regression-conf.groovy | 1 +
.../jdbc/test_db2_jdbc_catalog.groovy | 446 ++++++++++-----------
4 files changed, 227 insertions(+), 226 deletions(-)
diff --git a/docker/thirdparties/docker-compose/db2/db2.yaml.tpl
b/docker/thirdparties/docker-compose/db2/db2.yaml.tpl
index a3f2e778ae6..9967e4013bf 100644
--- a/docker/thirdparties/docker-compose/db2/db2.yaml.tpl
+++ b/docker/thirdparties/docker-compose/db2/db2.yaml.tpl
@@ -19,12 +19,12 @@ version: '3'
services:
doris--db2_11:
- image: icr.io/db2_community/db2
+ image: icr.io/db2_community/db2:11.5.9.0
ports:
- ${DOCKER_DB2_EXTERNAL_PORT}:50000
privileged: true
healthcheck:
- test: ["CMD-SHELL", "su - db2inst1 -c \"db2 connect to doris && db2
'select 1 from sysibm.sysdummy1'\""]
+ test: ["CMD-SHELL", "su - db2inst1 -c \"source ~/.bash_profile; db2
connect to doris && db2 'select 1 from sysibm.sysdummy1'\""]
interval: 20s
timeout: 60s
retries: 10
diff --git a/docker/thirdparties/run-thirdparties-docker.sh
b/docker/thirdparties/run-thirdparties-docker.sh
index 0615241523a..012f840cb9f 100755
--- a/docker/thirdparties/run-thirdparties-docker.sh
+++ b/docker/thirdparties/run-thirdparties-docker.sh
@@ -59,7 +59,7 @@ eval set -- "${OPTS}"
if [[ "$#" == 1 ]]; then
# default
-
COMPONENTS="mysql,es,hive2,hive3,pg,oracle,sqlserver,clickhouse,mariadb,iceberg"
+
COMPONENTS="mysql,es,hive2,hive3,pg,oracle,sqlserver,clickhouse,mariadb,iceberg,db2"
else
while true; do
case "$1" in
diff --git a/regression-test/pipeline/external/conf/regression-conf.groovy
b/regression-test/pipeline/external/conf/regression-conf.groovy
index 2c163b07989..7683a3e5b9e 100644
--- a/regression-test/pipeline/external/conf/regression-conf.groovy
+++ b/regression-test/pipeline/external/conf/regression-conf.groovy
@@ -152,6 +152,7 @@ hdfs_port=8020
oracle_11_port=1521
sqlserver_2022_port=1433
clickhouse_22_port=8123
+db2_11_port=50000
// trino-connector catalog test config
enableTrinoConnectorTest = true
diff --git
a/regression-test/suites/external_table_p0/jdbc/test_db2_jdbc_catalog.groovy
b/regression-test/suites/external_table_p0/jdbc/test_db2_jdbc_catalog.groovy
index a334d394c9b..ee930bbf6c3 100644
--- a/regression-test/suites/external_table_p0/jdbc/test_db2_jdbc_catalog.groovy
+++ b/regression-test/suites/external_table_p0/jdbc/test_db2_jdbc_catalog.groovy
@@ -29,249 +29,249 @@ suite("test_db2_jdbc_catalog",
"p0,external,db2,external_docker,external_docker_
String bucket = getS3BucketName()
String driver_url =
"https://${bucket}.${s3_endpoint}/regression/jdbc_driver/jcc-11.5.8.0.jar";
if (enabled != null && enabled.equalsIgnoreCase("true")) {
- // String catalog_name = "db2_jdbc_catalog";
- // String internal_db_name = "regression_test_jdbc_catalog_p0";
- // String ex_db_name = "DORIS_TEST";
- // String db2_port = context.config.otherConfigs.get("db2_11_port");
- // String sample_table = "SAMPLE_TABLE";
+ String catalog_name = "db2_jdbc_catalog";
+ String internal_db_name = "regression_test_jdbc_catalog_p0";
+ String ex_db_name = "DORIS_TEST";
+ String db2_port = context.config.otherConfigs.get("db2_11_port");
+ String sample_table = "SAMPLE_TABLE";
- // try {
- // db2_docker "CREATE SCHEMA doris_test;"
- // db2_docker "CREATE SCHEMA test;"
- // db2_docker """CREATE TABLE doris_test.sample_table (
- // id_column INT GENERATED ALWAYS AS IDENTITY,
- // numeric_column NUMERIC,
- // decimal_column DECIMAL(31, 10),
- // decfloat_column DECFLOAT,
- // float_column FLOAT,
- // real_column REAL,
- // double_column DOUBLE,
- // double_precision_column DOUBLE PRECISION,
- // smallint_column SMALLINT,
- // int_column INT,
- // bigint_column BIGINT,
- // varchar_column VARCHAR(255),
- // varcharphic_column VARGRAPHIC(50),
- // long_varchar_column LONG VARCHAR,
- // long_varcharphic_column LONG VARGRAPHIC,
- // char_varying_column CHAR VARYING(255),
- // char_column CHAR(255),
- // date_column DATE,
- // timestamp_column TIMESTAMP,
- // time_column TIME,
- // clob_column CLOB
- // );"""
+ try {
+ db2_docker "CREATE SCHEMA doris_test;"
+ db2_docker "CREATE SCHEMA test;"
+ db2_docker """CREATE TABLE doris_test.sample_table (
+ id_column INT GENERATED ALWAYS AS IDENTITY,
+ numeric_column NUMERIC,
+ decimal_column DECIMAL(31, 10),
+ decfloat_column DECFLOAT,
+ float_column FLOAT,
+ real_column REAL,
+ double_column DOUBLE,
+ double_precision_column DOUBLE PRECISION,
+ smallint_column SMALLINT,
+ int_column INT,
+ bigint_column BIGINT,
+ varchar_column VARCHAR(255),
+ varcharphic_column VARGRAPHIC(50),
+ long_varchar_column LONG VARCHAR,
+ long_varcharphic_column LONG VARGRAPHIC,
+ char_varying_column CHAR VARYING(255),
+ char_column CHAR(255),
+ date_column DATE,
+ timestamp_column TIMESTAMP,
+ time_column TIME,
+ clob_column CLOB
+ );"""
- // db2_docker """INSERT INTO doris_test.sample_table (
- // numeric_column,
- // decimal_column,
- // decfloat_column,
- // float_column,
- // real_column,
- // double_column,
- // double_precision_column,
- // smallint_column,
- // int_column,
- // bigint_column,
- // varchar_column,
- // varcharphic_column,
- // long_varchar_column,
- // long_varcharphic_column,
- // char_varying_column,
- // char_column,
- // date_column,
- // timestamp_column,
- // time_column,
- // clob_column
- // ) VALUES (
- // 123,
- // 1234567890.1234567890,
- // 1.234567890,
- // 12345.6789,
- // 12345.6789,
- // 1234567890.1234567890,
- // 1234567890.1234567890,
- // 123,
- // 12345,
- // 123456789012345,
- // 'Varchar text',
- // 'Varcharphic text',
- // 'Long varchar text',
- // 'Long varcharphic text',
- // 'Char varying text',
- // 'Char text',
- // '2024-01-24',
- // '2024-01-24-12.34.56.789000',
- // '12:34:56',
- // 'Sample CLOB text'
- // );"""
+ db2_docker """INSERT INTO doris_test.sample_table (
+ numeric_column,
+ decimal_column,
+ decfloat_column,
+ float_column,
+ real_column,
+ double_column,
+ double_precision_column,
+ smallint_column,
+ int_column,
+ bigint_column,
+ varchar_column,
+ varcharphic_column,
+ long_varchar_column,
+ long_varcharphic_column,
+ char_varying_column,
+ char_column,
+ date_column,
+ timestamp_column,
+ time_column,
+ clob_column
+ ) VALUES (
+ 123,
+ 1234567890.1234567890,
+ 1.234567890,
+ 12345.6789,
+ 12345.6789,
+ 1234567890.1234567890,
+ 1234567890.1234567890,
+ 123,
+ 12345,
+ 123456789012345,
+ 'Varchar text',
+ 'Varcharphic text',
+ 'Long varchar text',
+ 'Long varcharphic text',
+ 'Char varying text',
+ 'Char text',
+ '2024-01-24',
+ '2024-01-24-12.34.56.789000',
+ '12:34:56',
+ 'Sample CLOB text'
+ );"""
- // db2_docker """INSERT INTO doris_test.sample_table (
- // numeric_column,
- // decimal_column,
- // decfloat_column,
- // float_column,
- // real_column,
- // double_column,
- // double_precision_column,
- // smallint_column,
- // int_column,
- // bigint_column,
- // varchar_column,
- // varcharphic_column,
- // long_varchar_column,
- // long_varcharphic_column,
- // char_varying_column,
- // char_column,
- // date_column,
- // timestamp_column,
- // time_column,
- // clob_column
- // ) VALUES (
- // null,
- // null,
- // null,
- // null,
- // null,
- // null,
- // null,
- // null,
- // null,
- // null,
- // null,
- // null,
- // null,
- // null,
- // null,
- // null,
- // null,
- // null,
- // null,
- // null
- // );"""
+ db2_docker """INSERT INTO doris_test.sample_table (
+ numeric_column,
+ decimal_column,
+ decfloat_column,
+ float_column,
+ real_column,
+ double_column,
+ double_precision_column,
+ smallint_column,
+ int_column,
+ bigint_column,
+ varchar_column,
+ varcharphic_column,
+ long_varchar_column,
+ long_varcharphic_column,
+ char_varying_column,
+ char_column,
+ date_column,
+ timestamp_column,
+ time_column,
+ clob_column
+ ) VALUES (
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null
+ );"""
- // db2_docker """INSERT INTO doris_test.sample_table (
- // numeric_column,
- // decimal_column,
- // decfloat_column,
- // float_column,
- // real_column,
- // double_column,
- // double_precision_column,
- // smallint_column,
- // int_column,
- // bigint_column,
- // varchar_column,
- // varcharphic_column,
- // long_varchar_column,
- // long_varcharphic_column,
- // char_varying_column,
- // char_column,
- // date_column,
- // timestamp_column,
- // time_column,
- // clob_column
- // ) VALUES (
- // 123,
- // 1234567890.1234567890,
- // 1.234567890,
- // 12345.6789,
- // 12345.6789,
- // 1234567890.1234567890,
- // 1234567890.1234567890,
- // 123,
- // 12345,
- // 123456789012345,
- // '中文一',
- // '中文二',
- // '中文三',
- // '中文四',
- // '中文五',
- // '中文六',
- // '2024-01-24',
- // '2024-01-24-12.34.56.789000',
- // '12:34:56',
- // '中文七'
- // );"""
+ db2_docker """INSERT INTO doris_test.sample_table (
+ numeric_column,
+ decimal_column,
+ decfloat_column,
+ float_column,
+ real_column,
+ double_column,
+ double_precision_column,
+ smallint_column,
+ int_column,
+ bigint_column,
+ varchar_column,
+ varcharphic_column,
+ long_varchar_column,
+ long_varcharphic_column,
+ char_varying_column,
+ char_column,
+ date_column,
+ timestamp_column,
+ time_column,
+ clob_column
+ ) VALUES (
+ 123,
+ 1234567890.1234567890,
+ 1.234567890,
+ 12345.6789,
+ 12345.6789,
+ 1234567890.1234567890,
+ 1234567890.1234567890,
+ 123,
+ 12345,
+ 123456789012345,
+ '中文一',
+ '中文二',
+ '中文三',
+ '中文四',
+ '中文五',
+ '中文六',
+ '2024-01-24',
+ '2024-01-24-12.34.56.789000',
+ '12:34:56',
+ '中文七'
+ );"""
- // sql """create database if not exists ${internal_db_name}; """
+ sql """create database if not exists ${internal_db_name}; """
- // sql """drop catalog if exists ${catalog_name} """
+ sql """drop catalog if exists ${catalog_name} """
- // sql """create catalog if not exists ${catalog_name} properties(
- // "type"="jdbc",
- // "user"="db2inst1",
- // "password"="123456",
- // "jdbc_url" =
"jdbc:db2://${externalEnvIp}:${db2_port}/doris",
- // "driver_url" = "${driver_url}",
- // "driver_class" = "com.ibm.db2.jcc.DB2Driver"
- // );"""
+ sql """create catalog if not exists ${catalog_name} properties(
+ "type"="jdbc",
+ "user"="db2inst1",
+ "password"="123456",
+ "jdbc_url" =
"jdbc:db2://${externalEnvIp}:${db2_port}/doris:allowNextOnExhaustedResultSet=1;resultSetHoldability=1",
+ "driver_url" = "${driver_url}",
+ "driver_class" = "com.ibm.db2.jcc.DB2Driver"
+ );"""
- // sql """switch ${catalog_name}"""
- // qt_sql """select current_catalog()"""
- // sql """ use ${ex_db_name}"""
+ sql """switch ${catalog_name}"""
+ qt_sql """select current_catalog()"""
+ sql """ use ${ex_db_name}"""
- // order_qt_sample_table_desc """ desc ${sample_table}; """
+ order_qt_sample_table_desc """ desc ${sample_table}; """
- // order_qt_sample_table_select """ select * except(ID_COLUMN)
from ${sample_table} order by 1; """
+ order_qt_sample_table_select """ select * except(ID_COLUMN) from
${sample_table} order by 1; """
- // sql """INSERT INTO ${sample_table} (
- // numeric_column,
- // decimal_column,
- // decfloat_column,
- // float_column,
- // real_column,
- // double_column,
- // double_precision_column,
- // smallint_column,
- // int_column,
- // bigint_column,
- // varchar_column,
- // varcharphic_column,
- // long_varchar_column,
- // long_varcharphic_column,
- // char_varying_column,
- // char_column,
- // date_column,
- // timestamp_column,
- // time_column,
- // clob_column
- // )
- // select * except(ID_COLUMN) from ${sample_table};
- // """
+ sql """INSERT INTO ${sample_table} (
+ numeric_column,
+ decimal_column,
+ decfloat_column,
+ float_column,
+ real_column,
+ double_column,
+ double_precision_column,
+ smallint_column,
+ int_column,
+ bigint_column,
+ varchar_column,
+ varcharphic_column,
+ long_varchar_column,
+ long_varcharphic_column,
+ char_varying_column,
+ char_column,
+ date_column,
+ timestamp_column,
+ time_column,
+ clob_column
+ )
+ select * except(ID_COLUMN) from ${sample_table};
+ """
- // db2_docker """create table test.books(id bigint not null
- // primary key, book XML);"""
+ db2_docker """create table test.books(id bigint not null
+ primary key, book XML);"""
- // db2_docker """insert into test.books values(1000, '<catalog>
- // <book>
+ db2_docker """insert into test.books values(1000, '<catalog>
+ <book>
- // <author> Gambardella Matthew</author>
- // <title>XML Developers Guide</title>
- // <genre>Computer</genre>
- // <price>44.95</price>
- // <publish_date>2000-10-01</publish_date>
- // <description>An in-depth look at creating
application
- // with XML</description>
- // </book>
+ <author> Gambardella Matthew</author>
+ <title>XML Developers Guide</title>
+ <genre>Computer</genre>
+ <price>44.95</price>
+ <publish_date>2000-10-01</publish_date>
+ <description>An in-depth look at creating application
+ with XML</description>
+ </book>
- // </catalog>');"""
+ </catalog>');"""
- // order_qt_sample_table_insert """ select * except(ID_COLUMN)
from ${sample_table} order by 1; """
+ order_qt_sample_table_insert """ select * except(ID_COLUMN) from
${sample_table} order by 1; """
- // order_qt_desc_db "show databases from ${catalog_name};"
+ order_qt_desc_db "show databases from ${catalog_name};"
- // order_qt_select_xml "select * from TEST.BOOKS;"
+ order_qt_select_xml "select * from TEST.BOOKS;"
- // sql """ drop catalog if exists ${catalog_name} """
+ sql """ drop catalog if exists ${catalog_name} """
- // db2_docker "DROP TABLE IF EXISTS doris_test.sample_table;"
- // db2_docker "DROP SCHEMA doris_test restrict;"
- // db2_docker "DROP TABLE IF EXISTS test.books;"
- // db2_docker "DROP SCHEMA test restrict;"
+ db2_docker "DROP TABLE IF EXISTS doris_test.sample_table;"
+ db2_docker "DROP SCHEMA doris_test restrict;"
+ db2_docker "DROP TABLE IF EXISTS test.books;"
+ db2_docker "DROP SCHEMA test restrict;"
- // } catch (Exception e) {
- // e.printStackTrace()
- // }
+ } catch (Exception e) {
+ e.printStackTrace()
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
