(tsfile) branch develop updated: Pipe meta sync: support meta data sync between different clusters

[jackietien]

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

jackietien pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/tsfile.git


The following commit(s) were added to refs/heads/develop by this push:
     new 874a61d5 Pipe meta sync: support meta data sync between different 
clusters
874a61d5 is described below

commit 874a61d510b8e8d4ff08270124ec4758459f40ae
Author: Caideyipi <87789683+caidey...@users.noreply.github.com>
AuthorDate: Mon Mar 11 14:24:30 2024 +0800

    Pipe meta sync: support meta data sync between different clusters
---
 common/src/main/java/org/apache/tsfile/utils/BitMap.java              | 4 ++--
 .../org/apache/tsfile/write/chunk/NonAlignedChunkGroupWriterImpl.java | 2 +-
 tsfile/src/main/java/org/apache/tsfile/write/record/Tablet.java       | 4 ++--
 tsfile/src/test/java/org/apache/tsfile/read/TsFileReaderTest.java     | 1 +
 tsfile/src/test/java/org/apache/tsfile/write/PerfTest.java            | 2 +-
 tsfile/src/test/java/org/apache/tsfile/write/record/TabletTest.java   | 3 +--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/src/main/java/org/apache/tsfile/utils/BitMap.java 
b/common/src/main/java/org/apache/tsfile/utils/BitMap.java
index ecdeea3a..bc454295 100644
--- a/common/src/main/java/org/apache/tsfile/utils/BitMap.java
+++ b/common/src/main/java/org/apache/tsfile/utils/BitMap.java
@@ -36,8 +36,8 @@ public class BitMap {
         (byte) 0X7F // 01111111
       };
 
-  private byte[] bits;
-  private int size;
+  private final byte[] bits;
+  private final int size;
 
   /** Initialize a BitMap with given size. */
   public BitMap(int size) {
diff --git 
a/tsfile/src/main/java/org/apache/tsfile/write/chunk/NonAlignedChunkGroupWriterImpl.java
 
b/tsfile/src/main/java/org/apache/tsfile/write/chunk/NonAlignedChunkGroupWriterImpl.java
index 4bf0617a..0753a8bc 100644
--- 
a/tsfile/src/main/java/org/apache/tsfile/write/chunk/NonAlignedChunkGroupWriterImpl.java
+++ 
b/tsfile/src/main/java/org/apache/tsfile/write/chunk/NonAlignedChunkGroupWriterImpl.java
@@ -46,7 +46,7 @@ public class NonAlignedChunkGroupWriterImpl implements 
IChunkGroupWriter {
   private final String deviceId;
 
   /** Map(measurementID, ChunkWriterImpl). Aligned measurementId is empty. */
-  private Map<String, ChunkWriterImpl> chunkWriters = new LinkedHashMap<>();
+  private final Map<String, ChunkWriterImpl> chunkWriters = new 
LinkedHashMap<>();
 
   // measurementId -> lastTime
   private Map<String, Long> lastTimeMap = new HashMap<>();
diff --git a/tsfile/src/main/java/org/apache/tsfile/write/record/Tablet.java 
b/tsfile/src/main/java/org/apache/tsfile/write/record/Tablet.java
index 943b5a3c..6f19faa0 100644
--- a/tsfile/src/main/java/org/apache/tsfile/write/record/Tablet.java
+++ b/tsfile/src/main/java/org/apache/tsfile/write/record/Tablet.java
@@ -767,7 +767,7 @@ public class Tablet {
     }
     if (thisBitMaps == null) {
       for (int i = 0; i < columns; i++) {
-        if (thatBitMaps[i] != null) {
+        if (thatBitMaps[i] != null && !thatBitMaps[i].isAllMarked()) {
           return false;
         }
       }
@@ -775,7 +775,7 @@ public class Tablet {
     }
     if (thatBitMaps == null) {
       for (int i = 0; i < columns; i++) {
-        if (thisBitMaps[i] != null) {
+        if (thisBitMaps[i] != null && !thisBitMaps[i].isAllMarked()) {
           return false;
         }
       }
diff --git a/tsfile/src/test/java/org/apache/tsfile/read/TsFileReaderTest.java 
b/tsfile/src/test/java/org/apache/tsfile/read/TsFileReaderTest.java
index d5e404d9..a6387ea3 100644
--- a/tsfile/src/test/java/org/apache/tsfile/read/TsFileReaderTest.java
+++ b/tsfile/src/test/java/org/apache/tsfile/read/TsFileReaderTest.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.tsfile.read;
 
 import org.apache.tsfile.common.conf.TSFileConfig;
diff --git a/tsfile/src/test/java/org/apache/tsfile/write/PerfTest.java 
b/tsfile/src/test/java/org/apache/tsfile/write/PerfTest.java
index 0a6fb6e9..3cdf1bc0 100755
--- a/tsfile/src/test/java/org/apache/tsfile/write/PerfTest.java
+++ b/tsfile/src/test/java/org/apache/tsfile/write/PerfTest.java
@@ -228,7 +228,7 @@ public class PerfTest {
   }
 
   @Test
-  public void writeTest() throws IOException, InterruptedException, 
WriteProcessException {
+  public void writeTest() throws IOException, InterruptedException {
     write();
   }
 }
diff --git 
a/tsfile/src/test/java/org/apache/tsfile/write/record/TabletTest.java 
b/tsfile/src/test/java/org/apache/tsfile/write/record/TabletTest.java
index 66cc37e9..07412e8d 100644
--- a/tsfile/src/test/java/org/apache/tsfile/write/record/TabletTest.java
+++ b/tsfile/src/test/java/org/apache/tsfile/write/record/TabletTest.java
@@ -31,7 +31,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 public class TabletTest {
@@ -102,7 +101,7 @@ public class TabletTest {
     try {
       ByteBuffer byteBuffer = tablet.serialize();
       Tablet newTablet = Tablet.deserialize(byteBuffer);
-      assertTrue(newTablet.equals(tablet));
+      assertEquals(newTablet, tablet);
     } catch (Exception e) {
       e.printStackTrace();
       fail();