Fix SHOW CREATE PIPE compaction defaults

Author: Caideyipi

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AlterPipeProcedureV2.java

@@ -134,6 +134,16 @@ public boolean executeFromValidateTask(final ConfigNodeProcedureEnv env) throws
                 PipeSinkConstant.SINK_IOTDB_USERNAME_KEY,
                 PipeSinkConstant.CONNECTOR_IOTDB_PASSWORD_KEY,
                 PipeSinkConstant.SINK_IOTDB_PASSWORD_KEY);
+    final boolean hasExplicitSinkCompaction =
+        new PipeParameters(alterPipeRequest.getConnectorAttributes())
+            .hasAnyAttributes(
+                PipeSinkConstant.CONNECTOR_ENABLE_COMPACTION_KEY,
+                PipeSinkConstant.SINK_ENABLE_COMPACTION_KEY);
+    if (hasExplicitSinkCompaction) {
+      alterPipeRequest
+          .getConnectorAttributes()
+          .put(SystemConstant.SINK_ENABLE_COMPACTION_INJECTED_KEY, Boolean.FALSE.toString());
+    }
 
     pipeTaskInfo.get().checkAndUpdateRequestBeforeAlterPipe(alterPipeRequest);
 

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java

@@ -128,6 +128,9 @@ static TCreatePipeReq normalizeCreatePipeRequest(final TCreatePipeReq createPipe
       createPipeRequest
           .getConnectorAttributes()
           .put(PipeSinkConstant.SINK_ENABLE_COMPACTION_KEY, Boolean.TRUE.toString());
+      createPipeRequest
+          .getConnectorAttributes()
+          .put(SystemConstant.SINK_ENABLE_COMPACTION_INJECTED_KEY, Boolean.TRUE.toString());
     }
     return createPipeRequest;
   }

iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2Test.java

@@ -22,6 +22,7 @@
 import org.apache.iotdb.common.rpc.thrift.TSStatus;
 import org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant;
 import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant;
+import org.apache.iotdb.commons.pipe.config.constant.SystemConstant;
 import org.apache.iotdb.confignode.manager.ConfigManager;
 import org.apache.iotdb.confignode.manager.PermissionManager;
 import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv;
@@ -54,6 +55,9 @@ public void testNormalizeCreatePipeRequestEnablesCompactionForNewUserPipe() {
     assertEquals(
         Boolean.TRUE.toString(),
         request.getConnectorAttributes().get(PipeSinkConstant.SINK_ENABLE_COMPACTION_KEY));
+    assertEquals(
+        Boolean.TRUE.toString(),
+        request.getConnectorAttributes().get(SystemConstant.SINK_ENABLE_COMPACTION_INJECTED_KEY));
   }
 
   @Test
@@ -71,6 +75,10 @@ public void testNormalizeCreatePipeRequestKeepsExplicitCompactionValue() {
         request.getConnectorAttributes().get(PipeSinkConstant.CONNECTOR_ENABLE_COMPACTION_KEY));
     assertFalse(
         request.getConnectorAttributes().containsKey(PipeSinkConstant.SINK_ENABLE_COMPACTION_KEY));
+    assertFalse(
+        request
+            .getConnectorAttributes()
+            .containsKey(SystemConstant.SINK_ENABLE_COMPACTION_INJECTED_KEY));
   }
 
   @Test

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowCreatePipeTask.java

