Skip to content

Commit

Permalink
[Fix](regression)Fix statistics related regression test (apache#25888)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jibing-Li @wsjz
Jibing-Li authored and wsjz committed Nov 19, 2023
1 parent c200cbe commit 1e726e4
Show file tree
Hide file tree
Showing 7 changed files with 530 additions and 544 deletions.
7 changes: 0 additions & 7 deletions regression-test/data/external_table_p2/hive/test_hive_statistic_timeout.out
View file

This file was deleted.

308 changes: 155 additions & 153 deletions regression-test/suites/external_table_p2/hive/test_hive_analyze_db.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

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.size(), 17)

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")

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")

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")

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[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")

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")

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")

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")

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")

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")

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")

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'")

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")

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")

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")

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")

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")

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")

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[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")

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")

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")

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")

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'")

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")

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")

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")

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")

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")

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")

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")
}
}

2 changes: 1 addition & 1 deletion regression-test/suites/external_table_p2/hive/test_hive_partition_statistic.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading

0 comments on commit 1e726e4

Please sign in to comment.