[iotdb] branch rel/1.1 updated: skip compaction resources validation if a task is InnerUnSequenceSpaceCompactionTask (#10717)

[xingtanzjr]

This is an automated email from the ASF dual-hosted git repository.

xingtanzjr pushed a commit to branch rel/1.1
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/1.1 by this push:
     new a270e5ab581 skip compaction resources validation if a task is 
InnerUnSequenceSpaceCompactionTask (#10717)
a270e5ab581 is described below

commit a270e5ab581da4f95cce6b22520448648be00e08
Author: shuwenwei <55970239+shuwen...@users.noreply.github.com>
AuthorDate: Fri Jul 28 19:01:06 2023 +0800

    skip compaction resources validation if a task is 
InnerUnSequenceSpaceCompactionTask (#10717)
---
 .../execute/task/InnerSpaceCompactionTask.java     | 27 ++++++++++++++--------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/InnerSpaceCompactionTask.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/InnerSpaceCompactionTask.java
index 777c3e0c537..6cd8875d184 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/InnerSpaceCompactionTask.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/InnerSpaceCompactionTask.java
@@ -186,15 +186,24 @@ public class InnerSpaceCompactionTask extends 
AbstractCompactionTask {
           compactionLogger.logFile(targetTsFileResource, 
CompactionLogger.STR_DELETED_TARGET_FILES);
         }
 
-        if 
(IoTDBDescriptor.getInstance().getConfig().isEnableCompactionValidation()
-            && (!CompactionUtils.validateTsFileResources(
-                    tsFileManager, storageGroupName, timePartition)
-                || !CompactionUtils.validateTsFiles(targetTsFileList))) {
-          LOGGER.error(
-              "Failed to pass compaction validation, source files is: {}, 
target files is {}",
-              selectedTsFileResourceList,
-              targetTsFileList);
-          throw new RuntimeException("Failed to pass compaction validation");
+        if 
(IoTDBDescriptor.getInstance().getConfig().isEnableCompactionValidation()) {
+          boolean passValidation = true;
+          if (sequence) {
+            passValidation =
+                CompactionUtils.validateTsFileResources(
+                        tsFileManager, storageGroupName, timePartition)
+                    && CompactionUtils.validateTsFiles(targetTsFileList);
+          } else {
+            // skip overlap validation if a task is unSequence inner space 
compaction task
+            passValidation = CompactionUtils.validateTsFiles(targetTsFileList);
+          }
+          if (!passValidation) {
+            LOGGER.error(
+                "Failed to pass compaction validation, source files is: {}, 
target files is {}",
+                selectedTsFileResourceList,
+                targetTsFileList);
+            throw new RuntimeException("Failed to pass compaction validation");
+          }
         }
 
         LOGGER.info(