Merge branch 'master' of https://github.com/apache/iotdb

Author: Caideyipi

example/jdbc/pom.xml

@@ -39,5 +39,13 @@
             <artifactId>iotdb-jdbc</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
     </dependencies>
 </project>

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java

@@ -627,6 +627,30 @@ public CommonConfig setDatanodeMemoryProportion(String datanodeMemoryProportion)
     return this;
   }
 
+  @Override
+  public CommonConfig setEnableAuditLog(boolean enableAuditLog) {
+    setProperty("enable_audit_log", String.valueOf(enableAuditLog));
+    return this;
+  }
+
+  @Override
+  public CommonConfig setAuditableOperationType(String auditableOperationType) {
+    setProperty("auditable_operation_type", auditableOperationType);
+    return this;
+  }
+
+  @Override
+  public CommonConfig setAuditableOperationLevel(String auditableOperationLevel) {
+    setProperty("auditable_operation_level", auditableOperationLevel);
+    return this;
+  }
+
+  @Override
+  public CommonConfig setAuditableOperationResult(String auditableOperationResult) {
+    setProperty("auditable_operation_result", auditableOperationResult);
+    return this;
+  }
+
   // For part of the log directory
   public String getClusterConfigStr() {
     return fromConsensusFullNameToAbbr(properties.getProperty(CONFIG_NODE_CONSENSUS_PROTOCOL_CLASS))

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java

@@ -656,4 +656,32 @@ public CommonConfig setDatanodeMemoryProportion(String datanodeMemoryProportion)
     cnConfig.setDatanodeMemoryProportion(datanodeMemoryProportion);
     return this;
   }
+
+  @Override
+  public CommonConfig setEnableAuditLog(boolean enableAuditLog) {
+    dnConfig.setEnableAuditLog(enableAuditLog);
+    cnConfig.setEnableAuditLog(enableAuditLog);
+    return this;
+  }
+
+  @Override
+  public CommonConfig setAuditableOperationType(String auditableOperationType) {
+    dnConfig.setAuditableOperationType(auditableOperationType);
+    cnConfig.setAuditableOperationType(auditableOperationType);
+    return this;
+  }
+
+  @Override
+  public CommonConfig setAuditableOperationLevel(String auditableOperationLevel) {
+    dnConfig.setAuditableOperationLevel(auditableOperationLevel);
+    cnConfig.setAuditableOperationLevel(auditableOperationLevel);
+    return this;
+  }
+
+  @Override
+  public CommonConfig setAuditableOperationResult(String auditableOperationResult) {
+    dnConfig.setAuditableOperationResult(auditableOperationResult);
+    cnConfig.setAuditableOperationResult(auditableOperationResult);
+    return this;
+  }
 }

integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java

@@ -457,4 +457,24 @@ public CommonConfig setTrustStorePwd(String trustStorePwd) {
   public CommonConfig setDatanodeMemoryProportion(String datanodeMemoryProportion) {
     return this;
   }
+
+  @Override
+  public CommonConfig setEnableAuditLog(boolean enableAuditLog) {
+    return this;
+  }
+
+  @Override
+  public CommonConfig setAuditableOperationType(String auditableOperationType) {
+    return this;
+  }
+
+  @Override
+  public CommonConfig setAuditableOperationLevel(String auditableOperationLevel) {
+    return this;
+  }
+
+  @Override
+  public CommonConfig setAuditableOperationResult(String auditableOperationResult) {
+    return this;
+  }
 }

integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java

@@ -203,4 +203,12 @@ default CommonConfig setDefaultStorageGroupLevel(int defaultStorageGroupLevel) {
   CommonConfig setTrustStorePwd(String trustStorePwd);
 
   CommonConfig setDatanodeMemoryProportion(String datanodeMemoryProportion);
+
+  CommonConfig setEnableAuditLog(boolean enableAuditLog);
+
+  CommonConfig setAuditableOperationType(String auditableOperationType);
+
+  CommonConfig setAuditableOperationLevel(String auditableOperationLevel);
+
+  CommonConfig setAuditableOperationResult(String auditableOperationResult);
 }

integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBMultiDBRegionGroupLeaderDistributionIT.java

@@ -113,7 +113,8 @@ public void testMultiDatabaseLeaderDistribution()
         TShowRegionResp showRegionResp = client.showRegion(new TShowRegionReq());
         showRegionResp
             .getRegionInfoList()
-            .removeIf(r -> r.database.startsWith("root." + SystemConstant.SYSTEM_PREFIX_KEY));
+            // Skip AUDIT database
+            .removeIf(r -> r.database.startsWith(SystemConstant.AUDIT_DATABASE));
         showRegionResp
             .getRegionInfoList()
             .forEach(

integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBAutoRegionGroupExtensionIT.java

@@ -189,7 +189,7 @@ private void checkRegionDistribution(
                   .merge(regionInfo.getDataNodeId(), 1, Integer::sum);
             });
     // The number of RegionGroups should not less than the testMinRegionGroupNum for each database
-    // +1 for system database
+    // +1 for AUDIT database
     Assert.assertEquals(TEST_DATABASE_NUM + 1, databaseRegionCounter.size());
     databaseRegionCounter.forEach(
         (database, regionCount) ->

integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionGetterIT.java

@@ -535,7 +535,7 @@ public void testGetSchemaNodeManagementPartition() throws Exception {
       nodeManagementResp = client.getSchemaNodeManagementPartition(nodeManagementReq);
       Assert.assertEquals(
           TSStatusCode.SUCCESS_STATUS.getStatusCode(), nodeManagementResp.getStatus().getCode());
-      // +1 for SYSTEM database
+      // +1 for AUDIT database
       Assert.assertEquals(storageGroupNum + 1, nodeManagementResp.getMatchedNodeSize());
       Assert.assertNotNull(nodeManagementResp.getSchemaRegionMap());
       Assert.assertEquals(0, nodeManagementResp.getSchemaRegionMapSize());

integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/IoTDBRegionGroupExpandAndShrinkForIoTV1IT.java

@@ -94,7 +94,7 @@ public void singleRegionTest() throws Exception {
       Set<Integer> allDataNodeId = getAllDataNodes(statement);
 
       // expect one data region, one schema region
-      // plus one system data region, one system schema region
+      // plus one AUDIT data region, one AUDIT schema region
       Assert.assertEquals(4, regionMap.size());
 
       // expand
@@ -217,7 +217,7 @@ public void multiRegionNormalTest() throws Exception {
       Set<Integer> allDataNodeId = getAllDataNodes(statement);
 
       // expect one data region, one schema region
-      // plus one system data region, one system schema region
+      // plus one AUDIT data region, one AUDIT schema region
       Assert.assertEquals(4, regionMap.size());
 
       // select multiple regions for testing

integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBMiscIT.java

@@ -55,7 +55,7 @@ public void testCompressionRatioFile() throws SQLException {
         Statement statement = connection.createStatement()) {
       statement.execute("insert into root.comprssion_ratio_file.d1(timestamp,s1) values(1,1.0)");
       statement.execute("flush");
-      // one global file and two data region file (including one system region)
+      // one global file and two data region file (including one AUDIT region)
       assertEquals(3, collectCompressionRatioFiles(nodeWrapper).size());
 
       statement.execute("drop database root.comprssion_ratio_file");