Revert "Preserve case for RowType's field name and JSON content when …

…``CAST``"

This reverts commit 5b7cda2.

presto-common/src/main/java/com/facebook/presto/common/function/SqlFunctionProperties.java

@@ -34,7 +34,6 @@ public class SqlFunctionProperties
     private final Locale sessionLocale;
     private final String sessionUser;
     private final boolean fieldNamesInJsonCastEnabled;
-    private final boolean legacyJsonCast;
     private final Map<String, String> extraCredentials;
 
     private SqlFunctionProperties(
@@ -47,7 +46,6 @@ private SqlFunctionProperties(
             Locale sessionLocale,
             String sessionUser,
             boolean fieldNamesInJsonCastEnabled,
-            boolean legacyJsonCast,
             Map<String, String> extraCredentials)
     {
         this.parseDecimalLiteralAsDouble = parseDecimalLiteralAsDouble;
@@ -59,7 +57,6 @@ private SqlFunctionProperties(
         this.sessionLocale = requireNonNull(sessionLocale, "sessionLocale is null");
         this.sessionUser = requireNonNull(sessionUser, "sessionUser is null");
         this.fieldNamesInJsonCastEnabled = fieldNamesInJsonCastEnabled;
-        this.legacyJsonCast = legacyJsonCast;
         this.extraCredentials = requireNonNull(extraCredentials, "extraCredentials is null");
     }
 
@@ -114,11 +111,6 @@ public boolean isFieldNamesInJsonCastEnabled()
         return fieldNamesInJsonCastEnabled;
     }
 
-    public boolean isLegacyJsonCast()
-    {
-        return legacyJsonCast;
-    }
-
     @Override
     public boolean equals(Object o)
     {
@@ -137,16 +129,13 @@ public boolean equals(Object o)
                 Objects.equals(sessionStartTime, that.sessionStartTime) &&
                 Objects.equals(sessionLocale, that.sessionLocale) &&
                 Objects.equals(sessionUser, that.sessionUser) &&
-                Objects.equals(extraCredentials, that.extraCredentials) &&
-                Objects.equals(legacyJsonCast, that.legacyJsonCast);
+                Objects.equals(extraCredentials, that.extraCredentials);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(parseDecimalLiteralAsDouble, legacyRowFieldOrdinalAccessEnabled, timeZoneKey,
-                legacyTimestamp, legacyMapSubscript, sessionStartTime, sessionLocale, sessionUser,
-                extraCredentials, legacyJsonCast);
+        return Objects.hash(parseDecimalLiteralAsDouble, legacyRowFieldOrdinalAccessEnabled, timeZoneKey, legacyTimestamp, legacyMapSubscript, sessionStartTime, sessionLocale, sessionUser, extraCredentials);
     }
 
     public static Builder builder()
@@ -165,7 +154,6 @@ public static class Builder
         private Locale sessionLocale;
         private String sessionUser;
         private boolean fieldNamesInJsonCastEnabled;
-        private boolean legacyJsonCast;
         private Map<String, String> extraCredentials = emptyMap();
 
         private Builder() {}
@@ -230,26 +218,9 @@ public Builder setFieldNamesInJsonCastEnabled(boolean fieldNamesInJsonCastEnable
             return this;
         }
 
-        public Builder setLegacyJsonCast(boolean legacyJsonCast)
-        {
-            this.legacyJsonCast = legacyJsonCast;
-            return this;
-        }
-
         public SqlFunctionProperties build()
         {
-            return new SqlFunctionProperties(
-                    parseDecimalLiteralAsDouble,
-                    legacyRowFieldOrdinalAccessEnabled,
-                    timeZoneKey,
-                    legacyTimestamp,
-                    legacyMapSubscript,
-                    sessionStartTime,
-                    sessionLocale,
-                    sessionUser,
-                    fieldNamesInJsonCastEnabled,
-                    legacyJsonCast,
-                    extraCredentials);
+            return new SqlFunctionProperties(parseDecimalLiteralAsDouble, legacyRowFieldOrdinalAccessEnabled, timeZoneKey, legacyTimestamp, legacyMapSubscript, sessionStartTime, sessionLocale, sessionUser, fieldNamesInJsonCastEnabled, extraCredentials);
         }
     }
 }

