This is an automated email from the ASF dual-hosted git repository. yongzao pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 2ed021362c7 Audit log patch for both tree and table models (#16497) add 326850435b6 Revert recent updates about audit log (#16498) No new revisions were added by this update. Summary of changes: .../java/org/apache/iotdb/CountPointProcessor.java | 3 +- .../it/env/cluster/config/MppCommonConfig.java | 24 - .../env/cluster/config/MppSharedCommonConfig.java | 28 - .../it/env/remote/config/RemoteCommonConfig.java | 20 - .../org/apache/iotdb/itbase/env/CommonConfig.java | 8 - ...oTDBMultiDBRegionGroupLeaderDistributionIT.java | 3 +- .../partition/IoTDBAutoRegionGroupExtensionIT.java | 2 +- .../it/partition/IoTDBPartitionGetterIT.java | 2 +- .../IoTDBRegionGroupExpandAndShrinkForIoTV1IT.java | 4 +- .../java/org/apache/iotdb/db/it/IoTDBMiscIT.java | 2 +- .../iotdb/db/it/audit/IoTDBAuditLogBasicIT.java | 955 --------------------- .../org/apache/iotdb/db/it/auth/IoTDBAuthIT.java | 17 +- .../iotdb/db/it/schema/IoTDBDeleteDatabaseIT.java | 3 +- .../iotdb/pipe/it/single/IoTDBPipeAggregateIT.java | 14 +- .../pipe/it/single/IoTDBPipePermissionIT.java | 3 +- .../relational/it/schema/IoTDBDatabaseIT.java | 1 - .../event/dml/insertion/TabletInsertionEvent.java | 6 +- .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 38 +- .../iotdb/confignode/audit/CNAuditLogger.java | 18 +- .../pipe/payload/PipeDeactivateTemplatePlan.java | 2 +- .../write/template/CreateSchemaTemplatePlan.java | 2 +- .../response/template/TemplateInfoResp.java | 2 +- .../response/template/TemplateSetInfoResp.java | 2 +- .../iotdb/confignode/manager/ConfigManager.java | 8 +- .../confignode/manager/PermissionManager.java | 9 +- .../iotdb/confignode/manager/ProcedureManager.java | 2 +- .../iotdb/confignode/manager/node/NodeManager.java | 15 +- .../pipe/source/IoTDBConfigRegionSource.java | 64 +- ...onfigPhysicalPlanTablePatternParseVisitor.java} | 2 +- ...figPhysicalPlanTablePrivilegeParseVisitor.java} | 2 +- ...eConfigPhysicalPlanTableScopeParseVisitor.java} | 2 +- ...ConfigPhysicalPlanTreePatternParseVisitor.java} | 8 +- ...peConfigPhysicalPlanTreeScopeParseVisitor.java} | 2 +- .../PipeConfigTreePrivilegeParseVisitor.java | 385 --------- .../manager/schema/ClusterSchemaManager.java | 2 +- .../confignode/persistence/auth/AuthorInfo.java | 7 - .../persistence/auth/AuthorPlanExecutor.java | 27 - .../persistence/auth/IAuthorPlanExecutor.java | 5 - .../schema/CNPhysicalPlanGenerator.java | 2 +- .../persistence/schema/ClusterSchemaInfo.java | 2 +- .../persistence/schema/ConfigMTreeStore.java | 2 +- .../persistence/schema/TemplateTable.java | 2 +- .../impl/schema/DeactivateTemplateProcedure.java | 2 +- .../impl/schema/DeleteTimeSeriesProcedure.java | 4 +- .../procedure/impl/schema/SchemaUtils.java | 2 +- .../impl/schema/SetTemplateProcedure.java | 2 +- .../impl/schema/UnsetTemplateProcedure.java | 2 +- .../request/ConfigPhysicalPlanSerDeTest.java | 2 +- ...peConfigPhysicalPlanScopeParseVisitorTest.java} | 2 +- ...gPhysicalPlanTablePatternParseVisitorTest.java} | 2 +- ...igPhysicalPlanTreePatternParseVisitorTest.java} | 4 +- .../persistence/CNPhysicalPlanGeneratorTest.java | 2 +- .../persistence/schema/ClusterSchemaInfoTest.java | 2 +- .../persistence/schema/TemplateTableTest.java | 2 +- .../pipe/receiver/PipeEnrichedProcedureTest.java | 2 +- .../schema/DeactivateTemplateProcedureTest.java | 2 +- .../impl/schema/UnsetTemplateProcedureTest.java | 2 +- .../apache/iotdb/db/audit/AuditLogStorage.java} | 8 +- .../org/apache/iotdb/db/audit/AuditLogger.java | 278 ++++++ .../org/apache/iotdb/db/audit/DNAuditLogger.java | 216 ++--- .../org/apache/iotdb/db/auth/AuthorityChecker.java | 29 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 48 ++ .../schemaregion/SchemaExecutionVisitor.java | 2 +- .../agent/task/connection/PipeEventCollector.java | 22 +- .../db/pipe/event/common/PipeInsertionEvent.java | 1 - .../tablet/PipeInsertNodeTabletInsertionEvent.java | 75 +- .../common/tablet/PipeRawTabletInsertionEvent.java | 27 +- .../tablet/parser/TabletInsertionEventParser.java | 3 +- .../TabletInsertionEventTablePatternParser.java | 4 +- .../TabletInsertionEventTreePatternParser.java | 38 +- .../common/tsfile/PipeTsFileInsertionEvent.java | 120 +-- .../tsfile/parser/TsFileInsertionEventParser.java | 8 +- .../parser/TsFileInsertionEventParserProvider.java | 25 +- .../query/TsFileInsertionEventQueryParser.java | 59 +- .../scan/TsFileInsertionEventScanParser.java | 49 +- .../table/TsFileInsertionEventTableParser.java | 29 +- .../protocol/thrift/IoTDBDataNodeReceiver.java | 8 +- ...leStatementDataTypeConvertExecutionVisitor.java | 2 +- .../batch/PipeTabletEventTsFileBatch.java | 6 +- .../sink/protocol/legacy/IoTDBLegacyPipeSink.java | 7 +- .../sink/protocol/writeback/WriteBackSink.java | 71 +- ...istoricalDataRegionTsFileAndDeletionSource.java | 7 +- .../matcher/CachedSchemaPatternMatcher.java | 8 +- .../schemaregion/IoTDBSchemaRegionSource.java | 10 +- .../PipePlanTreePrivilegeParseVisitor.java | 345 -------- .../db/protocol/client/DataNodeInternalClient.java | 7 +- .../iotdb/db/protocol/mqtt/MPPPublishHandler.java | 7 +- .../rest/handler/AuthorizationHandler.java | 12 +- .../iotdb/db/protocol/session/SessionManager.java | 48 +- .../protocol/thrift/impl/ClientRPCServiceImpl.java | 340 ++++---- .../impl/DataNodeInternalRPCServiceImpl.java | 2 +- .../db/queryengine/common/MPPQueryContext.java | 27 +- .../common/schematree/ClusterSchemaTree.java | 2 +- .../queryengine/common/schematree/ISchemaTree.java | 2 +- .../schematree/visitor/SchemaTreeVisitor.java | 2 +- .../SchemaTreeVisitorWithLimitOffsetWrapper.java | 2 +- .../execution/executor/RegionWriteExecutor.java | 2 +- .../operator/schema/SchemaFetchScanOperator.java | 2 +- .../schema/source/SchemaSourceFactory.java | 2 +- .../schema/source/TimeSeriesSchemaSource.java | 2 +- .../db/queryengine/plan/analyze/Analysis.java | 2 +- .../queryengine/plan/analyze/AnalyzeVisitor.java | 4 +- .../plan/analyze/TemplatedAggregationAnalyze.java | 2 +- .../queryengine/plan/analyze/TemplatedAnalyze.java | 2 +- .../analyze/schema/AutoCreateSchemaExecutor.java | 13 +- .../analyze/schema/ClusterSchemaFetchExecutor.java | 2 +- .../plan/analyze/schema/ClusterSchemaFetcher.java | 2 +- .../plan/analyze/schema/ISchemaFetcher.java | 2 +- .../plan/analyze/schema/TemplateSchemaFetcher.java | 2 +- .../execution/config/TableConfigTaskVisitor.java | 33 +- .../execution/config/TreeConfigTaskVisitor.java | 29 +- .../config/executor/ClusterConfigTaskExecutor.java | 57 +- .../template/ShowNodesInSchemaTemplateTask.java | 2 +- .../metadata/template/ShowSchemaTemplateTask.java | 2 +- .../execution/config/sys/pipe/AlterPipeTask.java | 10 +- .../execution/config/sys/pipe/CreatePipeTask.java | 8 +- .../db/queryengine/plan/parser/ASTVisitor.java | 86 +- .../plan/planner/LogicalPlanBuilder.java | 2 +- .../plan/planner/LogicalPlanVisitor.java | 2 +- .../metadata/read/LevelTimeSeriesCountNode.java | 2 +- .../metadata/read/SeriesSchemaFetchScanNode.java | 2 +- .../node/metadata/read/TimeSeriesCountNode.java | 2 +- .../metadata/read/TimeSeriesSchemaScanNode.java | 2 +- .../relational/analyzer/StatementAnalyzer.java | 37 +- .../cache/TreeDeviceSchemaCacheManager.java | 2 +- .../plan/relational/security/AccessControl.java | 8 +- .../relational/security/AccessControlImpl.java | 147 +--- .../relational/security/AllowAllAccessControl.java | 9 +- .../relational/security/ITableAuthCheckerImpl.java | 127 +-- .../security/TreeAccessCheckContext.java | 43 +- .../security/TreeAccessCheckVisitor.java | 832 ++++-------------- .../plan/relational/sql/ast/CreatePipe.java | 37 +- .../plan/relational/sql/util/SqlFormatter.java | 8 +- .../plan/statement/StatementVisitor.java | 6 +- .../InternalBatchActivateTemplateStatement.java | 2 +- .../internal/SeriesSchemaFetchStatement.java | 2 +- .../statement/metadata/CountDatabaseStatement.java | 2 +- .../metadata/DeleteDatabaseStatement.java | 2 +- .../statement/metadata/ShowDatabaseStatement.java | 2 +- .../metadata/pipe/AlterPipeStatement.java | 40 +- .../metadata/pipe/CreatePipeStatement.java | 28 +- .../template/ActivateTemplateStatement.java | 11 +- .../template/BatchActivateTemplateStatement.java | 2 +- .../template/DeactivateTemplateStatement.java | 2 +- .../rescon/MemSchemaRegionStatistics.java | 2 +- .../schemaengine/schemaregion/ISchemaRegion.java | 2 +- .../schemaregion/impl/SchemaRegionMemoryImpl.java | 2 +- .../schemaregion/impl/SchemaRegionPBTreeImpl.java | 2 +- .../schemaregion/mtree/IMTreeStore.java | 2 +- .../mtree/impl/mem/MTreeBelowSGMemoryImpl.java | 2 +- .../schemaregion/mtree/impl/mem/MemMTreeStore.java | 2 +- .../mnode/iterator/AbstractTraverserIterator.java | 2 +- .../mnode/iterator/MemoryTraverserIterator.java | 2 +- .../mtree/impl/pbtree/CachedMTreeStore.java | 2 +- .../mtree/impl/pbtree/MTreeBelowSGCachedImpl.java | 2 +- .../pbtree/ReentrantReadOnlyCachedMTreeStore.java | 2 +- .../mnode/iterator/CachedTraverserIterator.java | 2 +- .../schemaregion/mtree/traverser/Traverser.java | 2 +- .../schemaregion/read/req/IShowTimeSeriesPlan.java | 2 +- .../read/req/SchemaRegionReadPlanFactory.java | 2 +- .../read/req/impl/ShowTimeSeriesPlanImpl.java | 2 +- .../schemaregion/utils/MNodeUtils.java | 2 +- .../template/ClusterTemplateManager.java | 1 - .../db/schemaengine/template/ITemplateManager.java | 1 - .../iotdb/db/schemaengine}/template/Template.java | 2 +- .../template/TemplateInternalRPCUtil.java | 2 - .../java/org/apache/iotdb/db/service/DataNode.java | 9 +- .../iotdb/db/service/DataNodeShutdownHook.java | 4 +- ...leStatementDataTypeConvertExecutionVisitor.java | 2 +- .../apache/iotdb/db/utils/DataNodeAuthUtils.java | 20 +- .../cache/TreeDeviceSchemaCacheManagerTest.java | 2 +- .../schemaRegion/SchemaRegionManagementTest.java | 2 +- .../SchemaRegionSimpleRecoverTest.java | 2 +- .../schemaRegion/SchemaRegionTemplateTest.java | 2 +- .../schemaRegion/SchemaRegionTestUtil.java | 2 +- .../schemaRegion/SchemaStatisticsTest.java | 2 +- .../pipe/event/PipeTabletInsertionEventTest.java | 18 +- .../pipe/event/TsFileInsertionEventParserTest.java | 30 +- .../common/schematree/ClusterSchemaTreeTest.java | 2 +- .../plan/analyze/FakeSchemaFetcherImpl.java | 2 +- .../plan/planner/distribution/Util.java | 2 +- .../plan/planner/distribution/Util2.java | 2 +- .../statement/sys/pipe/PipeStatementTest.java | 8 +- .../db/utils/SchemaRegionSnapshotParserTest.java | 2 +- .../iotdb/commons/audit/AbstractAuditLogger.java | 73 +- .../apache/iotdb/commons/audit/AuditEventType.java | 1 - .../apache/iotdb/commons/audit/AuditLogFields.java | 102 +-- .../apache/iotdb/commons/audit/IAuditEntity.java | 8 +- .../org/apache/iotdb/commons/audit/UserEntity.java | 21 +- .../iotdb/commons/auth/user/BasicUserManager.java | 41 + .../apache/iotdb/commons/conf/CommonConfig.java | 13 - .../iotdb/commons/conf/CommonDescriptor.java | 10 - .../apache/iotdb/commons/conf/IoTDBConstant.java | 4 + .../pipe/config/constant/SystemConstant.java | 2 + .../datastructure/pattern/IoTDBTreePattern.java | 14 - .../src/main/thrift/confignode.thrift | 8 - 196 files changed, 1631 insertions(+), 4145 deletions(-) delete mode 100644 integration-test/src/test/java/org/apache/iotdb/db/it/audit/IoTDBAuditLogBasicIT.java rename iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/{PipeConfigTablePatternParseVisitor.java => PipeConfigPhysicalPlanTablePatternParseVisitor.java} (99%) rename iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/{PipeConfigTablePrivilegeParseVisitor.java => PipeConfigPhysicalPlanTablePrivilegeParseVisitor.java} (99%) rename iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/{PipeConfigTableScopeParseVisitor.java => PipeConfigPhysicalPlanTableScopeParseVisitor.java} (98%) rename iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/{PipeConfigTreePatternParseVisitor.java => PipeConfigPhysicalPlanTreePatternParseVisitor.java} (97%) rename iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/{PipeConfigTreeScopeParseVisitor.java => PipeConfigPhysicalPlanTreeScopeParseVisitor.java} (98%) delete mode 100644 iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigTreePrivilegeParseVisitor.java rename iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/source/{PipeConfigScopeParseVisitorTest.java => PipeConfigPhysicalPlanScopeParseVisitorTest.java} (98%) rename iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/source/{PipeConfigTablePatternParseVisitorTest.java => PipeConfigPhysicalPlanTablePatternParseVisitorTest.java} (99%) rename iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/source/{PipeConfigTreePatternParseVisitorTest.java => PipeConfigPhysicalPlanTreePatternParseVisitorTest.java} (99%) copy iotdb-core/{metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/NodeType.java => datanode/src/main/java/org/apache/iotdb/db/audit/AuditLogStorage.java} (90%) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/audit/AuditLogger.java delete mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePrivilegeParseVisitor.java rename iotdb-core/{node-commons/src/main/java/org/apache/iotdb/commons/schema => datanode/src/main/java/org/apache/iotdb/db/schemaengine}/template/Template.java (99%)