zhanglingzhe0820 commented on a change in pull request #1758:
URL: https://github.com/apache/iotdb/pull/1758#discussion_r508539696
##########
File path:
server/src/main/java/org/apache/iotdb/db/engine/tsfilemanagement/TsFileManagement.java
##########
@@ -19,24 +19,56 @@
package org.apache.iotdb.db.engine.tsfilemanagement;
+import static
org.apache.iotdb.db.engine.storagegroup.StorageGroupProcessor.MERGING_MODIFICATION_FILE_NAME;
+
+import java.io.File;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.db.engine.merge.manage.MergeManager;
+import org.apache.iotdb.db.engine.merge.manage.MergeResource;
+import org.apache.iotdb.db.engine.merge.selector.IMergeFileSelector;
+import org.apache.iotdb.db.engine.merge.selector.MaxFileMergeFileSelector;
+import org.apache.iotdb.db.engine.merge.selector.MaxSeriesMergeFileSelector;
+import org.apache.iotdb.db.engine.merge.selector.MergeFileStrategy;
+import org.apache.iotdb.db.engine.merge.task.MergeTask;
+import org.apache.iotdb.db.engine.modification.Modification;
+import org.apache.iotdb.db.engine.modification.ModificationFile;
import
org.apache.iotdb.db.engine.storagegroup.StorageGroupProcessor.CloseHotCompactionMergeCallBack;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
+import org.apache.iotdb.db.engine.tsfilemanagement.level.LevelTsFileManagement;
+import org.apache.iotdb.db.exception.MergeException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class TsFileManagement {
+ private static final Logger logger =
LoggerFactory.getLogger(TsFileManagement.class);
protected String storageGroupName;
protected String storageGroupDir;
+
+ /**
+ * mergeLock is to be used in the merge process. Concurrent queries,
deletions and merges may
+ * result in losing some deletion in the merged new file, so a lock is
necessary.
+ */
+ public ReentrantReadWriteLock mergeLock = new ReentrantReadWriteLock();
/**
* hotCompactionMergeLock is used to wait for TsFile list change in hot
compaction merge
* processor.
*/
private final ReadWriteLock hotCompactionMergeLock = new
ReentrantReadWriteLock();
+ public volatile boolean isUnseqMerging = false;
Review comment:
use in test
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
