first clean

Author: pengpeng-lu

fdb-relational-api/src/main/java/com/apple/foundationdb/relational/api/metadata/DataType.java

@@ -957,17 +957,13 @@ public static final class StructType extends DataType implements Named {
         @Nonnull
         private final String name;
 
-        @Nonnull
-        private final Map<String, FunctionDefinition> userDefinedFunctions;
-
         @Nonnull
         private final Supplier<Boolean> resolvedSupplier = Suppliers.memoize(this::calculateResolved);
 
-        private StructType(@Nonnull final String name, boolean isNullable, @Nonnull final List<Field> fields, @Nonnull final Map<String, FunctionDefinition> userDefinedOperators) {
+        private StructType(@Nonnull final String name, boolean isNullable, @Nonnull final List<Field> fields) {
             super(isNullable, false, Code.STRUCT);
             this.name = name;
             this.fields = ImmutableList.copyOf(fields);
-            this.userDefinedFunctions = ImmutableMap.copyOf(userDefinedOperators);
         }
 
         @Nonnull
@@ -981,11 +977,6 @@ public String getName() {
             return name;
         }
 
-        @Nonnull
-        public Map<String, FunctionDefinition> getUserDefinedFunctions() {
-            return ImmutableMap.copyOf(userDefinedFunctions);
-        }
-
         public static class Field {
             @Nonnull
             private final Supplier<Integer> hashCodeSupplier = Suppliers.memoize(this::computeHashCode);
@@ -1056,14 +1047,7 @@ public String toString() {
 
         @Nonnull
         public static StructType from(@Nonnull final String name, @Nonnull final List<Field> fields, boolean isNullable) {
-            return new StructType(name, isNullable, fields, ImmutableMap.of());
-        }
-
-        @Nonnull
-        public StructType withFunctionDefinition(FunctionDefinition functionDefinition) {
-            Map<String, FunctionDefinition> newUserDefinedFunctions = new java.util.HashMap<>(userDefinedFunctions);
-            newUserDefinedFunctions.put(functionDefinition.getName(), functionDefinition);
-            return new StructType(name, isNullable(), fields, newUserDefinedFunctions);
+            return new StructType(name, isNullable, fields);
         }
 
         @Override
@@ -1072,7 +1056,7 @@ public StructType withNullable(boolean isNullable) {
             if (isNullable == isNullable()) {
                 return this;
             }
-            return new StructType(name, isNullable, fields, userDefinedFunctions);
+            return new StructType(name, isNullable, fields);
         }
 
         private boolean calculateResolved() {

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/catalog/RecordLayerStoreSchemaTemplateCatalog.java

@@ -160,7 +160,6 @@ private static Tuple getSchemaTemplatePrimaryKey(String schemaTemplateName) {
     @Override
     public SchemaTemplate loadSchemaTemplate(@Nonnull Transaction txn, @Nonnull String templateName)
             throws RelationalException {
-        System.out.println("RLStoreSchemaTemplateCatalog loadSchemaTemplate called with templateName:" + templateName);
         Tuple key = getSchemaTemplatePrimaryKey(templateName);
         var recordStore = RecordLayerStoreUtils.openRecordStore(txn, this.catalogSchemaPath,
                 this.catalogRecordMetaDataProvider);
@@ -203,7 +202,6 @@ public SchemaTemplate loadSchemaTemplate(@Nonnull Transaction txn, @Nonnull Stri
      */
     @Nonnull
     private static SchemaTemplate toSchemaTemplate(@Nonnull Message m) throws InvalidProtocolBufferException {
-        System.out.println("RecordLayerStoreSchemaTemplateCatalog::toSchemaTemplate called");
         Descriptors.Descriptor d = m.getDescriptorForType();
         ByteString bs = (ByteString) m.getField(d.findFieldByName(SchemaTemplateSystemTable.METADATA));
         RecordMetaData metaData = RecordMetaData.build(RecordMetaDataProto.MetaData.parseFrom(bs.toByteArray()));

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/metadata/RecordLayerSchemaTemplate.java

@@ -402,7 +402,6 @@ public Builder addAuxiliaryType(@Nonnull DataType.Named auxiliaryType) {
             Assert.thatUnchecked(!tables.containsKey(auxiliaryType.getName()), ErrorCode.INVALID_SCHEMA_TEMPLATE, TABLE_ALREADY_EXISTS, auxiliaryType.getName());
             Assert.thatUnchecked(!auxiliaryTypes.containsKey(auxiliaryType.getName()), ErrorCode.INVALID_SCHEMA_TEMPLATE, TYPE_WITH_NAME_ALREADY_EXISTS, auxiliaryType.getName());
             auxiliaryTypes.put(auxiliaryType.getName(), auxiliaryType);
-            System.out.println("auxiliaryTypes name:" + auxiliaryType.getName());
             return this;
         }
 
@@ -420,6 +419,19 @@ public Builder addAuxiliaryTypes(@Nonnull Collection<DataType.Named> auxiliaryTy
             return this;
         }
 
+        @Nonnull
+        public Builder addUDF(@Nonnull UDF udf) {
+            Assert.thatUnchecked(!udfMap.containsKey(udf.getUdfName()), ErrorCode.INVALID_SCHEMA_TEMPLATE, TABLE_ALREADY_EXISTS, udf.getUdfName());
+            udfMap.put(udf.getUdfName(), udf);
+            return this;
+        }
+
+        @Nonnull
+        public Builder addUDFs(@Nonnull Collection<UDF> udf) {
+            udf.forEach(this::addUDF);
+            return this;
+        }
+
         @Nonnull
         Builder setCachedMetadata(@Nonnull final RecordMetaData metadata) {
             this.cachedMetadata = metadata;

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/query/PlanGenerator.java

@@ -153,7 +153,6 @@ private Plan<?> getPlanInternal(@Nonnull String query, @Nonnull KeyValueLogMessa
                     QueryPlan.PhysicalQueryPlan.getValidPlanHashModes(options);
             final PlanHashable.PlanHashMode currentPlanHashMode = QueryPlan.PhysicalQueryPlan.getCurrentPlanHashMode(options);
             final var astHashResult = AstNormalizer.normalizeQuery(planContext, query, isCaseSensitive(), currentPlanHashMode);
-            // rewrite the query with operationDefinition
             RelationalLoggingUtil.publishNormalizeQueryLogs(message, stepTimeMicros(), astHashResult.getQueryCacheKey().getHash(),
                     astHashResult.getQueryCacheKey().getCanonicalQueryString());
             options = options.withChild(astHashResult.getQueryOptions());

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/query/functions/SqlFunctionCatalog.java

@@ -115,6 +115,12 @@ public static SqlFunctionCatalog instance() {
         return INSTANCE;
     }
 
+    public BuiltInFunction<? extends Typed> addFunction(UserDefinedFunctionDefinition functionDefinition) {
+        final var func = functionDefinition.getBuiltInFunction();
+        udfMap.put(functionDefinition.getName(), func);
+        return func;
+    }
+
     /**
      * A utility method that transforms a single-item {@link RecordConstructorValue} value into its inner {@link Value}.
      * This is mainly used for deterministically distinguishing between:

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/query/visitors/ExpressionVisitor.java

@@ -254,11 +254,13 @@ public Expression visitCaseFunctionCall(@Nonnull RelationalParser.CaseFunctionCa
     @Nonnull
     @Override
     public Expression visitUserDefinedFunctionCall(@Nonnull RelationalParser.UserDefinedFunctionCallContext ctx) {
-        System.out.println("visitUserDefinedFunctionCall called");
         final var functionName = ctx.userDefinedFunctionName.getText();
         // special case for user-defined functions where we want to exclude the first argument from
         // being literal-stripped.
         @Nonnull Expressions arguments;
+        // check if this function exists in schema template
+        UDF udf = getDelegate().getCatalog().getUDF(functionName);
+        // look up in FunctionCatalog
         boolean isUdf = getDelegate().getSemanticAnalyzer().isUdfFunction(functionName);
         if (isUdf) {
             final var argumentNodes = ctx.functionArgs().children.stream()
@@ -285,7 +287,6 @@ public Expression visitUserDefinedFunctionCall(@Nonnull RelationalParser.UserDef
     @Nonnull
     @Override
     public Expression visitFunctionCallExpressionAtom(@Nonnull RelationalParser.FunctionCallExpressionAtomContext ctx) {
-        System.out.println("ExpressionVisitor::visitFunctionCallExpressionAtom:" + ctx.getText() + " ctx class:" + ctx.getClass());
         return parseChild(ctx);
     }
 
@@ -500,20 +501,8 @@ public Expression visitBitExpressionAtom(@Nonnull RelationalParser.BitExpression
     @Nonnull
     @Override
     public Expression visitBinaryComparisonPredicate(@Nonnull RelationalParser.BinaryComparisonPredicateContext ctx) {
-        // if comparison operator is overriden, and left.dataType = RLUDOperator.getStructName,
-        // for example, ctx = (a = b)
-        // RLUDoperator.getExpressionCtx = (x.string_value = y.string_value and x.long_value = y.long_value);
-        // rewrite the function, change ctx -> a.string_value = b.string_value and a.long_value = b.long_value
-        System.out.println("get into visitBinaryComparisonPredicate");
         final var left = Assert.castUnchecked(ctx.left.accept(this), Expression.class);
         final var right = Assert.castUnchecked(ctx.right.accept(this), Expression.class);
-        System.out.println("left dataType:" + left.getDataType() + " left:" + left + " left.getClass:" + left.getDataType().getClass());
-        System.out.println("right dataType:" + right.getDataType());
-
-        if (left.getDataType() instanceof DataType.StructType) {
-            FunctionDefinition operationDefinition = getDelegate().getCatalog().getOperationDefinition(ctx.comparisonOperator().getText(), (DataType.StructType) left.getDataType());
-            System.out.println("operationDefinition:" + operationDefinition);
-        }
         return getDelegate().resolveFunction(ctx.comparisonOperator().getText(), left, right);
     }
 
@@ -869,11 +858,6 @@ Optional<LogicalPlanFragment.State> getStateMaybe() {
 
     @Nonnull
     private Expression parseChild(@Nonnull ParserRuleContext context) {
-        Expressions expressions = (Expressions) visitChildren(context);
-        for (int i = 0; i < context.getChildCount(); i++) {
-            System.out.println("ith:" + i + " child:" + context.getChild(i).getText());
-        }
-        System.out.println("expressions:" + expressions);
         return Assert.castUnchecked(visitChildren(context), Expression.class);
     }
 

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/query/visitors/IdentifierVisitor.java

@@ -54,7 +54,6 @@ public Identifier visitTableName(@Nonnull RelationalParser.TableNameContext tabl
     @Nonnull
     @Override
     public Identifier visitFullId(@Nonnull RelationalParser.FullIdContext fullIdContext) {
-        System.out.println("identifierVisitor visitFullId called");
         Assert.thatUnchecked(!fullIdContext.uid().isEmpty());
         final ImmutableList.Builder<String> qualifierBuilder = ImmutableList.builder();
         for (int i = 0; i < fullIdContext.uid().size() - 1; i++) {

fdb-relational-core/src/test/java/com/apple/foundationdb/relational/api/DriverManagerTest.java

@@ -30,7 +30,6 @@
 
 import java.sql.DriverManager;
 import java.sql.SQLException;
-import java.util.stream.Collectors;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;