re-implemented with detached result set

Author: chernser

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

@@ -37,8 +37,6 @@
 
 import java.io.Serializable;
 import java.lang.reflect.Array;
-import java.math.BigInteger;
-import java.sql.SQLException;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -93,7 +91,6 @@ public final class ClickHouseColumn implements Serializable {
     private List<String> parameters;
     private ClickHouseEnum enumConstants;
     private Map<String, ClickHouseColumn> jsonPredefinedPaths;
-    private ValueFunction valueFunction;
 
     private int arrayLevel;
     private ClickHouseColumn arrayBaseColumn;
@@ -856,18 +853,6 @@ public boolean isNestedType() {
         return dataType.isNested();
     }
 
-    public boolean hasValueFunction() {
-        return valueFunction != null;
-    }
-
-    public void setValueFunction(ValueFunction valueFunction) {
-        this.valueFunction = valueFunction;
-    }
-
-    public ValueFunction getValueFunction() {
-        return valueFunction;
-    }
-
     public int getArrayNestedLevel() {
         return arrayLevel;
     }
@@ -1212,8 +1197,4 @@ public String toString() {
         return builder.append(' ').append(originalTypeName).toString();
     }
 
-    public interface ValueFunction {
-
-        Object produceValue(Object[] row);
-    }
 }

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

@@ -1,7 +1,6 @@
 package com.clickhouse.client.api.data_formats;
 
 import com.clickhouse.client.api.metadata.TableSchema;
-import com.clickhouse.data.ClickHouseColumn;
 import com.clickhouse.data.value.ClickHouseBitmap;
 import com.clickhouse.data.value.ClickHouseGeoMultiPolygonValue;
 import com.clickhouse.data.value.ClickHouseGeoPointValue;
@@ -12,7 +11,12 @@
 import java.math.BigInteger;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
-import java.time.*;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
 import java.time.temporal.TemporalAmount;
 import java.util.List;
 import java.util.Map;
@@ -546,13 +550,4 @@ public interface ClickHouseBinaryFormatReader extends AutoCloseable {
     TemporalAmount getTemporalAmount(int index);
 
     TemporalAmount getTemporalAmount(String colName);
-
-    /**
-     * ! Experimental ! Might change in the future.
-     * Sets a value function of a column. If column has a value function then reader will pass current row
-     * as Object[] to a function. The least is responsible for returning correct value or null.
-     * @param index - column index starting with 1
-     * @param function - function that will be used to calculate column value from current row.
-     */
-    default void setValueFunction(int index, ClickHouseColumn.ValueFunction function) {}
 }

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

@@ -131,16 +131,11 @@ public boolean readToPOJO(Map<String, POJOFieldDeserializer> deserializers, Obje
         return true;
     }
 
-    @Override
-    public void setValueFunction(int index, ClickHouseColumn.ValueFunction function) {
-        columns[index - 1].setValueFunction(function);
-    }
-
     /**
      * It is still internal method and should be used with care.
      * Usually this method is called to read next record into internal object and affects hasNext() method.
      * So after calling this one:
-     * - hasNext(), next() should not be called
+     * - hasNext(), next() and get methods cannot be called
      * - stream should be read with readRecord() method fully
      *
      * @param record
@@ -153,11 +148,7 @@ public boolean readRecord(Map<String, Object> record) throws IOException {
         }
 
         boolean firstColumn = true;
-        boolean hasValueFunctionColumn = false;
         for (ClickHouseColumn column : columns) {
-            if (column.hasValueFunction()) {
-                hasValueFunctionColumn = true;
-            }
             try {
                 Object val = binaryStreamReader.readValue(column);
                 if (val != null) {
@@ -174,16 +165,6 @@ public boolean readRecord(Map<String, Object> record) throws IOException {
                 throw e;
             }
         }
-
-        if (hasValueFunctionColumn) {
-            // This variant of readRecord is called only for POJO serialization and this logic should be avoided.
-            Object[] row = record.values().toArray();
-            for (ClickHouseColumn column : columns) {
-                if (column.hasValueFunction()) {
-                    record.put(column.getColumnName(), column.getValueFunction().produceValue(row));
-                }
-            }
-        }
         return true;
     }
 
@@ -193,13 +174,9 @@ protected boolean readRecord(Object[] record) throws IOException {
         }
 
         boolean firstColumn = true;
-        boolean hasValueFunctionColumn = false;
         for (int i = 0; i < columns.length; i++) {
             try {
                 ClickHouseColumn column = columns[i];
-                if (column.hasValueFunction()) {
-                    hasValueFunctionColumn = true;
-                }
                 Object val = binaryStreamReader.readValue(column);
                 if (val != null) {
                     record[i] = val;
@@ -216,14 +193,6 @@ protected boolean readRecord(Object[] record) throws IOException {
             }
         }
 
-        if (hasValueFunctionColumn) {
-            for  (int i = 0; i < columns.length; i++) {
-                ClickHouseColumn column = columns[i];
-                if (column.hasValueFunction()) {
-                    record[i] = column.getValueFunction().produceValue(record);
-                }
-            }
-        }
         return true;
     }
 

client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java

@@ -13,6 +13,7 @@
 import com.clickhouse.client.api.command.CommandResponse;
 import com.clickhouse.client.api.command.CommandSettings;
 import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
+import com.clickhouse.client.api.data_formats.internal.AbstractBinaryFormatReader;
 import com.clickhouse.client.api.data_formats.internal.BinaryStreamReader;
 import com.clickhouse.client.api.enums.Protocol;
 import com.clickhouse.client.api.insert.InsertResponse;

jdbc-v2/src/main/java/com/clickhouse/jdbc/ResultSetImpl.java

@@ -3,7 +3,6 @@
 import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
 import com.clickhouse.client.api.metadata.TableSchema;
 import com.clickhouse.client.api.query.QueryResponse;
-import com.clickhouse.data.ClickHouseColumn;
 import com.clickhouse.data.ClickHouseDataType;
 import com.clickhouse.jdbc.internal.ExceptionUtils;
 import com.clickhouse.jdbc.internal.FeatureManager;
@@ -50,9 +49,9 @@ public class ResultSetImpl implements ResultSet, JdbcV2Wrapper {
 
     private final FeatureManager  featureManager;
 
-    private static final int AFTER_LAST = -1;
-    private static final int BEFORE_FIRST = 0;
-    private static final int FIRST_ROW = 1;
+    public static final int AFTER_LAST = -1;
+    public static final int BEFORE_FIRST = 0;
+    public static final int FIRST_ROW = 1;
     private int rowPos;
 
     private int fetchSize;
@@ -157,14 +156,6 @@ public void close() throws SQLException {
         }
     }
 
-    public void setValueFunction(int colIndex, ClickHouseColumn.ValueFunction valueFunction) {
-        reader.setValueFunction(colIndex, valueFunction);
-    }
-
-    public void hideLastNColumns(int n) {
-        metaData.setColumnCount(metaData.getOriginalColumnCount() - n);
-    }
-
     @Override
     public boolean wasNull() throws SQLException {
         checkClosed();