tikv
/
client-java
mirror of https://github.com/tikv/client-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[close #446] Fix Optional fields type (#445)

This commit is contained in:
Qishang Zhong 2021-12-27 22:54:23 +08:00 committed by GitHub
parent d14713a961
commit b94b3cbce7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/org/tikv/common/TiConfiguration.java
View File

@ -360,12 +360,12 @@ public class TiConfiguration implements Serializable {
private int rawKVBatchWriteTimeoutInMS = getInt(TIKV_RAWKV_BATCH_WRITE_TIMEOUT_IN_MS); private int rawKVBatchWriteTimeoutInMS = getInt(TIKV_RAWKV_BATCH_WRITE_TIMEOUT_IN_MS);
private int rawKVScanTimeoutInMS = getInt(TIKV_RAWKV_SCAN_TIMEOUT_IN_MS); private int rawKVScanTimeoutInMS = getInt(TIKV_RAWKV_SCAN_TIMEOUT_IN_MS);
private int rawKVCleanTimeoutInMS = getInt(TIKV_RAWKV_CLEAN_TIMEOUT_IN_MS); private int rawKVCleanTimeoutInMS = getInt(TIKV_RAWKV_CLEAN_TIMEOUT_IN_MS);
private Optional<Integer> rawKVReadSlowLogInMS = getIntOption(TIKV_RAWKV_READ_SLOWLOG_IN_MS); private Integer rawKVReadSlowLogInMS = getIntOption(TIKV_RAWKV_READ_SLOWLOG_IN_MS).orElse(null);
private Optional<Integer> rawKVWriteSlowLogInMS = getIntOption(TIKV_RAWKV_WRITE_SLOWLOG_IN_MS); private Integer rawKVWriteSlowLogInMS = getIntOption(TIKV_RAWKV_WRITE_SLOWLOG_IN_MS).orElse(null);
private Optional<Integer> rawKVBatchReadSlowLogInMS = private Integer rawKVBatchReadSlowLogInMS =
getIntOption(TIKV_RAWKV_BATCH_READ_SLOWLOG_IN_MS); getIntOption(TIKV_RAWKV_BATCH_READ_SLOWLOG_IN_MS).orElse(null);
private Optional<Integer> rawKVBatchWriteSlowLogInMS = private Integer rawKVBatchWriteSlowLogInMS =
getIntOption(TIKV_RAWKV_BATCH_WRITE_SLOWLOG_IN_MS); getIntOption(TIKV_RAWKV_BATCH_WRITE_SLOWLOG_IN_MS).orElse(null);
private int rawKVScanSlowLogInMS = getInt(TIKV_RAWKV_SCAN_SLOWLOG_IN_MS); private int rawKVScanSlowLogInMS = getInt(TIKV_RAWKV_SCAN_SLOWLOG_IN_MS);
private boolean tlsEnable = getBoolean(TIKV_TLS_ENABLE); private boolean tlsEnable = getBoolean(TIKV_TLS_ENABLE);
@ -956,35 +956,35 @@ public class TiConfiguration implements Serializable {
} }
public Integer getRawKVReadSlowLogInMS() { public Integer getRawKVReadSlowLogInMS() {
return rawKVReadSlowLogInMS.orElse((int) (getTimeout() * 2)); return Optional.ofNullable(rawKVReadSlowLogInMS).orElse((int) (getTimeout() * 2));
} }
public void setRawKVReadSlowLogInMS(Integer rawKVReadSlowLogInMS) { public void setRawKVReadSlowLogInMS(Integer rawKVReadSlowLogInMS) {
this.rawKVReadSlowLogInMS = Optional.of(rawKVReadSlowLogInMS); this.rawKVReadSlowLogInMS = rawKVReadSlowLogInMS;
} }
public Integer getRawKVWriteSlowLogInMS() { public Integer getRawKVWriteSlowLogInMS() {
return rawKVWriteSlowLogInMS.orElse((int) (getTimeout() * 2)); return Optional.ofNullable(rawKVWriteSlowLogInMS).orElse((int) (getTimeout() * 2));
} }
public void setRawKVWriteSlowLogInMS(Integer rawKVWriteSlowLogInMS) { public void setRawKVWriteSlowLogInMS(Integer rawKVWriteSlowLogInMS) {
this.rawKVWriteSlowLogInMS = Optional.of(rawKVWriteSlowLogInMS); this.rawKVWriteSlowLogInMS = rawKVWriteSlowLogInMS;
} }
public Integer getRawKVBatchReadSlowLogInMS() { public Integer getRawKVBatchReadSlowLogInMS() {
return rawKVBatchReadSlowLogInMS.orElse((int) (getTimeout() * 2)); return Optional.ofNullable(rawKVBatchReadSlowLogInMS).orElse((int) (getTimeout() * 2));
} }
public void setRawKVBatchReadSlowLogInMS(Integer rawKVBatchReadSlowLogInMS) { public void setRawKVBatchReadSlowLogInMS(Integer rawKVBatchReadSlowLogInMS) {
this.rawKVBatchReadSlowLogInMS = Optional.of(rawKVBatchReadSlowLogInMS); this.rawKVBatchReadSlowLogInMS = rawKVBatchReadSlowLogInMS;
} }
public Integer getRawKVBatchWriteSlowLogInMS() { public Integer getRawKVBatchWriteSlowLogInMS() {
return rawKVBatchWriteSlowLogInMS.orElse((int) (getTimeout() * 2)); return Optional.ofNullable(rawKVBatchWriteSlowLogInMS).orElse((int) (getTimeout() * 2));
} }
public void setRawKVBatchWriteSlowLogInMS(Integer rawKVBatchWriteSlowLogInMS) { public void setRawKVBatchWriteSlowLogInMS(Integer rawKVBatchWriteSlowLogInMS) {
this.rawKVBatchWriteSlowLogInMS = Optional.of(rawKVBatchWriteSlowLogInMS); this.rawKVBatchWriteSlowLogInMS = rawKVBatchWriteSlowLogInMS;
} }
public int getRawKVScanSlowLogInMS() { public int getRawKVScanSlowLogInMS() {

22
src/test/java/org/tikv/common/TiConfigurationTest.java
View File

@ -20,6 +20,9 @@ import static org.junit.Assert.assertFalse;
import static org.tikv.common.ConfigUtils.TIKV_GRPC_HEALTH_CHECK_TIMEOUT; import static org.tikv.common.ConfigUtils.TIKV_GRPC_HEALTH_CHECK_TIMEOUT;
import static org.tikv.common.ConfigUtils.TIKV_HEALTH_CHECK_PERIOD_DURATION; import static org.tikv.common.ConfigUtils.TIKV_HEALTH_CHECK_PERIOD_DURATION;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
@ -78,4 +81,23 @@ public class TiConfigurationTest {
TiConfiguration conf = TiConfiguration.createRawDefault(); TiConfiguration conf = TiConfiguration.createRawDefault();
assertFalse(conf.isJksEnable()); assertFalse(conf.isJksEnable());
} }
@Test
public void slowLogDefaultValueTest() {
TiConfiguration conf = TiConfiguration.createRawDefault();
assertEquals(conf.getTimeout() * 2, conf.getRawKVReadSlowLogInMS().longValue());
assertEquals(conf.getTimeout() * 2, conf.getRawKVWriteSlowLogInMS().longValue());
assertEquals(conf.getTimeout() * 2, conf.getRawKVBatchReadSlowLogInMS().longValue());
assertEquals(conf.getTimeout() * 2, conf.getRawKVBatchWriteSlowLogInMS().longValue());
}
@Test
public void serializeTest() throws IOException {
TiConfiguration conf = TiConfiguration.createDefault();
try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos)) {
oos.writeObject(conf);
oos.flush();
}
}
} }