Introduce getUnversionedClassName to VersionedSqlUserDefinedFunction

linkedin · Aug 20, 2024 · 0c9ba56 · 0c9ba56
1 parent 606473e
commit 0c9ba56
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/...main/java/com/linkedin/coral/hive/hive2rel/functions/VersionedSqlUserDefinedFunction.java b/...main/java/com/linkedin/coral/hive/hive2rel/functions/VersionedSqlUserDefinedFunction.java
@@ -70,6 +70,10 @@ public String getViewDependentFunctionName() {
     return viewDependentFunctionName;
   }
 
+  public String getUnversionedClassName() {
+    return removeVersioningPrefix(getName());
+  }
+
   // This method is called during SQL validation. The super-class implementation resets the call's sqlOperator to one
   // that is looked up from the StaticHiveFunctionRegistry or inferred dynamically if it's a Dali UDF. Since UDFs in the StaticHiveFunctionRegistry are not
   // versioned, this method overrides the super-class implementation to properly restore the call's operator as

diff --git a/...din/coral/trino/rel2trino/transformers/CoralRegistryOperatorRenameSqlCallTransformer.java b/...din/coral/trino/rel2trino/transformers/CoralRegistryOperatorRenameSqlCallTransformer.java
@@ -6,10 +6,11 @@
 package com.linkedin.coral.trino.rel2trino.transformers;
 
 import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlOperator;
 
 import com.linkedin.coral.common.transformers.OperatorRenameSqlCallTransformer;
 import com.linkedin.coral.hive.hive2rel.functions.StaticHiveFunctionRegistry;
-import com.linkedin.coral.hive.hive2rel.functions.utils.FunctionUtils;
+import com.linkedin.coral.hive.hive2rel.functions.VersionedSqlUserDefinedFunction;
 
 
 /**
@@ -21,8 +22,10 @@ public class CoralRegistryOperatorRenameSqlCallTransformer extends OperatorRenam
 
   @Override
   protected boolean condition(SqlCall sqlCall) {
-    return sourceOpName.equalsIgnoreCase(FunctionUtils.removeVersioningPrefix(sqlCall.getOperator().getName()))
-        && sqlCall.getOperandList().size() == numOperands;
+    final SqlOperator operator = sqlCall.getOperator();
+    final String operatorName = operator instanceof VersionedSqlUserDefinedFunction
+        ? ((VersionedSqlUserDefinedFunction) operator).getUnversionedClassName() : operator.getName();
+    return sourceOpName.equalsIgnoreCase(operatorName) && sqlCall.getOperandList().size() == numOperands;
   }
 
   public CoralRegistryOperatorRenameSqlCallTransformer(String sourceOpName, int numOperands, String targetOpName) {