(iotdb) branch master updated: Pipe/PipeConsensus: support progressIndex for InsertRowsNode (#12806)

[tanxinyu]

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

tanxinyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 3fa0320d81d Pipe/PipeConsensus: support progressIndex for 
InsertRowsNode (#12806)
3fa0320d81d is described below

commit 3fa0320d81dc011f562fb4f57d8eb0b29728fe88
Author: Peng Junzhi <78788603+peng...@users.noreply.github.com>
AuthorDate: Tue Jun 25 22:57:17 2024 -0500

    Pipe/PipeConsensus: support progressIndex for InsertRowsNode (#12806)
    
    * support insertRowsNode progressIndex
    
    * revert
---
 .../plan/planner/plan/node/write/InsertRowsNode.java          | 11 +++++++++++
 .../apache/iotdb/db/storageengine/dataregion/DataRegion.java  |  2 ++
 2 files changed, 13 insertions(+)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java
index 49fb7fac631..b6f16b7d70a 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java
@@ -280,6 +280,17 @@ public class InsertRowsNode extends InsertNode implements 
WALEntryValue {
     insertRowNodeList.forEach(insertRowNode -> 
insertRowNode.setProgressIndex(progressIndex));
   }
 
+  public void updateProgressIndex(ProgressIndex progressIndex) {
+    if (progressIndex == null) {
+      return;
+    }
+
+    this.progressIndex =
+        (this.progressIndex == null)
+            ? progressIndex
+            : 
this.progressIndex.updateToMinimumEqualOrIsAfterProgressIndex(progressIndex);
+  }
+
   // region serialize & deserialize methods for WAL
   /** Serialized size for wal. */
   @Override
diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
index e26096b34ef..67eaad0988e 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
@@ -1204,6 +1204,7 @@ public class DataRegion implements IDataRegionForQuery {
               v.setAligned(insertRowNode.isAligned());
             }
             v.addOneInsertRowNode(insertRowNode, finalI);
+            v.updateProgressIndex(insertRowNode.getProgressIndex());
             return v;
           });
     }
@@ -3293,6 +3294,7 @@ public class DataRegion implements IDataRegionForQuery {
                 v.setAligned(insertRowNode.isAligned());
               }
               v.addOneInsertRowNode(insertRowNode, finalI);
+              v.updateProgressIndex(insertRowNode.getProgressIndex());
               return v;
             });
       }