diff --git a/regression-test/suites/external_table_p2/hive/test_hive_statistic_auto.groovy b/regression-test/suites/external_table_p2/hive/test_hive_statistic_auto.groovy
index f766069346e1e8..08c4d0aed95094 100644
--- a/regression-test/suites/external_table_p2/hive/test_hive_statistic_auto.groovy
+++ b/regression-test/suites/external_table_p2/hive/test_hive_statistic_auto.groovy
@@ -41,43 +41,43 @@ suite("test_hive_statistic_auto", "p2,external,hive,external_remote,external_rem
             if (result.size <= 0) {
                 continue;
             }
-            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)"""
             if (result.size <= 0) {
                 continue;
             }
-            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)"""
             if (result.size <= 0) {
                 continue;
             }
-            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 catalog ${catalog_name}"""
diff --git a/regression-test/suites/external_table_p2/hive/test_hive_statistic_sample.groovy b/regression-test/suites/external_table_p2/hive/test_hive_statistic_sample.groovy
index 212ea2a3f9f72e..675a9409b33ce7 100644
--- a/regression-test/suites/external_table_p2/hive/test_hive_statistic_sample.groovy
+++ b/regression-test/suites/external_table_p2/hive/test_hive_statistic_sample.groovy
@@ -31,118 +31,118 @@ suite("test_hive_statistic_sample", "p2,external,hive,external_remote,external_r
         """
         logger.info("catalog " + catalog_name + " created")
 
-        sql """analyze table ${catalog_name}.tpch_1000_parquet.region with sample percent 10 with sync"""
+        sql """analyze table ${catalog_name}.tpch_1000_parquet.region with sample rows 10 with sync"""
         sql """analyze table ${catalog_name}.tpch_1000_parquet.supplier with sample percent 10 with sync"""
         sql """use ${catalog_name}.tpch_1000_parquet"""
         def result = sql """show column stats region (r_regionkey)"""
-        assertTrue(result.size() == 1)
-        assertTrue(result[0][0] == "r_regionkey")
-        assertTrue(result[0][1] == "5.0")
-        assertTrue(result[0][2] == "5.0")
-        assertTrue(result[0][3] == "0.0")
-        assertTrue(result[0][4] == "20.0")
-        assertTrue(result[0][5] == "4.0")
-        assertTrue(result[0][6] == "N/A")
-        assertTrue(result[0][7] == "N/A")
+        assertEquals(result.size(), 1)
+        assertEquals(result[0][0], "r_regionkey")
+        assertEquals(result[0][1], "5.0")
+        assertEquals(result[0][2], "5.0")
+        assertEquals(result[0][3], "0.0")
+        assertEquals(result[0][4], "20.0")
+        assertEquals(result[0][5], "4.0")
+        assertEquals(result[0][6], "N/A")
+        assertEquals(result[0][7], "N/A")
 
         result = sql """show column stats region (r_name)"""
-        assertTrue(result.size() == 1)
-        assertTrue(result[0][0] == "r_name")
-        assertTrue(result[0][1] == "5.0")
-        assertTrue(result[0][2] == "5.0")
-        assertTrue(result[0][3] == "0.0")
-        assertTrue(result[0][4] == "34.0")
-        assertTrue(result[0][5] == "6.8")
-        assertTrue(result[0][6] == "N/A")
-        assertTrue(result[0][7] == "N/A")
+        assertEquals(result.size(), 1)
+        assertEquals(result[0][0], "r_name")
+        assertEquals(result[0][1], "5.0")
+        assertEquals(result[0][2], "5.0")
+        assertEquals(result[0][3], "0.0")
+        assertEquals(result[0][4], "34.0")
+        assertEquals(result[0][5], "6.8")
+        assertEquals(result[0][6], "N/A")
+        assertEquals(result[0][7], "N/A")
 
         result = sql """show column stats region (r_comment)"""
