Skip to content

Commit 0b32f08

Browse files
chernserchernser
committed
removed most dependencies on clickhouse-client. mainly settings
1 parent adab923 commit 0b32f08

File tree

10 files changed

+209
-165
lines changed

10 files changed

+209
-165
lines changed

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

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

‎client-v2/src/main/java/com/clickhouse/client/api/ClientSettings.java‎

Lines changed: 91 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.clickhouse.client.api;
22

3+
import com.clickhouse.client.api.internal.SettingsConverter;
4+
import com.clickhouse.client.api.metrics.ClientMetrics;
5+
36
import java.util.Arrays;
47
import java.util.Collection;
58
import java.util.Collections;
@@ -40,25 +43,104 @@ public static List<String> valuesFromCommaSeparated(String value) {
4043

4144
public static final String HTTP_USE_BASIC_AUTH = "http_use_basic_auth";
4245

43-
// -- Experimental features --
46+
public static final String USER = "user";
47+
48+
public static final String PASSWORD = "password";
4449

4550
/**
46-
* Server will expect a string in JSON format and parse it into a JSON object.
51+
* Maximum number of active connection in internal connection pool.
4752
*/
48-
public static final String INPUT_FORMAT_BINARY_READ_JSON_AS_STRING = "input_format_binary_read_json_as_string";
53+
public static final String HTTP_MAX_OPEN_CONNECTIONS = "max_open_connections";
4954

5055
/**
51-
* Server will return a JSON object as a string.
56+
* HTTP keep-alive timeout override.
5257
*/
53-
public static final String OUTPUT_FORMAT_BINARY_WRITE_JSON_AS_STRING = "output_format_binary_write_json_as_string";
58+
public static final String HTTP_KEEP_ALIVE_TIMEOUT = "http_keep_alive_timeout";
59+
60+
public static final String USE_SERVER_TIMEZONE = "use_server_time_zone";
61+
62+
public static final String USE_TIMEZONE = "use_time_zone";
63+
64+
public static final String SERVER_TIMEZONE = "server_time_zone";
65+
66+
public static final String ASYNC_OPERATIONS = "async";
67+
68+
public static final String CONNECTION_TTL = "connection_ttl";
69+
70+
public static final String CONNECTION_TIMEOUT = "connection_timeout";
71+
72+
public static final String CONNECTION_REUSE_STRATEGY = "connection_reuse_strategy";
73+
74+
public static final String SOCKET_OPERATION_TIMEOUT = "socket_timeout";
75+
76+
public static final String SOCKET_RCVBUF_OPT = "socket_rcvbuf";
77+
78+
public static final String SOCKET_SNDBUF_OPT = "socket_sndbuf";
79+
80+
public static final String SOCKET_REUSEADDR_OPT = "socket_reuseaddr";
81+
82+
public static final String SOCKET_KEEPALIVE_OPT = "socket_keepalive";
83+
84+
public static final String SOCKET_TCP_NO_DELAY_OPT = "socket_tcp_nodelay";
85+
86+
public static final String SOCKET_LINGER_OPT = "socket_linger";
87+
88+
public static final String DATABASE = "database";
89+
90+
public static final String COMPRESS_SERVER_RESPONSE = "compress"; // actually a server setting
91+
92+
public static final String COMPRESS_CLIENT_REQUEST = "decompress"; // actually a server setting
93+
94+
public static final String USE_HTTP_COMPRESSION = "client.use_http_compression";
95+
96+
public static final String COMPRESSION_LZ4_UNCOMPRESSED_BUF_SIZE = "compression.lz4.uncompressed_buffer_size";
97+
98+
public static final String PROXY_TYPE = "proxy_type"; // "http"
99+
100+
public static final String PROXY_HOST = "proxy_host";
101+
102+
public static final String PROXY_PORT = "proxy_port";
103+
104+
public static final String PROXY_USER = "proxy_user";
105+
106+
public static final String PROXY_PASSWORD = "proxy_password";
107+
108+
public static final String MAX_EXECUTION_TIME = "max_execution_time";
109+
110+
public static final String SSL_TRUST_STORE = "trust_store";
111+
112+
public static final String SSL_KEYSTORE_TYPE = "key_store_type";
113+
114+
public static final String SSL_KEY_STORE = "ssl_key_store";
115+
116+
public static final String SSL_KEY_STORE_PASSWORD = "key_store_password";
117+
118+
public static final String SSL_KEY = "ssl_key";
119+
120+
public static final String CA_CERTIFICATE = "sslrootcert";
121+
122+
public static final String SSL_CERTIFICATE = "sslcert";
123+
124+
public static final String RETRY_ON_FAILURE = "retry";
125+
126+
public static final String INPUT_OUTPUT_FORMAT = "format";
127+
128+
public static final String MAX_THREADS_PER_CLIENT = "max_threads_per_client";
129+
130+
public static final String QUERY_ID = "query_id"; // actually a server setting
131+
132+
public static final String CLIENT_NETWORK_BUFFER_SIZE = "client_network_buffer_size";
133+
134+
// -- Experimental features --
54135

55136
/**
56-
* Maximum number of active connection in internal connection pool.
137+
* Server will expect a string in JSON format and parse it into a JSON object.
57138
*/
58-
public static final String HTTP_MAX_OPEN_CONNECTIONS = "max_open_connections";
139+
public static final String INPUT_FORMAT_BINARY_READ_JSON_AS_STRING = "input_format_binary_read_json_as_string";
59140

60141
/**
61-
* HTTP keep-alive timeout override.
142+
* Server will return a JSON object as a string.
62143
*/
63-
public static final String HTTP_KEEP_ALIVE_TIMEOUT = "http_keep_alive_timeout";
144+
public static final String OUTPUT_FORMAT_BINARY_WRITE_JSON_AS_STRING = "output_format_binary_write_json_as_string";
145+
64146
}

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.clickhouse.client.api.query.NullValueException;
99
import com.clickhouse.client.api.query.POJOSetter;
1010
import com.clickhouse.client.api.query.QuerySettings;
11-
import com.clickhouse.client.config.ClickHouseClientOption;
1211
import com.clickhouse.data.ClickHouseColumn;
1312
import com.clickhouse.data.value.ClickHouseBitmap;
1413
import com.clickhouse.data.value.ClickHouseGeoMultiPolygonValue;
@@ -34,10 +33,8 @@
3433
import java.time.temporal.ChronoUnit;
3534
import java.util.Collections;
3635
import java.util.HashMap;
37-
import java.util.HashSet;
3836
import java.util.List;
3937
import java.util.Map;
40-
import java.util.Set;
4138
import java.util.TimeZone;
4239
import java.util.UUID;
4340
import java.util.concurrent.ConcurrentHashMap;
@@ -69,9 +66,9 @@ protected AbstractBinaryFormatReader(InputStream inputStream, QuerySettings quer
6966
BinaryStreamReader.ByteBufferAllocator byteBufferAllocator) {
7067
this.input = inputStream;
7168
this.settings = querySettings == null ? Collections.emptyMap() : new HashMap<>(querySettings.getAllSettings());
72-
Boolean useServerTimeZone = (Boolean) this.settings.get(ClickHouseClientOption.USE_SERVER_TIME_ZONE.getKey());
69+
Boolean useServerTimeZone = (Boolean) this.settings.get(ClientSettings.USE_SERVER_TIMEZONE);
7370
TimeZone timeZone = useServerTimeZone == Boolean.TRUE && querySettings != null ? querySettings.getServerTimeZone() :
74-
(TimeZone) this.settings.get(ClickHouseClientOption.USE_TIME_ZONE.getKey());
71+
(TimeZone) this.settings.get(ClientSettings.USE_TIMEZONE);
7572
if (timeZone == null) {
7673
throw new ClientException("Time zone is not set. (useServerTimezone:" + useServerTimeZone + ")");
7774
}

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

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

3-
import com.clickhouse.client.ClickHouseClient;
43
import com.clickhouse.client.ClickHouseResponse;
54
import com.clickhouse.client.api.internal.ClientStatisticsHolder;
65
import com.clickhouse.client.api.internal.ClientV1AdaptorHelper;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
import com.clickhouse.client.api.Client;
44
import com.clickhouse.client.api.ClientSettings;
5-
import com.clickhouse.client.api.command.CommandSettings;
65
import com.clickhouse.client.api.internal.ValidationUtils;
7-
import com.clickhouse.client.api.query.QuerySettings;
86
import com.clickhouse.client.config.ClickHouseClientOption;
97

108
import java.util.Collection;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.clickhouse.client.api.metrics.OperationMetrics;
1212
import com.clickhouse.client.api.metrics.ServerMetrics;
1313
import com.clickhouse.client.config.ClickHouseClientOption;
14-
import com.clickhouse.client.config.ClickHouseProxyType;
1514
import com.clickhouse.config.ClickHouseOption;
1615

1716
import java.io.Serializable;

0 commit comments

Comments
 (0)