use the same encrypt type in tsfile (#333)

(cherry picked from commit 96a7432)
apache · Dec 11, 2024 · e96af65 · e96af65
1 parent 7566d12
commit e96af65
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileConfig.java b/java/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileConfig.java
@@ -268,9 +268,6 @@ public void setEncryptKey(String encryptKey) {
   }
 
   public void setEncryptKeyFromPath(String encryptKeyPath) {
-    if (!encryptFlag) {
-      return;
-    }
     this.encryptKey = EncryptUtils.getEncryptKeyFromPath(encryptKeyPath);
     EncryptUtils.encryptParam = EncryptUtils.getEncryptParameter();
     EncryptUtils.normalKeyStr = EncryptUtils.getNormalKeyStr();

diff --git a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/TsFileMetadata.java b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/TsFileMetadata.java
@@ -147,7 +147,7 @@ public static TsFileMetadata deserializeFrom(ByteBuffer buffer, DeserializeConfi
         }
         IDecryptor decryptor =
             IDecryptor.getDecryptor(
-                TSFileDescriptor.getInstance().getConfig().getEncryptType(),
+                propertiesMap.get("encryptType"),
                 TSFileDescriptor.getInstance().getConfig().getEncryptKey().getBytes());
         String str = propertiesMap.get("encryptKey");
         fileMetaData.dataEncryptKey = decryptor.decrypt(EncryptUtils.getSecondKeyFromStr(str));