Revert refactoring.

Author: hatyo

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

@@ -215,13 +215,18 @@ private static Comparable toComparable(@Nullable Object obj) {
 
     @Nonnull
     public static Object toClassWithRealEquals(@Nonnull Object obj) {
-        if (obj instanceof ByteString || obj instanceof Comparable
-                || obj instanceof List || obj instanceof RealVector) {
+        if (obj instanceof ByteString) {
             return obj;
         } else if (obj instanceof byte[]) {
             return ByteString.copyFrom((byte[])obj);
         } else if (obj instanceof Internal.EnumLite) {
             return ((Internal.EnumLite)obj).getNumber();
+        } else if (obj instanceof Comparable) {
+            return obj;
+        } else if (obj instanceof List) {
+            return obj;
+        } else if (obj instanceof RealVector) {
+            return obj;
         } else {
             throw new RecordCoreException("Tried to compare non-comparable object " + obj.getClass());
         }

yaml-tests/src/test/resources/in-predicate.yamsql

@@ -249,7 +249,6 @@ test_block:
 # "expected" as the point of error is different in both the cases.
 # https://github.com/FoundationDB/fdb-record-layer/issues/3583
 test_block:
-  preset: single_repetition_ordered
   tests:
       -
         # LONG value matched against IN list of LONG and DOUBLE values
@@ -258,50 +257,29 @@ test_block:
         # clear whether we want to support it as it would probably
         # make plan lookup in the cache much more expensive.
         - query: select a, b from ta where b in (1, 3.0, 5, 7.0)
-        - initialVersionLessThan: !current_version
         - error: "XX000"
-        - initialVersionAtLeast: !current_version
-        - error: "42804"
       -
         # Values of incompatible types in the IN list
         - query: select a, e from ta where e in ('foo' , 35)
-        - initialVersionLessThan: !current_version
         - error: "XX000"
-        - initialVersionAtLeast: !current_version
-        - error: "42804"
       -
         # Values of incompatible types in the IN list
         - query: select a, e from ta where e in (35, '23')
-        - initialVersionLessThan: !current_version
         - error: "XX000"
-        - initialVersionAtLeast: !current_version
-        - error: "42804"
       -
         # Values of incompatible types in the IN list
         - query: select a, e from ta where e in (true, 75.34)
-        - initialVersionLessThan: !current_version
         - error: "XX000"
-        - initialVersionAtLeast: !current_version
-        - error: "42804"
       -
         # Left type (STRING) is not compatible with right type (type of the IN List)
         - query: select a, e from ta where e in (35, 75.34)
-        - initialVersionLessThan: !current_version
         - error: "XX000"
-        - initialVersionAtLeast: !current_version
-        - error: "42804"
       -
         # Left type (STRING) is not compatible with right type (type of the IN List)
         - query: select a, e from ta where e in (35.34, 32)
-        - initialVersionLessThan: !current_version
         - error: "XX000"
-        - initialVersionAtLeast: !current_version
-        - error: "42804"
       -
         # Complex (STRUCT) left type matched against IN list
         - query: select a, e from ta where f in (34, 23)
-        - initialVersionLessThan: 4.8.2.0
-        - error: "XX000"
-        - initialVersionAtLeast: 4.8.2.0
         - error: "22000"
 ...