Skip to content

Commit 8a72b8c

Browse files
committed
reverted unneed changes
1 parent b66105e commit 8a72b8c

File tree

5 files changed

+2
-17
lines changed

5 files changed

+2
-17
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1196,5 +1196,4 @@ public String toString() {
11961196
}
11971197
return builder.append(' ').append(originalTypeName).toString();
11981198
}
1199-
12001199
}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,7 @@ protected boolean readRecord(Object[] record) throws IOException {
176176
boolean firstColumn = true;
177177
for (int i = 0; i < columns.length; i++) {
178178
try {
179-
ClickHouseColumn column = columns[i];
180-
Object val = binaryStreamReader.readValue(column);
179+
Object val = binaryStreamReader.readValue(columns[i]);
181180
if (val != null) {
182181
record[i] = val;
183182
} else {
@@ -192,11 +191,9 @@ protected boolean readRecord(Object[] record) throws IOException {
192191
throw e;
193192
}
194193
}
195-
196194
return true;
197195
}
198196

199-
200197
@Override
201198
public <T> T readValue(int colIndex) {
202199
if (colIndex < 1 || colIndex > getSchema().getColumns().size()) {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
import com.clickhouse.client.api.ClientException;
1111
import com.clickhouse.client.api.DataTypeUtils;
1212
import com.clickhouse.client.api.ServerException;
13-
import com.clickhouse.client.api.command.CommandResponse;
1413
import com.clickhouse.client.api.command.CommandSettings;
1514
import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
16-
import com.clickhouse.client.api.data_formats.internal.AbstractBinaryFormatReader;
1715
import com.clickhouse.client.api.data_formats.internal.BinaryStreamReader;
1816
import com.clickhouse.client.api.enums.Protocol;
1917
import com.clickhouse.client.api.insert.InsertResponse;
@@ -44,7 +42,6 @@
4442
import org.testng.annotations.BeforeMethod;
4543
import org.testng.annotations.DataProvider;
4644
import org.testng.annotations.Test;
47-
import org.testng.util.Strings;
4845

4946
import java.io.BufferedReader;
5047
import java.io.BufferedWriter;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ public String getStringFunctions() throws SQLException {
229229
public String getSystemFunctions() throws SQLException {
230230
// took from below URL(not from system.functions):
231231
// https://clickhouse.com/docs/en/sql-reference/functions/other-functions/
232-
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";
232+
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";
233233
}
234234

235235
@Override

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.clickhouse.jdbc.internal.ExceptionUtils;
77
import com.clickhouse.jdbc.internal.JdbcUtils;
88
import com.google.common.collect.ImmutableList;
9-
import com.google.common.collect.UnmodifiableListIterator;
109

1110
import java.sql.SQLException;
1211
import java.util.List;
@@ -24,16 +23,13 @@ public class ResultSetMetaDataImpl implements java.sql.ResultSetMetaData, JdbcV2
2423

2524
private final Map<ClickHouseDataType, Class<?>> typeClassMap;
2625

27-
private int columnCount;
28-
2926
public ResultSetMetaDataImpl(List<ClickHouseColumn> columns, String schema, String catalog, String tableName,
3027
Map<ClickHouseDataType, Class<?>> typeClassMap) {
3128
this.columns = ImmutableList.copyOf(columns);
3229
this.schema = schema;
3330
this.catalog = catalog;
3431
this.tableName = tableName;
3532
this.typeClassMap = typeClassMap;
36-
this.columnCount = columns.size();
3733
}
3834

3935
private ClickHouseColumn getColumn(int column) throws SQLException {
@@ -46,10 +42,6 @@ private ClickHouseColumn getColumn(int column) throws SQLException {
4642

4743
@Override
4844
public int getColumnCount() throws SQLException {
49-
return columnCount;
50-
}
51-
52-
public int getOriginalColumnCount() {
5345
return columns.size();
5446
}
5547

0 commit comments

Comments
 (0)