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 2020/11/11 02:23:15 UTC
[iotdb] branch MasterQueryLog created (now 7e6b27e)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch MasterQueryLog
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at 7e6b27e fix bug
This branch includes the following new commits:
new 7e6b27e fix bug
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: fix bug
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch MasterQueryLog
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 7e6b27e19a9ba4ca3ab18cd295f47e30b57adbe3
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Wed Nov 11 10:22:43 2020 +0800
fix bug
---
.../engine/storagegroup/StorageGroupProcessor.java | 37 ++++++++++++++++++----
1 file changed, 31 insertions(+), 6 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index 2b49583..2b015b2 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -48,6 +48,8 @@ import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.directories.DirectoryManager;
import org.apache.iotdb.db.engine.StorageEngine;
+import org.apache.iotdb.db.engine.compaction.CompactionMergeTaskPoolManager;
+import org.apache.iotdb.db.engine.compaction.TsFileManagement;
import org.apache.iotdb.db.engine.compaction.level.LevelCompactionTsFileManagement;
import org.apache.iotdb.db.engine.fileSystem.SystemFileFactory;
import org.apache.iotdb.db.engine.flush.CloseFileListener;
@@ -58,8 +60,6 @@ import org.apache.iotdb.db.engine.merge.task.RecoverMergeTask;
import org.apache.iotdb.db.engine.modification.Deletion;
import org.apache.iotdb.db.engine.modification.ModificationFile;
import org.apache.iotdb.db.engine.querycontext.QueryDataSource;
-import org.apache.iotdb.db.engine.compaction.CompactionMergeTaskPoolManager;
-import org.apache.iotdb.db.engine.compaction.TsFileManagement;
import org.apache.iotdb.db.engine.version.SimpleFileVersionController;
import org.apache.iotdb.db.engine.version.VersionController;
import org.apache.iotdb.db.exception.BatchInsertionException;
@@ -86,6 +86,7 @@ import org.apache.iotdb.db.writelog.recover.TsFileRecoverPerformer;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.TSStatus;
+import org.apache.iotdb.tsfile.common.constant.TsFileConstant;
import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata;
import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer;
import org.apache.iotdb.tsfile.fileSystem.fsFactory.FSFactory;
@@ -121,6 +122,7 @@ public class StorageGroupProcessor {
public static final String MERGING_MODIFICATION_FILE_NAME = "merge.mods";
private static final String FAIL_TO_UPGRADE_FOLDER = "Failed to move {} to upgrade folder";
+ private static final Logger DEBUG_LOGGER = LoggerFactory.getLogger("QUERY_DEBUG");
/**
* All newly generated chunks after merge have version number 0, so we set merged Modification
@@ -557,10 +559,13 @@ public class StorageGroupProcessor {
private void recoverTsFiles(List<TsFileResource> tsFiles, boolean isSeq) {
for (int i = 0; i < tsFiles.size(); i++) {
- if (LevelCompactionTsFileManagement.getMergeLevel(tsFiles.get(i).getTsFile()) > 0) {
+ TsFileResource tsFileResource = tsFiles.get(i);
+ // this tsfile is not zero level, no need to perform recovery here
+ if (LevelCompactionTsFileManagement.getMergeLevel(tsFileResource.getTsFile()) > 0) {
+ tsFileResource.setClosed(true);
+ tsFileManagement.add(tsFileResource, isSeq);
continue;
}
- TsFileResource tsFileResource = tsFiles.get(i);
long timePartitionId = tsFileResource.getTimePartition();
TsFileRecoverPerformer recoverPerformer = new TsFileRecoverPerformer(
@@ -619,7 +624,7 @@ public class StorageGroupProcessor {
long chunkMetadataSize = 0;
for (Map<String, List<ChunkMetadata>> metaMap : writer.getMetadatasForQuery().values()) {
for (List<ChunkMetadata> metadatas : metaMap.values()) {
- for (ChunkMetadata chunkMetadata: metadatas) {
+ for (ChunkMetadata chunkMetadata : metadatas) {
chunkMetadataSize += chunkMetadata.calculateRamSize();
}
}
@@ -1383,6 +1388,13 @@ public class StorageGroupProcessor {
boolean isSeq)
throws MetadataException {
+ if (config.isDebugOn()) {
+ DEBUG_LOGGER.info(
+ "Path: " + deviceId.getFullPath() + TsFileConstant.PATH_SEPARATOR + measurementId
+ + ", get tsfile list: " + tsFileResources + " isSeq: " + isSeq + " timefilter: " + (
+ timeFilter == null ? "null" : timeFilter.toString()));
+ }
+
MeasurementSchema schema = IoTDB.metaManager.getSeriesSchema(deviceId, measurementId);
List<TsFileResource> tsfileResourcesForQuery = new ArrayList<>();
@@ -1431,6 +1443,10 @@ public class StorageGroupProcessor {
private boolean isTsFileResourceSatisfied(TsFileResource tsFileResource, String deviceId,
Filter timeFilter, boolean isSeq) {
if (!tsFileResource.containsDevice(deviceId)) {
+ if (config.isDebugOn()) {
+ DEBUG_LOGGER.info("Path: " + deviceId + " file " + tsFileResource
+ + " is not satisfied because of no device!");
+ }
return false;
}
@@ -1440,11 +1456,20 @@ public class StorageGroupProcessor {
: Long.MAX_VALUE;
if (!isAlive(endTime)) {
+ if (config.isDebugOn()) {
+ DEBUG_LOGGER.info("Path: " + deviceId + " file " + tsFileResource
+ + " is not satisfied because of ttl!");
+ }
return false;
}
if (timeFilter != null) {
- return timeFilter.satisfyStartEndTime(startTime, endTime);
+ boolean res = timeFilter.satisfyStartEndTime(startTime, endTime);
+ if (config.isDebugOn() && !res) {
+ DEBUG_LOGGER.info("Path: " + deviceId + " file " + tsFileResource
+ + " is not satisfied because of time filter!");
+ }
+ return res;
}
return true;
}