You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tsfile.apache.org by ji...@apache.org on 2024/10/25 01:36:02 UTC
(tsfile) branch develop updated: Do not print warn log when Tsfile UNENCRYPTED (#276)
This is an automated email from the ASF dual-hosted git repository.
jiangtian 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 e4fe3554 Do not print warn log when Tsfile UNENCRYPTED (#276)
e4fe3554 is described below
commit e4fe355434bfc0f0e76bddc107880312f7e26967
Author: Haonan <hh...@outlook.com>
AuthorDate: Fri Oct 25 09:35:57 2024 +0800
Do not print warn log when Tsfile UNENCRYPTED (#276)
---
java/tsfile/src/main/java/org/apache/tsfile/encrypt/IEncryptor.java | 4 +++-
.../java/org/apache/tsfile/file/metadata/enums/EncryptionType.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/encrypt/IEncryptor.java b/java/tsfile/src/main/java/org/apache/tsfile/encrypt/IEncryptor.java
index 20ccb8e9..1c21d37d 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/encrypt/IEncryptor.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/encrypt/IEncryptor.java
@@ -41,7 +41,7 @@ import java.util.Arrays;
/** encrypt data according to tsfileconfig. */
public interface IEncryptor {
- static final Logger logger = LoggerFactory.getLogger(IEncryptor.class);
+ Logger logger = LoggerFactory.getLogger(IEncryptor.class);
static IEncryptor getEncryptor(String name, byte[] key) {
return getEncryptor(EncryptionType.valueOf(name), key);
@@ -56,6 +56,8 @@ public interface IEncryptor {
return new SM4128Encryptor(key);
case AES128:
return new AES128Encryptor(key);
+ case UNENCRYPTED:
+ return new NoEncryptor();
default:
// log a warning
logger.warn("Unknown encryption type: {}", name);
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/enums/EncryptionType.java b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/enums/EncryptionType.java
index 6fd4e516..0e1625dc 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/enums/EncryptionType.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/enums/EncryptionType.java
@@ -20,7 +20,7 @@
package org.apache.tsfile.file.metadata.enums;
public enum EncryptionType {
- /** Do not comprocess. */
+ /** UNENCRYPTED. */
UNENCRYPTED("UNENCRYPTED", (byte) 0),
/** SM4128. */