This is an automated email from the ASF dual-hosted git repository. morningman 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 4c60186e87 [test](jdbc)add new case for pg jdbc table (#14582) 4c60186e87 is described below commit 4c60186e87b63394932f7a71b25c9bff30fd3243 Author: lsy3993 <110876560+lsy3...@users.noreply.github.com> AuthorDate: Sat Nov 26 13:02:05 2022 +0800 [test](jdbc)add new case for pg jdbc table (#14582) --- .github/actions/clang-format-lint-action | 2 +- .github/actions/get-workflow-origin | 2 +- .../data/jdbc_p0/test_jdbc_query_pg.out | 84 ++++++++++++++++++++++ .../suites/jdbc_p0/test_jdbc_query_pg.groovy | 51 +++++++++++++ 4 files changed, 137 insertions(+), 2 deletions(-) diff --git a/.github/actions/clang-format-lint-action b/.github/actions/clang-format-lint-action index 9ea72631b7..c3b2c943e9 160000 --- a/.github/actions/clang-format-lint-action +++ b/.github/actions/clang-format-lint-action @@ -1 +1 @@ -Subproject commit 9ea72631b74e61ce337d0839a90e76180e997283 +Subproject commit c3b2c943e924028b93a707a5b1b017976ab8d50c diff --git a/.github/actions/get-workflow-origin b/.github/actions/get-workflow-origin index 588cc14f9f..70849a55e9 160000 --- a/.github/actions/get-workflow-origin +++ b/.github/actions/get-workflow-origin @@ -1 +1 @@ -Subproject commit 588cc14f9f1cdf1b8be3db816855e96422204fec +Subproject commit 70849a55e9a8df457b37092ecd6c30eefc71286f diff --git a/regression-test/data/jdbc_p0/test_jdbc_query_pg.out b/regression-test/data/jdbc_p0/test_jdbc_query_pg.out index a78defa987..1bda2d5dea 100644 --- a/regression-test/data/jdbc_p0/test_jdbc_query_pg.out +++ b/regression-test/data/jdbc_p0/test_jdbc_query_pg.out @@ -1337,3 +1337,87 @@ true abc 5 6 +-- !sql87 -- +1 3 +2 0 +3 1 + +-- !sql88 -- +1 +2 +3 + +-- !sql89 -- +1 +2 +3 + +-- !sql90 -- +1 +2 + +-- !sql91 -- +2 1015 1 +2 1016 1 +2 1017 1 + +-- !sql -- +123 abc +123 abc +234 bcd + +-- !sql92 -- +1020 +1021 +1022 +1023 +1024 + +-- !sql93 -- +1.000 +1.000 +1.000 + +-- !sql95 -- +0 +1 +3 + +-- !sql100 -- +1026 + +-- !sql103 -- +1 + +-- !sql105 -- +0 + +-- !sql106 -- +1.0 + +-- !sql107 -- +45 + +-- !sql108 -- +1 +1 +1 + +-- !sql109 -- +2 1026 0 +4 1026 0 +6 1026 0 + +-- !sql110 -- +2047 +2047 + +-- !sql111 -- +1 +1 +1 + +-- !sql112 -- +\N 914 +2 914 + diff --git a/regression-test/suites/jdbc_p0/test_jdbc_query_pg.groovy b/regression-test/suites/jdbc_p0/test_jdbc_query_pg.groovy index d664f62d70..b111749b4a 100644 --- a/regression-test/suites/jdbc_p0/test_jdbc_query_pg.groovy +++ b/regression-test/suites/jdbc_p0/test_jdbc_query_pg.groovy @@ -29,6 +29,7 @@ suite("test_jdbc_query_pg", "p0") { String dorisInTable3 = "doris_in_table3"; String dorisInTable4 = "doris_in_table4"; String dorisViewName = "doris_view_name"; + String exMysqlTypeTable = "doris_type_tb"; sql """drop resource if exists $jdbcResourcePg14;""" sql """ @@ -562,8 +563,58 @@ suite("test_jdbc_query_pg", "p0") { order_qt_sql84 """ SELECT NULL, NULL INTERSECT SELECT NULL, NULL FROM $jdbcPg14Table1 """ order_qt_sql85 """ SELECT COUNT(*) FROM $jdbcPg14Table1 INTERSECT SELECT COUNT(k8) FROM $jdbcPg14Table1 HAVING SUM(k7) IS NOT NULL """ order_qt_sql86 """ SELECT k8 FROM $jdbcPg14Table1 WHERE k8 < 7 EXCEPT SELECT k8 FROM $jdbcPg14Table1 WHERE k8 > 21 """ + order_qt_sql87 """ SELECT row_number() OVER (PARTITION BY k7) rn, k8 FROM $jdbcPg14Table1 LIMIT 3 """ + order_qt_sql88 """ SELECT row_number() OVER (PARTITION BY k7 ORDER BY k8) rn FROM $jdbcPg14Table1 LIMIT 3 """ + order_qt_sql89 """ SELECT row_number() OVER (ORDER BY k8) rn FROM $jdbcPg14Table1 LIMIT 3 """ + order_qt_sql90 """ SELECT row_number() OVER () FROM $jdbcPg14Table1 as a JOIN ${dorisExTable1} as b ON a.k8 = b.id WHERE a.k8 > 111 LIMIT 2 """ + order_qt_sql91 """ SELECT k7, k8, SUM(rn) OVER (PARTITION BY k8) c + FROM ( SELECT k7, k8, row_number() OVER (PARTITION BY k8) rn + FROM (SELECT * FROM $jdbcPg14Table1 ORDER BY k8 desc LIMIT 10) as t1) as t2 limit 3 """ + // test for create external table use different type with original type + sql """ drop table if exists ${exMysqlTypeTable} """ + sql """ + CREATE EXTERNAL TABLE `$exMysqlTypeTable` ( + `id` int NULL COMMENT "", + `name` varchar(120) NULL COMMENT "" + ) ENGINE=JDBC + PROPERTIES ( + "resource" = "$jdbcResourcePg14", + "table" = "test3", + "table_type"="postgresql" + ); + """ + order_qt_sql """ select * from ${exMysqlTypeTable} order by id """ + + + order_qt_sql92 """ WITH a AS (SELECT k8 from $jdbcPg14Table1), b AS (WITH a AS (SELECT k8 from $jdbcPg14Table1) SELECT * FROM a) + SELECT * FROM b order by k8 desc limit 5 """ + 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""" + 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 + EXISTS(SELECT * FROM $jdbcPg14Table1 l2 WHERE l2.k8 = l1.k8 ) + AND NOT EXISTS(SELECT * FROM $jdbcPg14Table1 l3 WHERE l3.k8= l1.k8) """ + order_qt_sql106 """ SELECT AVG(x) FROM (SELECT 1 AS x, k7 FROM $jdbcPg14Table1) as a GROUP BY x, k7 """ + order_qt_sql107 """ WITH lineitem_ex AS ( + SELECT k8,CAST(CONCAT(CONCAT(CONCAT(CONCAT(CONCAT(CONCAT(CAST((k8 % 255) AS VARCHAR), '.'), + CAST((k8 % 255) AS VARCHAR)), '.'),CAST(k8 AS VARCHAR)), '.' ), + CAST(k8 AS VARCHAR)) as varchar) AS ip FROM $jdbcPg14Table1) + SELECT SUM(length(l.ip)) FROM lineitem_ex l, ${dorisExTable1} p WHERE l.k8 = p.id """ + order_qt_sql108 """ SELECT RANK() OVER (PARTITION BY k7 ORDER BY COUNT(DISTINCT k8)) rnk + FROM $jdbcPg14Table1 GROUP BY k7, k8 ORDER BY rnk limit 3""" + order_qt_sql109 """ SELECT sum(k7) OVER(PARTITION BY k7 ORDER BY k8), count(k7) OVER(PARTITION BY k7 ORDER BY k7), + min(k8) OVER(PARTITION BY k9, k10 ORDER BY k8) FROM $jdbcPg14Table1 ORDER BY 1, 2 limit 3 """ + order_qt_sql110 """ WITH t1 AS (SELECT k8 FROM $jdbcPg14Table1 ORDER BY k7, k8 desc LIMIT 2), + t2 AS (SELECT k8, sum(k8) OVER() AS x FROM t1), + t3 AS (SELECT max(x) OVER() FROM t2) SELECT * FROM t3 limit 3""" + order_qt_sql111 """ SELECT rank() OVER () FROM (SELECT k8 FROM $jdbcPg14Table1 LIMIT 10) as t1 LIMIT 3 """ + order_qt_sql112 """ SELECT k7, count(DISTINCT k8) FROM $jdbcPg14Table1 WHERE k8 > 110 GROUP BY GROUPING SETS ((), (k7)) """ + } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org