reverted unneed changes

Author: chernser

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

@@ -1196,5 +1196,4 @@ public String toString() {
         }
         return builder.append(' ').append(originalTypeName).toString();
     }
-
 }

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

@@ -176,8 +176,7 @@ protected boolean readRecord(Object[] record) throws IOException {
         boolean firstColumn = true;
         for (int i = 0; i < columns.length; i++) {
             try {
-                ClickHouseColumn column = columns[i];
-                Object val = binaryStreamReader.readValue(column);
+                Object val = binaryStreamReader.readValue(columns[i]);
                 if (val != null) {
                     record[i] = val;
                 } else {
@@ -192,11 +191,9 @@ protected boolean readRecord(Object[] record) throws IOException {
                 throw e;
             }
         }
-
         return true;
     }
 
-
     @Override
     public <T> T readValue(int colIndex) {
         if (colIndex < 1 || colIndex > getSchema().getColumns().size()) {

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

@@ -10,10 +10,8 @@
 import com.clickhouse.client.api.ClientException;
 import com.clickhouse.client.api.DataTypeUtils;
 import com.clickhouse.client.api.ServerException;
-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;
@@ -44,7 +42,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
-import org.testng.util.Strings;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

jdbc-v2/src/main/java/com/clickhouse/jdbc/metadata/DatabaseMetaDataImpl.java

@@ -229,7 +229,7 @@ public String getStringFunctions() throws SQLException {
     public String getSystemFunctions() throws SQLException {
         // took from below URL(not from system.functions):
         // https://clickhouse.com/docs/en/sql-reference/functions/other-functions/
-        return "bar,basename,blockNumber,blockSerializedSize,blockSize,buildId,byteSize,countDigits,currentDatabase,currentProfiles,currentRoles,currentUser,defaultProfiles,defaultRoles,defaultValueOfArgumentType,defaultValueOfTypeName,dumpColumnStructure,enabledProfiles,enabledRoles,errorCodeToName,filesystemAvailable,filesystemCapacity,filesystemFree,finalizeAggregation,formatReadableQuantity,formatReadableSize,formatReadableTimeDelta,FQDN,getMacro,getServerPort,getSetting,getSizeOfEnumType,greatest,hasColumnInTable,hostName,identity,ifNotFinite,ignore,indexHint,initializeAggregation,initialQueryID,isConstant,isDecimalOverflow,isFinite,isInfinite,isNaN,joinGet,least,MACNumToString,MACStringToNum,MACStringToOUI,materialize,modelEvaluate,neighbor,queryID,randomFixedString,randomPrintableASCII,randomString,randomStringUTF8,replicate,rowNumberInAllBlocks,rowNumberInBlock,runningAccumulate,runningConcurrency,runningDifference,runningDifferenceStartingWithFirstValue,shardCount ,shardNum,sleep,sleepEachRow,tcpPort,throwIf,toColumnTypeName,toTypeName,e,uptime,version,visibleWidth";
+        return "bar,basename,blockNumber,blockSerializedSize,blockSize,buildId,byteSize,countDigits,currentDatabase,currentProfiles,currentRoles,currentUser,defaultProfiles,defaultRoles,defaultValueOfArgumentType,defaultValueOfTypeName,dumpColumnStructure,enabledProfiles,enabledRoles,errorCodeToName,filesystemAvailable,filesystemCapacity,filesystemFree,finalizeAggregation,formatReadableQuantity,formatReadableSize,formatReadableTimeDelta,FQDN,getMacro,getServerPort,getSetting,getSizeOfEnumType,greatest,hasColumnInTable,hostName,identity,ifNotFinite,ignore,indexHint,initializeAggregation,initialQueryID,isConstant,isDecimalOverflow,isFinite,isInfinite,isNaN,joinGet,least,MACNumToString,MACStringToNum,MACStringToOUI,materialize,modelEvaluate,neighbor,queryID,randomFixedString,randomPrintableASCII,randomString,randomStringUTF8,replicate,rowNumberInAllBlocks,rowNumberInBlock,runningAccumulate,runningConcurrency,runningDifference,runningDifferenceStartingWithFirstValue,shardCount ,shardNum,sleep,sleepEachRow,tcpPort,throwIf,toColumnTypeName,toTypeName,transform,uptime,version,visibleWidth";
     }
 
     @Override

jdbc-v2/src/main/java/com/clickhouse/jdbc/metadata/ResultSetMetaDataImpl.java

@@ -6,7 +6,6 @@
 import com.clickhouse.jdbc.internal.ExceptionUtils;
 import com.clickhouse.jdbc.internal.JdbcUtils;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.UnmodifiableListIterator;
 
 import java.sql.SQLException;
 import java.util.List;
@@ -24,16 +23,13 @@ public class ResultSetMetaDataImpl implements java.sql.ResultSetMetaData, JdbcV2
 
     private final Map<ClickHouseDataType, Class<?>> typeClassMap;
 
-    private int columnCount;
-
     public ResultSetMetaDataImpl(List<ClickHouseColumn> columns, String schema, String catalog, String tableName,
                                  Map<ClickHouseDataType, Class<?>> typeClassMap) {
         this.columns = ImmutableList.copyOf(columns);
         this.schema = schema;
         this.catalog = catalog;
         this.tableName = tableName;
         this.typeClassMap = typeClassMap;
-        this.columnCount = columns.size();
     }
 
     private ClickHouseColumn getColumn(int column) throws SQLException {
@@ -46,10 +42,6 @@ private ClickHouseColumn getColumn(int column) throws SQLException {
 
     @Override
     public int getColumnCount() throws SQLException {
-        return columnCount;
-    }
-
-    public int getOriginalColumnCount() {
         return columns.size();
     }