This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch caLastOpt in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9b33983f8635fdcc280ea1ac079fd4808c3f7427 Author: JackieTien97 <[email protected]> AuthorDate: Thu May 11 14:17:49 2023 +0800 opt --- .../db/engine/cache/TimeSeriesMetadataCache.java | 2 +- .../org/apache/iotdb/db/utils/FileLoaderUtils.java | 61 +++++++++------------- .../org/apache/iotdb/tsfile/read/common/Path.java | 2 +- 3 files changed, 28 insertions(+), 37 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java b/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java index 25a2a6b4f6e..6091af75fde 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java @@ -162,7 +162,7 @@ public class TimeSeriesMetadataCache { if (timeseriesMetadata == null) { cacheHit = false; - Path path = new Path(key.device, key.measurement, true); + Path path = new Path(key.device, key.measurement, false); // bloom filter part BloomFilter bloomFilter = BloomFilterCache.getInstance() diff --git a/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java index 1dc6500ac4f..d558d0cf015 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java @@ -52,11 +52,9 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import static org.apache.iotdb.db.mpp.metric.SeriesScanCostMetricSet.LOAD_TIMESERIES_METADATA_ALIGNED_DISK; import static org.apache.iotdb.db.mpp.metric.SeriesScanCostMetricSet.LOAD_TIMESERIES_METADATA_ALIGNED_MEM; import static org.apache.iotdb.db.mpp.metric.SeriesScanCostMetricSet.LOAD_TIMESERIES_METADATA_NONALIGNED_DISK; import static org.apache.iotdb.db.mpp.metric.SeriesScanCostMetricSet.LOAD_TIMESERIES_METADATA_NONALIGNED_MEM; -import static org.apache.iotdb.db.mpp.metric.SeriesScanCostMetricSet.TIMESERIES_METADATA_MODIFICATION_ALIGNED; import static org.apache.iotdb.db.mpp.metric.SeriesScanCostMetricSet.TIMESERIES_METADATA_MODIFICATION_NONALIGNED; public class FileLoaderUtils { @@ -252,45 +250,38 @@ public class FileLoaderUtils { } if (alignedTimeSeriesMetadata != null) { - long t2 = System.nanoTime(); - try { - if (alignedTimeSeriesMetadata.getTimeseriesMetadata().getStatistics().getStartTime() - > alignedTimeSeriesMetadata.getTimeseriesMetadata().getStatistics().getEndTime()) { - return null; - } - if (filter != null - && !filter.satisfyStartEndTime( - alignedTimeSeriesMetadata.getTimeseriesMetadata().getStatistics().getStartTime(), - alignedTimeSeriesMetadata.getTimeseriesMetadata().getStatistics().getEndTime())) { - return null; - } + if (alignedTimeSeriesMetadata.getTimeseriesMetadata().getStatistics().getStartTime() + > alignedTimeSeriesMetadata.getTimeseriesMetadata().getStatistics().getEndTime()) { + return null; + } + if (filter != null + && !filter.satisfyStartEndTime( + alignedTimeSeriesMetadata.getTimeseriesMetadata().getStatistics().getStartTime(), + alignedTimeSeriesMetadata.getTimeseriesMetadata().getStatistics().getEndTime())) { + return null; + } - // set modifications to each aligned path - List<TimeseriesMetadata> valueTimeSeriesMetadataList = - alignedTimeSeriesMetadata.getValueTimeseriesMetadataList(); - boolean modified = false; - for (int i = 0; i < valueTimeSeriesMetadataList.size(); i++) { - if (valueTimeSeriesMetadataList.get(i) != null) { - List<Modification> pathModifications = - context.getPathModifications( - resource.getModFile(), vectorPath.getPathWithMeasurement(i)); - valueTimeSeriesMetadataList.get(i).setModified(!pathModifications.isEmpty()); - modified = (modified || !pathModifications.isEmpty()); - } + // set modifications to each aligned path + List<TimeseriesMetadata> valueTimeSeriesMetadataList = + alignedTimeSeriesMetadata.getValueTimeseriesMetadataList(); + boolean modified = false; + for (int i = 0; i < valueTimeSeriesMetadataList.size(); i++) { + if (valueTimeSeriesMetadataList.get(i) != null) { + List<Modification> pathModifications = + context.getPathModifications( + resource.getModFile(), vectorPath.getPathWithMeasurement(i)); + valueTimeSeriesMetadataList.get(i).setModified(!pathModifications.isEmpty()); + modified = (modified || !pathModifications.isEmpty()); } - alignedTimeSeriesMetadata.getTimeseriesMetadata().setModified(modified); - } finally { - QUERY_METRICS.recordSeriesScanCost( - TIMESERIES_METADATA_MODIFICATION_ALIGNED, System.nanoTime() - t2); } + alignedTimeSeriesMetadata.getTimeseriesMetadata().setModified(modified); } return alignedTimeSeriesMetadata; } finally { - QUERY_METRICS.recordSeriesScanCost( - loadFromMem - ? LOAD_TIMESERIES_METADATA_ALIGNED_MEM - : LOAD_TIMESERIES_METADATA_ALIGNED_DISK, - System.nanoTime() - t1); + if (loadFromMem) { + QUERY_METRICS.recordSeriesScanCost( + LOAD_TIMESERIES_METADATA_ALIGNED_MEM, System.nanoTime() - t1); + } } } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Path.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Path.java index 043a950099e..8fa1967259f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Path.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Path.java @@ -102,7 +102,7 @@ public class Path implements Serializable, Comparable<Path> { if (!needCheck) { this.measurement = measurement; this.device = device; - this.fullPath = device + "." + measurement; + this.fullPath = device + TsFileConstant.PATH_SEPARATOR + measurement; return; } // use PathNodesGenerator to check whether path is legal.
