(tsfile) branch snapshot/1.2.0-241211 updated: use the same encrypt type in tsfile (#333)

[jiangtian]

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

jiangtian pushed a commit to branch snapshot/1.2.0-241211
in repository https://gitbox.apache.org/repos/asf/tsfile.git


The following commit(s) were added to refs/heads/snapshot/1.2.0-241211 by this 
push:
     new e96af653 use the same encrypt type in tsfile (#333)
e96af653 is described below

commit e96af653eb9cbfda5c56e8a1186fa76339a562ba
Author: jintao zhu <105690440+zhuj...@users.noreply.github.com>
AuthorDate: Wed Dec 11 16:54:09 2024 +0800

    use the same encrypt type in tsfile (#333)
    
    (cherry picked from commit 96a7432bec4a398c79193546e307f69c76c46270)
---
 .../src/main/java/org/apache/tsfile/common/conf/TSFileConfig.java      | 3 ---
 .../src/main/java/org/apache/tsfile/file/metadata/TsFileMetadata.java  | 2 +-
 2 files changed, 1 insertion(+), 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
index 4db62146..c09ac8d3 100644
--- 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 class TSFileConfig implements Serializable {
   }
 
   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
index e6c56688..00db6b65 100644
--- 
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 class TsFileMetadata {
         }
         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));