From d70af6b6bef730d151b24e2dabfc809cbe7ab24f Mon Sep 17 00:00:00 2001 From: zhangguoqiang <18372634969@163.com> Date: Wed, 25 Oct 2023 19:52:49 +0800 Subject: [PATCH] [Fix](regression)es catalog adds prefixes or suffixes to avoid mutual influence (#25826) es catalog adds prefixes or suffixes to avoid mutual influence --- .../external_table_p0/es/test_es_query.groovy | 18 +++++------ .../es/test_es_query_no_http_url.groovy | 30 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/regression-test/suites/external_table_p0/es/test_es_query.groovy b/regression-test/suites/external_table_p0/es/test_es_query.groovy index e2fd7db8e7..c0cec5c82d 100644 --- a/regression-test/suites/external_table_p0/es/test_es_query.groovy +++ b/regression-test/suites/external_table_p0/es/test_es_query.groovy @@ -23,15 +23,15 @@ suite("test_es_query", "p0,external,es,external_docker,external_docker_es") { String es_7_port = context.config.otherConfigs.get("es_7_port") String es_8_port = context.config.otherConfigs.get("es_8_port") - sql """drop catalog if exists es6;""" - sql """drop catalog if exists es7;""" - sql """drop catalog if exists es8;""" + sql """drop catalog if exists test_es_query_es6;""" + sql """drop catalog if exists test_es_query_es7;""" + sql """drop catalog if exists test_es_query_es8;""" sql """drop table if exists test_v1;""" sql """drop table if exists test_v2;""" // test old create-catalog syntax for compatibility sql """ - create catalog es6 + create catalog test_es_query_es6 properties ( "type"="es", "elasticsearch.hosts"="http://${externalEnvIp}:$es_6_port", @@ -41,7 +41,7 @@ suite("test_es_query", "p0,external,es,external_docker,external_docker_es") { """ // test new create catalog syntax - sql """create catalog if not exists es7 properties( + sql """create catalog if not exists test_es_query_es7 properties( "type"="es", "hosts"="http://${externalEnvIp}:$es_7_port", "nodes_discovery"="false", @@ -49,7 +49,7 @@ suite("test_es_query", "p0,external,es,external_docker,external_docker_es") { ); """ - sql """create catalog if not exists es8 properties( + sql """create catalog if not exists test_es_query_es8 properties( "type"="es", "hosts"="http://${externalEnvIp}:$es_8_port", "nodes_discovery"="false", @@ -156,7 +156,7 @@ suite("test_es_query", "p0,external,es,external_docker,external_docker_es") { order_qt_sql05 """select * from test_v2 where esquery(test2, '{"match":{"test2":"text#1"}}')""" order_qt_sql06 """select test4,test5,test6,test7,test8 from test_v2 order by test8""" - sql """switch es6""" + sql """switch test_es_query_es6""" // order_qt_sql_6_01 """show tables""" order_qt_sql_6_02 """select * from test1 where test2='text#1'""" order_qt_sql_6_03 """select * from test2_20220808 where test4 >= '2022-08-08 00:00:00' and test4 < '2022-08-08 23:59:59'""" @@ -192,7 +192,7 @@ suite("test_es_query", "p0,external,es,external_docker,external_docker_es") { } assertTrue(containHide) - sql """switch es7""" + sql """switch test_es_query_es7""" // order_qt_sql_7_01 """show tables""" order_qt_sql_7_02 """select * from test1 where test2='text#1'""" order_qt_sql_7_03 """select * from test2_20220808 where test4 >= '2022-08-08 00:00:00' and test4 < '2022-08-08 23:59:59'""" @@ -233,7 +233,7 @@ suite("test_es_query", "p0,external,es,external_docker,external_docker_es") { order_qt_sql_7_19 """select * from test3_20231005""" - sql """switch es8""" + sql """switch test_es_query_es8""" order_qt_sql_8_01 """select * from test1 where test2='text#1'""" order_qt_sql_8_02 """select * from test2_20220808 where test4 >= '2022-08-08 00:00:00' and test4 < '2022-08-08 23:59:59'""" order_qt_sql_8_03 """select c_bool[1], c_byte[1], c_short[1], c_integer[1], c_long[1], c_unsigned_long[1], c_float[1], c_half_float[1], c_double[1], c_scaled_float[1], c_date[1], c_datetime[1], c_keyword[1], c_text[1], c_ip[1], c_person[1] from test1""" diff --git a/regression-test/suites/external_table_p0/es/test_es_query_no_http_url.groovy b/regression-test/suites/external_table_p0/es/test_es_query_no_http_url.groovy index 3f592e10c6..004c1aea31 100644 --- a/regression-test/suites/external_table_p0/es/test_es_query_no_http_url.groovy +++ b/regression-test/suites/external_table_p0/es/test_es_query_no_http_url.groovy @@ -23,15 +23,15 @@ suite("test_es_query_no_http_url", "p0,external,es,external_docker,external_dock String es_7_port = context.config.otherConfigs.get("es_7_port") String es_8_port = context.config.otherConfigs.get("es_8_port") - sql """drop catalog if exists es6;""" - sql """drop catalog if exists es7;""" - sql """drop catalog if exists es8;""" - sql """drop table if exists test_v1;""" - sql """drop table if exists test_v2;""" + sql """drop catalog if exists es6_no_http_url;""" + sql """drop catalog if exists es7_no_http_url;""" + sql """drop catalog if exists es8_no_http_url;""" + sql """drop table if exists test_v1_no_http_url;""" + sql """drop table if exists test_v2_no_http_url;""" // test old create-catalog syntax for compatibility sql """ - create catalog if not exists es6 properties ( + create catalog if not exists es6_no_http_url properties ( "type"="es", "elasticsearch.hosts"="${externalEnvIp}:$es_6_port", "elasticsearch.nodes_discovery"="false", @@ -41,7 +41,7 @@ suite("test_es_query_no_http_url", "p0,external,es,external_docker,external_dock // test new create catalog syntax sql """ - create catalog if not exists es7 properties( + create catalog if not exists es7_no_http_url properties( "type"="es", "hosts"="${externalEnvIp}:$es_7_port", "nodes_discovery"="false", @@ -50,7 +50,7 @@ suite("test_es_query_no_http_url", "p0,external,es,external_docker,external_dock """ sql """ - create catalog if not exists es8 properties( + create catalog if not exists es8_no_http_url properties( "type"="es", "hosts"="${externalEnvIp}:$es_8_port", "nodes_discovery"="false", @@ -60,7 +60,7 @@ suite("test_es_query_no_http_url", "p0,external,es,external_docker,external_dock // test external table for datetime sql """ - CREATE TABLE `test_v1` ( + CREATE TABLE `test_v1_no_http_url` ( `c_datetime` array NULL, `c_long` array NULL, `c_unsigned_long` array NULL, @@ -95,10 +95,10 @@ suite("test_es_query_no_http_url", "p0,external,es,external_docker,external_dock "http_ssl_enabled"="false" ); """ - order_qt_sql51 """select * from test_v1 where test2='text#1'""" + order_qt_sql51 """select * from test_v1_no_http_url where test2='text#1'""" sql """ - CREATE TABLE `test_v2` ( + CREATE TABLE `test_v2_no_http_url` ( `c_datetime` array NULL, `c_long` array NULL, `c_unsigned_long` array NULL, @@ -133,16 +133,16 @@ suite("test_es_query_no_http_url", "p0,external,es,external_docker,external_dock "http_ssl_enabled"="false" ); """ - order_qt_sql52 """select * from test_v2 where test2='text#1'""" + order_qt_sql52 """select * from test_v2_no_http_url where test2='text#1'""" // es6 - sql """switch es6""" + sql """switch es6_no_http_url""" order_qt_sql61 """select * from test1 where test2='text#1'""" // es7 - sql """switch es7""" + sql """switch es7_no_http_url""" order_qt_sql71 """select * from test1 where test2='text#1'""" // es8 - sql """switch es8""" + sql """switch es8_no_http_url""" order_qt_sql81 """select * from test1 where test2='text#1'""" } }