Skip to content

Commit 52164fd

Browse files
zhicwuzhicwu
authored
Merge pull request #766 from zhicwu/prepare-test-release
Prepare test release
2 parents 9e543e8 + ddd5a19 commit 52164fd

File tree

10 files changed

+165
-152
lines changed

10 files changed

+165
-152
lines changed

‎clickhouse-benchmark/src/main/java/com/clickhouse/benchmark/jdbc/JdbcDriver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public enum JdbcDriver {
1212
"jdbc:ch://%s:%s/%s?ssl=false&user=%s&password=%s&use_server_time_zone=false&use_time_zone=UTC&compress=%s",
1313
Constants.HTTP_PORT),
1414
ClickhouseGrpcJdbc("com.clickhouse.jdbc.ClickHouseDriver",
15-
"jdbc:ch:grpc://%s:%s/%s?ssl=false&user=%s&password=%s&use_server_time_zone=false&use_time_zone=UTC&compress=%s",
15+
"jdbc:ch:grpc://%s:%s/%s?ssl=false&user=%s&password=%s&use_server_time_zone=false&use_time_zone=UTC&max_inbound_message_size=2147483647&compress=%s",
1616
Constants.GRPC_PORT),
1717
ClickhouseJdbc("ru.yandex.clickhouse.ClickHouseDriver",
1818
"jdbc:clickhouse://%s:%s/%s?ssl=false&user=%s&password=%s&use_server_time_zone=false&use_time_zone=UTC&compress=%s",

‎clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseClientBuilder.java‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@
44
import java.util.HashMap;
55
import java.util.Map;
66
import java.util.Objects;
7-
import java.util.Properties;
87
import java.util.ServiceLoader;
9-
import java.util.Map.Entry;
108
import java.util.concurrent.ExecutorService;
119
import java.util.concurrent.ForkJoinPool;
1210

13-
import com.clickhouse.client.config.ClickHouseClientOption;
1411
import com.clickhouse.client.config.ClickHouseOption;
1512
import com.clickhouse.client.config.ClickHouseDefaults;
1613

@@ -186,33 +183,6 @@ public ClickHouseClientBuilder options(Map<ClickHouseOption, Serializable> optio
186183
return this;
187184
}
188185

189-
/**
190-
* Sets options.
191-
*
192-
* @param options options
193-
* @return this builder
194-
*/
195-
public ClickHouseClientBuilder options(Properties options) {
196-
if (options != null && !options.isEmpty()) {
197-
for (Entry<Object, Object> e : options.entrySet()) {
198-
Object key = e.getKey();
199-
Object value = e.getValue();
200-
if (key == null || value == null) {
201-
continue;
202-
}
203-
204-
ClickHouseClientOption o = ClickHouseClientOption.fromKey(key.toString());
205-
if (o != null) {
206-
this.options.put(o, ClickHouseOption.fromString(value.toString(), o.getValueType()));
207-
}
208-
}
209-
210-
resetConfig();
211-
}
212-
213-
return this;
214-
}
215-
216186
/*
217187
* public ClickHouseClientBuilder addUserType(Object... userTypeMappers) {
218188
* resetConfig(); return this; }

‎clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseDefaults.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.io.Serializable;
44

55
import com.clickhouse.client.ClickHouseChecker;
6-
import com.clickhouse.client.ClickHouseCompression;
76
import com.clickhouse.client.ClickHouseFormat;
87
import com.clickhouse.client.ClickHouseProtocol;
98

@@ -87,7 +86,7 @@ public enum ClickHouseDefaults implements ClickHouseOption {
8786

8887
private final String key;
8988
private final Serializable defaultValue;
90-
private final Class<?> clazz;
89+
private final Class<? extends Serializable> clazz;
9190
private final String description;
9291

9392
<T extends Serializable> ClickHouseDefaults(String key, T defaultValue, String description) {
@@ -118,7 +117,7 @@ public String getPrefix() {
118117
}
119118

120119
@Override
121-
public Class<?> getValueType() {
120+
public Class<? extends Serializable> getValueType() {
122121
return clazz;
123122
}
124123
}

‎clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseOption.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ default String getPrefix() {
164164
*
165165
* @return value type of the option, defaults to String
166166
*/
167-
Class<?> getValueType();
167+
Class<? extends Serializable> getValueType();
168168

169169
/**
170170
* Gets name of the option.

‎clickhouse-client/src/test/java/com/clickhouse/client/config/ClickHouseConfigOptionTest.java‎

Lines changed: 101 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -8,106 +8,110 @@
88
import com.clickhouse.client.ClickHouseFormat;
99

1010
public class ClickHouseConfigOptionTest {
11-
static enum ClickHouseTestOption implements ClickHouseOption {
12-
STR("string_option", "string", "string option"),
13-
STR0("string_option0", "string0", "string option without environment variable support"),
14-
STR1("string_option0", "string1", "string option without environment variable and system property support"),
15-
INT("integer_option", 2333, "integer option"),
16-
INT0("integer_option0", 23330, "integer option without environment variable support"),
17-
INT1("integer_option1", 23331, "integer option without environment variable and system property support"),
18-
BOOL("boolean_option", false, "boolean option"),
19-
BOOL0("boolean_option0", true, "boolean option without environment variable support"),
20-
BOOL1("boolean_option1", false, "boolean option without environment variable and system property support");
21-
22-
private final String key;
23-
private final Serializable defaultValue;
24-
private final Class<? extends Serializable> clazz;
25-
private final String description;
26-
27-
<T extends Serializable> ClickHouseTestOption(String key, T defaultValue, String description) {
28-
this.key = ClickHouseChecker.nonNull(key, "key");
29-
this.defaultValue = defaultValue;
30-
this.clazz = defaultValue.getClass();
31-
this.description = ClickHouseChecker.nonNull(description, "description");
11+
static enum ClickHouseTestOption implements ClickHouseOption {
12+
STR("string_option", "string", "string option"),
13+
STR0("string_option0", "string0", "string option without environment variable support"),
14+
STR1("string_option0", "string1",
15+
"string option without environment variable and system property support"),
16+
INT("integer_option", 2333, "integer option"),
17+
INT0("integer_option0", 23330, "integer option without environment variable support"),
18+
INT1("integer_option1", 23331,
19+
"integer option without environment variable and system property support"),
20+
BOOL("boolean_option", false, "boolean option"),
21+
BOOL0("boolean_option0", true, "boolean option without environment variable support"),
22+
BOOL1("boolean_option1", false,
23+
"boolean option without environment variable and system property support");
24+
25+
private final String key;
26+
private final Serializable defaultValue;
27+
private final Class<? extends Serializable> clazz;
28+
private final String description;
29+
30+
<T extends Serializable> ClickHouseTestOption(String key, T defaultValue, String description) {
31+
this.key = ClickHouseChecker.nonNull(key, "key");
32+
this.defaultValue = defaultValue;
33+
this.clazz = defaultValue.getClass();
34+
this.description = ClickHouseChecker.nonNull(description, "description");
35+
}
36+
37+
@Override
38+
public String getKey() {
39+
return key;
40+
}
41+
42+
@Override
43+
public Serializable getDefaultValue() {
44+
return defaultValue;
45+
}
46+
47+
@Override
48+
public Class<? extends Serializable> getValueType() {
49+
return clazz;
50+
}
51+
52+
@Override
53+
public String getDescription() {
54+
return description;
55+
}
3256
}
3357

34-
@Override
35-
public String getKey() {
36-
return key;
58+
@Test(groups = { "unit" })
59+
public void testFromString() {
60+
Assert.assertThrows(IllegalArgumentException.class,
61+
() -> ClickHouseOption.fromString(null, String.class));
62+
Assert.assertEquals(ClickHouseOption.fromString("", String.class), "");
63+
64+
Assert.assertEquals(ClickHouseOption.fromString("", Boolean.class), Boolean.FALSE);
65+
Assert.assertEquals(ClickHouseOption.fromString("Yes", Boolean.class), Boolean.FALSE);
66+
Assert.assertEquals(ClickHouseOption.fromString("1", Boolean.class), Boolean.TRUE);
67+
Assert.assertEquals(ClickHouseOption.fromString("true", Boolean.class), Boolean.TRUE);
68+
Assert.assertEquals(ClickHouseOption.fromString("True", Boolean.class), Boolean.TRUE);
69+
70+
Assert.assertEquals(ClickHouseOption.fromString("", Integer.class), Integer.valueOf(0));
71+
Assert.assertEquals(ClickHouseOption.fromString("0", Integer.class), Integer.valueOf(0));
72+
Assert.assertThrows(IllegalArgumentException.class,
73+
() -> ClickHouseOption.fromString(null, Integer.class));
74+
75+
Assert.assertEquals(ClickHouseOption.fromString("0.1", Float.class), Float.valueOf(0.1F));
76+
Assert.assertEquals(ClickHouseOption.fromString("NaN", Float.class), Float.valueOf(Float.NaN));
77+
78+
Assert.assertEquals(ClickHouseOption.fromString("Map", ClickHouseDataType.class),
79+
ClickHouseDataType.Map);
80+
Assert.assertEquals(ClickHouseOption.fromString("RowBinary", ClickHouseFormat.class),
81+
ClickHouseFormat.RowBinary);
82+
Assert.assertThrows(IllegalArgumentException.class,
83+
() -> ClickHouseOption.fromString("NonExistFormat", ClickHouseFormat.class));
3784
}
3885

39-
@Override
40-
public Serializable getDefaultValue() {
41-
return defaultValue;
86+
@Test(groups = { "unit" })
87+
public void testGetEffectiveDefaultValue() {
88+
// environment variables are set in pom.xml
89+
Assert.assertEquals(ClickHouseTestOption.STR.getEffectiveDefaultValue(),
90+
ClickHouseTestOption.STR.getDefaultValueFromEnvVar().get());
91+
Assert.assertEquals(ClickHouseTestOption.INT.getEffectiveDefaultValue(),
92+
Integer.parseInt(ClickHouseTestOption.INT.getDefaultValueFromEnvVar().get()));
93+
Assert.assertEquals(ClickHouseTestOption.BOOL.getEffectiveDefaultValue(),
94+
Boolean.valueOf(ClickHouseTestOption.BOOL.getDefaultValueFromEnvVar().get()));
95+
96+
String sv = "system.property";
97+
int iv = 12345;
98+
boolean bv = true;
99+
System.setProperty(ClickHouseTestOption.STR0.getPrefix().toLowerCase() + "_"
100+
+ ClickHouseTestOption.STR0.name().toLowerCase(), sv);
101+
System.setProperty(ClickHouseTestOption.INT0.getPrefix().toLowerCase() + "_"
102+
+ ClickHouseTestOption.INT0.name().toLowerCase(), String.valueOf(iv));
103+
System.setProperty(ClickHouseTestOption.BOOL0.getPrefix().toLowerCase() + "_"
104+
+ ClickHouseTestOption.BOOL0.name().toLowerCase(), String.valueOf(bv));
105+
106+
Assert.assertEquals(ClickHouseTestOption.STR0.getEffectiveDefaultValue(), sv);
107+
Assert.assertEquals(ClickHouseTestOption.INT0.getEffectiveDefaultValue(), iv);
108+
Assert.assertEquals(ClickHouseTestOption.BOOL0.getEffectiveDefaultValue(), bv);
109+
110+
Assert.assertEquals(ClickHouseTestOption.STR1.getEffectiveDefaultValue(),
111+
ClickHouseTestOption.STR1.getDefaultValue());
112+
Assert.assertEquals(ClickHouseTestOption.INT1.getEffectiveDefaultValue(),
113+
ClickHouseTestOption.INT1.getDefaultValue());
114+
Assert.assertEquals(ClickHouseTestOption.BOOL1.getEffectiveDefaultValue(),
115+
ClickHouseTestOption.BOOL1.getDefaultValue());
42116
}
43-
44-
@Override
45-
public Class<?> getValueType() {
46-
return clazz;
47-
}
48-
49-
@Override
50-
public String getDescription() {
51-
return description;
52-
}
53-
}
54-
55-
@Test(groups = { "unit" })
56-
public void testFromString() {
57-
Assert.assertThrows(IllegalArgumentException.class,
58-
() -> ClickHouseOption.fromString(null, String.class));
59-
Assert.assertEquals(ClickHouseOption.fromString("", String.class), "");
60-
61-
Assert.assertEquals(ClickHouseOption.fromString("", Boolean.class), Boolean.FALSE);
62-
Assert.assertEquals(ClickHouseOption.fromString("Yes", Boolean.class), Boolean.FALSE);
63-
Assert.assertEquals(ClickHouseOption.fromString("1", Boolean.class), Boolean.TRUE);
64-
Assert.assertEquals(ClickHouseOption.fromString("true", Boolean.class), Boolean.TRUE);
65-
Assert.assertEquals(ClickHouseOption.fromString("True", Boolean.class), Boolean.TRUE);
66-
67-
Assert.assertEquals(ClickHouseOption.fromString("", Integer.class), Integer.valueOf(0));
68-
Assert.assertEquals(ClickHouseOption.fromString("0", Integer.class), Integer.valueOf(0));
69-
Assert.assertThrows(IllegalArgumentException.class,
70-
() -> ClickHouseOption.fromString(null, Integer.class));
71-
72-
Assert.assertEquals(ClickHouseOption.fromString("0.1", Float.class), Float.valueOf(0.1F));
73-
Assert.assertEquals(ClickHouseOption.fromString("NaN", Float.class), Float.valueOf(Float.NaN));
74-
75-
Assert.assertEquals(ClickHouseOption.fromString("Map", ClickHouseDataType.class), ClickHouseDataType.Map);
76-
Assert.assertEquals(ClickHouseOption.fromString("RowBinary", ClickHouseFormat.class),
77-
ClickHouseFormat.RowBinary);
78-
Assert.assertThrows(IllegalArgumentException.class,
79-
() -> ClickHouseOption.fromString("NonExistFormat", ClickHouseFormat.class));
80-
}
81-
82-
@Test(groups = { "unit" })
83-
public void testGetEffectiveDefaultValue() {
84-
// environment variables are set in pom.xml
85-
Assert.assertEquals(ClickHouseTestOption.STR.getEffectiveDefaultValue(),
86-
ClickHouseTestOption.STR.getDefaultValueFromEnvVar().get());
87-
Assert.assertEquals(ClickHouseTestOption.INT.getEffectiveDefaultValue(),
88-
Integer.parseInt(ClickHouseTestOption.INT.getDefaultValueFromEnvVar().get()));
89-
Assert.assertEquals(ClickHouseTestOption.BOOL.getEffectiveDefaultValue(),
90-
Boolean.valueOf(ClickHouseTestOption.BOOL.getDefaultValueFromEnvVar().get()));
91-
92-
String sv = "system.property";
93-
int iv = 12345;
94-
boolean bv = true;
95-
System.setProperty(ClickHouseTestOption.STR0.getPrefix().toLowerCase() + "_"
96-
+ ClickHouseTestOption.STR0.name().toLowerCase(), sv);
97-
System.setProperty(ClickHouseTestOption.INT0.getPrefix().toLowerCase() + "_"
98-
+ ClickHouseTestOption.INT0.name().toLowerCase(), String.valueOf(iv));
99-
System.setProperty(ClickHouseTestOption.BOOL0.getPrefix().toLowerCase() + "_"
100-
+ ClickHouseTestOption.BOOL0.name().toLowerCase(), String.valueOf(bv));
101-
102-
Assert.assertEquals(ClickHouseTestOption.STR0.getEffectiveDefaultValue(), sv);
103-
Assert.assertEquals(ClickHouseTestOption.INT0.getEffectiveDefaultValue(), iv);
104-
Assert.assertEquals(ClickHouseTestOption.BOOL0.getEffectiveDefaultValue(), bv);
105-
106-
Assert.assertEquals(ClickHouseTestOption.STR1.getEffectiveDefaultValue(),
107-
ClickHouseTestOption.STR1.getDefaultValue());
108-
Assert.assertEquals(ClickHouseTestOption.INT1.getEffectiveDefaultValue(),
109-
ClickHouseTestOption.INT1.getDefaultValue());
110-
Assert.assertEquals(ClickHouseTestOption.BOOL1.getEffectiveDefaultValue(),
111-
ClickHouseTestOption.BOOL1.getDefaultValue());
112-
}
113117
}

‎clickhouse-grpc-client/src/main/java/com/clickhouse/client/grpc/config/ClickHouseGrpcOption.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public enum ClickHouseGrpcOption implements ClickHouseOption {
3737

3838
private final String key;
3939
private final Serializable defaultValue;
40-
private final Class<?> clazz;
40+
private final Class<? extends Serializable> clazz;
4141
private final String description;
4242

4343
<T extends Serializable> ClickHouseGrpcOption(String key, T defaultValue, String description) {
@@ -63,7 +63,7 @@ public String getKey() {
6363
}
6464

6565
@Override
66-
public Class<?> getValueType() {
66+
public Class<? extends Serializable> getValueType() {
6767
return clazz;
6868
}
6969
}

‎clickhouse-http-client/src/main/java/com/clickhouse/client/http/config/ClickHouseHttpOption.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public enum ClickHouseHttpOption implements ClickHouseOption {
4444

4545
private final String key;
4646
private final Serializable defaultValue;
47-
private final Class<?> clazz;
47+
private final Class<? extends Serializable> clazz;
4848
private final String description;
4949

5050
<T extends Serializable> ClickHouseHttpOption(String key, T defaultValue, String description) {
@@ -70,7 +70,7 @@ public String getKey() {
7070
}
7171

7272
@Override
73-
public Class<?> getValueType() {
73+
public Class<? extends Serializable> getValueType() {
7474
return clazz;
7575
}
7676
}

0 commit comments

Comments
 (0)