resolve conflicts

apache · Nov 13, 2024 · 449cd54 · 449cd54
2 parents 022c8cb + 3aef6ad
commit 449cd54
Show file tree

Hide file tree

Showing 66 changed files with 2,170 additions and 374 deletions.
diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java
@@ -97,6 +97,24 @@ public CommonConfig setCompressor(String compressor) {
     return this;
   }
 
+  @Override
+  public CommonConfig setEncryptFlag(boolean encryptFlag) {
+    setProperty("encrypt_flag", String.valueOf(encryptFlag));
+    return this;
+  }
+
+  @Override
+  public CommonConfig setEncryptType(String encryptType) {
+    setProperty("encrypt_type", encryptType);
+    return this;
+  }
+
+  @Override
+  public CommonConfig setEncryptKeyPath(String encryptKeyPath) {
+    setProperty("encrypt_key_path", encryptKeyPath);
+    return this;
+  }
+
   @Override
   public CommonConfig setUdfMemoryBudgetInMB(float udfCollectorMemoryBudgetInMB) {
     // udf_memory_budget_in_mb

diff --git a/...tion-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java b/...tion-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java
@@ -75,6 +75,27 @@ public CommonConfig setCompressor(String compressor) {
     return this;
   }
 
+  @Override
+  public CommonConfig setEncryptFlag(boolean encryptFlag) {
+    cnConfig.setProperty("encrypt_flag", String.valueOf(encryptFlag));
+    dnConfig.setProperty("encrypt_flag", String.valueOf(encryptFlag));
+    return this;
+  }
+
+  @Override
+  public CommonConfig setEncryptType(String encryptType) {
+    cnConfig.setProperty("encrypt_type", encryptType);
+    dnConfig.setProperty("encrypt_type", encryptType);
+    return this;
+  }
+
+  @Override
+  public CommonConfig setEncryptKeyPath(String encryptKeyPath) {
+    cnConfig.setProperty("encrypt_key_path", encryptKeyPath);
+    dnConfig.setProperty("encrypt_key_path", encryptKeyPath);
+    return this;
+  }
+
   @Override
   public CommonConfig setConfigRegionRatisRPCLeaderElectionTimeoutMaxMs(int maxMs) {
     cnConfig.setConfigRegionRatisRPCLeaderElectionTimeoutMaxMs(maxMs);

diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java b/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java
@@ -54,6 +54,21 @@ public CommonConfig setCompressor(String compressor) {
     return this;
   }
 
+  @Override
+  public CommonConfig setEncryptFlag(boolean encryptFlag) {
+    return this;
+  }
+
+  @Override
+  public CommonConfig setEncryptType(String encryptType) {
+    return this;
+  }
+
+  @Override
+  public CommonConfig setEncryptKeyPath(String encryptKeyPath) {
+    return this;
+  }
+
   @Override
   public CommonConfig setConfigRegionRatisRPCLeaderElectionTimeoutMaxMs(int maxMs) {
     return this;

diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java b/integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java
@@ -36,6 +36,12 @@ public interface CommonConfig {
 
   CommonConfig setCompressor(String compressor);
 
+  CommonConfig setEncryptFlag(boolean encryptFlag);
+
+  CommonConfig setEncryptType(String encryptType);
+
+  CommonConfig setEncryptKeyPath(String encryptKeyPath);
+
   CommonConfig setConfigRegionRatisRPCLeaderElectionTimeoutMaxMs(int maxMs);
 
   CommonConfig setUdfMemoryBudgetInMB(float udfCollectorMemoryBudgetInMB);