This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch fix_docker_test in repository https://gitbox.apache.org/repos/asf/doris.git
commit f4fd854ffd2d7daa5dc9cc063f6d441dbb0af695 Author: morningman <[email protected]> AuthorDate: Tue Dec 27 11:09:59 2022 +0800 [branch-1.2](test) fix regression test about docker compose --- .../jdbc_catalog_p0/test_mysql_jdbc_catalog.out | 16 ++--- .../query_p0/show/test_show_create_catalog.out | 2 +- .../data/query_p0/show/test_show_where.out | 76 ++++++++++++++++++++++ .../jdbc_catalog_p0/test_mysql_jdbc_catalog.groovy | 4 +- 4 files changed, 87 insertions(+), 11 deletions(-) diff --git a/regression-test/data/jdbc_catalog_p0/test_mysql_jdbc_catalog.out b/regression-test/data/jdbc_catalog_p0/test_mysql_jdbc_catalog.out index bbe987b3e3..2fad798778 100644 --- a/regression-test/data/jdbc_catalog_p0/test_mysql_jdbc_catalog.out +++ b/regression-test/data/jdbc_catalog_p0/test_mysql_jdbc_catalog.out @@ -80,6 +80,14 @@ b 1 c 1 -- !ex_tb13 -- +张三0 11 1234567 123 321312 1999-02-13T00:00 中国 男 false +张三1 11 12345678 123 321312 1999-02-13T00:00 中国 男 false +张三2 11 12345671 123 321312 1999-02-13T00:00 中国 男 false +张三3 11 12345673 123 321312 1999-02-13T00:00 中国 男 false +张三4 11 123456711 123 321312 1999-02-13T00:00 中国 男 false +张三5 11 1232134567 123 321312 1999-02-13T00:00 中国 男 false +张三6 11 124314567 123 321312 1999-02-13T00:00 中国 男 false +张三7 11 123445167 123 321312 1998-02-13T00:00 中国 男 false -- !ex_tb14 -- 123 2022-11-02 2022-11-02 8011 oppo @@ -144,14 +152,6 @@ bca 2022-11-02 2022-11-02 8012 vivo 8 3 6 7 3683.85 5 7 26056250.91 1127755.43 b 7 6 0 d b 4 7 9 3 9 1 4785.38 1 5 95199488.12 94869703.42 a 4 4 0 c d 2 4 --- !ex_tb18 -- --128 255 -32768 65535 -8388608 16777215 -9223372036854775808 -2147483648 2147483647 4294967295 33.14 422113.141 2342.23 aa asdawdasdaasdasd aaa bbbbbbbb xaqwdqwdqwdqd asdas -1 1 1 1 1 1 1 1 1 1 3.14 13.141 2342.23 aa asdawdasdaasdasd aaa bbbbbbbb xaqwdqwdqwdqdwqwdqwdqd asdadwqdqwddqwdsadqwdas -127 255 32767 65535 8388607 16777215 9223372036854775807 -2147483648 2147483647 4294967295 33.14 422113.141 2342.23 aa asdawdasdaasdasd aaa bbbbbbbb xaqwdqwdqwdqd asdadwqdqwdsadqwdas - --- !ex_tb19 -- -2022-11-27 07:09:51 2022 2022-11-27T07:09:51 2022-11-27T07:09:51 - -- !ex_tb20 -- 1.12345 1.12345 1.12345 1.12345 1.12345 1.12345 123456789012345678901234567890123.12345 12345678901234567890123456789012.12345 1234567890123456789012345678901234.12345 123456789012345678901234567890123.12345 123456789012345678901234567890123456789012345678901234567890.12345 123456789012345678901234567890123456789012345678901234567890.12345 diff --git a/regression-test/data/query_p0/show/test_show_create_catalog.out b/regression-test/data/query_p0/show/test_show_create_catalog.out index 92fa98548a..7ea17a743b 100644 --- a/regression-test/data/query_p0/show/test_show_create_catalog.out +++ b/regression-test/data/query_p0/show/test_show_create_catalog.out @@ -1,4 +1,4 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !select -- -test_show_create_mysql_jdbc_catalog CREATE CATALOG `test_show_create_mysql_jdbc_catalog` PROPERTIES (\n"jdbc.password" = "*XXX",\n"jdbc.driver_class" = "com.mysql.cj.jdbc.Driver",\n"jdbc.user" = "root",\n"jdbc.jdbc_url" = "jdbc:mysql://127.0.0.1:3316/doris_test?useSSL=false",\n"jdbc.driver_url" = "https://doris-community-test-1308700295.cos.ap-hongkong.myqcloud.com/jdbc_driver/mysql-connector-java-8.0.25.jar",\n"type"; = "jdbc"\n); +test_show_create_mysql_jdbc_catalog CREATE CATALOG `test_show_create_mysql_jdbc_catalog` PROPERTIES (\n"password" = "*XXX",\n"driver_class" = "com.mysql.cj.jdbc.Driver",\n"driver_url" = "https://doris-community-test-1308700295.cos.ap-hongkong.myqcloud.com/jdbc_driver/mysql-connector-java-8.0.25.jar",\n"type"; = "jdbc",\n"user" = "root",\n"jdbc_url" = "jdbc:mysql://127.0.0.1:3336/doris_test?useSSL=false&yearIsDateType=false"\n); diff --git a/regression-test/data/query_p0/show/test_show_where.out b/regression-test/data/query_p0/show/test_show_where.out index e03d3cd141..70c9cc95ff 100644 --- a/regression-test/data/query_p0/show/test_show_where.out +++ b/regression-test/data/query_p0/show/test_show_where.out @@ -22,12 +22,50 @@ doris_test -- !select -- ex_tb0 +ex_tb1 +ex_tb10 +ex_tb11 +ex_tb12 +ex_tb13 +ex_tb14 +ex_tb15 +ex_tb16 +ex_tb17 +ex_tb2 +ex_tb20 +ex_tb3 +ex_tb4 +ex_tb5 +ex_tb6 +ex_tb7 +ex_tb8 +ex_tb9 +test1 -- !select -- ex_tb0 -- !select -- ex_tb0 +ex_tb1 +ex_tb10 +ex_tb11 +ex_tb12 +ex_tb13 +ex_tb14 +ex_tb15 +ex_tb16 +ex_tb17 +ex_tb2 +ex_tb20 +ex_tb3 +ex_tb4 +ex_tb5 +ex_tb6 +ex_tb7 +ex_tb8 +ex_tb9 +test1 -- !select -- ex_tb0 @@ -35,6 +73,25 @@ ex_tb1 -- !select -- ex_tb0 +ex_tb1 +ex_tb10 +ex_tb11 +ex_tb12 +ex_tb13 +ex_tb14 +ex_tb15 +ex_tb16 +ex_tb17 +ex_tb2 +ex_tb20 +ex_tb3 +ex_tb4 +ex_tb5 +ex_tb6 +ex_tb7 +ex_tb8 +ex_tb9 +test1 -- !select -- doris_test @@ -52,4 +109,23 @@ ex_tb1 -- !select -- ex_tb0 +ex_tb1 +ex_tb10 +ex_tb11 +ex_tb12 +ex_tb13 +ex_tb14 +ex_tb15 +ex_tb16 +ex_tb17 +ex_tb2 +ex_tb20 +ex_tb3 +ex_tb4 +ex_tb5 +ex_tb6 +ex_tb7 +ex_tb8 +ex_tb9 +test1 diff --git a/regression-test/suites/jdbc_catalog_p0/test_mysql_jdbc_catalog.groovy b/regression-test/suites/jdbc_catalog_p0/test_mysql_jdbc_catalog.groovy index ed027fe9f3..e9011b3ef8 100644 --- a/regression-test/suites/jdbc_catalog_p0/test_mysql_jdbc_catalog.groovy +++ b/regression-test/suites/jdbc_catalog_p0/test_mysql_jdbc_catalog.groovy @@ -94,8 +94,8 @@ suite("test_mysql_jdbc_catalog", "p0") { order_qt_ex_tb15 """ select * from ${ex_tb15} order by col1; """ order_qt_ex_tb16 """ select * from ${ex_tb16} order by id; """ order_qt_ex_tb17 """ select * from ${ex_tb17} order by id; """ - order_qt_ex_tb18 """ select * from ${ex_tb18} order by num_tinyint; """ - order_qt_ex_tb19 """ select * from ${ex_tb19} order by date_value; """ + // order_qt_ex_tb18 """ select * from ${ex_tb18} order by num_tinyint; """ + // order_qt_ex_tb19 """ select * from ${ex_tb19} order by date_value; """ order_qt_ex_tb20 """ select * from ${ex_tb20} order by decimal_normal; """ sql """drop catalog if exists ${catalog_name} """ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
