You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2023/04/21 07:11:20 UTC
[iotdb] branch for_tsbs updated: mock: getPathModifications in class QueryContext always return empty
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch for_tsbs
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/for_tsbs by this push:
new 1e2de40144 mock: getPathModifications in class QueryContext always return empty
1e2de40144 is described below
commit 1e2de40144169167a745e1176be19868a7bfe21c
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Fri Apr 21 15:11:04 2023 +0800
mock: getPathModifications in class QueryContext always return empty
---
.../iotdb/db/query/context/QueryContext.java | 42 +++++++++++-----------
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 21 ++++++-----
2 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/query/context/QueryContext.java b/server/src/main/java/org/apache/iotdb/db/query/context/QueryContext.java
index c3583f4070..1a696abe03 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/context/QueryContext.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/context/QueryContext.java
@@ -25,7 +25,6 @@ import org.apache.iotdb.commons.path.PatternTreeMap;
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.metadata.path.PatternTreeMapFactory;
import org.apache.iotdb.db.metadata.path.PatternTreeMapFactory.ModsSerializer;
import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata;
@@ -93,26 +92,29 @@ public class QueryContext {
* them from 'modFile' and put then into the cache.
*/
public List<Modification> getPathModifications(ModificationFile modFile, PartialPath path) {
+ return Collections.emptyList();
+
// if the mods file does not exist, do not add it to the cache
- if (!modFile.exists()) {
- return Collections.emptyList();
- }
- Map<String, List<Modification>> fileModifications =
- filePathModCache.computeIfAbsent(modFile.getFilePath(), k -> new ConcurrentHashMap<>());
- return fileModifications.computeIfAbsent(
- path.getFullPath(),
- k -> {
- PatternTreeMap<Modification, ModsSerializer> allModifications =
- fileModCache.get(modFile.getFilePath());
- if (allModifications == null) {
- allModifications = PatternTreeMapFactory.getModsPatternTreeMap();
- for (Modification modification : modFile.getModifications()) {
- allModifications.append(modification.getPath(), modification);
- }
- fileModCache.put(modFile.getFilePath(), allModifications);
- }
- return sortAndMerge(allModifications.getOverlapped(path));
- });
+ // if (!modFile.exists()) {
+ // return Collections.emptyList();
+ // }
+ // Map<String, List<Modification>> fileModifications =
+ // filePathModCache.computeIfAbsent(modFile.getFilePath(), k -> new
+ // ConcurrentHashMap<>());
+ // return fileModifications.computeIfAbsent(
+ // path.getFullPath(),
+ // k -> {
+ // PatternTreeMap<Modification, ModsSerializer> allModifications =
+ // fileModCache.get(modFile.getFilePath());
+ // if (allModifications == null) {
+ // allModifications = PatternTreeMapFactory.getModsPatternTreeMap();
+ // for (Modification modification : modFile.getModifications()) {
+ // allModifications.append(modification.getPath(), modification);
+ // }
+ // fileModCache.put(modFile.getFilePath(), allModifications);
+ // }
+ // return sortAndMerge(allModifications.getOverlapped(path));
+ // });
}
private List<Modification> sortAndMerge(List<Modification> modifications) {
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 ff83a81d00..c19dcafa20 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
@@ -269,17 +269,16 @@ public class FileLoaderUtils {
List<TimeseriesMetadata> valueTimeSeriesMetadataList =
alignedTimeSeriesMetadata.getValueTimeseriesMetadataList();
boolean modified = false;
- // FIXME comment for tsbs test
- // 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());
- // }
- // }
+ 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(