You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ne...@apache.org on 2023/01/04 07:37:38 UTC

[iotdb] branch master updated: fix the wal comment (#8673)

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

neuyilan 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 bd70ca269b fix the wal comment (#8673)
bd70ca269b is described below

commit bd70ca269bcdb1228bbc8ad36cf29aed0be948a0
Author: Houliang Qi <ne...@163.com>
AuthorDate: Wed Jan 4 15:37:33 2023 +0800

    fix the wal comment (#8673)
---
 .../apache/iotdb/db/wal/utils/WALFileUtils.java    |  4 ++--
 .../iotdb/db/wal/utils/WALFileUtilsTest.java       | 26 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/wal/utils/WALFileUtils.java b/server/src/main/java/org/apache/iotdb/db/wal/utils/WALFileUtils.java
index e5d945024b..8caade5b2e 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/utils/WALFileUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/utils/WALFileUtils.java
@@ -112,8 +112,8 @@ public class WALFileUtils {
    * _2-5-1.wal: 6, 7, 8, 9, -1, -1, -1, 10, 11, -1, 12, 12 <br>
    * _3-12-1.wal: 12, 12, 12, 12, 12 <br>
    * _4-12-1.wal: 12, 13, 14, 15, 16, -1 <br>
-   * searching [1, 5] will return 0, searching [6, 12] will return 1, search [13, infinity) will
-   * return 3, others will return -1
+   * searching [1, 5] will return 0, searching [6, 12] will return 2, search [13, infinity) will
+   * return 4, others will return -1
    *
    * @param files files to be searched
    * @param targetSearchIndex search index of target insert plan
diff --git a/server/src/test/java/org/apache/iotdb/db/wal/utils/WALFileUtilsTest.java b/server/src/test/java/org/apache/iotdb/db/wal/utils/WALFileUtilsTest.java
index 6b1ae078f6..dab5968d05 100644
--- a/server/src/test/java/org/apache/iotdb/db/wal/utils/WALFileUtilsTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/wal/utils/WALFileUtilsTest.java
@@ -212,4 +212,30 @@ public class WALFileUtilsTest {
     int i = WALFileUtils.binarySearchFileBySearchIndex(files, 12);
     Assert.assertEquals(7, i);
   }
+
+  @Test
+  public void binarySearchFileBySearchIndex13() {
+    File[] files =
+        new File[] {
+          new File(WALFileUtils.getLogFileName(0, 0, WALFileStatus.CONTAINS_SEARCH_INDEX)),
+          new File(WALFileUtils.getLogFileName(1, 5, WALFileStatus.CONTAINS_NONE_SEARCH_INDEX)),
+          new File(WALFileUtils.getLogFileName(2, 5, WALFileStatus.CONTAINS_SEARCH_INDEX)),
+          new File(WALFileUtils.getLogFileName(3, 12, WALFileStatus.CONTAINS_SEARCH_INDEX)),
+          new File(WALFileUtils.getLogFileName(4, 12, WALFileStatus.CONTAINS_SEARCH_INDEX)),
+        };
+    int i = WALFileUtils.binarySearchFileBySearchIndex(files, 5);
+    Assert.assertEquals(0, i);
+
+    i = WALFileUtils.binarySearchFileBySearchIndex(files, 6);
+    Assert.assertEquals(2, i);
+
+    i = WALFileUtils.binarySearchFileBySearchIndex(files, 13);
+    Assert.assertEquals(4, i);
+
+    i = WALFileUtils.binarySearchFileBySearchIndex(files, 100);
+    Assert.assertEquals(4, i);
+
+    i = WALFileUtils.binarySearchFileBySearchIndex(files, 0);
+    Assert.assertEquals(-1, i);
+  }
 }