diff --git a/regression-test/data/external_table_p2/hive/test_hive_statistic_timeout.out b/regression-test/data/external_table_p2/hive/test_hive_statistic_timeout.out deleted file mode 100644 index e906deea59..0000000000 --- a/regression-test/data/external_table_p2/hive/test_hive_statistic_timeout.out +++ /dev/null @@ -1,7 +0,0 @@ --- This file is automatically generated. You should know what you did if you want to edit this --- !01 -- -p_container 200000000 40 0 JUMBO BAG WRAP PKG -p_partkey 200000000 200778064 0 1 200000000 -p_retailprice 200000000 120014 0 900.00 2099.00 -p_type 200000000 150 0 ECONOMY ANODIZED BRASS STANDARD POLISHED TIN - diff --git a/regression-test/suites/external_table_p2/hive/test_hive_analyze_db.groovy b/regression-test/suites/external_table_p2/hive/test_hive_analyze_db.groovy index 97148094d7..bcbb6040bf 100644 --- a/regression-test/suites/external_table_p2/hive/test_hive_analyze_db.groovy +++ b/regression-test/suites/external_table_p2/hive/test_hive_analyze_db.groovy @@ -34,162 +34,164 @@ suite("test_hive_analyze_db", "p2,external,hive,external_remote,external_remote_ logger.info("switched to catalog " + catalog_name) sql """use statistics;""" sql """set query_timeout=300""" - sql """analyze database statistics with sync""" + // sql """analyze database statistics with sync""" + sql """analyze table statistics with sync""" + sql """analyze table stats with sync""" def result = sql """show column stats statistics""" - assertTrue(result.size() == 17) + assertEquals(result.size(), 17) - assertTrue(result[0][0] == "lo_orderpriority") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "5.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "888.8000000000001") - assertTrue(result[0][5] == "8.8") - assertTrue(result[0][6] == "'1-URGENT'") - assertTrue(result[0][7] == "'5-LOW'") + assertEquals(result[0][0], "lo_orderpriority") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "5.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "880.0") + assertEquals(result[0][5], "8.8") + assertEquals(result[0][6], "'1-URGENT'") + assertEquals(result[0][7], "'5-LOW'") - assertTrue(result[1][0] == "lo_custkey") - assertTrue(result[1][1] == "100.0") - assertTrue(result[1][2] == "26.0") - assertTrue(result[1][3] == "0.0") - assertTrue(result[1][4] == "404.0") - assertTrue(result[1][5] == "4.0") - assertTrue(result[1][6] == "67423") - assertTrue(result[1][7] == "2735521") + assertEquals(result[1][0], "lo_custkey") + assertEquals(result[1][1], "100.0") + assertEquals(result[1][2], "26.0") + assertEquals(result[1][3], "0.0") + assertEquals(result[1][4], "400.0") + assertEquals(result[1][5], "4.0") + assertEquals(result[1][6], "67423") + assertEquals(result[1][7], "2735521") - assertTrue(result[2][0] == "lo_partkey") - assertTrue(result[2][1] == "100.0") - assertTrue(result[2][2] == "100.0") - assertTrue(result[2][3] == "0.0") - assertTrue(result[2][4] == "404.0") - assertTrue(result[2][5] == "4.0") - assertTrue(result[2][6] == "2250") - assertTrue(result[2][7] == "989601") + assertEquals(result[2][0], "lo_partkey") + assertEquals(result[2][1], "100.0") + assertEquals(result[2][2], "100.0") + assertEquals(result[2][3], "0.0") + assertEquals(result[2][4], "400.0") + assertEquals(result[2][5], "4.0") + assertEquals(result[2][6], "2250") + assertEquals(result[2][7], "989601") - assertTrue(result[3][0] == "lo_revenue") - assertTrue(result[3][1] == "100.0") - assertTrue(result[3][2] == "100.0") - assertTrue(result[3][3] == "0.0") - assertTrue(result[3][4] == "404.0") - assertTrue(result[3][5] == "4.0") - assertTrue(result[3][6] == "101171") - assertTrue(result[3][7] == "8703450") + assertEquals(result[3][0], "lo_revenue") + assertEquals(result[3][1], "100.0") + assertEquals(result[3][2], "100.0") + assertEquals(result[3][3], "0.0") + assertEquals(result[3][4], "400.0") + assertEquals(result[3][5], "4.0") + assertEquals(result[3][6], "101171") + assertEquals(result[3][7], "8703450") - assertTrue(result[4][0] == "lo_commitdate") - assertTrue(result[4][1] == "100.0") - assertTrue(result[4][2] == "95.0") - assertTrue(result[4][3] == "0.0") - assertTrue(result[4][4] == "404.0") - assertTrue(result[4][5] == "4.0") - assertTrue(result[4][6] == "19920515") - assertTrue(result[4][7] == "19981016") + assertEquals(result[4][0], "lo_commitdate") + assertEquals(result[4][1], "100.0") + assertEquals(result[4][2], "95.0") + assertEquals(result[4][3], "0.0") + assertEquals(result[4][4], "400.0") + assertEquals(result[4][5], "4.0") + assertEquals(result[4][6], "19920515") + assertEquals(result[4][7], "19981016") - assertTrue(result[5][0] == "lo_quantity") - assertTrue(result[5][1] == "100.0") - assertTrue(result[5][2] == "46.0") - assertTrue(result[5][3] == "0.0") - assertTrue(result[5][4] == "404.0") - assertTrue(result[5][5] == "4.0") - assertTrue(result[5][6] == "1") - assertTrue(result[5][7] == "50") + assertEquals(result[5][0], "lo_quantity") + assertEquals(result[5][1], "100.0") + assertEquals(result[5][2], "46.0") + assertEquals(result[5][3], "0.0") + assertEquals(result[5][4], "400.0") + assertEquals(result[5][5], "4.0") + assertEquals(result[5][6], "1") + assertEquals(result[5][7], "50") - assertTrue(result[6][0] == "lo_orderkey") - assertTrue(result[6][1] == "100.0") - assertTrue(result[6][2] == "26.0") - assertTrue(result[6][3] == "0.0") - assertTrue(result[6][4] == "404.0") - assertTrue(result[6][5] == "4.0") - assertTrue(result[6][6] == "1") - assertTrue(result[6][7] == "98") + assertEquals(result[6][0], "lo_orderkey") + assertEquals(result[6][1], "100.0") + assertEquals(result[6][2], "26.0") + assertEquals(result[6][3], "0.0") + assertEquals(result[6][4], "400.0") + assertEquals(result[6][5], "4.0") + assertEquals(result[6][6], "1") + assertEquals(result[6][7], "98") - assertTrue(result[7][0] == "lo_suppkey") - assertTrue(result[7][1] == "100.0") - assertTrue(result[7][2] == "100.0") - assertTrue(result[7][3] == "0.0") - assertTrue(result[7][4] == "404.0") - assertTrue(result[7][5] == "4.0") - assertTrue(result[7][6] == "4167") - assertTrue(result[7][7] == "195845") + assertEquals(result[7][0], "lo_suppkey") + assertEquals(result[7][1], "100.0") + assertEquals(result[7][2], "100.0") + assertEquals(result[7][3], "0.0") + assertEquals(result[7][4], "400.0") + assertEquals(result[7][5], "4.0") + assertEquals(result[7][6], "4167") + assertEquals(result[7][7], "195845") - assertTrue(result[8][0] == "lo_supplycost") - assertTrue(result[8][1] == "100.0") - assertTrue(result[8][2] == "100.0") - assertTrue(result[8][3] == "0.0") - assertTrue(result[8][4] == "404.0") - assertTrue(result[8][5] == "4.0") - assertTrue(result[8][6] == "58023") - assertTrue(result[8][7] == "121374") + assertEquals(result[8][0], "lo_supplycost") + assertEquals(result[8][1], "100.0") + assertEquals(result[8][2], "100.0") + assertEquals(result[8][3], "0.0") + assertEquals(result[8][4], "400.0") + assertEquals(result[8][5], "4.0") + assertEquals(result[8][6], "58023") + assertEquals(result[8][7], "121374") - assertTrue(result[9][0] == "lo_shipmode") - assertTrue(result[9][1] == "100.0") - assertTrue(result[9][2] == "7.0") - assertTrue(result[9][3] == "0.0") - assertTrue(result[9][4] == "425.21") - assertTrue(result[9][5] == "4.21") - assertTrue(result[9][6] == "'AIR'") - assertTrue(result[9][7] == "'TRUCK'") + assertEquals(result[9][0], "lo_shipmode") + assertEquals(result[9][1], "100.0") + assertEquals(result[9][2], "7.0") + assertEquals(result[9][3], "0.0") + assertEquals(result[9][4], "421.0") + assertEquals(result[9][5], "4.21") + assertEquals(result[9][6], "'AIR'") + assertEquals(result[9][7], "'TRUCK'") - assertTrue(result[10][0] == "lo_orderdate") - assertTrue(result[10][1] == "100.0") - assertTrue(result[10][2] == "26.0") - assertTrue(result[10][3] == "0.0") - assertTrue(result[10][4] == "404.0") - assertTrue(result[10][5] == "4.0") - assertTrue(result[10][6] == "19920221") - assertTrue(result[10][7] == "19980721") + assertEquals(result[10][0], "lo_orderdate") + assertEquals(result[10][1], "100.0") + assertEquals(result[10][2], "26.0") + assertEquals(result[10][3], "0.0") + assertEquals(result[10][4], "400.0") + assertEquals(result[10][5], "4.0") + assertEquals(result[10][6], "19920221") + assertEquals(result[10][7], "19980721") - assertTrue(result[11][0] == "lo_linenumber") - assertTrue(result[11][1] == "100.0") - assertTrue(result[11][2] == "7.0") - assertTrue(result[11][3] == "0.0") - assertTrue(result[11][4] == "404.0") - assertTrue(result[11][5] == "4.0") - assertTrue(result[11][6] == "1") - assertTrue(result[11][7] == "7") + assertEquals(result[11][0], "lo_linenumber") + assertEquals(result[11][1], "100.0") + assertEquals(result[11][2], "7.0") + assertEquals(result[11][3], "0.0") + assertEquals(result[11][4], "400.0") + assertEquals(result[11][5], "4.0") + assertEquals(result[11][6], "1") + assertEquals(result[11][7], "7") - assertTrue(result[12][0] == "lo_shippriority") - assertTrue(result[12][1] == "100.0") - assertTrue(result[12][2] == "1.0") - assertTrue(result[12][3] == "0.0") - assertTrue(result[12][4] == "404.0") - assertTrue(result[12][5] == "4.0") - assertTrue(result[12][6] == "0") - assertTrue(result[12][7] == "0") + assertEquals(result[12][0], "lo_shippriority") + assertEquals(result[12][1], "100.0") + assertEquals(result[12][2], "1.0") + assertEquals(result[12][3], "0.0") + assertEquals(result[12][4], "400.0") + assertEquals(result[12][5], "4.0") + assertEquals(result[12][6], "0") + assertEquals(result[12][7], "0") - assertTrue(result[13][0] == "lo_ordtotalprice") - assertTrue(result[13][1] == "100.0") - assertTrue(result[13][2] == "26.0") - assertTrue(result[13][3] == "0.0") - assertTrue(result[13][4] == "404.0") - assertTrue(result[13][5] == "4.0") - assertTrue(result[13][6] == "3428256") - assertTrue(result[13][7] == "36771805") + assertEquals(result[13][0], "lo_ordtotalprice") + assertEquals(result[13][1], "100.0") + assertEquals(result[13][2], "26.0") + assertEquals(result[13][3], "0.0") + assertEquals(result[13][4], "400.0") + assertEquals(result[13][5], "4.0") + assertEquals(result[13][6], "3428256") + assertEquals(result[13][7], "36771805") - assertTrue(result[14][0] == "lo_extendedprice") - assertTrue(result[14][1] == "100.0") - assertTrue(result[14][2] == "100.0") - assertTrue(result[14][3] == "0.0") - assertTrue(result[14][4] == "404.0") - assertTrue(result[14][5] == "4.0") - assertTrue(result[14][6] == "104300") - assertTrue(result[14][7] == "9066094") + assertEquals(result[14][0], "lo_extendedprice") + assertEquals(result[14][1], "100.0") + assertEquals(result[14][2], "100.0") + assertEquals(result[14][3], "0.0") + assertEquals(result[14][4], "400.0") + assertEquals(result[14][5], "4.0") + assertEquals(result[14][6], "104300") + assertEquals(result[14][7], "9066094") - assertTrue(result[15][0] == "lo_tax") - assertTrue(result[15][1] == "100.0") - assertTrue(result[15][2] == "9.0") - assertTrue(result[15][3] == "0.0") - assertTrue(result[15][4] == "404.0") - assertTrue(result[15][5] == "4.0") - assertTrue(result[15][6] == "0") - assertTrue(result[15][7] == "8") + assertEquals(result[15][0], "lo_tax") + assertEquals(result[15][1], "100.0") + assertEquals(result[15][2], "9.0") + assertEquals(result[15][3], "0.0") + assertEquals(result[15][4], "400.0") + assertEquals(result[15][5], "4.0") + assertEquals(result[15][6], "0") + assertEquals(result[15][7], "8") - assertTrue(result[16][0] == "lo_discount") - assertTrue(result[16][1] == "100.0") - assertTrue(result[16][2] == "11.0") - assertTrue(result[16][3] == "0.0") - assertTrue(result[16][4] == "404.0") - assertTrue(result[16][5] == "4.0") - assertTrue(result[16][6] == "0") - assertTrue(result[16][7] == "10") + assertEquals(result[16][0], "lo_discount") + assertEquals(result[16][1], "100.0") + assertEquals(result[16][2], "11.0") + assertEquals(result[16][3], "0.0") + assertEquals(result[16][4], "400.0") + assertEquals(result[16][5], "4.0") + assertEquals(result[16][6], "0") + assertEquals(result[16][7], "10") } } diff --git a/regression-test/suites/external_table_p2/hive/test_hive_partition_statistic.groovy b/regression-test/suites/external_table_p2/hive/test_hive_partition_statistic.groovy index 9f4b462237..73b6db1c64 100644 --- a/regression-test/suites/external_table_p2/hive/test_hive_partition_statistic.groovy +++ b/regression-test/suites/external_table_p2/hive/test_hive_partition_statistic.groovy @@ -35,7 +35,7 @@ suite("test_hive_partition_statistic", "p2,external,hive,external_remote,externa sql """analyze table multi_partition_orc partitions (`event_day=2008-09-25`, `event_day=1956-09-07`) with sync""" def ctlId - def result = sql """show proc '/catalogs'""" + def result = sql """show catalogs""" for (int i = 0; i < result.size(); i++) { if (result[i][1] == catalog_name) { diff --git a/regression-test/suites/external_table_p2/hive/test_hive_statistic.groovy b/regression-test/suites/external_table_p2/hive/test_hive_statistic.groovy index f743b75837..ea777437cc 100644 --- a/regression-test/suites/external_table_p2/hive/test_hive_statistic.groovy +++ b/regression-test/suites/external_table_p2/hive/test_hive_statistic.groovy @@ -39,221 +39,221 @@ suite("test_hive_statistic", "p2,external,hive,external_remote,external_remote_h sql """use statistics;""" sql """analyze table `statistics` with sync""" def result = sql """show column stats `statistics` (lo_quantity)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_quantity") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "46.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "400.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "1") - assertTrue(result[0][7] == "50") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_quantity") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "46.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "1") + assertEquals(result[0][7], "50") result = sql """show column stats `statistics` (lo_orderkey)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_orderkey") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "26.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "400.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "1") - assertTrue(result[0][7] == "98") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_orderkey") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "26.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "1") + assertEquals(result[0][7], "98") result = sql """show column stats `statistics` (lo_linenumber)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_linenumber") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "7.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "400.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "1") - assertTrue(result[0][7] == "7") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_linenumber") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "7.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "1") + assertEquals(result[0][7], "7") result = sql """show column stats `statistics` (lo_custkey)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_custkey") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "26.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "400.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "67423") - assertTrue(result[0][7] == "2735521") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_custkey") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "26.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "67423") + assertEquals(result[0][7], "2735521") result = sql """show column stats `statistics` (lo_partkey)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_partkey") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "100.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "400.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "2250") - assertTrue(result[0][7] == "989601") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_partkey") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "100.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "2250") + assertEquals(result[0][7], "989601") result = sql """show column stats `statistics` (lo_suppkey)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_suppkey") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "100.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "400.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "4167") - assertTrue(result[0][7] == "195845") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_suppkey") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "100.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "4167") + assertEquals(result[0][7], "195845") result = sql """show column stats `statistics` (lo_orderdate)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_orderdate") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "26.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "400.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "19920221") - assertTrue(result[0][7] == "19980721") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_orderdate") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "26.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "19920221") + assertEquals(result[0][7], "19980721") result = sql """show column stats `statistics` (lo_orderpriority)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_orderpriority") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "5.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "880.0") - assertTrue(result[0][5] == "8.8") - assertTrue(result[0][6] == "'1-URGENT'") - assertTrue(result[0][7] == "'5-LOW'") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_orderpriority") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "5.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "880.0") + assertEquals(result[0][5], "8.8") + assertEquals(result[0][6], "'1-URGENT'") + assertEquals(result[0][7], "'5-LOW'") result = sql """show column stats `statistics` (lo_shippriority)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_shippriority") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "1.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "400.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "0") - assertTrue(result[0][7] == "0") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_shippriority") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "1.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "0") + assertEquals(result[0][7], "0") result = sql """show column stats `statistics` (lo_extendedprice)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_extendedprice") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "100.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "400.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "104300") - assertTrue(result[0][7] == "9066094") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_extendedprice") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "100.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "104300") + assertEquals(result[0][7], "9066094") result = sql """show column stats `statistics` (lo_ordtotalprice)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_ordtotalprice") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "26.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "400.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "3428256") - assertTrue(result[0][7] == "36771805") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_ordtotalprice") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "26.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "3428256") + assertEquals(result[0][7], "36771805") result = sql """show column stats `statistics` (lo_discount)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_discount") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "11.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "400.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "0") - assertTrue(result[0][7] == "10") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_discount") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "11.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "0") + assertEquals(result[0][7], "10") result = sql """show column stats `statistics` (lo_revenue)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_revenue") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "100.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "400.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "101171") - assertTrue(result[0][7] == "8703450") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_revenue") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "100.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "101171") + assertEquals(result[0][7], "8703450") result = sql """show column stats `statistics` (lo_supplycost)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_supplycost") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "100.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "400.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "58023") - assertTrue(result[0][7] == "121374") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_supplycost") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "100.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "58023") + assertEquals(result[0][7], "121374") result = sql """show column stats `statistics` (lo_tax)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_tax") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "9.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "400.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "0") - assertTrue(result[0][7] == "8") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_tax") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "9.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "0") + assertEquals(result[0][7], "8") result = sql """show column stats `statistics` (lo_commitdate)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_commitdate") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "95.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "400.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "19920515") - assertTrue(result[0][7] == "19981016") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_commitdate") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "95.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "19920515") + assertEquals(result[0][7], "19981016") result = sql """show column stats `statistics` (lo_shipmode)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_shipmode") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "7.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "421.0") - assertTrue(result[0][5] == "4.21") - assertTrue(result[0][6] == "'AIR'") - assertTrue(result[0][7] == "'TRUCK'") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_shipmode") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "7.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "421.0") + assertEquals(result[0][5], "4.21") + assertEquals(result[0][6], "'AIR'") + assertEquals(result[0][7], "'TRUCK'") sql """ALTER TABLE statistics MODIFY COLUMN lo_shipmode SET STATS ('row_count'='6001215')""" result = sql "show column stats `statistics` (lo_shipmode)" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_shipmode") - assertTrue(result[0][1] == "6001215.0") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_shipmode") + assertEquals(result[0][1], "6001215.0") sql """drop stats statistics""" result = sql """show column stats statistics""" - assertTrue(result.size() == 0) + assertEquals(result.size(), 0) sql """analyze database `statistics` with sync""" result = sql """show table stats statistics""" - assertTrue(result.size() == 1) - assertTrue(result[0][2] == "100") + assertEquals(result.size(), 1) + assertEquals(result[0][2], "100") result = sql """show table cached stats statistics""" - assertTrue(result.size() == 1) - assertTrue(result[0][2] == "100") + assertEquals(result.size(), 1) + assertEquals(result[0][2], "100") sql """drop stats statistics""" result = sql """show column cached stats statistics""" - assertTrue(result.size() == 0) + assertEquals(result.size(), 0) sql """use multi_catalog""" sql """analyze table logs1_parquet (log_time) with sync""" def ctlId def dbId def tblId - result = sql """show proc '/catalogs'""" + result = sql """show catalogs""" for (int i = 0; i < result.size(); i++) { if (result[i][1] == catalog_name) { @@ -274,7 +274,7 @@ suite("test_hive_statistic", "p2,external,hive,external_remote,external_remote_h } result = sql """select * from internal.__internal_schema.column_statistics where id = '${tblId}--1-log_time'""" - assertTrue(result.size() == 1) + assertEquals(result.size(), 1) def id = result[0][0] def catalog_id = result[0][1] def db_id = result[0][2] @@ -290,9 +290,9 @@ suite("test_hive_statistic", "p2,external,hive,external_remote,external_remote_h sql """insert into internal.__internal_schema.column_statistics values ('$id', '$catalog_id', '$db_id', '$tbl_id', '$idx_id', '$col_id', NULL, $count, $ndv, $null_count, '', '', '$data_size_in_bytes', '$update_time')""" result = sql """show column stats logs1_parquet (log_time)""" - assertTrue(result.size() == 1) - assertTrue(result[0][6] == "N/A") - assertTrue(result[0][7] == "N/A") + assertEquals(result.size(), 1) + assertEquals(result[0][6], "N/A") + assertEquals(result[0][7], "N/A") sql """drop catalog ${catalog_name}""" } } diff --git a/regression-test/suites/external_table_p2/hive/test_hive_statistic_cache.groovy b/regression-test/suites/external_table_p2/hive/test_hive_statistic_cache.groovy index f98962b9f2..74ce33ace4 100644 --- a/regression-test/suites/external_table_p2/hive/test_hive_statistic_cache.groovy +++ b/regression-test/suites/external_table_p2/hive/test_hive_statistic_cache.groovy @@ -40,28 +40,28 @@ suite("test_hive_statistic_cache", "p2,external,hive,external_remote,external_re sql """desc supplier"""; Thread.sleep(1000); def result = sql """show table cached stats customer""" - assertTrue(result[0][2] == "150000000") + assertEquals(result[0][2], "150000000") result = sql """show table cached stats lineitem""" - assertTrue(result[0][2] == "5999989709") + assertEquals(result[0][2], "5999989709") result = sql """show table cached stats region""" - assertTrue(result[0][2] == "5") + assertEquals(result[0][2], "5") result = sql """show table cached stats nation""" - assertTrue(result[0][2] == "25") + assertEquals(result[0][2], "25") result = sql """show table cached stats orders""" - assertTrue(result[0][2] == "1500000000") + assertEquals(result[0][2], "1500000000") result = sql """show table cached stats part""" - assertTrue(result[0][2] == "200000000") + assertEquals(result[0][2], "200000000") result = sql """show table cached stats partsupp""" - assertTrue(result[0][2] == "800000000") + assertEquals(result[0][2], "800000000") result = sql """show table cached stats supplier""" - assertTrue(result[0][2] == "10000000") + assertEquals(result[0][2], "10000000") logger.info("catalog " + catalog_name + " created") sql """switch ${catalog_name};""" @@ -72,174 +72,174 @@ suite("test_hive_statistic_cache", "p2,external,hive,external_remote,external_re sql """select count(*) from stats""" Thread.sleep(5000); result = sql """show column cached stats `stats` (lo_orderkey)""" - assertTrue(result[0][0] == "lo_orderkey") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "26.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "1") - assertTrue(result[0][7] == "98") + assertEquals(result[0][0], "lo_orderkey") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "26.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "1") + assertEquals(result[0][7], "98") result = sql """show column cached stats `stats` (lo_linenumber)""" - assertTrue(result[0][0] == "lo_linenumber") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "7.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "1") - assertTrue(result[0][7] == "7") + assertEquals(result[0][0], "lo_linenumber") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "7.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "1") + assertEquals(result[0][7], "7") result = sql """show column cached stats `stats` (lo_custkey)""" - assertTrue(result[0][0] == "lo_custkey") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "26.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "67423") - assertTrue(result[0][7] == "2735521") + assertEquals(result[0][0], "lo_custkey") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "26.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "67423") + assertEquals(result[0][7], "2735521") result = sql """show column cached stats `stats` (lo_partkey)""" - assertTrue(result[0][0] == "lo_partkey") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "100.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "2250") - assertTrue(result[0][7] == "989601") + assertEquals(result[0][0], "lo_partkey") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "100.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "2250") + assertEquals(result[0][7], "989601") result = sql """show column cached stats `stats` (lo_suppkey)""" - assertTrue(result[0][0] == "lo_suppkey") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "100.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "4167") - assertTrue(result[0][7] == "195845") + assertEquals(result[0][0], "lo_suppkey") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "100.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "4167") + assertEquals(result[0][7], "195845") result = sql """show column cached stats `stats` (lo_orderdate)""" - assertTrue(result[0][0] == "lo_orderdate") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "26.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "19920221") - assertTrue(result[0][7] == "19980721") + assertEquals(result[0][0], "lo_orderdate") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "26.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "19920221") + assertEquals(result[0][7], "19980721") result = sql """show column cached stats `stats` (lo_orderpriority)""" - assertTrue(result[0][0] == "lo_orderpriority") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "5.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "888.8000000000001") - assertTrue(result[0][5] == "8.8") - assertTrue(result[0][6] == "'1-URGENT'") - assertTrue(result[0][7] == "'5-LOW'") + assertEquals(result[0][0], "lo_orderpriority") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "5.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "880.0") + assertEquals(result[0][5], "8.8") + assertEquals(result[0][6], "'1-URGENT'") + assertEquals(result[0][7], "'5-LOW'") result = sql """show column cached stats `stats` (lo_shippriority)""" - assertTrue(result[0][0] == "lo_shippriority") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "1.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "0") - assertTrue(result[0][7] == "0") + assertEquals(result[0][0], "lo_shippriority") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "1.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "0") + assertEquals(result[0][7], "0") result = sql """show column cached stats `stats` (lo_extendedprice)""" - assertTrue(result[0][0] == "lo_extendedprice") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "100.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "104300") - assertTrue(result[0][7] == "9066094") + assertEquals(result[0][0], "lo_extendedprice") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "100.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "104300") + assertEquals(result[0][7], "9066094") result = sql """show column cached stats `stats` (lo_ordtotalprice)""" - assertTrue(result[0][0] == "lo_ordtotalprice") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "26.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "3428256") - assertTrue(result[0][7] == "36771805") + assertEquals(result[0][0], "lo_ordtotalprice") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "26.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "3428256") + assertEquals(result[0][7], "36771805") result = sql """show column cached stats `stats` (lo_discount)""" - assertTrue(result[0][0] == "lo_discount") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "11.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "0") - assertTrue(result[0][7] == "10") + assertEquals(result[0][0], "lo_discount") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "11.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "0") + assertEquals(result[0][7], "10") result = sql """show column cached stats `stats` (lo_revenue)""" - assertTrue(result[0][0] == "lo_revenue") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "100.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "101171") - assertTrue(result[0][7] == "8703450") + assertEquals(result[0][0], "lo_revenue") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "100.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "101171") + assertEquals(result[0][7], "8703450") result = sql """show column cached stats `stats` (lo_supplycost)""" - assertTrue(result[0][0] == "lo_supplycost") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "100.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "58023") - assertTrue(result[0][7] == "121374") + assertEquals(result[0][0], "lo_supplycost") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "100.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "58023") + assertEquals(result[0][7], "121374") result = sql """show column cached stats `stats` (lo_tax)""" - assertTrue(result[0][0] == "lo_tax") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "9.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "0") - assertTrue(result[0][7] == "8") + assertEquals(result[0][0], "lo_tax") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "9.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "0") + assertEquals(result[0][7], "8") result = sql """show column cached stats `stats` (lo_commitdate)""" - assertTrue(result[0][0] == "lo_commitdate") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "95.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "19920515") - assertTrue(result[0][7] == "19981016") + assertEquals(result[0][0], "lo_commitdate") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "95.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "19920515") + assertEquals(result[0][7], "19981016") result = sql """show column cached stats `stats` (lo_shipmode)""" - assertTrue(result[0][0] == "lo_shipmode") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "7.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "425.21") - assertTrue(result[0][5] == "4.21") - assertTrue(result[0][6] == "'AIR'") - assertTrue(result[0][7] == "'TRUCK'") + assertEquals(result[0][0], "lo_shipmode") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "7.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "421.0") + assertEquals(result[0][5], "4.21") + assertEquals(result[0][6], "'AIR'") + assertEquals(result[0][7], "'TRUCK'") result = sql """show column cached stats `stats` (lo_quantity)""" - assertTrue(result[0][0] == "lo_quantity") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "46.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "1") - assertTrue(result[0][7] == "50") + assertEquals(result[0][0], "lo_quantity") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "46.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "1") + assertEquals(result[0][7], "50") } } diff --git a/regression-test/suites/external_table_p2/hive/test_hive_statistic_clean.groovy b/regression-test/suites/external_table_p2/hive/test_hive_statistic_clean.groovy index 3ceab60afc..bef2e44883 100644 --- a/regression-test/suites/external_table_p2/hive/test_hive_statistic_clean.groovy +++ b/regression-test/suites/external_table_p2/hive/test_hive_statistic_clean.groovy @@ -31,78 +31,79 @@ suite("test_hive_statistic_clean", "p2,external,hive,external_remote,external_re """ logger.info("catalog " + catalog_name + " created") - sql """analyze database ${catalog_name}.statistics with sync""" + // sql """analyze database ${catalog_name}.statistics with sync""" + sql """analyze table ${catalog_name}.statistics.statistics with sync""" sql """use ${catalog_name}.statistics""" def result = sql """show column stats `statistics` (lo_quantity)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_quantity") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "46.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "1") - assertTrue(result[0][7] == "50") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_quantity") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "46.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "1") + assertEquals(result[0][7], "50") result = sql """show column stats `statistics` (lo_orderkey)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_orderkey") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "26.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "1") - assertTrue(result[0][7] == "98") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_orderkey") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "26.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "1") + assertEquals(result[0][7], "98") result = sql """show column stats `statistics` (lo_linenumber)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_linenumber") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "7.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "1") - assertTrue(result[0][7] == "7") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_linenumber") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "7.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "1") + assertEquals(result[0][7], "7") sql """drop expired stats""" result = sql """show column stats `statistics` (lo_quantity)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_quantity") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "46.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "1") - assertTrue(result[0][7] == "50") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_quantity") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "46.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "1") + assertEquals(result[0][7], "50") result = sql """show column stats `statistics` (lo_orderkey)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_orderkey") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "26.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "1") - assertTrue(result[0][7] == "98") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_orderkey") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "26.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "1") + assertEquals(result[0][7], "98") result = sql """show column stats `statistics` (lo_linenumber)""" - assertTrue(result.size() == 1) - assertTrue(result[0][0] == "lo_linenumber") - assertTrue(result[0][1] == "100.0") - assertTrue(result[0][2] == "7.0") - assertTrue(result[0][3] == "0.0") - assertTrue(result[0][4] == "404.0") - assertTrue(result[0][5] == "4.0") - assertTrue(result[0][6] == "1") - assertTrue(result[0][7] == "7") + assertEquals(result.size(), 1) + assertEquals(result[0][0], "lo_linenumber") + assertEquals(result[0][1], "100.0") + assertEquals(result[0][2], "7.0") + assertEquals(result[0][3], "0.0") + assertEquals(result[0][4], "400.0") + assertEquals(result[0][5], "4.0") + assertEquals(result[0][6], "1") + assertEquals(result[0][7], "7") def ctlId - result = sql """show proc '/catalogs'""" + result = sql """show catalogs""" for (int i = 0; i < result.size(); i++) { if (result[i][1] == catalog_name) { @@ -113,7 +114,7 @@ suite("test_hive_statistic_clean", "p2,external,hive,external_remote,external_re sql """drop catalog ${catalog_name}""" sql """drop expired stats""" result = sql """select * from internal.__internal_schema.column_statistics where catalog_id=${ctlId}""" - assertTrue(result.size() == 0) + assertEquals(result.size(), 0) } } diff --git a/regression-test/suites/external_table_p2/hive/test_hive_statistic_timeout.groovy b/regression-test/suites/external_table_p2/hive/test_hive_statistic_timeout.groovy index a3754d9d2a..2910666c44 100644 --- a/regression-test/suites/external_table_p2/hive/test_hive_statistic_timeout.groovy +++ b/regression-test/suites/external_table_p2/hive/test_hive_statistic_timeout.groovy @@ -32,22 +32,12 @@ suite("test_hive_statistic_timeout", "p2,external,hive,external_remote,external_ logger.info("catalog " + catalog_name + " created") sql """use ${catalog_name}.tpch_1000_parquet""" - sql """set query_timeout=1""" - sql """analyze table part (p_partkey, p_container, p_type, p_retailprice) with sync;""" - - def result = sql """show column stats part""" - assertTrue(result.size() == 4) - - def ctlId - result = sql """show proc '/catalogs'""" - - for (int i = 0; i < result.size(); i++) { - if (result[i][1] == catalog_name) { - ctlId = result[i][0] - } + sql """set analyze_timeout=1""" + try { + sql """analyze table part (p_partkey, p_container, p_type, p_retailprice) with sync with full;""" + } catch (Exception e) { + assertTrue(e.getMessage().contains("Cancelled")); } - - qt_01 """select col_id, count, ndv, null_count, min, max from internal.__internal_schema.column_statistics where catalog_id='$ctlId' order by col_id;""" sql """drop catalog ${catalog_name}"""; } }