presto-common/src/main/java/com/facebook/presto/common/type/RowType.java

@@ -83,11 +83,6 @@ public static Field field(Type type)
         return new Field(Optional.empty(), type);
     }
 
-    public static Field field(String name, Type type, boolean delimited)
-    {
-        return new Field(Optional.of(name), type, delimited);
-    }
-
     private static TypeSignature makeSignature(List<Field> fields)
     {
         int size = fields.size();

presto-common/src/main/java/com/facebook/presto/common/type/TypeSignature.java

@@ -16,7 +16,6 @@
 import com.facebook.drift.annotations.ThriftConstructor;
 import com.facebook.drift.annotations.ThriftField;
 import com.facebook.drift.annotations.ThriftStruct;
-import com.facebook.presto.common.InvalidTypeDefinitionException;
 import com.facebook.presto.common.QualifiedObjectName;
 import com.facebook.presto.common.type.BigintEnumType.LongEnumMap;
 import com.facebook.presto.common.type.VarcharEnumType.VarcharEnumMap;
@@ -511,7 +510,6 @@ private static TypeSignature parseRowTypeSignature(String signature, Set<String>
 
         List<TypeSignatureParameter> fields = new ArrayList<>();
 
-        Set<String> distinctFieldNames = new HashSet<>();
         for (int i = StandardTypes.ROW.length() + 1; i < signature.length(); i++) {
             char c = signature.charAt(i);
             switch (state) {
@@ -558,19 +556,13 @@ else if (c == ')' && bracketLevel > 1) {
                     }
                     else if (c == ')') {
                         verify(tokenStart >= 0, "Expect tokenStart to be non-negative");
-                        TypeSignatureParameter parameter = parseTypeOrNamedType(signature.substring(tokenStart, i).trim(), literalParameters);
-                        parameter.getNamedTypeSignature().getName()
-                                .ifPresent(fieldName -> checkDuplicateAndAdd(distinctFieldNames, fieldName));
-                        fields.add(parameter);
+                        fields.add(parseTypeOrNamedType(signature.substring(tokenStart, i).trim(), literalParameters));
                         tokenStart = -1;
                         state = RowTypeSignatureParsingState.FINISHED;
                     }
                     else if (c == ',' && bracketLevel == 1) {
                         verify(tokenStart >= 0, "Expect tokenStart to be non-negative");
-                        TypeSignatureParameter parameter = parseTypeOrNamedType(signature.substring(tokenStart, i).trim(), literalParameters);
-                        parameter.getNamedTypeSignature().getName()
-                                .ifPresent(fieldName -> checkDuplicateAndAdd(distinctFieldNames, fieldName));
-                        fields.add(parameter);
+                        fields.add(parseTypeOrNamedType(signature.substring(tokenStart, i).trim(), literalParameters));
                         tokenStart = -1;
                         state = RowTypeSignatureParsingState.START_OF_FIELD;
                     }
@@ -586,7 +578,6 @@ else if (c == ')' && bracketLevel > 1) {
                     else if (c == ')') {
                         verify(tokenStart >= 0, "Expect tokenStart to be non-negative");
                         verify(delimitedColumnName != null, "Expect delimitedColumnName to be non-null");
-                        checkDuplicateAndAdd(distinctFieldNames, delimitedColumnName);
                         fields.add(TypeSignatureParameter.of(new NamedTypeSignature(
                                 Optional.of(new RowFieldName(delimitedColumnName, true)),
                                 parseTypeSignature(signature.substring(tokenStart, i).trim(), literalParameters))));
@@ -597,7 +588,6 @@ else if (c == ')') {
                     else if (c == ',' && bracketLevel == 1) {
                         verify(tokenStart >= 0, "Expect tokenStart to be non-negative");
                         verify(delimitedColumnName != null, "Expect delimitedColumnName to be non-null");
-                        checkDuplicateAndAdd(distinctFieldNames, delimitedColumnName);
                         fields.add(TypeSignatureParameter.of(new NamedTypeSignature(
                                 Optional.of(new RowFieldName(delimitedColumnName, true)),
                                 parseTypeSignature(signature.substring(tokenStart, i).trim(), literalParameters))));
@@ -619,13 +609,6 @@ else if (c == ',' && bracketLevel == 1) {
         return new TypeSignature(signature.substring(0, StandardTypes.ROW.length()), fields);
     }
 
-    private static void checkDuplicateAndAdd(Set<String> fieldNames, String fieldName)
-    {
-        if (!fieldNames.add(fieldName)) {
-            throw new InvalidTypeDefinitionException("Duplicate field: " + fieldName);
-        }
-    }
-
     private static TypeSignatureParameter parseTypeOrNamedType(String typeOrNamedType, Set<String> literalParameters)
     {
         int split = typeOrNamedType.indexOf(' ');

presto-docs/src/main/sphinx/admin/properties.rst

@@ -989,16 +989,3 @@ Logging Properties
     * **Default value:** ``100MB``
 
     The maximum file size for the log file of the HTTP server.
-
-
-Legacy Compatible Properties
-------------------------------
-
-``legacy_json_cast``
-^^^^^^^^^^^^^^^^^^^^^
-
-    * **Type:** ``boolean``
-    * **Default value:** ``true``
-
-    When casting from ``JSON`` to ``ROW``, ignore the case of field names in ``RowType`` for legacy support so that the matching is case-insensitive.
-    Set ``legacy_json_cast`` to ``false`` to strictly enforce the case-sensitivity of double quoted field names in ``RowType`` when matching. Matching for unquoted field names remains case-insensitive.

presto-docs/src/main/sphinx/functions/json.rst

@@ -71,30 +71,6 @@ Cast from JSON
         SELECT CAST(JSON '{"k1": [1, 23], "k2": 456}' AS MAP(VARCHAR, JSON)); -- {k1 = JSON '[1,23]', k2 = JSON '456'}
         SELECT CAST(JSON '[null]' AS ARRAY(JSON)); -- [JSON 'null']
 
-.. note::
-
-    When casting from ``JSON`` to ``ROW``, for legacy support the case of double quoted field names
-    in ``RowType`` is ignored when matching. For example::
-
-        SELECT CAST(JSON '{"v1":123,"V2":"abc","v3":true}' AS ROW(v1 BIGINT, v2 VARCHAR, v3 BOOLEAN)); -- {v1=123, v2=abc, v3=true}
-        SELECT CAST(JSON '{"v1":123,"V2":"abc","v3":true}' AS ROW(v1 BIGINT, "V2" VARCHAR, "V3" BOOLEAN)); -- {v1=123, V2=abc, V3=true}
-
-    The following statement returns an error due to duplicate field::
-
-        SELECT CAST(JSON '{"v1":123,"V2":"abc","v2":"abc2","v3":true}' AS ROW(v1 BIGINT, "V2" VARCHAR, v2 VARCHAR, "V3" BOOLEAN));
-
-    To enforce the case of field names in ``RowType`` when casting from ``JSON`` to ``ROW``, set the configuration property ``legacy_json_cast`` to ``false``
-    in the coordinator and the worker's `configuration properties <../admin/properties.html#legacy-compatible-properties>`_.
-    After setting the property, the matching is case-sensitive for double quoted field names and
-    remains case-insensitive for unquoted field names. For example::
-
-        SELECT CAST(JSON '{"v1":123,"V2":"abc","v3":true}' AS ROW(v1 BIGINT, v2 VARCHAR, v3 BOOLEAN)); -- {v1=123, v2=abc, v3=true}
-        SELECT CAST(JSON '{"v1":123,"V2":"abc","v3":true}' AS ROW(v1 BIGINT, "V2" VARCHAR, v3 BOOLEAN)); -- {v1=123, V2=abc, v3=true}
-        SELECT CAST(JSON '{"v1":123,"V2":"abc","v3":true}' AS ROW(v1 BIGINT, "v2" VARCHAR, v3 BOOLEAN)); -- {v1=123, v2=null, v3=true}
-        SELECT CAST(JSON '{"v1":123,"V2":"abc", "v2":"abc2","v3":true}' AS ROW(v1 BIGINT, v2 VARCHAR, "V2" VARCHAR, v3 BOOLEAN)); -- {v1=123, v2=abc2, V2=abc, v3=true}
-
-    If the name of a field does not match (including case sensitivity), the value is ``null``.
-
 .. note:: When casting from ``JSON`` to ``ROW``, both JSON array and JSON object are supported.
 
 JSON Functions

presto-main/src/main/java/com/facebook/presto/Session.java

@@ -52,7 +52,6 @@
 import java.util.TimeZone;
 import java.util.stream.Collectors;
 
-import static com.facebook.presto.SystemSessionProperties.LEGACY_JSON_CAST;
 import static com.facebook.presto.SystemSessionProperties.isFieldNameInJsonCastEnabled;
 import static com.facebook.presto.SystemSessionProperties.isLegacyMapSubscript;
 import static com.facebook.presto.SystemSessionProperties.isLegacyRowFieldOrdinalAccessEnabled;
@@ -497,7 +496,6 @@ public ConnectorSession toConnectorSession()
 
     public SqlFunctionProperties getSqlFunctionProperties()
     {
-        boolean legacyJsonCast = this.sessionPropertyManager.decodeSystemPropertyValue(LEGACY_JSON_CAST, null, Boolean.class);
         return SqlFunctionProperties.builder()
                 .setTimeZoneKey(timeZoneKey)
                 .setLegacyRowFieldOrdinalAccessEnabled(isLegacyRowFieldOrdinalAccessEnabled(this))
@@ -508,7 +506,6 @@ public SqlFunctionProperties getSqlFunctionProperties()
                 .setSessionLocale(getLocale())
                 .setSessionUser(getUser())
                 .setFieldNamesInJsonCastEnabled(isFieldNameInJsonCastEnabled(this))
-                .setLegacyJsonCast(legacyJsonCast)
                 .setExtraCredentials(identity.getExtraCredentials())
                 .build();
     }

presto-main/src/main/java/com/facebook/presto/SystemSessionProperties.java

@@ -311,7 +311,6 @@ public final class SystemSessionProperties
     public static final String ADD_PARTIAL_NODE_FOR_ROW_NUMBER_WITH_LIMIT = "add_partial_node_for_row_number_with_limit";
     public static final String REWRITE_CASE_TO_MAP_ENABLED = "rewrite_case_to_map_enabled";
     public static final String FIELD_NAMES_IN_JSON_CAST_ENABLED = "field_names_in_json_cast_enabled";
-    public static final String LEGACY_JSON_CAST = "legacy_json_cast";
     public static final String PULL_EXPRESSION_FROM_LAMBDA_ENABLED = "pull_expression_from_lambda_enabled";
     public static final String REWRITE_CONSTANT_ARRAY_CONTAINS_TO_IN_EXPRESSION = "rewrite_constant_array_contains_to_in_expression";
     public static final String INFER_INEQUALITY_PREDICATES = "infer_inequality_predicates";
@@ -1754,11 +1753,6 @@ public SystemSessionProperties(
                         "Include field names in json output when casting rows",
                         featuresConfig.isFieldNamesInJsonCastEnabled(),
                         false),
-                booleanProperty(
-                        LEGACY_JSON_CAST,
-                        "Keep the legacy json cast behavior, do not reserve the case for field names when casting to row type",
-                        featuresConfig.isLegacyJsonCast(),
-                        false),
                 booleanProperty(
                         OPTIMIZE_JOIN_PROBE_FOR_EMPTY_BUILD_RUNTIME,
                         "Optimize join probe at runtime if build side is empty",

presto-main/src/main/java/com/facebook/presto/operator/scalar/JsonToArrayCast.java

@@ -95,7 +95,7 @@ public static Block toArray(ArrayType arrayType, BlockBuilderAppender elementApp
             }
             BlockBuilder blockBuilder = arrayType.getElementType().createBlockBuilder(null, 20);
             while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
-                elementAppender.append(jsonParser, blockBuilder, properties);
+                elementAppender.append(jsonParser, blockBuilder);
             }
             if (jsonParser.nextToken() != null) {
                 throw new JsonCastException(format("Unexpected trailing token: %s", jsonParser.getText()));

presto-main/src/main/java/com/facebook/presto/operator/scalar/JsonToMapCast.java

@@ -103,9 +103,9 @@ public static Block toMap(MapType mapType, BlockBuilderAppender keyAppender, Blo
             HashTable hashTable = new HashTable(mapType.getKeyType(), singleMapBlockBuilder);
             int position = 0;
             while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                keyAppender.append(jsonParser, singleMapBlockBuilder, properties);
+                keyAppender.append(jsonParser, singleMapBlockBuilder);
                 jsonParser.nextToken();
-                valueAppender.append(jsonParser, singleMapBlockBuilder, properties);
+                valueAppender.append(jsonParser, singleMapBlockBuilder);
 
                 // Duplicate key detection is required even if the JSON is valid.
                 // For example: CAST(JSON '{"1": 1, "01": 2}' AS MAP<INTEGER, INTEGER>).

presto-main/src/main/java/com/facebook/presto/operator/scalar/JsonToRowCast.java

@@ -35,6 +35,8 @@
 
 import java.lang.invoke.MethodHandle;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 import static com.facebook.presto.common.type.TypeSignature.parseTypeSignature;
 import static com.facebook.presto.operator.scalar.ScalarFunctionImplementationChoice.ArgumentProperty.valueTypeArgumentProperty;
@@ -46,6 +48,7 @@
 import static com.facebook.presto.util.JsonUtil.JSON_FACTORY;
 import static com.facebook.presto.util.JsonUtil.canCastFromJson;
 import static com.facebook.presto.util.JsonUtil.createJsonParser;
+import static com.facebook.presto.util.JsonUtil.getFieldNameToIndex;
 import static com.facebook.presto.util.JsonUtil.parseJsonToSingleRowBlock;
 import static com.facebook.presto.util.JsonUtil.truncateIfNecessaryForErrorMessage;
 import static com.facebook.presto.util.Reflection.methodHandle;
@@ -58,7 +61,7 @@ public class JsonToRowCast
         extends SqlOperator
 {
     public static final JsonToRowCast JSON_TO_ROW = new JsonToRowCast();
-    private static final MethodHandle METHOD_HANDLE = methodHandle(JsonToRowCast.class, "toRow", RowType.class, BlockBuilderAppender[].class, SqlFunctionProperties.class, Slice.class);
+    private static final MethodHandle METHOD_HANDLE = methodHandle(JsonToRowCast.class, "toRow", RowType.class, BlockBuilderAppender[].class, Optional.class, SqlFunctionProperties.class, Slice.class);
 
     private JsonToRowCast()
     {
@@ -80,7 +83,7 @@ public BuiltInScalarFunctionImplementation specialize(BoundVariables boundVariab
         BlockBuilderAppender[] fieldAppenders = rowFields.stream()
                 .map(rowField -> createBlockBuilderAppender(rowField.getType()))
                 .toArray(BlockBuilderAppender[]::new);
-        MethodHandle methodHandle = METHOD_HANDLE.bindTo(rowType).bindTo(fieldAppenders);
+        MethodHandle methodHandle = METHOD_HANDLE.bindTo(rowType).bindTo(fieldAppenders).bindTo(getFieldNameToIndex(rowFields));
         return new BuiltInScalarFunctionImplementation(
                 true,
                 ImmutableList.of(valueTypeArgumentProperty(RETURN_NULL_ON_NULL)),
@@ -91,6 +94,7 @@ public BuiltInScalarFunctionImplementation specialize(BoundVariables boundVariab
     public static Block toRow(
             RowType rowType,
             BlockBuilderAppender[] fieldAppenders,
+            Optional<Map<String, Integer>> fieldNameToIndex,
             SqlFunctionProperties properties,
             Slice json)
     {
@@ -109,8 +113,7 @@ public static Block toRow(
                     jsonParser,
                     (SingleRowBlockWriter) rowBlockBuilder.beginBlockEntry(),
                     fieldAppenders,
-                    rowType,
-                    properties);
+                    fieldNameToIndex);
             rowBlockBuilder.closeEntry();
 
             if (jsonParser.nextToken() != null) {