-        assertTrue(result.size() == 1)
-        assertTrue(result[0][0] == "r_comment")
-        assertTrue(result[0][1] == "5.0")
-        assertTrue(result[0][2] == "5.0")
-        assertTrue(result[0][3] == "0.0")
-        assertTrue(result[0][4] == "330.0")
-        assertTrue(result[0][5] == "66.0")
-        assertTrue(result[0][6] == "N/A")
-        assertTrue(result[0][7] == "N/A")
+        assertEquals(result.size(), 1)
+        assertEquals(result[0][0], "r_comment")
+        assertEquals(result[0][1], "5.0")
+        assertEquals(result[0][2], "5.0")
+        assertEquals(result[0][3], "0.0")
+        assertEquals(result[0][4], "330.0")
+        assertEquals(result[0][5], "66.0")
+        assertEquals(result[0][6], "N/A")
+        assertEquals(result[0][7], "N/A")
 
         result = sql """show column stats supplier (s_suppkey)"""
-        assertTrue(result.size() == 1)
-        assertTrue(result[0][0] == "s_suppkey")
-        assertTrue(result[0][1] == "9998799.0")
-        assertTrue(result[0][2] == "9970222.0")
-        assertTrue(result[0][3] == "0.0")
-        assertTrue(result[0][4] == "3.9995194E7")
-        assertTrue(result[0][5] == "3.9999997999759773")
-        assertTrue(result[0][6] == "N/A")
-        assertTrue(result[0][7] == "N/A")
+        assertEquals(result.size(), 1)
+        assertEquals(result[0][0], "s_suppkey")
+        assertEquals(result[0][1], "9998799.0")
+        assertEquals(result[0][2], "9998799.0")
+        assertEquals(result[0][3], "0.0")
+        assertEquals(result[0][4], "3.9995194E7")
+        assertEquals(result[0][5], "3.9999997999759773")
+        assertEquals(result[0][6], "N/A")
+        assertEquals(result[0][7], "N/A")
 
         result = sql """show column stats supplier (s_name)"""
-        assertTrue(result.size() == 1)
-        assertTrue(result[0][0] == "s_name")
-        assertTrue(result[0][1] == "9998799.0")
-        assertTrue(result[0][2] == "1.004004E7")
-        assertTrue(result[0][3] == "0.0")
-        assertTrue(result[0][4] == "1.79978374E8")
-        assertTrue(result[0][5] == "17.999999199903908")
-        assertTrue(result[0][6] == "N/A")
-        assertTrue(result[0][7] == "N/A")
+        assertEquals(result.size(), 1)
+        assertEquals(result[0][0], "s_name")
+        assertEquals(result[0][1], "9998799.0")
+        assertEquals(result[0][2], "9998799.0")
+        assertEquals(result[0][3], "0.0")
+        assertEquals(result[0][4], "1.79978374E8")
+        assertEquals(result[0][5], "17.999999199903908")
+        assertEquals(result[0][6], "N/A")
+        assertEquals(result[0][7], "N/A")
 
         result = sql """show column stats supplier (s_address)"""
-        assertTrue(result.size() == 1)
-        assertTrue(result[0][0] == "s_address")
-        assertTrue(result[0][1] == "9998799.0")
-        assertTrue(result[0][2] == "9998862.0")
-        assertTrue(result[0][3] == "0.0")
-        assertTrue(result[0][4] == "2.50070604E8")
-        assertTrue(result[0][5] == "25.010064108699456")
-        assertTrue(result[0][6] == "N/A")
-        assertTrue(result[0][7] == "N/A")
+        assertEquals(result.size(), 1)
+        assertEquals(result[0][0], "s_address")
+        assertEquals(result[0][1], "9998799.0")
+        assertEquals(result[0][2], "9998799.0")
+        assertEquals(result[0][3], "0.0")
+        assertEquals(result[0][4], "2.50070604E8")
+        assertEquals(result[0][5], "25.010064108699456")
+        assertEquals(result[0][6], "N/A")
+        assertEquals(result[0][7], "N/A")
 
         result = sql """show column stats supplier (s_nationkey)"""
