removed optimization :-(

Author: chernser

clickhouse-data/src/main/java/com/clickhouse/data/ClickHouseColumn.java

@@ -49,6 +49,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.TimeZone;
+import java.util.stream.Collectors;
 
 /**
  * This class represents a column defined in database.
@@ -89,6 +90,7 @@ public final class ClickHouseColumn implements Serializable {
     private List<ClickHouseColumn> nested;
     private List<String> parameters;
     private ClickHouseEnum enumConstants;
+    private Map<String, ClickHouseColumn> jsonPredefinedPaths;
 
     private int arrayLevel;
     private ClickHouseColumn arrayBaseColumn;
@@ -509,11 +511,14 @@ protected static int readColumn(String args, int startIndex, int len, String nam
                 i = ClickHouseUtils.skipBrackets(args, index, len, '(');
                 String originalTypeName = args.substring(startIndex, i);
                 List<ClickHouseColumn> nestedColumns = new ArrayList<>();
+
                 List<String> parameters = new ArrayList<>();
                 parseJSONColumn(args.substring(index + 1, i - 1), nestedColumns, parameters);
                 nestedColumns.sort(Comparator.comparing(o -> o.getDataType().name()));
                 column = new ClickHouseColumn(ClickHouseDataType.JSON, name, originalTypeName, nullable, lowCardinality,
                         parameters, nestedColumns);
+                column.jsonPredefinedPaths = nestedColumns.stream().collect(Collectors.toMap(ClickHouseColumn::getColumnName,
+                        c -> c));
                 fixedLength = false;
                 estimatedLength++;
             }
@@ -1009,6 +1014,10 @@ public ClickHouseAggregateFunction getAggregateFunction() {
         return aggFuncType;
     }
 
+    public Map<String, ClickHouseColumn> getJsonPredefinedPaths() {
+        return jsonPredefinedPaths;
+    }
+
     public ClickHouseArraySequence newArrayValue(ClickHouseDataConfig config) {
         int level = arrayLevel;
         ClickHouseArraySequence value;

client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/BinaryStreamReader.java

@@ -1203,14 +1203,11 @@ private Map<String, Object> readJsonData(InputStream input, ClickHouseColumn col
 
         Map<String, Object> obj = new HashMap<>();
 
-        final int predefinedPaths = column.getNestedColumns().size();
-        final List<ClickHouseColumn> predefinedColumns = column.getNestedColumns();
+        final Map<String, ClickHouseColumn> predefinedColumns = column.getJsonPredefinedPaths();
         for (int i = 0; i < numOfPaths; i++) {
             String path = readString(input);
-            ClickHouseColumn dataColumn = i < predefinedPaths ? predefinedColumns.get(i) : JSON_PLACEHOLDER_COL;
-            if (dataColumn != JSON_PLACEHOLDER_COL && !dataColumn.getColumnName().equals(path)) {
-                throw new DataTransferException("Wrong column at position " + i + " where path " + path + " expected");
-            }
+            ClickHouseColumn dataColumn = predefinedColumns == null? JSON_PLACEHOLDER_COL :
+                    predefinedColumns.getOrDefault(path, JSON_PLACEHOLDER_COL);
             Object value = readValue(dataColumn);
             obj.put(path, value);
         }