Skip to content

Commit f5ec675

Browse files
authored
Merge pull request #2087 from ClickHouse/remove_old_client_usage
[client-v2] Remove Client-v1 usage and references
2 parents f5e34fe + 22dd8d6 commit f5ec675

File tree

7 files changed

+134
-1178
lines changed

7 files changed

+134
-1178
lines changed

client-v2/src/main/java/com/clickhouse/client/api/Client.java

Lines changed: 120 additions & 239 deletions
Large diffs are not rendered by default.

client-v2/src/main/java/com/clickhouse/client/api/insert/InsertResponse.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,17 @@
11
package com.clickhouse.client.api.insert;
22

3-
import com.clickhouse.client.ClickHouseResponse;
4-
import com.clickhouse.client.api.internal.ClientStatisticsHolder;
5-
import com.clickhouse.client.api.internal.ClientV1AdaptorHelper;
63
import com.clickhouse.client.api.metrics.OperationMetrics;
74
import com.clickhouse.client.api.metrics.ServerMetrics;
85

96
public class InsertResponse implements AutoCloseable {
10-
private final ClickHouseResponse responseRef;
117
private OperationMetrics operationMetrics;
128

13-
public InsertResponse(ClickHouseResponse responseRef,
14-
ClientStatisticsHolder clientStatisticsHolder) {
15-
this.responseRef = responseRef;
16-
this.operationMetrics = new OperationMetrics(clientStatisticsHolder);
17-
this.operationMetrics.operationComplete();
18-
this.operationMetrics.setQueryId(responseRef.getSummary().getQueryId());
19-
ClientV1AdaptorHelper.setServerStats(responseRef.getSummary().getProgress(), this.operationMetrics);
20-
}
21-
229
public InsertResponse(OperationMetrics metrics) {
23-
this.responseRef = null;
2410
this.operationMetrics = metrics;
2511
}
2612

2713
@Override
2814
public void close() {
29-
if (responseRef != null) {
30-
responseRef.close();
31-
}
3215
}
3316

3417
/**

client-v2/src/main/java/com/clickhouse/client/api/insert/InsertSettings.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.clickhouse.client.api.insert;
22

3+
import com.clickhouse.client.ClickHouseProtocol;
34
import com.clickhouse.client.api.Client;
45
import com.clickhouse.client.api.ClientConfigProperties;
5-
import com.clickhouse.client.api.internal.ServerSettings;
6+
import com.clickhouse.client.api.enums.Protocol;
67
import com.clickhouse.client.api.internal.ValidationUtils;
7-
import com.clickhouse.client.config.ClickHouseClientOption;
88
import org.apache.hc.core5.http.HttpHeaders;
99

1010
import java.util.Collection;
@@ -79,14 +79,14 @@ public InsertSettings setDeduplicationToken(String token) {
7979
}
8080

8181
public String getQueryId() {
82-
return (String) rawSettings.get(ClickHouseClientOption.QUERY_ID.getKey());
82+
return (String) rawSettings.get(ClientConfigProperties.QUERY_ID.getKey());
8383
}
8484

8585
/**
8686
* Sets the query id. This id will be sent to the server and can be used to identify the query.
8787
*/
8888
public InsertSettings setQueryId(String queryId) {
89-
rawSettings.put(ClickHouseClientOption.QUERY_ID.getKey(), queryId);
89+
rawSettings.put(ClientConfigProperties.QUERY_ID.getKey(), queryId);
9090
return this;
9191
}
9292

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

Lines changed: 0 additions & 83 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import com.clickhouse.client.ClickHouseNode;
44
import com.clickhouse.client.ClickHouseSslContextProvider;
55
import com.clickhouse.client.api.Client;
6+
import com.clickhouse.client.api.ClientConfigProperties;
67
import com.clickhouse.client.api.ClientException;
78
import com.clickhouse.client.api.ClientFaultCause;
89
import com.clickhouse.client.api.ClientMisconfigurationException;
9-
import com.clickhouse.client.api.ClientConfigProperties;
1010
import com.clickhouse.client.api.ConnectionInitiationException;
1111
import com.clickhouse.client.api.ConnectionReuseStrategy;
1212
import com.clickhouse.client.api.ServerException;

0 commit comments

Comments
 (0)