You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by da...@apache.org on 2023/08/17 02:55:00 UTC

[doris] branch master updated: [fix](regresstion) Fix sql server external case (#23031)

This is an automated email from the ASF dual-hosted git repository.

dataroaring 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 a288377118 [fix](regresstion) Fix sql server external case (#23031)
a288377118 is described below

commit a288377118ef901e6ee631348148a001bbc6624f
Author: zhangguoqiang <18...@163.com>
AuthorDate: Thu Aug 17 10:54:54 2023 +0800

    [fix](regresstion) Fix sql server external case (#23031)
---
 .../jdbc/test_jdbc_query_mysql.out                 | 24 +++++++++++-----------
 .../external_table_p0/jdbc/test_jdbc_query_pg.out  |  6 +++---
 .../pipeline/external/conf/regression-conf.groovy  |  1 +
 .../jdbc/test_jdbc_query_mysql.groovy              |  2 +-
 .../jdbc/test_jdbc_query_pg.groovy                 |  2 +-
 .../jdbc/test_sqlserver_jdbc_catalog.groovy        | 10 +++++----
 6 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/regression-test/data/external_table_p0/jdbc/test_jdbc_query_mysql.out b/regression-test/data/external_table_p0/jdbc/test_jdbc_query_mysql.out
index be09c0a6a4..f1fb0d3351 100644
--- a/regression-test/data/external_table_p0/jdbc/test_jdbc_query_mysql.out
+++ b/regression-test/data/external_table_p0/jdbc/test_jdbc_query_mysql.out
@@ -1104,10 +1104,10 @@ false
 \N
 
 -- !sql --
-3	1970-01-01	1970-01-01	1427427954.90	0.00	0.00	0.00	0.00	0.00	6,7,2,9	H,G,E,A	7601.25,3683.85,2449.00,5297.81,4785.38	4,5,6,9,A	9,7,C,5	a,b,e,d,c
-5	1970-01-01	1970-01-01	163793651.90	0.00	0.00	0.00	0.00	0.00	7	C	6276.86	8	9	d,a,b,c,e
-6	1970-01-01	1970-01-01	113878186.90	106106702.80	0.00	0.00	0.00	343909702.45	1,4	A,E	2099.18,9137.82	C,B	8,7	e,d,b,c,a
-8	1970-01-01	1970-01-01	487433108.65	0.00	0.00	0.00	0.00	0.00	9	H	2900.42	A	6	c,e,b,a,d
+3	1970-01-01	1970-01-01	1427427954.90	0.00	0.00	0.00	0.00	0.00	7,2,9,6	G,H,A,E	5297.81,3683.85,7601.25,2449.00,4785.38	5,9,A,6,4	7,5,9,C	c,e,d,a,b
+5	1970-01-01	1970-01-01	163793651.90	0.00	0.00	0.00	0.00	0.00	7	C	6276.86	8	9	c,e,d,a,b
+6	1970-01-01	1970-01-01	113878186.90	106106702.80	0.00	0.00	0.00	343909702.45	1,4	A,E	2099.18,9137.82	B,C	7,8	c,e,d,a,b
+8	1970-01-01	1970-01-01	487433108.65	0.00	0.00	0.00	0.00	0.00	9	H	2900.42	A	6	c,e,d,a,b
 
 -- !sql1 --
 1025
@@ -1152,14 +1152,14 @@ abc	\N
 -- !sql14 --
 \N	342
 0	136
-11	1
-13	1
-14	1
 16	1
-2	1
+17	1
+28	1
 4	1
-7	1
-8	1
+52	1
+58	1
+61	1
+89	1
 
 -- !sql15 --
 1025	1
@@ -1475,9 +1475,9 @@ true	abc	efg	2022-10-01	3.4	1	2	4	100000	1.2	2022-10-02T12:59:01	24.000	true	abc
 1.000
 
 -- !sql95 --
+0
+1
 1
-2
-3
 
 -- !sql100 --
 1025
diff --git a/regression-test/data/external_table_p0/jdbc/test_jdbc_query_pg.out b/regression-test/data/external_table_p0/jdbc/test_jdbc_query_pg.out
index 14b59b54a5..06b0247814 100644
--- a/regression-test/data/external_table_p0/jdbc/test_jdbc_query_pg.out
+++ b/regression-test/data/external_table_p0/jdbc/test_jdbc_query_pg.out
@@ -1384,9 +1384,9 @@ true	abc	def	2022-10-11	1.234	1	2	3	2022-10-22T10:59:59	34.123	true	abc	def	2022
 1.000
 
 -- !sql95 --
-123
-123
-234
+0
+1
+2
 
 -- !sql100 --
 1026
diff --git a/regression-test/pipeline/external/conf/regression-conf.groovy b/regression-test/pipeline/external/conf/regression-conf.groovy
index 7de29b74bd..f24d9baddc 100644
--- a/regression-test/pipeline/external/conf/regression-conf.groovy
+++ b/regression-test/pipeline/external/conf/regression-conf.groovy
@@ -101,3 +101,4 @@ s3Region = "ap-hongkong"
 max_failure_num=50
 
 externalEnvIp="127.0.0.1"
+
diff --git a/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_mysql.groovy b/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_mysql.groovy
index 813824d6ab..b30c5bc103 100644
--- a/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_mysql.groovy
+++ b/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_mysql.groovy
@@ -918,7 +918,7 @@ suite("test_jdbc_query_mysql", "p0,external,mysql,external_docker,external_docke
         order_qt_sql93 """ SELECT CASE k8 WHEN 1 THEN CAST(1 AS decimal(4,1)) WHEN 2 THEN CAST(1 AS decimal(4,2)) 
                             ELSE CAST(1 AS decimal(4,3)) END FROM $jdbcMysql57Table1 limit 3"""
         order_qt_sql95 """ SELECT * from (SELECT k8 FROM $jdbcMysql57Table1 UNION (SELECT id as k8 FROM ${exMysqlTable}  UNION SELECT k7 as k8 FROM $jdbcMysql57Table1) 
-                            UNION ALL SELECT products_id as k8 FROM $exMysqlTable1 ORDER BY k8 limit 3) as a  limit 3"""
+                            UNION ALL SELECT products_id as k8 FROM $exMysqlTable1 ORDER BY k8 limit 3) as a  order by k8 limit 3"""
         order_qt_sql100 """ SELECT COUNT(*) FROM $jdbcMysql57Table1 WHERE EXISTS(SELECT max(id) FROM ${exMysqlTable}) """
         order_qt_sql103 """ SELECT count(*) FROM $jdbcMysql57Table1 n WHERE (SELECT count(*) FROM ${exMysqlTable} r WHERE n.k8 = r.id) > 1 """
         order_qt_sql105 """ SELECT count(*) AS numwait FROM $jdbcMysql57Table1 l1 WHERE
diff --git a/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_pg.groovy b/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_pg.groovy
index add09d8da2..ae2566c445 100644
--- a/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_pg.groovy
+++ b/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_pg.groovy
@@ -622,7 +622,7 @@ suite("test_jdbc_query_pg", "p0,external,pg,external_docker,external_docker_pg")
         order_qt_sql93 """ SELECT CASE k8 WHEN 1 THEN CAST(1 AS decimal(4,1)) WHEN 2 THEN CAST(1 AS decimal(4,2)) 
                             ELSE CAST(1 AS decimal(4,3)) END FROM $jdbcPg14Table1 limit 3"""
         order_qt_sql95 """ SELECT * from (SELECT k8 FROM $jdbcPg14Table1 UNION (SELECT id as k8 FROM ${dorisExTable1}  UNION SELECT k7 as k8 FROM $jdbcPg14Table1) 
-                            UNION ALL SELECT id as k8 FROM $exMysqlTypeTable ORDER BY id limit 3) as a  limit 3"""
+                            UNION ALL SELECT id as k8 FROM $exMysqlTypeTable ORDER BY id limit 3) as a order by k8 limit 3"""
         order_qt_sql100 """ SELECT COUNT(*) FROM $jdbcPg14Table1 WHERE EXISTS(SELECT max(id) FROM ${dorisExTable1}) """
         order_qt_sql103 """ SELECT count(*) FROM $jdbcPg14Table1 n WHERE (SELECT count(*) FROM ${dorisExTable1} r WHERE n.k8 = r.id) > 1 """
         order_qt_sql105 """ SELECT count(*) AS numwait FROM $jdbcPg14Table1 l1 WHERE
diff --git a/regression-test/suites/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.groovy b/regression-test/suites/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.groovy
index af0cf21aaf..00bf5cde10 100644
--- a/regression-test/suites/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.groovy
+++ b/regression-test/suites/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.groovy
@@ -23,8 +23,8 @@ suite("test_sqlserver_jdbc_catalog", "p0,external,sqlserver,external_docker,exte
     String driver_url = "https://${bucket}.${s3_endpoint}/regression/jdbc_driver/mssql-jdbc-11.2.3.jre8.jar"
     if (enabled != null && enabled.equalsIgnoreCase("true")) {
         String catalog_name = "sqlserver_catalog";
-        String internal_db_name = "regression_test_jdbc_catalog_p0";
-        String ex_db_name = "doris_test";
+        String internal_db_name = "sqlserver_jdbc_catalog_p0";
+        String ex_db_name = "dbo";
         String sqlserver_port = context.config.otherConfigs.get("sqlserver_2022_port");
 
         String inDorisTable = "test_sqlserver_doris_in_tb";
@@ -33,12 +33,14 @@ suite("test_sqlserver_jdbc_catalog", "p0,external,sqlserver,external_docker,exte
 
         sql """ create catalog if not exists ${catalog_name} properties(
                     "type"="jdbc",
-                    "user"="SA",
+                    "user"="sa",
                     "password"="Doris123456",
-                    "jdbc_url" = "jdbc:sqlserver://${externalEnvIp}:${sqlserver_port};encrypt=false;DataBaseName=doris_test",
+                    "jdbc_url" = "jdbc:sqlserver://${externalEnvIp}:${sqlserver_port};encrypt=false;databaseName=doris_test;",
                     "driver_url" = "${driver_url}",
                     "driver_class" = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
         );"""
+        sql """drop database if exists ${internal_db_name}"""
+        sql """create database if not exists ${internal_db_name}"""
         sql """use ${internal_db_name}"""
         sql  """ drop table if exists ${inDorisTable} """
         sql  """


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org