(tsfile) branch develop updated: Add decryptor in UnclosedFileReader (#240)

[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 b1bdd045 Add decryptor in UnclosedFileReader (#240)
b1bdd045 is described below

commit b1bdd045b66ba5d6ada45aba16aea0d42b935a80
Author: Jiang Tian <jt2594...@163.com>
AuthorDate: Wed Sep 11 20:09:28 2024 +0800

    Add decryptor in UnclosedFileReader (#240)
---
 .../apache/tsfile/read/UnClosedTsFileReader.java   | 15 +++++
 .../tsfile/read/UnClosedTsFileReaderTest.java      | 75 ++++++++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git 
a/java/tsfile/src/main/java/org/apache/tsfile/read/UnClosedTsFileReader.java 
b/java/tsfile/src/main/java/org/apache/tsfile/read/UnClosedTsFileReader.java
index 4c19dac9..930bfcc2 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/read/UnClosedTsFileReader.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/read/UnClosedTsFileReader.java
@@ -19,6 +19,8 @@
 
 package org.apache.tsfile.read;
 
+import org.apache.tsfile.encrypt.EncryptUtils;
+import org.apache.tsfile.encrypt.IDecryptor;
 import org.apache.tsfile.exception.NotImplementedException;
 import org.apache.tsfile.file.metadata.TsFileMetadata;
 
@@ -27,8 +29,16 @@ import java.io.IOException;
 /** A class for reading unclosed tsfile. */
 public class UnClosedTsFileReader extends TsFileSequenceReader {
 
+  private IDecryptor decryptor;
+
   public UnClosedTsFileReader(String file) throws IOException {
     super(file, false);
+    decryptor = EncryptUtils.decryptor;
+  }
+
+  public UnClosedTsFileReader(String file, IDecryptor decryptor) throws 
IOException {
+    super(file, false);
+    this.decryptor = decryptor;
   }
 
   /** unclosed file has no tail magic data. */
@@ -42,4 +52,9 @@ public class UnClosedTsFileReader extends 
TsFileSequenceReader {
   public TsFileMetadata readFileMetadata() {
     throw new NotImplementedException();
   }
+
+  @Override
+  public IDecryptor getDecryptor() {
+    return decryptor;
+  }
 }
diff --git 
a/java/tsfile/src/test/java/org/apache/tsfile/read/UnClosedTsFileReaderTest.java
 
b/java/tsfile/src/test/java/org/apache/tsfile/read/UnClosedTsFileReaderTest.java
new file mode 100644
index 00000000..cc022fbc
--- /dev/null
+++ 
b/java/tsfile/src/test/java/org/apache/tsfile/read/UnClosedTsFileReaderTest.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tsfile.read;
+
+import org.apache.tsfile.constant.TestConstant;
+import org.apache.tsfile.encrypt.EncryptUtils;
+import org.apache.tsfile.enums.TSDataType;
+import org.apache.tsfile.file.metadata.ChunkMetadata;
+import org.apache.tsfile.file.metadata.IDeviceID.Factory;
+import org.apache.tsfile.read.common.BatchData;
+import org.apache.tsfile.read.common.Chunk;
+import org.apache.tsfile.read.reader.chunk.ChunkReader;
+import org.apache.tsfile.write.chunk.ChunkWriterImpl;
+import org.apache.tsfile.write.schema.MeasurementSchema;
+import org.apache.tsfile.write.writer.TsFileIOWriter;
+
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class UnClosedTsFileReaderTest {
+
+  @Test
+  public void testRead() throws IOException {
+    File file = new File(TestConstant.BASE_OUTPUT_PATH + File.separator + 
"test.tsfile");
+    TsFileIOWriter writer = new TsFileIOWriter(file);
+    writer.startChunkGroup(Factory.DEFAULT_FACTORY.create("root.sg1.d1"));
+    ChunkWriterImpl chunkWriter =
+        new ChunkWriterImpl(new MeasurementSchema("s1", TSDataType.INT64), 
EncryptUtils.encryptor);
+    chunkWriter.write(1, 1L);
+    chunkWriter.write(2, 2L);
+    chunkWriter.write(3, 3L);
+    chunkWriter.writeToFileWriter(writer);
+    writer.endChunkGroup();
+    writer.close();
+    ChunkMetadata chunkMetadata =
+        
writer.getChunkGroupMetadataList().get(0).getChunkMetadataList().get(0);
+
+    UnClosedTsFileReader reader = new 
UnClosedTsFileReader(file.getAbsolutePath());
+    Chunk chunk = reader.readMemChunk(chunkMetadata);
+    ChunkReader chunkReader = new ChunkReader(chunk);
+    BatchData batchData = chunkReader.nextPageData();
+    for (int i = 0; i < 3; i++) {
+      assertTrue(batchData.hasCurrent());
+      assertEquals(i + 1, batchData.currentTime());
+      assertEquals(i + 1L, ((long) batchData.currentValue()));
+      batchData.next();
+    }
+    assertFalse(batchData.hasCurrent());
+
+    file.delete();
+  }
+}