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 e795637d delete parameter encrypt_flag (#491)
e795637d is described below
commit e795637d32570734b6a0b19e34370db0efbf9a9d
Author: jintao zhu <[email protected]>
AuthorDate: Mon May 12 14:01:37 2025 +0800
delete parameter encrypt_flag (#491)
---
.../java/org/apache/tsfile/common/conf/TSFileConfig.java | 13 +------------
.../org/apache/tsfile/common/conf/TSFileDescriptor.java | 1 -
.../main/java/org/apache/tsfile/encrypt/EncryptUtils.java | 7 +++++--
.../src/main/java/org/apache/tsfile/write/TsFileWriter.java | 4 +++-
.../tsfile/write/v4/AbstractTableModelTsFileWriter.java | 4 +++-
.../java/org/apache/tsfile/write/writer/TsFileIOWriter.java | 12 +++++++++---
6 files changed, 21 insertions(+), 20 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 456377c8..fd6a06c1 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
@@ -155,13 +155,10 @@ public class TSFileConfig implements Serializable {
/** Data compression method, TsFile supports UNCOMPRESSED, SNAPPY, ZSTD or
LZ4. */
private CompressionType compressor = CompressionType.LZ4;
- /** encryptFlag, true means opening the encrypt function. */
- private boolean encryptFlag = false;
-
/** encryptKey, this should be 16 bytes String. */
private String encryptKey = "abcdefghijklmnop";
- /** default encryptType is "UNENCRYPTED". */
+ /** Data encryption method, default encryptType is "UNENCRYPTED". */
private String encryptType = "UNENCRYPTED";
/** Line count threshold for checking page memory occupied size. */
@@ -245,14 +242,6 @@ public class TSFileConfig implements Serializable {
// do nothing because we already give default value to each field when
they are being declared
}
- public boolean getEncryptFlag() {
- return encryptFlag;
- }
-
- public void setEncryptFlag(String encryptFlag) {
- this.encryptFlag = Boolean.parseBoolean(encryptFlag);
- }
-
public String getEncryptType() {
return this.encryptType;
}
diff --git
a/java/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileDescriptor.java
b/java/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileDescriptor.java
index 1db389b6..498716dd 100644
---
a/java/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileDescriptor.java
+++
b/java/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileDescriptor.java
@@ -82,7 +82,6 @@ public class TSFileDescriptor {
writer.setString(conf::setValueEncoder, "value_encoder");
writer.setString(conf::setCompressor, "compressor");
writer.setInt(conf::setBatchSize, "batch_size");
- writer.setString(conf::setEncryptFlag, "encrypt_flag");
writer.setString(conf::setEncryptType, "encrypt_type");
writer.setString(conf::setEncryptKeyFromPath, "encrypt_key_path");
writer.setBoolean(conf::setLz4UseJni, "lz4_use_jni");
diff --git
a/java/tsfile/src/main/java/org/apache/tsfile/encrypt/EncryptUtils.java
b/java/tsfile/src/main/java/org/apache/tsfile/encrypt/EncryptUtils.java
index 9b14debd..b697c32e 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/encrypt/EncryptUtils.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/encrypt/EncryptUtils.java
@@ -32,6 +32,7 @@ import java.lang.reflect.InvocationTargetException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
+import java.util.Objects;
public class EncryptUtils {
@@ -168,7 +169,8 @@ public class EncryptUtils {
public static EncryptParameter getEncryptParameter(TSFileConfig conf) {
String encryptType;
byte[] dataEncryptKey;
- if (conf.getEncryptFlag()) {
+ if (!Objects.equals(conf.getEncryptType(), "UNENCRYPTED")
+ && !Objects.equals(conf.getEncryptType(),
"org.apache.tsfile.encrypt.UNENCRYPTED")) {
encryptType = conf.getEncryptType();
final MessageDigest md;
try {
@@ -214,7 +216,8 @@ public class EncryptUtils {
public static IEncrypt getEncrypt(TSFileConfig conf) {
String encryptType;
byte[] dataEncryptKey;
- if (conf.getEncryptFlag()) {
+ if (!Objects.equals(conf.getEncryptType(), "UNENCRYPTED")
+ && !Objects.equals(conf.getEncryptType(),
"org.apache.tsfile.encrypt.UNENCRYPTED")) {
encryptType = conf.getEncryptType();
final MessageDigest md;
try {
diff --git
a/java/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java
b/java/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java
index efc0ab55..90f8843e 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java
@@ -61,6 +61,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.TreeMap;
/**
@@ -192,7 +193,8 @@ public class TsFileWriter implements AutoCloseable {
byte[] encryptKey;
byte[] dataEncryptKey;
String encryptType;
- if (config.getEncryptFlag()) {
+ if (!Objects.equals(config.getEncryptType(), "UNENCRYPTED")
+ && !Objects.equals(config.getEncryptType(),
"org.apache.tsfile.encrypt.UNENCRYPTED")) {
encryptLevel = "2";
encryptType = config.getEncryptType();
final MessageDigest md;
diff --git
a/java/tsfile/src/main/java/org/apache/tsfile/write/v4/AbstractTableModelTsFileWriter.java
b/java/tsfile/src/main/java/org/apache/tsfile/write/v4/AbstractTableModelTsFileWriter.java
index dd03471c..73321ad0 100644
---
a/java/tsfile/src/main/java/org/apache/tsfile/write/v4/AbstractTableModelTsFileWriter.java
+++
b/java/tsfile/src/main/java/org/apache/tsfile/write/v4/AbstractTableModelTsFileWriter.java
@@ -45,6 +45,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.TreeMap;
abstract class AbstractTableModelTsFileWriter implements ITsFileWriter {
@@ -103,7 +104,8 @@ abstract class AbstractTableModelTsFileWriter implements
ITsFileWriter {
byte[] encryptKey;
byte[] dataEncryptKey;
String encryptType;
- if (config.getEncryptFlag()) {
+ if (!Objects.equals(config.getEncryptType(), "UNENCRYPTED")
+ && !Objects.equals(config.getEncryptType(),
"org.apache.tsfile.encrypt.UNENCRYPTED")) {
encryptLevel = "2";
encryptType = config.getEncryptType();
diff --git
a/java/tsfile/src/main/java/org/apache/tsfile/write/writer/TsFileIOWriter.java
b/java/tsfile/src/main/java/org/apache/tsfile/write/writer/TsFileIOWriter.java
index f1df08cd..7d8dc490 100644
---
a/java/tsfile/src/main/java/org/apache/tsfile/write/writer/TsFileIOWriter.java
+++
b/java/tsfile/src/main/java/org/apache/tsfile/write/writer/TsFileIOWriter.java
@@ -64,6 +64,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Objects;
import java.util.Queue;
import java.util.TreeMap;
@@ -135,7 +136,9 @@ public class TsFileIOWriter implements AutoCloseable {
/** empty construct function. */
protected TsFileIOWriter() {
- if (TS_FILE_CONFIG.getEncryptFlag()) {
+ if (!Objects.equals(TS_FILE_CONFIG.getEncryptType(), "UNENCRYPTED")
+ && !Objects.equals(
+ TS_FILE_CONFIG.getEncryptType(),
"org.apache.tsfile.encrypt.UNENCRYPTED")) {
this.encryptLevel = "2";
this.encryptType = TS_FILE_CONFIG.getEncryptType();
this.encryptKey = EncryptUtils.getNormalKeyStr();
@@ -163,7 +166,8 @@ public class TsFileIOWriter implements AutoCloseable {
if (resourceLogger.isDebugEnabled()) {
resourceLogger.debug("{} writer is opened.", file.getName());
}
- if (conf.getEncryptFlag()) {
+ if (!Objects.equals(conf.getEncryptType(), "UNENCRYPTED")
+ && !Objects.equals(conf.getEncryptType(),
"org.apache.tsfile.encrypt.UNENCRYPTED")) {
this.encryptLevel = "2";
this.encryptType = conf.getEncryptType();
this.encryptKey = EncryptUtils.getNormalKeyStr();
@@ -182,7 +186,9 @@ public class TsFileIOWriter implements AutoCloseable {
*/
public TsFileIOWriter(TsFileOutput output) throws IOException {
this.out = output;
- if (TS_FILE_CONFIG.getEncryptFlag()) {
+ if (!Objects.equals(TS_FILE_CONFIG.getEncryptType(), "UNENCRYPTED")
+ && !Objects.equals(
+ TS_FILE_CONFIG.getEncryptType(),
"org.apache.tsfile.encrypt.UNENCRYPTED")) {
this.encryptLevel = "2";
this.encryptType = TS_FILE_CONFIG.getEncryptType();
this.encryptKey = EncryptUtils.getNormalKeyStr();
