[flink] 02/04: [hotfix] Fix logical type generalization for approximate types.

[dwysakowicz]

This is an automated email from the ASF dual-hosted git repository.

dwysakowicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 08cee24bbfb5914f7bb60aa7b237c4f64d59f9a3
Author: Dawid Wysakowicz <dwysakow...@apache.org>
AuthorDate: Mon Mar 2 15:58:25 2020 +0100

    [hotfix] Fix logical type generalization for approximate types.
---
 .../flink/table/types/logical/utils/LogicalTypeGeneralization.java    | 2 +-
 .../org/apache/flink/table/types/LogicalTypeGeneralizationTest.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/utils/LogicalTypeGeneralization.java
 
b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/utils/LogicalTypeGeneralization.java
index 21efe4e..efb23c4 100644
--- 
a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/utils/LogicalTypeGeneralization.java
+++ 
b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/utils/LogicalTypeGeneralization.java
@@ -300,7 +300,7 @@ public final class LogicalTypeGeneralization {
                        }
                        // for APPROXIMATE_NUMERIC types
                        else if (hasFamily(type, APPROXIMATE_NUMERIC)) {
-                               if (hasFamily(type, APPROXIMATE_NUMERIC)) {
+                               if (hasFamily(resultType, APPROXIMATE_NUMERIC)) 
{
                                        resultType = 
createCommonApproximateNumericType(resultType, type);
                                } else if (hasFamily(resultType, 
EXACT_NUMERIC)) {
                                        // the result was exact so far
diff --git 
a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/LogicalTypeGeneralizationTest.java
 
b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/LogicalTypeGeneralizationTest.java
index d860aed..169cb5a 100644
--- 
a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/LogicalTypeGeneralizationTest.java
+++ 
b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/LogicalTypeGeneralizationTest.java
@@ -206,8 +206,8 @@ public class LogicalTypeGeneralizationTest {
 
                                // one APPROXIMATE_NUMERIC and one 
EXACT_NUMERIC type
                                {
-                                       Arrays.asList(new DoubleType(), new 
IntType()),
-                                       new DoubleType()
+                                       Arrays.asList(new IntType(), new 
FloatType()),
+                                       new FloatType()
                                },
 
                                // two APPROXIMATE_NUMERIC and one DECIMAL type