This is an automated email from the ASF dual-hosted git repository.
hello-stephen 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 394740cc350 [test](regression) Move memory-intensive external cases to
P2 (#65459)
394740cc350 is described below
commit 394740cc350b0c1fb082d2fc5040d9617c2da0fc
Author: Socrates <[email protected]>
AuthorDate: Mon Jul 13 15:10:18 2026 +0800
[test](regression) Move memory-intensive external cases to P2 (#65459)
Problem Summary:
The P0 external regression pipeline currently starts several
memory-intensive Docker services for relatively low-priority
compatibility coverage. This PR reduces the P0 resource footprint by
moving the following service-specific cases and expected results to P2:
- DB2
- SQL Server / MSSQL, including the SQL Server Trino connector and
row-count coverage
- OceanBase
- Elasticsearch 5/6/7/8, including ES MTMV coverage
The SQL Server row-count checks are split from the mixed P0 JDBC suite
so the existing MySQL, PostgreSQL, and Oracle P0 coverage remains
unchanged. The ES MTMV database reference is updated to match its new P2
directory.
Kerberos was evaluated separately but remains required in P0 for safety.
The earlier Kerberos move has been fully reverted, so the cumulative
diff of this PR contains no Kerberos file changes.
This PR only changes regression-suite grouping and paths. It does not
change Docker service configuration, runtime behavior, query behavior,
or expected test results.
---
.../es/test_es_flatten_type.out | 0
.../es/test_es_keyword_array_type.out | 0
.../es/test_es_query.out | 0
.../es/test_es_query_nereids.out | 0
.../es/test_es_query_no_http_url.out | 0
.../es/test_es_query_predicate_correctness.out | 0
.../jdbc/test_db2_jdbc_catalog.out | 0
.../jdbc/test_oceanbase_jdbc_catalog.out | 0
.../jdbc/test_sqlserver_jdbc_catalog.out | 0
.../select/test_sqlserver_all_types_select.out | 0
.../trino_connector/jdbc/test_trino_sqlserver.out | 0
.../data/{mtmv_p0 => mtmv_p2}/test_es_mtmv.out | 0
.../suites/doc/external/jdbc/ibmdb2.md.groovy | 2 +-
.../suites/doc/external/jdbc/oceanbase.md.groovy | 2 +-
.../suites/doc/external/jdbc/sqlserver.md.groovy | 2 +-
.../jdbc/test_jdbc_row_count.groovy | 54 --------------------
.../es/test_es_catalog_http_open_api.groovy | 2 +-
.../es/test_es_flatten_type.groovy | 2 +-
.../es/test_es_keyword_array_type.groovy | 2 +-
.../es/test_es_query.groovy | 2 +-
.../es/test_es_query_nereids.groovy | 2 +-
.../es/test_es_query_no_http_url.groovy | 2 +-
.../es/test_es_query_predicate_correctness.groovy | 2 +-
.../jdbc/test_db2_jdbc_catalog.groovy | 2 +-
.../jdbc/test_oceanbase_jdbc_catalog.groovy | 2 +-
.../jdbc/test_sqlserver_jdbc_catalog.groovy | 2 +-
.../jdbc/test_sqlserver_jdbc_row_count.groovy} | 59 ++++++++++++++--------
.../select/test_sqlserver_all_types_select.groovy | 2 +-
.../jdbc/test_trino_sqlserver.groovy | 2 +-
.../{mtmv_p0 => mtmv_p2}/test_es_mtmv.groovy | 5 +-
30 files changed, 54 insertions(+), 94 deletions(-)
diff --git a/regression-test/data/external_table_p0/es/test_es_flatten_type.out
b/regression-test/data/external_table_p2/es/test_es_flatten_type.out
similarity index 100%
rename from regression-test/data/external_table_p0/es/test_es_flatten_type.out
rename to regression-test/data/external_table_p2/es/test_es_flatten_type.out
diff --git
a/regression-test/data/external_table_p0/es/test_es_keyword_array_type.out
b/regression-test/data/external_table_p2/es/test_es_keyword_array_type.out
similarity index 100%
rename from
regression-test/data/external_table_p0/es/test_es_keyword_array_type.out
rename to
regression-test/data/external_table_p2/es/test_es_keyword_array_type.out
diff --git a/regression-test/data/external_table_p0/es/test_es_query.out
b/regression-test/data/external_table_p2/es/test_es_query.out
similarity index 100%
rename from regression-test/data/external_table_p0/es/test_es_query.out
rename to regression-test/data/external_table_p2/es/test_es_query.out
diff --git
a/regression-test/data/external_table_p0/es/test_es_query_nereids.out
b/regression-test/data/external_table_p2/es/test_es_query_nereids.out
similarity index 100%
rename from regression-test/data/external_table_p0/es/test_es_query_nereids.out
rename to regression-test/data/external_table_p2/es/test_es_query_nereids.out
diff --git
a/regression-test/data/external_table_p0/es/test_es_query_no_http_url.out
b/regression-test/data/external_table_p2/es/test_es_query_no_http_url.out
similarity index 100%
rename from
regression-test/data/external_table_p0/es/test_es_query_no_http_url.out
rename to
regression-test/data/external_table_p2/es/test_es_query_no_http_url.out
diff --git
a/regression-test/data/external_table_p0/es/test_es_query_predicate_correctness.out
b/regression-test/data/external_table_p2/es/test_es_query_predicate_correctness.out
similarity index 100%
rename from
regression-test/data/external_table_p0/es/test_es_query_predicate_correctness.out
rename to
regression-test/data/external_table_p2/es/test_es_query_predicate_correctness.out
diff --git
a/regression-test/data/external_table_p0/jdbc/test_db2_jdbc_catalog.out
b/regression-test/data/external_table_p2/jdbc/test_db2_jdbc_catalog.out
similarity index 100%
rename from
regression-test/data/external_table_p0/jdbc/test_db2_jdbc_catalog.out
rename to regression-test/data/external_table_p2/jdbc/test_db2_jdbc_catalog.out
diff --git
a/regression-test/data/external_table_p0/jdbc/test_oceanbase_jdbc_catalog.out
b/regression-test/data/external_table_p2/jdbc/test_oceanbase_jdbc_catalog.out
similarity index 100%
rename from
regression-test/data/external_table_p0/jdbc/test_oceanbase_jdbc_catalog.out
rename to
regression-test/data/external_table_p2/jdbc/test_oceanbase_jdbc_catalog.out
diff --git
a/regression-test/data/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.out
b/regression-test/data/external_table_p2/jdbc/test_sqlserver_jdbc_catalog.out
similarity index 100%
rename from
regression-test/data/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.out
rename to
regression-test/data/external_table_p2/jdbc/test_sqlserver_jdbc_catalog.out
diff --git
a/regression-test/data/external_table_p0/jdbc/type_test/select/test_sqlserver_all_types_select.out
b/regression-test/data/external_table_p2/jdbc/type_test/select/test_sqlserver_all_types_select.out
similarity index 100%
rename from
regression-test/data/external_table_p0/jdbc/type_test/select/test_sqlserver_all_types_select.out
rename to
regression-test/data/external_table_p2/jdbc/type_test/select/test_sqlserver_all_types_select.out
diff --git
a/regression-test/data/external_table_p0/trino_connector/jdbc/test_trino_sqlserver.out
b/regression-test/data/external_table_p2/trino_connector/jdbc/test_trino_sqlserver.out
similarity index 100%
rename from
regression-test/data/external_table_p0/trino_connector/jdbc/test_trino_sqlserver.out
rename to
regression-test/data/external_table_p2/trino_connector/jdbc/test_trino_sqlserver.out
diff --git a/regression-test/data/mtmv_p0/test_es_mtmv.out
b/regression-test/data/mtmv_p2/test_es_mtmv.out
similarity index 100%
rename from regression-test/data/mtmv_p0/test_es_mtmv.out
rename to regression-test/data/mtmv_p2/test_es_mtmv.out
diff --git a/regression-test/suites/doc/external/jdbc/ibmdb2.md.groovy
b/regression-test/suites/doc/external/jdbc/ibmdb2.md.groovy
index 5979c651a8d..0acc531b494 100644
--- a/regression-test/suites/doc/external/jdbc/ibmdb2.md.groovy
+++ b/regression-test/suites/doc/external/jdbc/ibmdb2.md.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("ibmdb2.md", "p0,external,db2,external_docker,external_docker_db2") {
+suite("ibmdb2.md", "p2,external,db2,external_docker,external_docker_db2") {
String enabled = context.config.otherConfigs.get("enableJdbcTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String catalog_name = "db2_catalog_md";
diff --git a/regression-test/suites/doc/external/jdbc/oceanbase.md.groovy
b/regression-test/suites/doc/external/jdbc/oceanbase.md.groovy
index dd8c3284ef1..c17820fbb39 100644
--- a/regression-test/suites/doc/external/jdbc/oceanbase.md.groovy
+++ b/regression-test/suites/doc/external/jdbc/oceanbase.md.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("oceanbase.md",
"p0,external,oceanbase,external_docker,external_docker_oceanbase") {
+suite("oceanbase.md",
"p2,external,oceanbase,external_docker,external_docker_oceanbase") {
String enabled = context.config.otherConfigs.get("enableJdbcTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String catalog_name = "oceanbase_catalog_md";
diff --git a/regression-test/suites/doc/external/jdbc/sqlserver.md.groovy
b/regression-test/suites/doc/external/jdbc/sqlserver.md.groovy
index 0ba7e146ae9..89ce6909dfe 100644
--- a/regression-test/suites/doc/external/jdbc/sqlserver.md.groovy
+++ b/regression-test/suites/doc/external/jdbc/sqlserver.md.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("sqlserver.md",
"p0,external,sqlserver,external_docker,external_docker_sqlserver") {
+suite("sqlserver.md",
"p2,external,sqlserver,external_docker,external_docker_sqlserver") {
String enabled = context.config.otherConfigs.get("enableJdbcTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String catalog_name = "sqlserver_catalog_md";
diff --git
a/regression-test/suites/external_table_p0/jdbc/test_jdbc_row_count.groovy
b/regression-test/suites/external_table_p0/jdbc/test_jdbc_row_count.groovy
index 51278954bcd..e48969397a0 100644
--- a/regression-test/suites/external_table_p0/jdbc/test_jdbc_row_count.groovy
+++ b/regression-test/suites/external_table_p0/jdbc/test_jdbc_row_count.groovy
@@ -130,59 +130,6 @@ suite("test_jdbc_row_count", "p0,external") {
assertEquals("1", result[0][2])
sql """drop catalog ${catalog_name}"""
- // Test sqlserver
- catalog_name = "test_sqlserver_jdbc_row_count";
- driver_url =
"https://${bucket}.${s3_endpoint}/regression/jdbc_driver/mssql-jdbc-11.2.3.jre8.jar";
- String sqlserver_port =
context.config.otherConfigs.get("sqlserver_2022_port");
- sql """drop catalog if exists ${catalog_name} """
- sql """ create catalog if not exists ${catalog_name} properties(
- "type"="jdbc",
- "user"="sa",
- "password"="Doris123456",
- "jdbc_url" =
"jdbc:sqlserver://${externalEnvIp}:${sqlserver_port};encrypt=false;databaseName=doris_test;",
- "driver_url" = "${driver_url}",
- "driver_class" =
"com.microsoft.sqlserver.jdbc.SQLServerDriver"
- );"""
- sql """use ${catalog_name}.dbo"""
- result = sql """show table stats student"""
- Thread.sleep(1000)
- for (int i = 0; i < 60; i++) {
- result = sql """show table stats student""";
- if (result[0][2] != "-1") {
- break;
- }
- logger.info("Table row count not ready yet. Wait 1 second.")
- Thread.sleep(1000)
- }
- assertEquals("3", result[0][2])
- sql """drop catalog ${catalog_name}"""
-
- // Test sqlserver lower
- catalog_name = "test_sqlserver_lower_jdbc_row_count";
- sql """drop catalog if exists ${catalog_name} """
- sql """ create catalog if not exists ${catalog_name} properties(
- "type"="jdbc",
- "user"="sa",
- "password"="Doris123456",
- "jdbc_url" =
"jdbc:sqlserver://${externalEnvIp}:${sqlserver_port};encrypt=false;databaseName=doris_test;",
- "driver_url" = "${driver_url}",
- "driver_class" =
"com.microsoft.sqlserver.jdbc.SQLServerDriver",
- "lower_case_meta_names" = "true"
- );"""
- sql """use ${catalog_name}.dbo"""
- result = sql """show table stats test_lower"""
- Thread.sleep(1000)
- for (int i = 0; i < 60; i++) {
- result = sql """show table stats test_lower""";
- if (result[0][2] != "-1") {
- break;
- }
- logger.info("Table row count not ready yet. Wait 1 second.")
- Thread.sleep(1000)
- }
- assertEquals("1", result[0][2])
- sql """drop catalog ${catalog_name}"""
-
// Test oracle
catalog_name = "test_oracle_jdbc_row_count";
String oracle_port = context.config.otherConfigs.get("oracle_11_port");
@@ -242,4 +189,3 @@ suite("test_jdbc_row_count", "p0,external") {
sql """drop catalog ${catalog_name}"""
}
}
-
diff --git
a/regression-test/suites/external_table_p0/es/test_es_catalog_http_open_api.groovy
b/regression-test/suites/external_table_p2/es/test_es_catalog_http_open_api.groovy
similarity index 98%
rename from
regression-test/suites/external_table_p0/es/test_es_catalog_http_open_api.groovy
rename to
regression-test/suites/external_table_p2/es/test_es_catalog_http_open_api.groovy
index 48df19992f5..67d7bbc95b7 100644
---
a/regression-test/suites/external_table_p0/es/test_es_catalog_http_open_api.groovy
+++
b/regression-test/suites/external_table_p2/es/test_es_catalog_http_open_api.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_es_catalog_http_open_api", "p0,external") {
+suite("test_es_catalog_http_open_api", "p2,external") {
String enabled = context.config.otherConfigs.get("enableEsTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/es/test_es_flatten_type.groovy
b/regression-test/suites/external_table_p2/es/test_es_flatten_type.groovy
similarity index 97%
rename from
regression-test/suites/external_table_p0/es/test_es_flatten_type.groovy
rename to
regression-test/suites/external_table_p2/es/test_es_flatten_type.groovy
index 2dca30a4424..20698d225cd 100644
--- a/regression-test/suites/external_table_p0/es/test_es_flatten_type.groovy
+++ b/regression-test/suites/external_table_p2/es/test_es_flatten_type.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_es_flatten_type", "p0,external") {
+suite("test_es_flatten_type", "p2,external") {
String enabled = context.config.otherConfigs.get("enableEsTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/es/test_es_keyword_array_type.groovy
b/regression-test/suites/external_table_p2/es/test_es_keyword_array_type.groovy
similarity index 98%
rename from
regression-test/suites/external_table_p0/es/test_es_keyword_array_type.groovy
rename to
regression-test/suites/external_table_p2/es/test_es_keyword_array_type.groovy
index 2c153c940f9..82f07c19e40 100644
---
a/regression-test/suites/external_table_p0/es/test_es_keyword_array_type.groovy
+++
b/regression-test/suites/external_table_p2/es/test_es_keyword_array_type.groovy
@@ -20,7 +20,7 @@
// is an array, Doris should not throw an error. Instead, it should serialize
// the array to a JSON string representation.
-suite("test_es_keyword_array_type",
"p0,external,es,external_docker,external_docker_es") {
+suite("test_es_keyword_array_type",
"p2,external,es,external_docker,external_docker_es") {
String enabled = context.config.otherConfigs.get("enableEsTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git a/regression-test/suites/external_table_p0/es/test_es_query.groovy
b/regression-test/suites/external_table_p2/es/test_es_query.groovy
similarity index 99%
rename from regression-test/suites/external_table_p0/es/test_es_query.groovy
rename to regression-test/suites/external_table_p2/es/test_es_query.groovy
index 52bdc138e0f..65cb837f867 100644
--- a/regression-test/suites/external_table_p0/es/test_es_query.groovy
+++ b/regression-test/suites/external_table_p2/es/test_es_query.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_es_query", "p0,external") {
+suite("test_es_query", "p2,external") {
String enabled = context.config.otherConfigs.get("enableEsTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/es/test_es_query_nereids.groovy
b/regression-test/suites/external_table_p2/es/test_es_query_nereids.groovy
similarity index 99%
rename from
regression-test/suites/external_table_p0/es/test_es_query_nereids.groovy
rename to
regression-test/suites/external_table_p2/es/test_es_query_nereids.groovy
index 1fe746b0e56..87af5c46fec 100644
--- a/regression-test/suites/external_table_p0/es/test_es_query_nereids.groovy
+++ b/regression-test/suites/external_table_p2/es/test_es_query_nereids.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_es_query_nereids", "p0,external") {
+suite("test_es_query_nereids", "p2,external") {
String enabled = context.config.otherConfigs.get("enableEsTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/es/test_es_query_no_http_url.groovy
b/regression-test/suites/external_table_p2/es/test_es_query_no_http_url.groovy
similarity index 98%
rename from
regression-test/suites/external_table_p0/es/test_es_query_no_http_url.groovy
rename to
regression-test/suites/external_table_p2/es/test_es_query_no_http_url.groovy
index 1f2627a9bd7..58889210d5a 100644
---
a/regression-test/suites/external_table_p0/es/test_es_query_no_http_url.groovy
+++
b/regression-test/suites/external_table_p2/es/test_es_query_no_http_url.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_es_query_no_http_url", "p0,external") {
+suite("test_es_query_no_http_url", "p2,external") {
String enabled = context.config.otherConfigs.get("enableEsTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/es/test_es_query_predicate_correctness.groovy
b/regression-test/suites/external_table_p2/es/test_es_query_predicate_correctness.groovy
similarity index 99%
rename from
regression-test/suites/external_table_p0/es/test_es_query_predicate_correctness.groovy
rename to
regression-test/suites/external_table_p2/es/test_es_query_predicate_correctness.groovy
index ccf84e9fc7f..58b7ce82d17 100644
---
a/regression-test/suites/external_table_p0/es/test_es_query_predicate_correctness.groovy
+++
b/regression-test/suites/external_table_p2/es/test_es_query_predicate_correctness.groovy
@@ -20,7 +20,7 @@
// P0-4: REGEXP must generate ES 'regexp' query, not 'wildcard'
// P1-3: IS NULL must generate 'must_not exists', not 'term null'
-suite("test_es_query_predicate_correctness", "p0,external") {
+suite("test_es_query_predicate_correctness", "p2,external") {
String enabled = context.config.otherConfigs.get("enableEsTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/jdbc/test_db2_jdbc_catalog.groovy
b/regression-test/suites/external_table_p2/jdbc/test_db2_jdbc_catalog.groovy
similarity index 99%
rename from
regression-test/suites/external_table_p0/jdbc/test_db2_jdbc_catalog.groovy
rename to
regression-test/suites/external_table_p2/jdbc/test_db2_jdbc_catalog.groovy
index d32d06a8514..eeef434e87e 100644
--- a/regression-test/suites/external_table_p0/jdbc/test_db2_jdbc_catalog.groovy
+++ b/regression-test/suites/external_table_p2/jdbc/test_db2_jdbc_catalog.groovy
@@ -20,7 +20,7 @@ import java.sql.Connection
import java.sql.DriverManager
import java.net.URL
-suite("test_db2_jdbc_catalog", "p0,external") {
+suite("test_db2_jdbc_catalog", "p2,external") {
qt_sql """select current_catalog()"""
String enabled = context.config.otherConfigs.get("enableJdbcTest")
diff --git
a/regression-test/suites/external_table_p0/jdbc/test_oceanbase_jdbc_catalog.groovy
b/regression-test/suites/external_table_p2/jdbc/test_oceanbase_jdbc_catalog.groovy
similarity index 97%
rename from
regression-test/suites/external_table_p0/jdbc/test_oceanbase_jdbc_catalog.groovy
rename to
regression-test/suites/external_table_p2/jdbc/test_oceanbase_jdbc_catalog.groovy
index 13fc4c3dd0b..7ebc54cd60b 100644
---
a/regression-test/suites/external_table_p0/jdbc/test_oceanbase_jdbc_catalog.groovy
+++
b/regression-test/suites/external_table_p2/jdbc/test_oceanbase_jdbc_catalog.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_oceanbase_jdbc_catalog", "p0,external") {
+suite("test_oceanbase_jdbc_catalog", "p2,external") {
String enabled = context.config.otherConfigs.get("enableJdbcTest");
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
String s3_endpoint = getS3Endpoint()
diff --git
a/regression-test/suites/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.groovy
b/regression-test/suites/external_table_p2/jdbc/test_sqlserver_jdbc_catalog.groovy
similarity index 99%
rename from
regression-test/suites/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.groovy
rename to
regression-test/suites/external_table_p2/jdbc/test_sqlserver_jdbc_catalog.groovy
index f49ac2af22c..01648cdca6c 100644
---
a/regression-test/suites/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.groovy
+++
b/regression-test/suites/external_table_p2/jdbc/test_sqlserver_jdbc_catalog.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_sqlserver_jdbc_catalog", "p0,external") {
+suite("test_sqlserver_jdbc_catalog", "p2,external") {
String enabled = context.config.otherConfigs.get("enableJdbcTest");
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
String s3_endpoint = getS3Endpoint()
diff --git
a/regression-test/suites/external_table_p0/jdbc/type_test/select/test_sqlserver_all_types_select.groovy
b/regression-test/suites/external_table_p2/jdbc/test_sqlserver_jdbc_row_count.groovy
similarity index 55%
copy from
regression-test/suites/external_table_p0/jdbc/type_test/select/test_sqlserver_all_types_select.groovy
copy to
regression-test/suites/external_table_p2/jdbc/test_sqlserver_jdbc_row_count.groovy
index 98bc1eee058..24eb42c4991 100644
---
a/regression-test/suites/external_table_p0/jdbc/type_test/select/test_sqlserver_all_types_select.groovy
+++
b/regression-test/suites/external_table_p2/jdbc/test_sqlserver_jdbc_row_count.groovy
@@ -15,18 +15,18 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_sqlserver_all_types_select", "p0,external") {
+suite("test_sqlserver_jdbc_row_count", "p2,external") {
String enabled = context.config.otherConfigs.get("enableJdbcTest")
+ logger.info("enabled " + enabled)
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
String s3_endpoint = getS3Endpoint()
String bucket = getS3BucketName()
String driver_url =
"https://${bucket}.${s3_endpoint}/regression/jdbc_driver/mssql-jdbc-11.2.3.jre8.jar";
- String driver_url13 =
"https://${bucket}.${s3_endpoint}/regression/jdbc_driver/mssql-jdbc-13.4.0.jre8.jar";
if (enabled != null && enabled.equalsIgnoreCase("true")) {
+ String catalog_name = "test_sqlserver_jdbc_row_count";
String sqlserver_port =
context.config.otherConfigs.get("sqlserver_2022_port");
-
- sql """drop catalog if exists sqlserver_all_type_test """
- sql """create catalog if not exists sqlserver_all_type_test properties(
+ sql """drop catalog if exists ${catalog_name} """
+ sql """ create catalog if not exists ${catalog_name} properties(
"type"="jdbc",
"user"="sa",
"password"="Doris123456",
@@ -34,28 +34,43 @@ suite("test_sqlserver_all_types_select", "p0,external") {
"driver_url" = "${driver_url}",
"driver_class" =
"com.microsoft.sqlserver.jdbc.SQLServerDriver"
);"""
+ sql """use ${catalog_name}.dbo"""
+ def result = sql """show table stats student"""
+ Thread.sleep(1000)
+ for (int i = 0; i < 60; i++) {
+ result = sql """show table stats student""";
+ if (result[0][2] != "-1") {
+ break;
+ }
+ logger.info("Table row count not ready yet. Wait 1 second.")
+ Thread.sleep(1000)
+ }
+ assertEquals("3", result[0][2])
+ sql """drop catalog ${catalog_name}"""
- sql """use sqlserver_all_type_test.dbo"""
-
- qt_desc_all_types_null """desc dbo.extreme_test;"""
-
- qt_select_all_types_null """select * from dbo.extreme_test order by
1;"""
-
- qt_select_all_types_multi_block """select count(*) from
dbo.extreme_test_multi_block;"""
-
- sql """drop catalog if exists sqlserver_all_type_test """
-
- sql """drop catalog if exists sqlserver_13_test """
- sql """create catalog if not exists sqlserver_13_test properties(
+ catalog_name = "test_sqlserver_lower_jdbc_row_count";
+ sql """drop catalog if exists ${catalog_name} """
+ sql """ create catalog if not exists ${catalog_name} properties(
"type"="jdbc",
"user"="sa",
"password"="Doris123456",
"jdbc_url" =
"jdbc:sqlserver://${externalEnvIp}:${sqlserver_port};encrypt=false;databaseName=doris_test;",
- "driver_url" = "${driver_url13}",
- "driver_class" =
"com.microsoft.sqlserver.jdbc.SQLServerDriver"
+ "driver_url" = "${driver_url}",
+ "driver_class" =
"com.microsoft.sqlserver.jdbc.SQLServerDriver",
+ "lower_case_meta_names" = "true"
);"""
- sql """switch sqlserver_13_test"""
- qt_order_show_db """show databases"""
- sql """drop catalog if exists sqlserver_13_test """
+ sql """use ${catalog_name}.dbo"""
+ result = sql """show table stats test_lower"""
+ Thread.sleep(1000)
+ for (int i = 0; i < 60; i++) {
+ result = sql """show table stats test_lower""";
+ if (result[0][2] != "-1") {
+ break;
+ }
+ logger.info("Table row count not ready yet. Wait 1 second.")
+ Thread.sleep(1000)
+ }
+ assertEquals("1", result[0][2])
+ sql """drop catalog ${catalog_name}"""
}
}
diff --git
a/regression-test/suites/external_table_p0/jdbc/type_test/select/test_sqlserver_all_types_select.groovy
b/regression-test/suites/external_table_p2/jdbc/type_test/select/test_sqlserver_all_types_select.groovy
similarity index 98%
rename from
regression-test/suites/external_table_p0/jdbc/type_test/select/test_sqlserver_all_types_select.groovy
rename to
regression-test/suites/external_table_p2/jdbc/type_test/select/test_sqlserver_all_types_select.groovy
index 98bc1eee058..af86285bed7 100644
---
a/regression-test/suites/external_table_p0/jdbc/type_test/select/test_sqlserver_all_types_select.groovy
+++
b/regression-test/suites/external_table_p2/jdbc/type_test/select/test_sqlserver_all_types_select.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_sqlserver_all_types_select", "p0,external") {
+suite("test_sqlserver_all_types_select", "p2,external") {
String enabled = context.config.otherConfigs.get("enableJdbcTest")
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
String s3_endpoint = getS3Endpoint()
diff --git
a/regression-test/suites/external_table_p0/trino_connector/jdbc/test_trino_sqlserver.groovy
b/regression-test/suites/external_table_p2/trino_connector/jdbc/test_trino_sqlserver.groovy
similarity index 98%
rename from
regression-test/suites/external_table_p0/trino_connector/jdbc/test_trino_sqlserver.groovy
rename to
regression-test/suites/external_table_p2/trino_connector/jdbc/test_trino_sqlserver.groovy
index a5ecffb2fff..1a3f144adb4 100644
---
a/regression-test/suites/external_table_p0/trino_connector/jdbc/test_trino_sqlserver.groovy
+++
b/regression-test/suites/external_table_p2/trino_connector/jdbc/test_trino_sqlserver.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_trino_sqlserver", "p0,external") {
+suite("test_trino_sqlserver", "p2,external") {
String enabled = context.config.otherConfigs.get("enableJdbcTest")
String enabled_trino_connector =
context.config.otherConfigs.get("enableTrinoConnectorTest")
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git a/regression-test/suites/mtmv_p0/test_es_mtmv.groovy
b/regression-test/suites/mtmv_p2/test_es_mtmv.groovy
similarity index 95%
rename from regression-test/suites/mtmv_p0/test_es_mtmv.groovy
rename to regression-test/suites/mtmv_p2/test_es_mtmv.groovy
index e7c72289e17..8dc757561fe 100644
--- a/regression-test/suites/mtmv_p0/test_es_mtmv.groovy
+++ b/regression-test/suites/mtmv_p2/test_es_mtmv.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_es_mtmv", "p0,external,es,external_docker,external_docker_hive") {
+suite("test_es_mtmv", "p2,external,es,external_docker,external_docker_hive") {
String enabled = context.config.otherConfigs.get("enableEsTest")
logger.info("enabled: " + enabled)
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
@@ -25,7 +25,7 @@ suite("test_es_mtmv",
"p0,external,es,external_docker,external_docker_hive") {
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String catalog_name = "es_mtmv_catalog";
String mvName = "test_es_mtmv"
- String dbName = "regression_test_mtmv_p0"
+ String dbName = "regression_test_mtmv_p2"
String esDb = "default_db"
String esTable = "test1"
sql """drop catalog if exists ${catalog_name} """
@@ -60,4 +60,3 @@ suite("test_es_mtmv",
"p0,external,es,external_docker,external_docker_hive") {
sql """ drop catalog if exists ${catalog_name} """
}
}
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
