This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
from 9b8c91e18c [improvement](rowset reader) fix possible memleak (#16680)
add 69c70d27bd [Refactor](auth) Add AccessController to support customized
authorization (#16679)
No new revisions were added by this update.
Summary of changes:
.../doris/alter/MaterializedViewHandler.java | 2 +-
.../apache/doris/alter/SchemaChangeHandler.java | 2 +-
.../apache/doris/analysis/AbstractBackupStmt.java | 2 +-
.../analysis/AdminCancelRebalanceDiskStmt.java | 2 +-
.../doris/analysis/AdminCancelRepairTableStmt.java | 2 +-
.../doris/analysis/AdminCheckTabletsStmt.java | 2 +-
.../apache/doris/analysis/AdminCleanTrashStmt.java | 2 +-
.../doris/analysis/AdminCompactTableStmt.java | 2 +-
.../apache/doris/analysis/AdminCopyTabletStmt.java | 2 +-
.../doris/analysis/AdminDiagnoseTabletStmt.java | 2 +-
.../doris/analysis/AdminRebalanceDiskStmt.java | 2 +-
.../doris/analysis/AdminRepairTableStmt.java | 2 +-
.../apache/doris/analysis/AdminSetConfigStmt.java | 2 +-
.../doris/analysis/AdminSetReplicaStatusStmt.java | 2 +-
.../apache/doris/analysis/AdminShowConfigStmt.java | 2 +-
.../analysis/AdminShowReplicaDistributionStmt.java | 2 +-
.../doris/analysis/AdminShowReplicaStatusStmt.java | 2 +-
.../analysis/AdminShowTabletStorageFormatStmt.java | 2 +-
.../doris/analysis/AlterCatalogNameStmt.java | 2 +-
.../doris/analysis/AlterCatalogPropertyStmt.java | 2 +-
.../apache/doris/analysis/AlterClusterStmt.java | 2 +-
.../doris/analysis/AlterColumnStatsStmt.java | 2 +-
.../doris/analysis/AlterDatabaseQuotaStmt.java | 3 +-
.../apache/doris/analysis/AlterDatabaseRename.java | 2 +-
.../doris/analysis/AlterMaterializedViewStmt.java | 2 +-
.../org/apache/doris/analysis/AlterPolicyStmt.java | 2 +-
.../apache/doris/analysis/AlterResourceStmt.java | 2 +-
.../doris/analysis/AlterSqlBlockRuleStmt.java | 2 +-
.../org/apache/doris/analysis/AlterSystemStmt.java | 2 +-
.../org/apache/doris/analysis/AlterTableStmt.java | 2 +-
.../org/apache/doris/analysis/AlterUserStmt.java | 2 +-
.../org/apache/doris/analysis/AlterViewStmt.java | 2 +-
.../org/apache/doris/analysis/AnalyzeStmt.java | 5 +-
.../doris/analysis/CancelAlterTableStmt.java | 2 +-
.../apache/doris/analysis/CancelBackupStmt.java | 2 +-
.../apache/doris/analysis/ChannelDescription.java | 2 +-
.../org/apache/doris/analysis/CleanLabelStmt.java | 2 +-
.../apache/doris/analysis/CreateCatalogStmt.java | 2 +-
.../apache/doris/analysis/CreateClusterStmt.java | 2 +-
.../org/apache/doris/analysis/CreateDbStmt.java | 2 +-
.../doris/analysis/CreateEncryptKeyStmt.java | 2 +-
.../org/apache/doris/analysis/CreateFileStmt.java | 2 +-
.../apache/doris/analysis/CreateFunctionStmt.java | 2 +-
.../apache/doris/analysis/CreatePolicyStmt.java | 2 +-
.../doris/analysis/CreateRepositoryStmt.java | 2 +-
.../apache/doris/analysis/CreateResourceStmt.java | 2 +-
.../org/apache/doris/analysis/CreateRoleStmt.java | 2 +-
.../doris/analysis/CreateSqlBlockRuleStmt.java | 2 +-
.../apache/doris/analysis/CreateTableLikeStmt.java | 4 +-
.../org/apache/doris/analysis/CreateTableStmt.java | 2 +-
.../org/apache/doris/analysis/CreateUserStmt.java | 2 +-
.../org/apache/doris/analysis/CreateViewStmt.java | 2 +-
.../org/apache/doris/analysis/DataDescription.java | 4 +-
.../java/org/apache/doris/analysis/DeleteStmt.java | 2 +-
.../org/apache/doris/analysis/DescribeStmt.java | 3 +-
.../org/apache/doris/analysis/DropCatalogStmt.java | 2 +-
.../org/apache/doris/analysis/DropClusterStmt.java | 2 +-
.../java/org/apache/doris/analysis/DropDbStmt.java | 2 +-
.../apache/doris/analysis/DropEncryptKeyStmt.java | 2 +-
.../org/apache/doris/analysis/DropFileStmt.java | 2 +-
.../apache/doris/analysis/DropFunctionStmt.java | 2 +-
.../doris/analysis/DropMaterializedViewStmt.java | 4 +-
.../org/apache/doris/analysis/DropPolicyStmt.java | 2 +-
.../apache/doris/analysis/DropRepositoryStmt.java | 2 +-
.../apache/doris/analysis/DropResourceStmt.java | 2 +-
.../org/apache/doris/analysis/DropRoleStmt.java | 2 +-
.../doris/analysis/DropSqlBlockRuleStmt.java | 2 +-
.../apache/doris/analysis/DropTableStatsStmt.java | 5 +-
.../org/apache/doris/analysis/DropTableStmt.java | 2 +-
.../org/apache/doris/analysis/DropUserStmt.java | 2 +-
.../java/org/apache/doris/analysis/ExportStmt.java | 2 +-
.../org/apache/doris/analysis/FrontendClause.java | 2 +-
.../apache/doris/analysis/FunctionCallExpr.java | 2 +-
.../java/org/apache/doris/analysis/GrantStmt.java | 20 +--
.../java/org/apache/doris/analysis/InsertStmt.java | 4 +-
.../apache/doris/analysis/InstallPluginStmt.java | 2 +-
.../java/org/apache/doris/analysis/LinkDbStmt.java | 2 +-
.../java/org/apache/doris/analysis/LoadStmt.java | 2 +-
.../org/apache/doris/analysis/LockTablesStmt.java | 2 +-
.../org/apache/doris/analysis/MigrateDbStmt.java | 2 +-
.../org/apache/doris/analysis/RecoverDbStmt.java | 2 +-
.../doris/analysis/RecoverPartitionStmt.java | 2 +-
.../apache/doris/analysis/RecoverTableStmt.java | 2 +-
.../apache/doris/analysis/RefreshCatalogStmt.java | 2 +-
.../org/apache/doris/analysis/RefreshDbStmt.java | 4 +-
.../analysis/RefreshMaterializedViewStmt.java | 2 +-
.../apache/doris/analysis/RefreshTableStmt.java | 4 +-
.../java/org/apache/doris/analysis/SelectStmt.java | 2 +-
.../java/org/apache/doris/analysis/SetPassVar.java | 2 +-
.../apache/doris/analysis/SetUserPropertyVar.java | 12 +-
.../java/org/apache/doris/analysis/SetVar.java | 2 +-
.../org/apache/doris/analysis/ShowAnalyzeStmt.java | 5 +-
.../apache/doris/analysis/ShowBackendsStmt.java | 4 +-
.../org/apache/doris/analysis/ShowBackupStmt.java | 2 +-
.../org/apache/doris/analysis/ShowBrokerStmt.java | 4 +-
.../org/apache/doris/analysis/ShowClusterStmt.java | 2 +-
.../doris/analysis/ShowCreateCatalogStmt.java | 2 +-
.../apache/doris/analysis/ShowCreateDbStmt.java | 2 +-
.../doris/analysis/ShowCreateFunctionStmt.java | 2 +-
.../analysis/ShowCreateMaterializedViewStmt.java | 2 +-
.../apache/doris/analysis/ShowCreateTableStmt.java | 2 +-
.../apache/doris/analysis/ShowDataSkewStmt.java | 2 +-
.../org/apache/doris/analysis/ShowDataStmt.java | 4 +-
.../org/apache/doris/analysis/ShowDbIdStmt.java | 2 +-
.../apache/doris/analysis/ShowEncryptKeysStmt.java | 2 +-
.../apache/doris/analysis/ShowFrontendsStmt.java | 4 +-
.../apache/doris/analysis/ShowFunctionsStmt.java | 2 +-
.../org/apache/doris/analysis/ShowGrantsStmt.java | 2 +-
.../org/apache/doris/analysis/ShowIndexStmt.java | 2 +-
.../apache/doris/analysis/ShowMigrationsStmt.java | 2 +-
.../apache/doris/analysis/ShowPartitionIdStmt.java | 2 +-
.../apache/doris/analysis/ShowPartitionsStmt.java | 2 +-
.../org/apache/doris/analysis/ShowPolicyStmt.java | 2 +-
.../org/apache/doris/analysis/ShowProcStmt.java | 2 +-
.../org/apache/doris/analysis/ShowRestoreStmt.java | 2 +-
.../org/apache/doris/analysis/ShowRolesStmt.java | 2 +-
.../apache/doris/analysis/ShowSmallFilesStmt.java | 2 +-
.../doris/analysis/ShowSqlBlockRuleStmt.java | 2 +-
.../org/apache/doris/analysis/ShowTableIdStmt.java | 2 +-
.../apache/doris/analysis/ShowTableStatusStmt.java | 2 +-
.../org/apache/doris/analysis/ShowTabletStmt.java | 2 +-
.../apache/doris/analysis/ShowTrashDiskStmt.java | 4 +-
.../org/apache/doris/analysis/ShowTrashStmt.java | 4 +-
.../apache/doris/analysis/ShowTypeCastStmt.java | 2 +-
.../doris/analysis/ShowUserPropertyStmt.java | 2 +-
.../org/apache/doris/analysis/ShowViewStmt.java | 2 +-
.../java/org/apache/doris/analysis/SwitchStmt.java | 2 +-
.../apache/doris/analysis/TruncateTableStmt.java | 2 +-
.../apache/doris/analysis/UninstallPluginStmt.java | 2 +-
.../java/org/apache/doris/analysis/UpdateStmt.java | 2 +-
.../java/org/apache/doris/analysis/UseStmt.java | 2 +-
.../main/java/org/apache/doris/catalog/Env.java | 9 +-
.../java/org/apache/doris/catalog/MysqlTable.java | 2 +-
.../java/org/apache/doris/catalog/OdbcTable.java | 2 +-
.../java/org/apache/doris/catalog/ResourceMgr.java | 3 +-
.../org/apache/doris/datasource/CatalogMgr.java | 6 +-
.../apache/doris/datasource/InternalCatalog.java | 4 +-
.../doris/httpv2/controller/BaseController.java | 8 +-
.../apache/doris/httpv2/rest/CancelLoadAction.java | 2 +-
.../apache/doris/httpv2/rest/MetaInfoAction.java | 5 +-
.../doris/httpv2/restv2/MetaInfoActionV2.java | 6 +-
.../java/org/apache/doris/load/DeleteHandler.java | 2 +-
.../main/java/org/apache/doris/load/ExportMgr.java | 4 +-
.../src/main/java/org/apache/doris/load/Load.java | 4 +-
.../java/org/apache/doris/load/loadv2/LoadJob.java | 6 +-
.../doris/load/loadv2/LoadingTaskPlanner.java | 2 +-
.../doris/load/routineload/RoutineLoadManager.java | 6 +-
.../mysql/privilege/AccessControllerManager.java | 161 +++++++++++++++++++++
.../org/apache/doris/mysql/privilege/Auth.java | 84 ++---------
.../mysql/privilege/CatalogAccessController.java | 48 ++++++
.../InternalCatalogAccessController.java} | 30 ++--
.../privilege/RangerAccessController.java} | 33 ++---
.../org/apache/doris/mysql/privilege/Role.java | 2 +-
.../privilege/SystemAccessController.java} | 45 +++---
.../nereids/rules/analysis/UserAuthentication.java | 3 +-
.../java/org/apache/doris/qe/ConnectScheduler.java | 2 +-
.../java/org/apache/doris/qe/ShowExecutor.java | 22 +--
.../java/org/apache/doris/qe/StmtExecutor.java | 2 +-
.../apache/doris/service/FrontendServiceImpl.java | 12 +-
.../tablefunction/IcebergTableValuedFunction.java | 3 +-
.../doris/transaction/DatabaseTransactionMgr.java | 2 +-
.../org/apache/doris/analysis/AccessTestUtil.java | 62 ++++----
.../analysis/AdminCancelRebalanceDiskStmtTest.java | 6 +-
.../doris/analysis/AdminRebalanceDiskStmtTest.java | 9 +-
.../doris/analysis/AlterCatalogNameStmtTest.java | 6 +-
.../doris/analysis/AlterCatalogPropsStmtTest.java | 6 +-
.../doris/analysis/AlterClusterStmtTest.java | 6 +-
.../doris/analysis/AlterDatabaseQuotaStmtTest.java | 10 +-
.../doris/analysis/AlterRoutineLoadStmtTest.java | 10 +-
.../doris/analysis/AlterSqlBlockRuleStmtTest.java | 6 +-
.../apache/doris/analysis/AlterTableStmtTest.java | 10 +-
.../doris/analysis/CreateCatalogStmtTest.java | 6 +-
.../doris/analysis/CreateClusterStmtTest.java | 6 +-
.../doris/analysis/CreateDataSyncJobStmtTest.java | 10 +-
.../apache/doris/analysis/CreateDbStmtTest.java | 6 +-
.../doris/analysis/CreateResourceStmtTest.java | 20 +--
.../doris/analysis/CreateSqlBlockRuleStmtTest.java | 6 +-
.../apache/doris/analysis/CreateTableStmtTest.java | 6 +-
.../apache/doris/analysis/CreateUserStmtTest.java | 5 +-
.../apache/doris/analysis/DataDescriptionTest.java | 6 +-
.../org/apache/doris/analysis/DeleteStmtTest.java | 6 +-
.../apache/doris/analysis/DropCatalogStmtTest.java | 6 +-
.../apache/doris/analysis/DropClusterStmtTest.java | 10 +-
.../org/apache/doris/analysis/DropDbStmtTest.java | 6 +-
.../analysis/DropMaterializedViewStmtTest.java | 6 +-
.../apache/doris/analysis/DropTableStmtTest.java | 6 +-
.../apache/doris/analysis/DropUserStmtTest.java | 6 +-
.../org/apache/doris/analysis/GrantStmtTest.java | 8 +-
.../doris/analysis/InstallPluginStmtTest.java | 6 +-
.../org/apache/doris/analysis/LinkDbStmtTest.java | 6 +-
.../org/apache/doris/analysis/LoadStmtTest.java | 13 +-
.../apache/doris/analysis/MigrateDbStmtTest.java | 6 +-
.../doris/analysis/SetOperationStmtTest.java | 6 +-
.../org/apache/doris/analysis/SetPassVarTest.java | 6 +-
.../org/apache/doris/analysis/SetStmtTest.java | 6 +-
.../doris/analysis/SetUserPropertyStmtTest.java | 6 +-
.../java/org/apache/doris/analysis/SetVarTest.java | 6 +-
.../doris/analysis/ShowCreateDbStmtTest.java | 6 +-
.../apache/doris/analysis/ShowDataStmtTest.java | 18 ++-
.../apache/doris/analysis/ShowDbIdStmtTest.java | 6 +-
.../doris/analysis/ShowEncryptKeysStmtTest.java | 6 +-
.../doris/analysis/ShowFunctionsStmtTest.java | 6 +-
.../apache/doris/analysis/ShowIndexStmtTest.java | 6 +-
.../doris/analysis/ShowPartitionIdStmtTest.java | 6 +-
.../doris/analysis/ShowTableCreationStmtTest.java | 6 +-
.../apache/doris/analysis/ShowTableIdStmtTest.java | 6 +-
.../apache/doris/analysis/ShowTableStmtTest.java | 6 +-
.../doris/analysis/ShowUserPropertyStmtTest.java | 6 +-
.../org/apache/doris/analysis/UseStmtTest.java | 6 +-
.../org/apache/doris/backup/CatalogMocker.java | 41 ++----
.../doris/catalog/OdbcCatalogResourceTest.java | 10 +-
.../org/apache/doris/catalog/ResourceMgrTest.java | 19 +--
.../org/apache/doris/catalog/S3ResourceTest.java | 20 +--
.../apache/doris/catalog/SparkResourceTest.java | 29 ++--
.../apache/doris/datasource/CatalogMgrTest.java | 8 +-
.../org/apache/doris/http/DorisHttpTestCase.java | 6 +-
.../apache/doris/ldap/LdapAuthenticateTest.java | 7 +
.../org/apache/doris/load/DeleteHandlerTest.java | 9 +-
.../apache/doris/load/loadv2/ExportMgrTest.java | 6 +-
.../load/routineload/RoutineLoadManagerTest.java | 62 ++++----
.../org/apache/doris/mtmv/ShowMTMVJobStmtTest.java | 8 +-
.../org/apache/doris/mysql/MysqlProtoTest.java | 10 +-
.../org/apache/doris/mysql/privilege/AuthTest.java | 134 +++++++++--------
.../apache/doris/mysql/privilege/MockedAuth.java | 10 +-
.../org/apache/doris/qe/PartitionCacheTest.java | 10 +-
.../java/org/apache/doris/qe/SetExecutorTest.java | 9 +-
.../java/org/apache/doris/qe/ShowExecutorTest.java | 9 +-
.../suites/demo_p0/thread_action.groovy | 2 -
228 files changed, 919 insertions(+), 736 deletions(-)
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/AccessControllerManager.java
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/CatalogAccessController.java
copy
fe/fe-core/src/main/java/org/apache/doris/{nereids/types/DateTimeType.java =>
mysql/privilege/InternalCatalogAccessController.java} (52%)
copy fe/fe-core/src/main/java/org/apache/doris/{analysis/DefaultValueExpr.java
=> mysql/privilege/RangerAccessController.java} (59%)
copy
fe/fe-core/src/main/java/org/apache/doris/{common/proc/UserPropertyProcNode.java
=> mysql/privilege/SystemAccessController.java} (50%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