@@ -143,7 +143,12 @@ private static Map<String, String> sanitizeSourceAttributes(final Map<String, St
   private static Map<String, String> sanitizeSinkAttributes(final Map<String, String> sink) {
     final boolean hasInjectedSinkAuthentication =
         Boolean.parseBoolean(sink.get(SystemConstant.SINK_AUTHENTICATION_INJECTED_KEY));
+    final boolean hasInjectedSinkCompaction =
+        Boolean.parseBoolean(sink.get(SystemConstant.SINK_ENABLE_COMPACTION_INJECTED_KEY));
     final Map<String, String> result = sanitizeCommonAttributes(sink);
+    if (hasInjectedSinkCompaction) {
+      result.remove(PipeSinkConstant.SINK_ENABLE_COMPACTION_KEY);
+    }
     result.remove(PipeSinkConstant.CONNECTOR_IOTDB_USER_ID);
     result.remove(PipeSinkConstant.SINK_IOTDB_USER_ID);
     result.remove(PipeSinkConstant.CONNECTOR_IOTDB_CLI_HOSTNAME);

iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowCreateTaskTest.java

@@ -93,13 +93,15 @@ public void testShowCreatePipeSQLShouldSanitizeInternalAndInjectedAttributes() {
 
     final Map<String, String> sinkAttributes = new HashMap<>();
     sinkAttributes.put(PipeSinkConstant.SINK_KEY, "write-back-sink");
+    sinkAttributes.put(PipeSinkConstant.SINK_ENABLE_COMPACTION_KEY, Boolean.TRUE.toString());
     sinkAttributes.put(SystemConstant.RESTART_OR_NEWLY_ADDED_KEY, "true");
     sinkAttributes.put("__audit.sink", "audit");
     sinkAttributes.put(PipeSinkConstant.SINK_IOTDB_USER_ID, "1");
     sinkAttributes.put(PipeSinkConstant.SINK_IOTDB_USERNAME_KEY, "alice");
     sinkAttributes.put(PipeSinkConstant.SINK_IOTDB_PASSWORD_KEY, "hashed-password");
     sinkAttributes.put(PipeSinkConstant.SINK_IOTDB_CLI_HOSTNAME, "host");
     sinkAttributes.put(SystemConstant.SINK_AUTHENTICATION_INJECTED_KEY, Boolean.TRUE.toString());
+    sinkAttributes.put(SystemConstant.SINK_ENABLE_COMPACTION_INJECTED_KEY, Boolean.TRUE.toString());
 
     final PipeMeta pipeMeta =
         new PipeMeta(
@@ -114,6 +116,24 @@ public void testShowCreatePipeSQLShouldSanitizeInternalAndInjectedAttributes() {
         ShowCreatePipeTask.getShowCreatePipeSQL(pipeMeta));
   }
 
+  @Test
+  public void testShowCreatePipeSQLShouldKeepExplicitCompactionAttribute() {
+    final Map<String, String> sinkAttributes = new HashMap<>();
+    sinkAttributes.put(PipeSinkConstant.SINK_KEY, "do-nothing-sink");
+    sinkAttributes.put(PipeSinkConstant.SINK_ENABLE_COMPACTION_KEY, Boolean.TRUE.toString());
+    sinkAttributes.put(
+        SystemConstant.SINK_ENABLE_COMPACTION_INJECTED_KEY, Boolean.FALSE.toString());
+
+    final PipeMeta pipeMeta =
+        new PipeMeta(
+            new PipeStaticMeta("test_pipe", 1L, new HashMap<>(), new HashMap<>(), sinkAttributes),
+            new PipeRuntimeMeta());
+
+    assertEquals(
+        "CREATE PIPE \"test_pipe\" WITH SINK ('sink'='do-nothing-sink','sink.enable-compaction'='true')",
+        ShowCreatePipeTask.getShowCreatePipeSQL(pipeMeta));
+  }
+
   @Test
   public void testShowCreatePipeSQLShouldMaskExplicitCredentials() {
     final Map<String, String> sourceAttributes = new HashMap<>();

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/config/constant/SystemConstant.java

@@ -48,6 +48,8 @@ public class SystemConstant {
       "__system.source-authentication-injected";
   public static final String SINK_AUTHENTICATION_INJECTED_KEY =
       "__system.sink-authentication-injected";
+  public static final String SINK_ENABLE_COMPACTION_INJECTED_KEY =
+      "__system.sink-enable-compaction-injected";
   public static final String SINK_WAIT_FOR_SCHEMA_BEFORE_LOAD_KEY =
       "__system.sink-wait-for-schema-before-load";
 
@@ -61,6 +63,7 @@ public class SystemConstant {
     SYSTEM_KEYS.add(PIPE_VISIBILITY_KEY);
     SYSTEM_KEYS.add(SOURCE_AUTHENTICATION_INJECTED_KEY);
     SYSTEM_KEYS.add(SINK_AUTHENTICATION_INJECTED_KEY);
+    SYSTEM_KEYS.add(SINK_ENABLE_COMPACTION_INJECTED_KEY);
     SYSTEM_KEYS.add(SINK_WAIT_FOR_SCHEMA_BEFORE_LOAD_KEY);
   }