This is an automated email from the ASF dual-hosted git repository. yongzao pushed a commit to branch Force-update-system-parameter in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8ca1e3e622ea4720be5c874f8e47d4ac3152efc2 Merge: 35e9e4c5777 bff402b99d3 Author: YongzaoDan <[email protected]> AuthorDate: Fri Jun 16 18:20:14 2023 +0800 Merge branch 'master' into Force-update-system-parameter docs/UserGuide/Maintenance-Tools/Watermark-Tool.md | 196 ------------------ .../UserGuide/Maintenance-Tools/Watermark-Tool.md | 196 ------------------ integration-test/import-control.xml | 1 - .../iotdb/it/env/cluster/MppCommonConfig.java | 24 --- .../it/env/cluster/MppSharedCommonConfig.java | 28 --- .../iotdb/it/env/remote/RemoteCommonConfig.java | 20 -- .../org/apache/iotdb/itbase/env/CommonConfig.java | 8 - .../iotdb/db/it/watermark/IoTDBWatermarkIT.java | 229 --------------------- .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 14 -- .../iotdb/jdbc/IoTDBDatabaseMetadataTest.java | 4 - .../thrift/src/main/thrift/client.thrift | 12 +- .../resources/conf/iotdb-common.properties | 16 -- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 75 ------- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 10 - .../iotdb/db/rescon/TsFileResourceManager.java | 2 +- .../service/thrift/impl/ClientRPCServiceImpl.java | 8 - .../watermark/GroupedLSBWatermarkEncoder.java | 150 -------------- .../db/tools/watermark/WatermarkDetector.java | 220 -------------------- .../iotdb/db/tools/watermark/WatermarkEncoder.java | 36 ---- 19 files changed, 5 insertions(+), 1244 deletions(-) diff --cc server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java index 2778084a414,b98bad05684..98aec0f7fcc --- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java @@@ -2192,68 -2218,14 +2179,6 @@@ public class IoTDBConfig this.enableQueryMemoryEstimation = enableQueryMemoryEstimation; } - public boolean isEnableWatermark() { - return enableWatermark; - } - - public void setEnableWatermark(boolean enableWatermark) { - this.enableWatermark = enableWatermark; - } - - public String getWatermarkSecretKey() { - return watermarkSecretKey; - } - - public void setWatermarkSecretKey(String watermarkSecretKey) { - this.watermarkSecretKey = watermarkSecretKey; - } - - public String getWatermarkBitString() { - return watermarkBitString; - } - - public void setWatermarkBitString(String watermarkBitString) { - this.watermarkBitString = watermarkBitString; - } - - public String getWatermarkMethod() { - return this.watermarkMethod; - } - - public void setWatermarkMethod(String watermarkMethod) { - this.watermarkMethod = watermarkMethod; - } - - public String getWatermarkMethodName() { - return watermarkMethod.split("\\(")[0]; - } - - public int getWatermarkParamMarkRate() { - return Integer.parseInt(getWatermarkParamValue("embed_row_cycle", "5")); - } - - public int getWatermarkParamMaxRightBit() { - return Integer.parseInt(getWatermarkParamValue("embed_lsb_num", "5")); - } - - private String getWatermarkParamValue(String key, String defaultValue) { - String res = getWatermarkParamValue(key); - if (res != null) { - return res; - } - return defaultValue; - public boolean isLastCacheEnabled() { - return lastCacheEnable; -- } -- - private String getWatermarkParamValue(String key) { - String pattern = key + "=(\\w*)"; - Pattern r = Pattern.compile(pattern); - Matcher m = r.matcher(watermarkMethod); - if (m.find() && m.groupCount() > 0) { - return m.group(1); - } - return null; - public void setEnableLastCache(boolean lastCacheEnable) { - this.lastCacheEnable = lastCacheEnable; -- } -- public boolean isAutoCreateSchemaEnabled() { return enableAutoCreateSchema; } diff --cc server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java index c1e37000d2f,a1a4104820e..bf7c35aad7e --- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java @@@ -735,17 -735,9 +735,9 @@@ public class ClientRPCServiceImpl imple properties.getSupportedTimeAggregationOperations().add(IoTDBConstant.MAX_TIME); properties.getSupportedTimeAggregationOperations().add(IoTDBConstant.MIN_TIME); properties.setTimestampPrecision( - IoTDBDescriptor.getInstance().getConfig().getTimestampPrecision()); + CommonDescriptor.getInstance().getConfig().getTimestampPrecision()); properties.setMaxConcurrentClientNum( IoTDBDescriptor.getInstance().getConfig().getRpcMaxConcurrentClientNum()); - properties.setWatermarkSecretKey( - IoTDBDescriptor.getInstance().getConfig().getWatermarkSecretKey()); - properties.setWatermarkBitString( - IoTDBDescriptor.getInstance().getConfig().getWatermarkBitString()); - properties.setWatermarkParamMarkRate( - IoTDBDescriptor.getInstance().getConfig().getWatermarkParamMarkRate()); - properties.setWatermarkParamMaxRightBit( - IoTDBDescriptor.getInstance().getConfig().getWatermarkParamMaxRightBit()); properties.setIsReadOnly(CommonDescriptor.getInstance().getConfig().isReadOnly()); properties.setThriftMaxFrameSize( IoTDBDescriptor.getInstance().getConfig().getThriftMaxFrameSize());
