HamaWhiteGG#128 fixed parsing multi-tier udf error bug

jeff-zou · jeff-zou · commit d2cb8dce3a1c · 2024-04-21T13:44:36.000+08:00
diff --git a/lineage-flink1.14.x/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnOrigins.java b/lineage-flink1.14.x/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnOrigins.java
@@ -30,8 +30,6 @@
 
 import java.util.*;
 import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static com.hw.lineage.common.util.Constant.DELIMITER;
@@ -59,8 +57,6 @@ public class RelMdColumnOrigins implements MetadataHandler<BuiltInMetadata.Colum
 
     private static final Logger LOG = LoggerFactory.getLogger(RelMdColumnOrigins.class);
 
-    private final Pattern pattern = Pattern.compile("\\$[\\d.]+");
-
     public static final RelMetadataProvider SOURCE =
             ReflectiveRelMetadataProvider.reflectiveSource(
                     BuiltInMethod.COLUMN_ORIGIN.method, new RelMdColumnOrigins());
@@ -92,7 +88,7 @@ public Set<RelColumnOrigin> getColumnOrigins(Aggregate rel, RelMetadataQuery mq,
 
             if (rexNode instanceof RexLiteral) {
                 RexLiteral literal = (RexLiteral) rexNode;
-                transform = transform.replace("$" + iInput, literal.toString());
+                transform = transform.replace("$" + iInput, literal.toString().replace("_UTF-16LE", ""));
                 continue;
             }
 
@@ -438,32 +434,12 @@ private Set<RelColumnOrigin> createDerivedColumnOrigins(Set<RelColumnOrigin> inp
     private String computeTransform(Set<RelColumnOrigin> inputSet, Object transform) {
         LOG.debug("origin transform: {}, class: {}", transform, transform.getClass());
         String finalTransform = transform.toString();
-
-        Matcher matcher = pattern.matcher(finalTransform);
-
-        Set<String> operandSet = new LinkedHashSet<>();
-        while (matcher.find()) {
-            operandSet.add(matcher.group());
-        }
-
-        if (operandSet.isEmpty()) {
-            return finalTransform;
-        }
-        /*if (inputSet.size() != operandSet.size()) {
-            LOG.warn("The number [{}] of fields in the source tables are not equal to operands [{}]", inputSet.size(),
-                    operandSet.size());
-            return null;
-        }*/
-
         Map<String, String> sourceColumnMap = buildSourceColumnMap(inputSet, transform);
 
-        matcher = pattern.matcher(finalTransform);
-        String temp;
-        while (matcher.find()) {
-            temp = matcher.group();
-            finalTransform = finalTransform.replace(temp, sourceColumnMap.get(temp));
+        for (Map.Entry<String, String> entry : sourceColumnMap.entrySet()) {
+            finalTransform = finalTransform.replace(entry.getKey(), entry.getValue());
         }
-        // temporary special treatment
+
         finalTransform = finalTransform.replace("_UTF-16LE", "");
         LOG.debug("final transform: {}", finalTransform);
         return finalTransform;
@@ -508,7 +484,12 @@ public Void visitFieldAccess(RexFieldAccess fieldAccess) {
         }
         Map<String, String> sourceColumnMap = new HashMap<>(INITIAL_CAPACITY);
         Iterator<String> iterator = optimizeSourceColumnSet(inputSet).iterator();
-        traversalSet.forEach(index -> sourceColumnMap.put("$" + index, iterator.next()));
+        traversalSet.forEach(
+                index -> {
+                    if (iterator.hasNext()) {
+                        sourceColumnMap.put("$" + index, iterator.next());
+                    }
+                });
         LOG.debug("sourceColumnMap: {}", sourceColumnMap);
         return sourceColumnMap;
     }
diff --git a/lineage-flink1.14.x/src/test/java/com/hw/lineage/flink/aggregatefunction/AggregateFunctionTest.java b/lineage-flink1.14.x/src/test/java/com/hw/lineage/flink/aggregatefunction/AggregateFunctionTest.java
@@ -1,6 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.hw.lineage.flink.aggregatefunction;
 
 import com.hw.lineage.flink.basic.AbstractBasicTest;
+
 import org.junit.Before;
 import org.junit.Test;
 
@@ -15,9 +34,14 @@ public void createTable() {
 
         createTableOfOdsMysqlUsersDetail();
 
-        context.execute("create function test_aggregate as 'com.hw.lineage.flink.aggregatefunction.TestAggregateFunction'");
+        createPrintTable();
+
+        createFunction();
     }
 
+    /**
+     * #125 issue
+     */
     @Test
     public void testAggregateFunction() {
         String sql = "INSERT INTO dwd_hudi_users " +
@@ -34,7 +58,8 @@ public void testAggregateFunction() {
         String[][] expectedArray = {
                 {"ods_mysql_users", "id", "dwd_hudi_users", "id"},
                 {"ods_mysql_users", "name", "dwd_hudi_users", "name"},
-                {"ods_mysql_users", "name", "dwd_hudi_users", "company_name", "test_aggregate(CONCAT_WS('_', name, 'test'), name, _UTF-16LE'test')"},
+                {"ods_mysql_users", "name", "dwd_hudi_users", "company_name",
+                        "test_aggregate(CONCAT_WS('_', name, 'test'), name, 'test')"},
                 {"ods_mysql_users", "birthday", "dwd_hudi_users", "birthday"},
                 {"ods_mysql_users", "ts", "dwd_hudi_users", "ts"},
                 {"ods_mysql_users", "birthday", "dwd_hudi_users", "partition", "DATE_FORMAT(birthday, 'yyyyMMdd')"}
@@ -43,6 +68,28 @@ public void testAggregateFunction() {
         analyzeLineage(sql, expectedArray);
     }
 
+    /**
+     * #128 issue
+     */
+    @Test
+    public void testMultiTierUdf() {
+        String sql = "INSERT INTO print_table " +
+                "SELECT " +
+                "   round( COUNT(*) /  COUNT( DISTINCT  name ) , 2 )" +
+                "FROM" +
+                "   ods_mysql_users group by ts ";
+
+        String[][] expectedArray = {
+                {"ods_mysql_users", "name", "print_table", "num", "ROUND(/(COUNT(DISTINCT name), $2), 2)"},
+
+        };
+
+        analyzeLineage(sql, expectedArray);
+    }
+
+    /**
+     * #126 issue
+     */
     @Test
     public void testAggregateFunctionInputArgument() {
         String sql = "INSERT INTO dwd_hudi_users " +
@@ -59,17 +106,25 @@ public void testAggregateFunctionInputArgument() {
         String[][] expectedArray = {
                 {"ods_mysql_user_detail", "id", "dwd_hudi_users", "id"},
                 {"ods_mysql_user_detail", "name", "dwd_hudi_users", "name"},
-                {"ods_mysql_user_detail", "name", "dwd_hudi_users", "company_name", "test_aggregate(CONCAT_WS('_', name, email), address, _UTF-16LE'test')"},
-                {"ods_mysql_user_detail", "email", "dwd_hudi_users", "company_name", "test_aggregate(CONCAT_WS('_', name, email), address, _UTF-16LE'test')"},
-                {"ods_mysql_user_detail", "address", "dwd_hudi_users", "company_name", "test_aggregate(CONCAT_WS('_', name, email), address, _UTF-16LE'test')"},
+                {"ods_mysql_user_detail", "name", "dwd_hudi_users", "company_name",
+                        "test_aggregate(CONCAT_WS('_', name, email), address, 'test')"},
+                {"ods_mysql_user_detail", "email", "dwd_hudi_users", "company_name",
+                        "test_aggregate(CONCAT_WS('_', name, email), address, 'test')"},
+                {"ods_mysql_user_detail", "address", "dwd_hudi_users", "company_name",
+                        "test_aggregate(CONCAT_WS('_', name, email), address, 'test')"},
                 {"ods_mysql_user_detail", "birthday", "dwd_hudi_users", "birthday"},
                 {"ods_mysql_user_detail", "ts", "dwd_hudi_users", "ts"},
-                {"ods_mysql_user_detail", "birthday", "dwd_hudi_users", "partition", "DATE_FORMAT(birthday, 'yyyyMMdd')"}
+                {"ods_mysql_user_detail", "birthday", "dwd_hudi_users", "partition",
+                        "DATE_FORMAT(birthday, 'yyyyMMdd')"}
         };
 
         analyzeLineage(sql, expectedArray);
     }
 
+    private void createPrintTable() {
+        context.execute("drop table if exists print_table");
+        context.execute("create table print_table (num double) with ('connector'='print')");
+    }
     protected void createTableOfOdsMysqlUsersDetail() {
         context.execute("DROP TABLE IF EXISTS ods_mysql_user_detail ");
 
@@ -92,4 +147,11 @@ protected void createTableOfOdsMysqlUsersDetail() {
                 "       'table-name'    = 'users' " +
                 ")");
     }
+
+    private void createFunction() {
+        context.execute("drop function if exists test_aggregate");
+        context.execute(
+                "create function test_aggregate as 'com.hw.lineage.flink.aggregatefunction.TestAggregateFunction'");
+    }
+
 }
diff --git a/lineage-flink1.14.x/src/test/java/com/hw/lineage/flink/aggregatefunction/TestAggregateFunction.java b/lineage-flink1.14.x/src/test/java/com/hw/lineage/flink/aggregatefunction/TestAggregateFunction.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.hw.lineage.flink.aggregatefunction;
 
 import org.apache.flink.table.functions.AggregateFunction;
@@ -19,6 +37,7 @@ public TestAggregateAcc createAccumulator() {
     }
 
     public static class TestAggregateAcc {
+
         public String test;
     }
 }
