This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch pipe-rename in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 21fc08d78aa0e4c554bc7ba031c0e50c96577cda Author: Steve Yurong Su <[email protected]> AuthorDate: Fri Oct 27 10:12:40 2023 +0800 rename: "extractor.history.sloppy-time-range" -> "extractor.history.loose-range" --- .../db/pipe/config/constant/PipeExtractorConstant.java | 3 +-- .../PipeHistoricalDataRegionTsFileExtractor.java | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/config/constant/PipeExtractorConstant.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/config/constant/PipeExtractorConstant.java index b4be2ed34b9..f432e9838cd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/config/constant/PipeExtractorConstant.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/config/constant/PipeExtractorConstant.java @@ -33,8 +33,7 @@ public class PipeExtractorConstant { public static final String EXTRACTOR_HISTORY_ENABLE_KEY = "extractor.history.enable"; public static final String EXTRACTOR_HISTORY_START_TIME = "extractor.history.start-time"; public static final String EXTRACTOR_HISTORY_END_TIME = "extractor.history.end-time"; - public static final String EXTRACTOR_HISTORY_SLOPPY_TIME_RANGE = - "extractor.history.sloppy-time-range"; + public static final String EXTRACTOR_HISTORY_LOOSE_RANGE = "extractor.history.loose-range"; public static final String EXTRACTOR_REALTIME_ENABLE = "extractor.realtime.enable"; public static final String EXTRACTOR_REALTIME_MODE = "extractor.realtime.mode"; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/historical/PipeHistoricalDataRegionTsFileExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/historical/PipeHistoricalDataRegionTsFileExtractor.java index 37da7db751b..0b00632ff0f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/historical/PipeHistoricalDataRegionTsFileExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/historical/PipeHistoricalDataRegionTsFileExtractor.java @@ -42,6 +42,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.time.ZoneId; import java.util.ArrayDeque; +import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -50,7 +51,7 @@ import java.util.stream.Collectors; import static org.apache.iotdb.db.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_ENABLE_KEY; import static org.apache.iotdb.db.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_END_TIME; -import static org.apache.iotdb.db.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_SLOPPY_TIME_RANGE; +import static org.apache.iotdb.db.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_LOOSE_RANGE; import static org.apache.iotdb.db.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_START_TIME; import static org.apache.iotdb.db.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_PATTERN_DEFAULT_VALUE; import static org.apache.iotdb.db.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_PATTERN_KEY; @@ -166,7 +167,20 @@ public class PipeHistoricalDataRegionTsFileExtractor implements PipeHistoricalDa } } - sloppyTimeRange = parameters.getBooleanOrDefault(EXTRACTOR_HISTORY_SLOPPY_TIME_RANGE, false); + sloppyTimeRange = + Arrays.stream(parameters.getStringOrDefault(EXTRACTOR_HISTORY_LOOSE_RANGE, "").split(",")) + .map(String::trim) + .map(String::toLowerCase) + .collect(Collectors.toSet()) + .contains("time"); + + LOGGER.info( + "historical data extraction time range, start time {}({}), end time {}({}), sloppy time range {}", + DateTimeUtils.convertLongToDate(historicalDataExtractionStartTime), + historicalDataExtractionStartTime, + DateTimeUtils.convertLongToDate(historicalDataExtractionEndTime), + historicalDataExtractionEndTime, + sloppyTimeRange); } private void flushDataRegionAllTsFiles() {
