[FLINK-29831][hive] fix test failure for hive3

zhuoluoy · Nov 4, 2022 · 8e66be8 · 8e66be8
1 parent 276bb77
commit 8e66be8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 41 deletions.
diff --git a/...e/src/test/java/org/apache/flink/connectors/hive/HiveTableSourceStatisticsReportTest.java b/...e/src/test/java/org/apache/flink/connectors/hive/HiveTableSourceStatisticsReportTest.java
@@ -18,11 +18,9 @@
 
 package org.apache.flink.connectors.hive;
 
-import org.apache.flink.table.HiveVersionTestUtil;
 import org.apache.flink.table.api.SqlDialect;
 import org.apache.flink.table.catalog.hive.HiveCatalog;
 import org.apache.flink.table.catalog.hive.HiveTestUtils;
-import org.apache.flink.table.catalog.hive.client.HiveShimLoader;
 import org.apache.flink.table.plan.stats.ColumnStats;
 import org.apache.flink.table.plan.stats.TableStats;
 import org.apache.flink.table.planner.plan.stats.FlinkStatistic;
@@ -43,7 +41,6 @@
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
 
 /** Test for statistics functionality in {@link HiveTableSource}. */
 public class HiveTableSourceStatisticsReportTest extends StatisticsReportTestBase {
@@ -298,43 +295,20 @@ private static void assertHiveTableOrcFormatTableStatsEquals(
         expectedColumnStatsMap.put(
                 "f_string",
                 new ColumnStats.Builder().setMax("def").setMin("abcd").setNullCount(0L).build());
-        if (HiveVersionTestUtil.HIVE_310_OR_LATER) {
-            // TODO For hive 3.x version, Orc format encounter decimal type columns (like
-            // decimal(5, 2), decimal(14, 2)) will write a wrong column stat 'min' or 'max' in
-            // orc metadata footer. This branch will remove after this error is fixed, following
-            // issue HIVE-26492
-            expectedColumnStatsMap.put(
-                    "f_decimal5",
-                    new ColumnStats.Builder()
-                            .setMax(new BigDecimal("223.45"))
-                            .setMin(new BigDecimal("0"))
-                            .setNullCount(0L)
-                            .build());
-            expectedColumnStatsMap.put(
-                    "f_decimal14",
-                    new ColumnStats.Builder()
-                            .setMax(new BigDecimal("123333333355.33"))
-                            .setMin(new BigDecimal("0"))
-                            .setNullCount(0L)
-                            .build());
-        } else if (HiveVersionTestUtil.HIVE_230_OR_LATER) {
-            expectedColumnStatsMap.put(
-                    "f_decimal5",
-                    new ColumnStats.Builder()
-                            .setMax(new BigDecimal("223.45"))
-                            .setMin(new BigDecimal("123.45"))
-                            .setNullCount(0L)
-                            .build());
-            expectedColumnStatsMap.put(
-                    "f_decimal14",
-                    new ColumnStats.Builder()
-                            .setMax(new BigDecimal("123333333355.33"))
-                            .setMin(new BigDecimal("123333333333.33"))
-                            .setNullCount(0L)
-                            .build());
-        } else {
-            fail("Unknown test version " + HiveShimLoader.getHiveVersion());
-        }
+        expectedColumnStatsMap.put(
+                "f_decimal5",
+                new ColumnStats.Builder()
+                        .setMax(new BigDecimal("223.45"))
+                        .setMin(new BigDecimal("123.45"))
+                        .setNullCount(0L)
+                        .build());
+        expectedColumnStatsMap.put(
+                "f_decimal14",
+                new ColumnStats.Builder()
+                        .setMax(new BigDecimal("123333333355.33"))
+                        .setMin(new BigDecimal("123333333333.33"))
+                        .setNullCount(0L)
+                        .build());
         expectedColumnStatsMap.put(
                 "f_decimal38",
                 new ColumnStats.Builder()

diff --git a/...flink-connector-hive/src/test/java/org/apache/flink/table/module/hive/HiveModuleTest.java b/...flink-connector-hive/src/test/java/org/apache/flink/table/module/hive/HiveModuleTest.java
@@ -72,7 +72,7 @@ public void testNumberOfBuiltinFunctions() {
 
     private void verifyNumBuiltInFunctions(String hiveVersion, HiveModule hiveModule) {
         if (HiveVersionTestUtil.HIVE_310_OR_LATER) {
-            assertThat(hiveModule.listFunctions()).hasSize(296);
+            assertThat(hiveModule.listFunctions()).hasSize(297);
         } else if (HiveVersionTestUtil.HIVE_230_OR_LATER) {
             assertThat(hiveModule.listFunctions()).hasSize(277);
         } else {