This is an automated email from the ASF dual-hosted git repository.
zykkk 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 221e7bdd17 [test](jdbc external) fix mysql and pg external regression
test (#22998)
221e7bdd17 is described below
commit 221e7bdd17a1a2fcc3e069049d2823946be3754d
Author: zy-kkk <[email protected]>
AuthorDate: Wed Aug 16 10:44:47 2023 +0800
[test](jdbc external) fix mysql and pg external regression test (#22998)
---
.../src/main/java/org/apache/doris/jdbc/JdbcExecutor.java | 8 ++++----
.../data/external_table_p0/jdbc/test_jdbc_query_mysql.out | 8 ++++----
.../data/external_table_p0/jdbc/test_jdbc_query_pg.out | 6 +++---
.../data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out | 1 +
.../suites/external_table_p0/jdbc/test_doris_jdbc_catalog.groovy | 2 +-
.../suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy | 1 +
6 files changed, 14 insertions(+), 12 deletions(-)
diff --git
a/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/JdbcExecutor.java
b/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/JdbcExecutor.java
index 54506679a3..6b22fb1be0 100644
---
a/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/JdbcExecutor.java
+++
b/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/JdbcExecutor.java
@@ -790,11 +790,11 @@ public class JdbcExecutor {
bigDecimalPutToInt(column, isNullable, numRows, nullMapAddr,
columnAddr, firstNotNullIndex);
} else if (column[firstNotNullIndex] instanceof Integer) {
integerPutToInt(column, isNullable, numRows, nullMapAddr,
columnAddr, firstNotNullIndex);
- } else if (column[firstNotNullIndex] instanceof
com.clickhouse.data.value.UnsignedShort) {
- clickHouseUInt16ToInt(column, isNullable, numRows, nullMapAddr,
columnAddr, firstNotNullIndex);
} else if (column[firstNotNullIndex] instanceof java.lang.Long) {
// For mysql view. But don't worry about overflow
longPutToInt(column, isNullable, numRows, nullMapAddr, columnAddr,
firstNotNullIndex);
+ } else if (column[firstNotNullIndex] instanceof
com.clickhouse.data.value.UnsignedShort) {
+ clickHouseUInt16ToInt(column, isNullable, numRows, nullMapAddr,
columnAddr, firstNotNullIndex);
}
}
@@ -1406,10 +1406,10 @@ public class JdbcExecutor {
localDateTimePutToLongV2(column, isNullable, numRows, nullMapAddr,
columnAddr, firstNotNullIndex);
} else if (column[firstNotNullIndex] instanceof java.sql.Timestamp) {
timestampPutToLongV2(column, isNullable, numRows, nullMapAddr,
columnAddr, firstNotNullIndex);
- } else if (column[firstNotNullIndex] instanceof oracle.sql.TIMESTAMP) {
- oracleTimetampPutToLongV2(column, isNullable, numRows,
nullMapAddr, columnAddr, firstNotNullIndex);
} else if (column[firstNotNullIndex] instanceof OffsetDateTime) {
offsetDateTimePutToLongV2(column, isNullable, numRows,
nullMapAddr, columnAddr, firstNotNullIndex);
+ } else if (column[firstNotNullIndex] instanceof oracle.sql.TIMESTAMP) {
+ oracleTimetampPutToLongV2(column, isNullable, numRows,
nullMapAddr, columnAddr, firstNotNullIndex);
}
}
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 5e33d9fb61..be09c0a6a4 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 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
+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
-- !sql1 --
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 4b36606b90..14b59b54a5 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 --
-0
-1
-3
+123
+123
+234
-- !sql100 --
1026
diff --git
a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out
b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out
index 81ce6f369b..5037157a24 100644
--- a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out
+++ b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out
@@ -288,6 +288,7 @@ information_schema
init_db
mysql
performance_schema
+show_test_do_not_modify
sys
-- !specified_database_4 --
diff --git
a/regression-test/suites/external_table_p0/jdbc/test_doris_jdbc_catalog.groovy
b/regression-test/suites/external_table_p0/jdbc/test_doris_jdbc_catalog.groovy
index 0eff0b18c1..4b1e4ab7d6 100644
---
a/regression-test/suites/external_table_p0/jdbc/test_doris_jdbc_catalog.groovy
+++
b/regression-test/suites/external_table_p0/jdbc/test_doris_jdbc_catalog.groovy
@@ -45,7 +45,7 @@ suite("test_doris_jdbc_catalog",
"p0,external,doris,external_docker,external_doc
"password" = "${jdbcPassword}",
"jdbc_url" = "${jdbcUrl}",
"driver_url" = "${driver_url}",
- "driver_class" = "com.mysql.jdbc.Driver"
+ "driver_class" = "com.mysql.cj.jdbc.Driver"
)"""
sql """use ${internal_db_name}"""
sql """ drop table if exists ${internal_db_name}.${inDorisTable} """
diff --git
a/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy
b/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy
index 2997f2f785..cc8f4fd0fe 100644
---
a/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy
+++
b/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy
@@ -229,6 +229,7 @@ suite("test_mysql_jdbc_catalog",
"p0,external,mysql,external_docker,external_doc
sql """ drop catalog if exists ${catalog_name} """
// test mysql view
+ sql """ drop catalog if exists view_catalog """
sql """ CREATE CATALOG view_catalog PROPERTIES (
"type"="jdbc",
"jdbc.user"="root",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
