You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/12/20 01:35:19 UTC
[iotdb] branch QueryMetrics updated: delete modification
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch QueryMetrics
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/QueryMetrics by this push:
new 40c026bd65 delete modification
40c026bd65 is described below
commit 40c026bd65a42050a58c24274c9b58d4919e0a5f
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Tue Dec 20 09:35:04 2022 +0800
delete modification
---
.../db/metadata/utils/ResourceByPathUtils.java | 17 ++++++------
.../metadata/DiskAlignedChunkMetadataLoader.java | 28 ++++++++++----------
.../chunk/metadata/DiskChunkMetadataLoader.java | 30 ++++++++++------------
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 20 +++++++--------
4 files changed, 44 insertions(+), 51 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/utils/ResourceByPathUtils.java b/server/src/main/java/org/apache/iotdb/db/metadata/utils/ResourceByPathUtils.java
index f13b173bce..a8da75391d 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/utils/ResourceByPathUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/utils/ResourceByPathUtils.java
@@ -29,7 +29,6 @@ import org.apache.iotdb.db.engine.memtable.IWritableMemChunk;
import org.apache.iotdb.db.engine.memtable.IWritableMemChunkGroup;
import org.apache.iotdb.db.engine.modification.Deletion;
import org.apache.iotdb.db.engine.modification.Modification;
-import org.apache.iotdb.db.engine.modification.ModificationFile;
import org.apache.iotdb.db.engine.querycontext.AlignedReadOnlyMemChunk;
import org.apache.iotdb.db.engine.querycontext.QueryDataSource;
import org.apache.iotdb.db.engine.querycontext.ReadOnlyMemChunk;
@@ -41,7 +40,6 @@ import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.query.filter.TsFileFilter;
import org.apache.iotdb.db.query.reader.series.AlignedSeriesReader;
import org.apache.iotdb.db.query.reader.series.SeriesReader;
-import org.apache.iotdb.db.utils.QueryUtils;
import org.apache.iotdb.db.utils.datastructure.TVList;
import org.apache.iotdb.tsfile.file.metadata.AlignedChunkMetadata;
import org.apache.iotdb.tsfile.file.metadata.AlignedTimeSeriesMetadata;
@@ -353,9 +351,9 @@ class AlignedResourceByPathUtils extends ResourceByPathUtils {
@Override
public List<IChunkMetadata> getVisibleMetadataListFromWriter(
RestorableTsFileIOWriter writer, TsFileResource tsFileResource, QueryContext context) {
- ModificationFile modificationFile = tsFileResource.getModFile();
- List<List<Modification>> modifications =
- context.getPathModifications(modificationFile, partialPath);
+ // ModificationFile modificationFile = tsFileResource.getModFile();
+ // List<List<Modification>> modifications =
+ // context.getPathModifications(modificationFile, partialPath);
List<AlignedChunkMetadata> chunkMetadataList = new ArrayList<>();
List<ChunkMetadata> timeChunkMetadataList =
@@ -384,7 +382,7 @@ class AlignedResourceByPathUtils extends ResourceByPathUtils {
}
}
- QueryUtils.modifyAlignedChunkMetaData(chunkMetadataList, modifications);
+ // QueryUtils.modifyAlignedChunkMetaData(chunkMetadataList, modifications);
chunkMetadataList.removeIf(context::chunkNotSatisfy);
return new ArrayList<>(chunkMetadataList);
}
@@ -554,8 +552,9 @@ class MeasurementResourceByPathUtils extends ResourceByPathUtils {
@Override
public List<IChunkMetadata> getVisibleMetadataListFromWriter(
RestorableTsFileIOWriter writer, TsFileResource tsFileResource, QueryContext context) {
- ModificationFile modificationFile = tsFileResource.getModFile();
- List<Modification> modifications = context.getPathModifications(modificationFile, partialPath);
+ // ModificationFile modificationFile = tsFileResource.getModFile();
+ // List<Modification> modifications = context.getPathModifications(modificationFile,
+ // partialPath);
List<IChunkMetadata> chunkMetadataList =
new ArrayList<>(
@@ -564,7 +563,7 @@ class MeasurementResourceByPathUtils extends ResourceByPathUtils {
partialPath.getMeasurement(),
partialPath.getSeriesType()));
- QueryUtils.modifyChunkMetaData(chunkMetadataList, modifications);
+ // QueryUtils.modifyChunkMetaData(chunkMetadataList, modifications);
chunkMetadataList.removeIf(context::chunkNotSatisfy);
return chunkMetadataList;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskAlignedChunkMetadataLoader.java b/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskAlignedChunkMetadataLoader.java
index 58d4a1c98a..0165630e1c 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskAlignedChunkMetadataLoader.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskAlignedChunkMetadataLoader.java
@@ -19,11 +19,9 @@
package org.apache.iotdb.db.query.reader.chunk.metadata;
import org.apache.iotdb.commons.path.AlignedPath;
-import org.apache.iotdb.db.engine.modification.Modification;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.query.reader.chunk.DiskAlignedChunkLoader;
-import org.apache.iotdb.db.utils.QueryUtils;
import org.apache.iotdb.tsfile.file.metadata.AlignedChunkMetadata;
import org.apache.iotdb.tsfile.file.metadata.AlignedTimeSeriesMetadata;
import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata;
@@ -61,19 +59,19 @@ public class DiskAlignedChunkMetadataLoader implements IChunkMetadataLoader {
((AlignedTimeSeriesMetadata) timeSeriesMetadata).getCopiedChunkMetadataList();
// get all sub sensors' modifications
- List<List<Modification>> pathModifications =
- context.getPathModifications(resource.getModFile(), seriesPath);
-
- if (context.isDebug()) {
- DEBUG_LOGGER.info(
- "Modifications size is {} for file Path: {} ",
- pathModifications.size(),
- resource.getTsFilePath());
- pathModifications.forEach(c -> DEBUG_LOGGER.info(c.toString()));
- }
-
- // remove ChunkMetadata that have been deleted
- QueryUtils.modifyAlignedChunkMetaData(alignedChunkMetadataList, pathModifications);
+ // List<List<Modification>> pathModifications =
+ // context.getPathModifications(resource.getModFile(), seriesPath);
+ //
+ // if (context.isDebug()) {
+ // DEBUG_LOGGER.info(
+ // "Modifications size is {} for file Path: {} ",
+ // pathModifications.size(),
+ // resource.getTsFilePath());
+ // pathModifications.forEach(c -> DEBUG_LOGGER.info(c.toString()));
+ // }
+ //
+ // // remove ChunkMetadata that have been deleted
+ // QueryUtils.modifyAlignedChunkMetaData(alignedChunkMetadataList, pathModifications);
if (context.isDebug()) {
DEBUG_LOGGER.info("After modification Chunk meta data list is: ");
diff --git a/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskChunkMetadataLoader.java b/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskChunkMetadataLoader.java
index 7b8856ec69..091cc5ba65 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskChunkMetadataLoader.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskChunkMetadataLoader.java
@@ -19,11 +19,9 @@
package org.apache.iotdb.db.query.reader.chunk.metadata;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.engine.modification.Modification;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.query.reader.chunk.DiskChunkLoader;
-import org.apache.iotdb.db.utils.QueryUtils;
import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata;
import org.apache.iotdb.tsfile.file.metadata.ITimeSeriesMetadata;
import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata;
@@ -59,20 +57,20 @@ public class DiskChunkMetadataLoader implements IChunkMetadataLoader {
List<IChunkMetadata> chunkMetadataList =
((TimeseriesMetadata) timeSeriesMetadata).getCopiedChunkMetadataList();
- List<Modification> pathModifications =
- context.getPathModifications(resource.getModFile(), seriesPath);
-
- if (context.isDebug()) {
- DEBUG_LOGGER.info(
- "Modifications size is {} for file Path: {} ",
- pathModifications.size(),
- resource.getTsFilePath());
- pathModifications.forEach(c -> DEBUG_LOGGER.info(c.toString()));
- }
-
- if (!pathModifications.isEmpty()) {
- QueryUtils.modifyChunkMetaData(chunkMetadataList, pathModifications);
- }
+ // List<Modification> pathModifications =
+ // context.getPathModifications(resource.getModFile(), seriesPath);
+
+ // if (context.isDebug()) {
+ // DEBUG_LOGGER.info(
+ // "Modifications size is {} for file Path: {} ",
+ // pathModifications.size(),
+ // resource.getTsFilePath());
+ // pathModifications.forEach(c -> DEBUG_LOGGER.info(c.toString()));
+ // }
+ //
+ // if (!pathModifications.isEmpty()) {
+ // QueryUtils.modifyChunkMetaData(chunkMetadataList, pathModifications);
+ // }
if (context.isDebug()) {
DEBUG_LOGGER.info("After modification Chunk meta data list is: ");
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 bdaffb8360..e002371be6 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
@@ -22,7 +22,6 @@ import org.apache.iotdb.commons.path.AlignedPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache;
import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache.TimeSeriesMetadataCacheKey;
-import org.apache.iotdb.db.engine.modification.Modification;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.engine.storagegroup.TsFileResourceStatus;
import org.apache.iotdb.db.mpp.statistics.QueryStatistics;
@@ -156,9 +155,9 @@ public class FileLoaderUtils {
}
if (timeSeriesMetadata != null) {
- List<Modification> pathModifications =
- context.getPathModifications(resource.getModFile(), seriesPath);
- timeSeriesMetadata.setModified(!pathModifications.isEmpty());
+ // List<Modification> pathModifications =
+ // context.getPathModifications(resource.getModFile(), seriesPath);
+ timeSeriesMetadata.setModified(false);
if (timeSeriesMetadata.getStatistics().getStartTime()
> timeSeriesMetadata.getStatistics().getEndTime()) {
return null;
@@ -257,17 +256,16 @@ public class FileLoaderUtils {
// 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());
+ // List<Modification> pathModifications =
+ // context.getPathModifications(
+ // resource.getModFile(), vectorPath.getPathWithMeasurement(i));
+ valueTimeSeriesMetadataList.get(i).setModified(false);
+ // modified = (modified || !pathModifications.isEmpty());
}
}
- alignedTimeSeriesMetadata.getTimeseriesMetadata().setModified(modified);
+ alignedTimeSeriesMetadata.getTimeseriesMetadata().setModified(false);
}
return alignedTimeSeriesMetadata;
} finally {