remove over optimization

Author: pengpeng-lu

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/expressions/Comparisons.java

@@ -638,8 +638,8 @@ public enum Type {
         SORT(false),
         @API(API.Status.EXPERIMENTAL)
         LIKE,
-        IS_DISTINCT_FROM(true),
-        NOT_DISTINCT_FROM(false);
+        IS_DISTINCT_FROM(false),
+        NOT_DISTINCT_FROM(true);
 
         @Nonnull
         private static final Supplier<BiMap<Type, PComparisonType>> protoEnumBiMapSupplier =
@@ -1337,9 +1337,7 @@ public BooleanWithConstraint semanticEqualsTyped(@Nonnull final Comparison other
         public Boolean eval(@Nullable FDBRecordStoreBase<?> store, @Nonnull EvaluationContext context, @Nullable Object value) {
             // this is at evaluation time --> always use the context binding
             final Object comparand = getComparand(store, context);
-            if (comparand == null) {
-                return null;
-            } else if (comparand == COMPARISON_SKIPPED_BINDING) {
+            if (comparand == COMPARISON_SKIPPED_BINDING) {
                 return Boolean.TRUE;
             } else {
                 return evalComparison(type, value, comparand);
@@ -1660,9 +1658,7 @@ public BooleanWithConstraint semanticEqualsTyped(@Nonnull final Comparison other
         public Boolean eval(@Nullable FDBRecordStoreBase<?> store, @Nonnull EvaluationContext context, @Nullable Object v) {
             // this is at evaluation time --> always use the context binding
             final Object comparand = getComparand(store, context);
-            if (comparand == null) {
-                return null;
-            } else if (comparand == COMPARISON_SKIPPED_BINDING) {
+            if (comparand == COMPARISON_SKIPPED_BINDING) {
                 return Boolean.TRUE;
             } else {
                 return evalComparison(type, v, comparand);

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/values/RelOpValue.java

@@ -184,7 +184,6 @@ private static Optional<QueryPredicate> promoteOperandsAndCreatePredicate(@Nulla
                                                                               @Nonnull Value leftChild,
                                                                               @Nonnull Value rightChild,
                                                                               @Nonnull final Comparisons.Type comparisonType) {
-/*
         if (leftChild.getResultType().getTypeCode() == Type.TypeCode.NULL && rightChild.getResultType().getTypeCode() == Type.TypeCode.NULL) {
             if (comparisonType == Comparisons.Type.NOT_DISTINCT_FROM) {
                 return Optional.of(ConstantPredicate.TRUE);
@@ -193,10 +192,6 @@ private static Optional<QueryPredicate> promoteOperandsAndCreatePredicate(@Nulla
             }
         }
 
- */
-
-
-
         // maximumType may return null, but only for non-primitive types which is not possible here
         final var maxtype = Verify.verifyNotNull(Type.maximumType(leftChild.getResultType(), rightChild.getResultType()));
 
@@ -306,30 +301,11 @@ private static Value encapsulate(@Nonnull final String functionName,
             final Typed arg1 = arguments.get(1);
             final Type res1 = arg1.getResultType();
 
-            /*
-            if ("isDistinctFrom".equals(functionName)) {
-                if (res0.getTypeCode() == Type.TypeCode.NULL && res1.getTypeCode() != Type.TypeCode.NULL) {
-                    return encapsulate("notNull", Comparisons.Type.NOT_NULL, List.of(arg1));
-                } else if (res1.getTypeCode() == Type.TypeCode.NULL && res0.getTypeCode() != Type.TypeCode.NULL) {
-                    return encapsulate("notNull", Comparisons.Type.NOT_NULL, List.of(arg0));
-                }
-            }
-            if ("notDistinctFrom".equals(functionName)) {
-                if (res0.getTypeCode() == Type.TypeCode.NULL && res1.getTypeCode() != Type.TypeCode.NULL) {
-                    return encapsulate("isNull", Comparisons.Type.IS_NULL, List.of(arg1));
-                } else if (res1.getTypeCode() == Type.TypeCode.NULL && res0.getTypeCode() != Type.TypeCode.NULL) {
-                    return encapsulate("isNull", Comparisons.Type.IS_NULL, List.of(arg0));
-                }
-            }
-
-             */
-
             SemanticException.check(res1.isPrimitive() || res1.isEnum() || res1.isUuid(), SemanticException.ErrorCode.COMPARAND_TO_COMPARISON_IS_OF_COMPLEX_TYPE);
 
             final BinaryPhysicalOperator physicalOperator =
                     getBinaryOperatorMap().get(new BinaryComparisonSignature(comparisonType, res0.getTypeCode(), res1.getTypeCode()));
 
-            System.out.println("comparisonType:" + comparisonType + " res0:" + res0.getTypeCode() + " res1:" + res1.getTypeCode());
             Verify.verifyNotNull(physicalOperator, "unable to encapsulate comparison operation due to type mismatch(es)");
 
             return new BinaryRelOpValue(functionName,