-        assertTrue(result.size() == 1)
-        assertTrue(result[0][0] == "s_nationkey")
-        assertTrue(result[0][1] == "9998799.0")
-        assertTrue(result[0][2] == "25.0")
-        assertTrue(result[0][3] == "0.0")
-        assertTrue(result[0][4] == "3.9995194E7")
-        assertTrue(result[0][5] == "3.9999997999759773")
-        assertTrue(result[0][6] == "N/A")
-        assertTrue(result[0][7] == "N/A")
+        assertEquals(result.size(), 1)
+        assertEquals(result[0][0], "s_nationkey")
+        assertEquals(result[0][1], "9998799.0")
+        assertEquals(result[0][2], "25.0")
+        assertEquals(result[0][3], "0.0")
+        assertEquals(result[0][4], "3.9995194E7")
+        assertEquals(result[0][5], "3.9999997999759773")
+        assertEquals(result[0][6], "N/A")
+        assertEquals(result[0][7], "N/A")
 
         result = sql """show column stats supplier (s_phone)"""
-        assertTrue(result.size() == 1)
-        assertTrue(result[0][0] == "s_phone")
-        assertTrue(result[0][1] == "9998799.0")
-        assertTrue(result[0][2] == "9928006.0")
-        assertTrue(result[0][3] == "0.0")
-        assertTrue(result[0][4] == "1.49981978E8")
-        assertTrue(result[0][5] == "14.99999929991592")
-        assertTrue(result[0][6] == "N/A")
-        assertTrue(result[0][7] == "N/A")
+        assertEquals(result.size(), 1)
+        assertEquals(result[0][0], "s_phone")
+        assertEquals(result[0][1], "9998799.0")
+        assertEquals(result[0][2], "9996537.0")
+        assertEquals(result[0][3], "0.0")
+        assertEquals(result[0][4], "1.49981978E8")
+        assertEquals(result[0][5], "14.99999929991592")
+        assertEquals(result[0][6], "N/A")
+        assertEquals(result[0][7], "N/A")
 
         result = sql """show column stats supplier (s_acctbal)"""
-        assertTrue(result.size() == 1)
-        assertTrue(result[0][0] == "s_acctbal")
-        assertTrue(result[0][1] == "9998799.0")
-        assertTrue(result[0][2] == "4766937.0")
-        assertTrue(result[0][3] == "0.0")
-        assertTrue(result[0][4] == "7.9990388E7")
-        assertTrue(result[0][5] == "7.999999599951955")
-        assertTrue(result[0][6] == "N/A")
-        assertTrue(result[0][7] == "N/A")
+        assertEquals(result.size(), 1)
+        assertEquals(result[0][0], "s_acctbal")
+        assertEquals(result[0][1], "9998799.0")
+        assertEquals(result[0][2], "1054512.0")
+        assertEquals(result[0][3], "0.0")
+        assertEquals(result[0][4], "7.9990388E7")
+        assertEquals(result[0][5], "7.999999599951955")
+        assertEquals(result[0][6], "N/A")
+        assertEquals(result[0][7], "N/A")
 
         result = sql """show column stats supplier (s_comment)"""
-        assertTrue(result.size() == 1)
-        assertTrue(result[0][0] == "s_comment")
-        assertTrue(result[0][1] == "9998799.0")
-        assertTrue(result[0][2] == "9931298.0")
-        assertTrue(result[0][3] == "0.0")
-        assertTrue(result[0][4] == "6.24883849E8")
-        assertTrue(result[0][5] == "62.49589065646784")
-        assertTrue(result[0][6] == "N/A")
-        assertTrue(result[0][7] == "N/A")
+        assertEquals(result.size(), 1)
+        assertEquals(result[0][0], "s_comment")
+        assertEquals(result[0][1], "9998799.0")
+        assertEquals(result[0][2], "9630165.0")
+        assertEquals(result[0][3], "0.0")
+        assertEquals(result[0][4], "6.24883849E8")
+        assertEquals(result[0][5], "62.49589065646784")
+        assertEquals(result[0][6], "N/A")
+        assertEquals(result[0][7], "N/A")
 
         sql """drop catalog ${catalog_name}"""
     }