diff --git a/fe/fe-core/src/main/java/com/starrocks/alter/AlterJobMgr.java b/fe/fe-core/src/main/java/com/starrocks/alter/AlterJobMgr.java index 9aa6b791d4881..9cae78d95752d 100644 --- a/fe/fe-core/src/main/java/com/starrocks/alter/AlterJobMgr.java +++ b/fe/fe-core/src/main/java/com/starrocks/alter/AlterJobMgr.java @@ -37,6 +37,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.starrocks.authentication.AuthenticationMgr; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.catalog.BaseTableInfo; import com.starrocks.catalog.Column; import com.starrocks.catalog.Database; @@ -74,7 +75,6 @@ import com.starrocks.persist.metablock.SRMetaBlockID; import com.starrocks.persist.metablock.SRMetaBlockReader; import com.starrocks.persist.metablock.SRMetaBlockWriter; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.qe.ConnectContext; import com.starrocks.scheduler.Task; import com.starrocks.scheduler.TaskBuilder; diff --git a/fe/fe-core/src/main/java/com/starrocks/alter/AlterJobV2.java b/fe/fe-core/src/main/java/com/starrocks/alter/AlterJobV2.java index 38f51bb7c3bfe..45b5e5029b467 100644 --- a/fe/fe-core/src/main/java/com/starrocks/alter/AlterJobV2.java +++ b/fe/fe-core/src/main/java/com/starrocks/alter/AlterJobV2.java @@ -36,6 +36,7 @@ import com.google.common.collect.Sets; import com.google.gson.annotations.SerializedName; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.catalog.Database; import com.starrocks.catalog.MaterializedIndex; import com.starrocks.catalog.MaterializedIndexMeta; @@ -49,7 +50,6 @@ import com.starrocks.common.util.concurrent.lock.LockType; import com.starrocks.common.util.concurrent.lock.Locker; import com.starrocks.persist.gson.GsonUtils; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.server.WarehouseManager; diff --git a/fe/fe-core/src/main/java/com/starrocks/alter/OnlineOptimizeJobV2.java b/fe/fe-core/src/main/java/com/starrocks/alter/OnlineOptimizeJobV2.java index 21be0119b7f1c..98e4be6d3e3af 100644 --- a/fe/fe-core/src/main/java/com/starrocks/alter/OnlineOptimizeJobV2.java +++ b/fe/fe-core/src/main/java/com/starrocks/alter/OnlineOptimizeJobV2.java @@ -20,6 +20,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.gson.annotations.SerializedName; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.catalog.Database; import com.starrocks.catalog.DistributionInfo; import com.starrocks.catalog.MaterializedIndex; @@ -45,7 +46,6 @@ import com.starrocks.persist.ReplacePartitionOperationLog; import com.starrocks.persist.gson.GsonPostProcessable; import com.starrocks.persist.gson.GsonUtils; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.QueryState; import com.starrocks.qe.SessionVariable; diff --git a/fe/fe-core/src/main/java/com/starrocks/analysis/DescriptorTable.java b/fe/fe-core/src/main/java/com/starrocks/analysis/DescriptorTable.java index 02a4397d444eb..41e38835b4ffb 100644 --- a/fe/fe-core/src/main/java/com/starrocks/analysis/DescriptorTable.java +++ b/fe/fe-core/src/main/java/com/starrocks/analysis/DescriptorTable.java @@ -36,7 +36,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import com.starrocks.catalog.PartitionKey; import com.starrocks.catalog.Table; import com.starrocks.common.IdGenerator; @@ -45,7 +44,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; diff --git a/fe/fe-core/src/main/java/com/starrocks/analysis/DictQueryExpr.java b/fe/fe-core/src/main/java/com/starrocks/analysis/DictQueryExpr.java index f13dee5674029..1c85a4dcd34d3 100644 --- a/fe/fe-core/src/main/java/com/starrocks/analysis/DictQueryExpr.java +++ b/fe/fe-core/src/main/java/com/starrocks/analysis/DictQueryExpr.java @@ -17,7 +17,6 @@ import com.starrocks.catalog.Function; import com.starrocks.catalog.FunctionSet; -import com.starrocks.catalog.Type; import com.starrocks.sql.analyzer.SemanticException; import com.starrocks.sql.ast.AstVisitor; import com.starrocks.thrift.TDictQueryExpr; diff --git a/fe/fe-core/src/main/java/com/starrocks/analysis/LabelName.java b/fe/fe-core/src/main/java/com/starrocks/analysis/LabelName.java index 43f0f71484d56..0d3a0b413fcf0 100644 --- a/fe/fe-core/src/main/java/com/starrocks/analysis/LabelName.java +++ b/fe/fe-core/src/main/java/com/starrocks/analysis/LabelName.java @@ -35,11 +35,11 @@ package com.starrocks.analysis; import com.starrocks.cluster.ClusterNamespace; -import com.starrocks.sql.analyzer.FeNameFormat; import com.starrocks.common.io.Text; import com.starrocks.common.io.Writable; import com.starrocks.qe.ConnectContext; import com.starrocks.sql.analyzer.AnalyzerUtils; +import com.starrocks.sql.analyzer.FeNameFormat; import com.starrocks.sql.parser.NodePosition; import org.apache.commons.lang.builder.HashCodeBuilder; diff --git a/fe/fe-core/src/main/java/com/starrocks/analysis/VarBinaryLiteral.java b/fe/fe-core/src/main/java/com/starrocks/analysis/VarBinaryLiteral.java index 4542f868fd963..4310a31b119be 100644 --- a/fe/fe-core/src/main/java/com/starrocks/analysis/VarBinaryLiteral.java +++ b/fe/fe-core/src/main/java/com/starrocks/analysis/VarBinaryLiteral.java @@ -33,7 +33,6 @@ import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Objects; - import javax.validation.constraints.NotNull; import static com.starrocks.sql.common.ErrorMsgProxy.PARSER_ERROR_MSG; diff --git a/fe/fe-core/src/main/java/com/starrocks/analysis/VectorIndexUtil.java b/fe/fe-core/src/main/java/com/starrocks/analysis/VectorIndexUtil.java index 23c83504b3108..f8f79fafc3bd7 100644 --- a/fe/fe-core/src/main/java/com/starrocks/analysis/VectorIndexUtil.java +++ b/fe/fe-core/src/main/java/com/starrocks/analysis/VectorIndexUtil.java @@ -14,23 +14,13 @@ package com.starrocks.analysis; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.Locale; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - import com.starrocks.catalog.ArrayType; import com.starrocks.catalog.Column; -import com.starrocks.catalog.KeysType; -import com.starrocks.common.Config; import com.starrocks.catalog.IndexParams; import com.starrocks.catalog.IndexParams.IndexParamItem; import com.starrocks.catalog.IndexParams.IndexParamType; +import com.starrocks.catalog.KeysType; +import com.starrocks.common.Config; import com.starrocks.common.VectorIndexParams; import com.starrocks.common.VectorIndexParams.CommonIndexParamKey; import com.starrocks.common.VectorIndexParams.IndexParamsKey; @@ -40,6 +30,16 @@ import com.starrocks.sql.analyzer.SemanticException; import com.starrocks.sql.ast.IndexDef.IndexType; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Locale; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + public class VectorIndexUtil { public static void checkVectorIndexValid(Column column, Map properties, KeysType keysType) { diff --git a/fe/fe-core/src/main/java/com/starrocks/authentication/AuthenticationMgr.java b/fe/fe-core/src/main/java/com/starrocks/authentication/AuthenticationMgr.java index cee71ea1007d5..73fb01f801b3b 100644 --- a/fe/fe-core/src/main/java/com/starrocks/authentication/AuthenticationMgr.java +++ b/fe/fe-core/src/main/java/com/starrocks/authentication/AuthenticationMgr.java @@ -17,6 +17,9 @@ import com.google.gson.annotations.SerializedName; import com.starrocks.StarRocksFE; +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.PrivilegeException; +import com.starrocks.authorization.UserPrivilegeCollectionV2; import com.starrocks.common.Config; import com.starrocks.common.DdlException; import com.starrocks.common.Pair; @@ -28,9 +31,6 @@ import com.starrocks.persist.metablock.SRMetaBlockID; import com.starrocks.persist.metablock.SRMetaBlockReader; import com.starrocks.persist.metablock.SRMetaBlockWriter; -import com.starrocks.privilege.AuthorizationMgr; -import com.starrocks.privilege.PrivilegeException; -import com.starrocks.privilege.UserPrivilegeCollectionV2; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.SemanticException; import com.starrocks.sql.ast.CreateUserStmt; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/AccessControlProvider.java b/fe/fe-core/src/main/java/com/starrocks/authorization/AccessControlProvider.java similarity index 96% rename from fe/fe-core/src/main/java/com/starrocks/privilege/AccessControlProvider.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/AccessControlProvider.java index 7e7549e15e61d..3674b2c879a79 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/AccessControlProvider.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/AccessControlProvider.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; +import com.starrocks.authorization.ranger.RangerAccessController; import com.starrocks.catalog.InternalCatalog; -import com.starrocks.privilege.ranger.RangerAccessController; import com.starrocks.sql.analyzer.AuthorizerStmtVisitor; import java.util.Map; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/AccessController.java b/fe/fe-core/src/main/java/com/starrocks/authorization/AccessController.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/AccessController.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/AccessController.java index 33d41df2c1a2e..9e9eb002e1ec8 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/AccessController.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/AccessController.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.starrocks.analysis.Expr; import com.starrocks.analysis.TableName; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/AccessDeniedException.java b/fe/fe-core/src/main/java/com/starrocks/authorization/AccessDeniedException.java similarity index 98% rename from fe/fe-core/src/main/java/com/starrocks/privilege/AccessDeniedException.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/AccessDeniedException.java index 039fc08aeb5fc..f1250e429ba88 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/AccessDeniedException.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/AccessDeniedException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.starrocks.catalog.InternalCatalog; import com.starrocks.common.ErrorCode; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ActionSet.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ActionSet.java similarity index 97% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ActionSet.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ActionSet.java index de723fc71f33c..0c9eecd729aad 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ActionSet.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ActionSet.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.gson.annotations.SerializedName; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/AuthorizationMgr.java b/fe/fe-core/src/main/java/com/starrocks/authorization/AuthorizationMgr.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/AuthorizationMgr.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/AuthorizationMgr.java index 6824e959d1ec3..17bc9e791ae46 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/AuthorizationMgr.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/AuthorizationMgr.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/AuthorizationProvider.java b/fe/fe-core/src/main/java/com/starrocks/authorization/AuthorizationProvider.java similarity index 98% rename from fe/fe-core/src/main/java/com/starrocks/privilege/AuthorizationProvider.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/AuthorizationProvider.java index 6d82a993fb1ce..0ea665d69065e 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/AuthorizationProvider.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/AuthorizationProvider.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/CatalogPEntryObject.java b/fe/fe-core/src/main/java/com/starrocks/authorization/CatalogPEntryObject.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/CatalogPEntryObject.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/CatalogPEntryObject.java index 7823222e1ffb7..e458c04f0f372 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/CatalogPEntryObject.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/CatalogPEntryObject.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.gson.annotations.SerializedName; import com.starrocks.catalog.Catalog; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ColumnPrivilege.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ColumnPrivilege.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ColumnPrivilege.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ColumnPrivilege.java index f8910eceff5e6..b65adafde6335 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ColumnPrivilege.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ColumnPrivilege.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.common.collect.Maps; import com.starrocks.analysis.TableName; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/DbPEntryObject.java b/fe/fe-core/src/main/java/com/starrocks/authorization/DbPEntryObject.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/DbPEntryObject.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/DbPEntryObject.java index 1e89a795f8504..f393ebbab37ca 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/DbPEntryObject.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/DbPEntryObject.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.common.base.Preconditions; import com.google.gson.annotations.SerializedName; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/DefaultAuthorizationProvider.java b/fe/fe-core/src/main/java/com/starrocks/authorization/DefaultAuthorizationProvider.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/DefaultAuthorizationProvider.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/DefaultAuthorizationProvider.java index 6dd2d9b59df22..60c2e1df5265c 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/DefaultAuthorizationProvider.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/DefaultAuthorizationProvider.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.common.collect.Lists; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ExternalAccessController.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ExternalAccessController.java similarity index 94% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ExternalAccessController.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ExternalAccessController.java index c73b0c8b42bc2..5583e39b24f43 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ExternalAccessController.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ExternalAccessController.java @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; public abstract class ExternalAccessController implements AccessController { } diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ForwardCompatiblePEntryObject.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ForwardCompatiblePEntryObject.java similarity index 98% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ForwardCompatiblePEntryObject.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ForwardCompatiblePEntryObject.java index c8bfb9703ee90..ee94cdb869757 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ForwardCompatiblePEntryObject.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ForwardCompatiblePEntryObject.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/FunctionPEntryObject.java b/fe/fe-core/src/main/java/com/starrocks/authorization/FunctionPEntryObject.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/FunctionPEntryObject.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/FunctionPEntryObject.java index 677911af8ef28..e60f028023fe4 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/FunctionPEntryObject.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/FunctionPEntryObject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.common.base.Objects; import com.google.gson.annotations.SerializedName; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/GlobalFunctionPEntryObject.java b/fe/fe-core/src/main/java/com/starrocks/authorization/GlobalFunctionPEntryObject.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/GlobalFunctionPEntryObject.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/GlobalFunctionPEntryObject.java index d0da0dd78f3ed..6d1c2a6763236 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/GlobalFunctionPEntryObject.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/GlobalFunctionPEntryObject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.common.base.Objects; import com.google.gson.annotations.SerializedName; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/MaterializedViewPEntryObject.java b/fe/fe-core/src/main/java/com/starrocks/authorization/MaterializedViewPEntryObject.java similarity index 98% rename from fe/fe-core/src/main/java/com/starrocks/privilege/MaterializedViewPEntryObject.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/MaterializedViewPEntryObject.java index 48c93ccd68541..f5215f2c49728 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/MaterializedViewPEntryObject.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/MaterializedViewPEntryObject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.starrocks.catalog.Database; import com.starrocks.catalog.InternalCatalog; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/NativeAccessController.java b/fe/fe-core/src/main/java/com/starrocks/authorization/NativeAccessController.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/NativeAccessController.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/NativeAccessController.java index ba4d337ee62b2..50f5438c83ae4 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/NativeAccessController.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/NativeAccessController.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ObjectType.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ObjectType.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ObjectType.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ObjectType.java index 4779fecc06297..6bc9a536c3b05 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ObjectType.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ObjectType.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/PEntryObject.java b/fe/fe-core/src/main/java/com/starrocks/authorization/PEntryObject.java similarity index 98% rename from fe/fe-core/src/main/java/com/starrocks/privilege/PEntryObject.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/PEntryObject.java index ddd19e0b24771..19fffef1ff67f 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/PEntryObject.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/PEntryObject.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/PipePEntryObject.java b/fe/fe-core/src/main/java/com/starrocks/authorization/PipePEntryObject.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/PipePEntryObject.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/PipePEntryObject.java index dca02bca3c6f4..54e590bb52b1d 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/PipePEntryObject.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/PipePEntryObject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.common.collect.Lists; import com.google.gson.annotations.SerializedName; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/PolicyFCEntryObject.java b/fe/fe-core/src/main/java/com/starrocks/authorization/PolicyFCEntryObject.java similarity index 94% rename from fe/fe-core/src/main/java/com/starrocks/privilege/PolicyFCEntryObject.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/PolicyFCEntryObject.java index 23d14b72dc854..757a2eba26d15 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/PolicyFCEntryObject.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/PolicyFCEntryObject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; public class PolicyFCEntryObject extends ForwardCompatiblePEntryObject { } diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/PrivObjNotFoundException.java b/fe/fe-core/src/main/java/com/starrocks/authorization/PrivObjNotFoundException.java similarity index 95% rename from fe/fe-core/src/main/java/com/starrocks/privilege/PrivObjNotFoundException.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/PrivObjNotFoundException.java index 3fb91ceecb299..565a484f1573c 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/PrivObjNotFoundException.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/PrivObjNotFoundException.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; public class PrivObjNotFoundException extends PrivilegeException { public PrivObjNotFoundException(String msg) { diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeBuiltinConstants.java b/fe/fe-core/src/main/java/com/starrocks/authorization/PrivilegeBuiltinConstants.java similarity index 98% rename from fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeBuiltinConstants.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/PrivilegeBuiltinConstants.java index e271c6aeec33f..df64972cfebfe 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeBuiltinConstants.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/PrivilegeBuiltinConstants.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import java.util.Arrays; import java.util.HashSet; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeCollectionV2.java b/fe/fe-core/src/main/java/com/starrocks/authorization/PrivilegeCollectionV2.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeCollectionV2.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/PrivilegeCollectionV2.java index 2b0b05123ebf4..c5761fe8b034a 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeCollectionV2.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/PrivilegeCollectionV2.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.gson.annotations.SerializedName; import com.starrocks.persist.gson.GsonPostProcessable; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeEntry.java b/fe/fe-core/src/main/java/com/starrocks/authorization/PrivilegeEntry.java similarity index 98% rename from fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeEntry.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/PrivilegeEntry.java index 24b5bb4219573..b79110b5d7b2c 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeEntry.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/PrivilegeEntry.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.gson.annotations.SerializedName; import org.jetbrains.annotations.NotNull; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeException.java b/fe/fe-core/src/main/java/com/starrocks/authorization/PrivilegeException.java similarity index 95% rename from fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeException.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/PrivilegeException.java index 66ab2a4105179..0c410cebae37d 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeException.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/PrivilegeException.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; public class PrivilegeException extends Exception { public PrivilegeException(String msg) { diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeType.java b/fe/fe-core/src/main/java/com/starrocks/authorization/PrivilegeType.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeType.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/PrivilegeType.java index fc58b855d12b5..41bff44938755 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeType.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/PrivilegeType.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.common.collect.ImmutableSet; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ResourceGroupPEntryObject.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ResourceGroupPEntryObject.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ResourceGroupPEntryObject.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ResourceGroupPEntryObject.java index 1a49f3d88ae22..b764bfcd1e69a 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ResourceGroupPEntryObject.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ResourceGroupPEntryObject.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.gson.annotations.SerializedName; import com.starrocks.catalog.ResourceGroup; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ResourcePEntryObject.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ResourcePEntryObject.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ResourcePEntryObject.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ResourcePEntryObject.java index 8a8ae580b45f2..7bdd7cb51df79 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ResourcePEntryObject.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ResourcePEntryObject.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.gson.annotations.SerializedName; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/RolePrivilegeCollectionV2.java b/fe/fe-core/src/main/java/com/starrocks/authorization/RolePrivilegeCollectionV2.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/RolePrivilegeCollectionV2.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/RolePrivilegeCollectionV2.java index 0fb89094f5948..f4b6fd4ffc225 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/RolePrivilegeCollectionV2.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/RolePrivilegeCollectionV2.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.gson.annotations.SerializedName; import com.starrocks.persist.gson.GsonUtils; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/SecurityPolicyRewriteRule.java b/fe/fe-core/src/main/java/com/starrocks/authorization/SecurityPolicyRewriteRule.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/SecurityPolicyRewriteRule.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/SecurityPolicyRewriteRule.java index e0c30f50b57aa..dde9c728f8d4e 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/SecurityPolicyRewriteRule.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/SecurityPolicyRewriteRule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.starrocks.analysis.Expr; import com.starrocks.analysis.SlotRef; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/StorageVolumePEntryObject.java b/fe/fe-core/src/main/java/com/starrocks/authorization/StorageVolumePEntryObject.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/StorageVolumePEntryObject.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/StorageVolumePEntryObject.java index 74ffe69a1a7be..1bbb637724908 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/StorageVolumePEntryObject.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/StorageVolumePEntryObject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.gson.annotations.SerializedName; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/TablePEntryObject.java b/fe/fe-core/src/main/java/com/starrocks/authorization/TablePEntryObject.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/TablePEntryObject.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/TablePEntryObject.java index 0546d82b5ceab..ab1dcb5f21162 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/TablePEntryObject.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/TablePEntryObject.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.common.base.Preconditions; import com.google.gson.annotations.SerializedName; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/UserPEntryObject.java b/fe/fe-core/src/main/java/com/starrocks/authorization/UserPEntryObject.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/UserPEntryObject.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/UserPEntryObject.java index 3eee9df560eeb..d5a058cc0b54a 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/UserPEntryObject.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/UserPEntryObject.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.gson.annotations.SerializedName; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/UserPrivilegeCollectionV2.java b/fe/fe-core/src/main/java/com/starrocks/authorization/UserPrivilegeCollectionV2.java similarity index 97% rename from fe/fe-core/src/main/java/com/starrocks/privilege/UserPrivilegeCollectionV2.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/UserPrivilegeCollectionV2.java index caa7cb5a00c6a..2b4899c0165dc 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/UserPrivilegeCollectionV2.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/UserPrivilegeCollectionV2.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.gson.annotations.SerializedName; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ViewPEntryObject.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ViewPEntryObject.java similarity index 98% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ViewPEntryObject.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ViewPEntryObject.java index 010d5322b9d63..fabfe3ff1923e 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ViewPEntryObject.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ViewPEntryObject.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.starrocks.catalog.Database; import com.starrocks.catalog.InternalCatalog; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/WarehouseFCPEntryObject.java b/fe/fe-core/src/main/java/com/starrocks/authorization/WarehouseFCPEntryObject.java similarity index 95% rename from fe/fe-core/src/main/java/com/starrocks/privilege/WarehouseFCPEntryObject.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/WarehouseFCPEntryObject.java index 1c3788cc537c2..2623c1f49d582 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/WarehouseFCPEntryObject.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/WarehouseFCPEntryObject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; public class WarehouseFCPEntryObject extends ForwardCompatiblePEntryObject { } diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/WarehousePEntryObject.java b/fe/fe-core/src/main/java/com/starrocks/authorization/WarehousePEntryObject.java similarity index 99% rename from fe/fe-core/src/main/java/com/starrocks/privilege/WarehousePEntryObject.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/WarehousePEntryObject.java index 3abba4b9cf223..9691d4b81eed8 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/WarehousePEntryObject.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/WarehousePEntryObject.java @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.gson.annotations.SerializedName; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/AccessTypeConverter.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/AccessTypeConverter.java similarity index 88% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ranger/AccessTypeConverter.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ranger/AccessTypeConverter.java index f2b0e6c6ad692..3eb76e3fa062d 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/AccessTypeConverter.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/AccessTypeConverter.java @@ -11,9 +11,9 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege.ranger; +package com.starrocks.authorization.ranger; -import com.starrocks.privilege.PrivilegeType; +import com.starrocks.authorization.PrivilegeType; public interface AccessTypeConverter { String convertToAccessType(PrivilegeType privilegeType); diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/ObjectTypeConverter.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/ObjectTypeConverter.java similarity index 88% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ranger/ObjectTypeConverter.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ranger/ObjectTypeConverter.java index e89ac807b5918..b330e5f8e9107 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/ObjectTypeConverter.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/ObjectTypeConverter.java @@ -11,9 +11,9 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege.ranger; +package com.starrocks.authorization.ranger; -import com.starrocks.privilege.ObjectType; +import com.starrocks.authorization.ObjectType; public interface ObjectTypeConverter { String convertToRangerType(ObjectType privilegeType); diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/RangerAccessController.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/RangerAccessController.java similarity index 96% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ranger/RangerAccessController.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ranger/RangerAccessController.java index 280ef5ef1980f..40420f0c525bc 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/RangerAccessController.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/RangerAccessController.java @@ -11,13 +11,13 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege.ranger; +package com.starrocks.authorization.ranger; import com.starrocks.analysis.Expr; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.ExternalAccessController; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.Column; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.ExternalAccessController; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.sql.ast.UserIdentity; import com.starrocks.sql.parser.SqlParser; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/RangerAccessResourceBuilder.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/RangerAccessResourceBuilder.java similarity index 97% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ranger/RangerAccessResourceBuilder.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ranger/RangerAccessResourceBuilder.java index df166db9463f7..cd42734bfc946 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/RangerAccessResourceBuilder.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/RangerAccessResourceBuilder.java @@ -11,9 +11,9 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege.ranger; +package com.starrocks.authorization.ranger; -import com.starrocks.privilege.ObjectType; +import com.starrocks.authorization.ObjectType; import org.apache.ranger.plugin.policyengine.RangerAccessResourceImpl; public abstract class RangerAccessResourceBuilder implements ObjectTypeConverter { diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/RangerStarRocksAccessRequest.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/RangerStarRocksAccessRequest.java similarity index 98% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ranger/RangerStarRocksAccessRequest.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ranger/RangerStarRocksAccessRequest.java index ce8aee6b9bbad..7cea07448dad9 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/RangerStarRocksAccessRequest.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/RangerStarRocksAccessRequest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege.ranger; +package com.starrocks.authorization.ranger; import com.starrocks.common.Config; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/hive/HiveAccessType.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/hive/HiveAccessType.java similarity index 93% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ranger/hive/HiveAccessType.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ranger/hive/HiveAccessType.java index 7833007c6bea0..2cfc2f084c479 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/hive/HiveAccessType.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/hive/HiveAccessType.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege.ranger.hive; +package com.starrocks.authorization.ranger.hive; public enum HiveAccessType { NONE, CREATE, ALTER, DROP, INDEX, LOCK, SELECT, UPDATE, USE, READ, WRITE, ALL, SERVICEADMIN, TEMPUDFADMIN diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/hive/RangerHiveAccessController.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/hive/RangerHiveAccessController.java similarity index 95% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ranger/hive/RangerHiveAccessController.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ranger/hive/RangerHiveAccessController.java index 804c401cd12e3..96fe426c77662 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/hive/RangerHiveAccessController.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/hive/RangerHiveAccessController.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege.ranger.hive; +package com.starrocks.authorization.ranger.hive; import com.google.common.collect.Maps; import com.starrocks.analysis.Expr; import com.starrocks.analysis.TableName; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; +import com.starrocks.authorization.ranger.RangerAccessController; import com.starrocks.catalog.Column; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; -import com.starrocks.privilege.ranger.RangerAccessController; import com.starrocks.qe.ConnectContext; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/hive/RangerHiveResource.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/hive/RangerHiveResource.java similarity index 89% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ranger/hive/RangerHiveResource.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ranger/hive/RangerHiveResource.java index e05b1e0b00bb3..a739d03a13afa 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/hive/RangerHiveResource.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/hive/RangerHiveResource.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege.ranger.hive; +package com.starrocks.authorization.ranger.hive; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.ranger.RangerAccessResourceBuilder; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.ranger.RangerAccessResourceBuilder; import org.apache.ranger.plugin.policyengine.RangerAccessResourceImpl; public class RangerHiveResource extends RangerAccessResourceImpl { diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/starrocks/RangerStarRocksAccessController.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/starrocks/RangerStarRocksAccessController.java similarity index 98% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ranger/starrocks/RangerStarRocksAccessController.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ranger/starrocks/RangerStarRocksAccessController.java index 2e62d4ec44374..8adda504995a0 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/starrocks/RangerStarRocksAccessController.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/starrocks/RangerStarRocksAccessController.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege.ranger.starrocks; +package com.starrocks.authorization.ranger.starrocks; import com.google.common.collect.Maps; import com.starrocks.analysis.Expr; import com.starrocks.analysis.TableName; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; +import com.starrocks.authorization.ranger.RangerAccessController; import com.starrocks.catalog.Column; import com.starrocks.catalog.Database; import com.starrocks.catalog.Function; import com.starrocks.catalog.InternalCatalog; import com.starrocks.catalog.Table; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; -import com.starrocks.privilege.ranger.RangerAccessController; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/starrocks/RangerStarRocksResource.java b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/starrocks/RangerStarRocksResource.java similarity index 93% rename from fe/fe-core/src/main/java/com/starrocks/privilege/ranger/starrocks/RangerStarRocksResource.java rename to fe/fe-core/src/main/java/com/starrocks/authorization/ranger/starrocks/RangerStarRocksResource.java index 8bfb2ff12b354..1ed017230d626 100644 --- a/fe/fe-core/src/main/java/com/starrocks/privilege/ranger/starrocks/RangerStarRocksResource.java +++ b/fe/fe-core/src/main/java/com/starrocks/authorization/ranger/starrocks/RangerStarRocksResource.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege.ranger.starrocks; +package com.starrocks.authorization.ranger.starrocks; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.ranger.RangerAccessResourceBuilder; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.ranger.RangerAccessResourceBuilder; import org.apache.ranger.plugin.policyengine.RangerAccessResourceImpl; public class RangerStarRocksResource extends RangerAccessResourceImpl { diff --git a/fe/fe-core/src/main/java/com/starrocks/backup/mv/MVRestoreUpdater.java b/fe/fe-core/src/main/java/com/starrocks/backup/mv/MVRestoreUpdater.java index 4d3ca893389a9..b6a6b57d74f47 100644 --- a/fe/fe-core/src/main/java/com/starrocks/backup/mv/MVRestoreUpdater.java +++ b/fe/fe-core/src/main/java/com/starrocks/backup/mv/MVRestoreUpdater.java @@ -19,6 +19,7 @@ import com.google.common.collect.Sets; import com.starrocks.analysis.TableName; import com.starrocks.authentication.AuthenticationMgr; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.backup.BackupJobInfo; import com.starrocks.backup.Status; import com.starrocks.catalog.BaseTableInfo; @@ -27,7 +28,6 @@ import com.starrocks.catalog.MvId; import com.starrocks.catalog.Table; import com.starrocks.common.Pair; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.SemanticException; diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/Dictionary.java b/fe/fe-core/src/main/java/com/starrocks/catalog/Dictionary.java index e2795912122fa..a6f4bb31d313e 100644 --- a/fe/fe-core/src/main/java/com/starrocks/catalog/Dictionary.java +++ b/fe/fe-core/src/main/java/com/starrocks/catalog/Dictionary.java @@ -17,7 +17,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.annotations.SerializedName; -import com.starrocks.catalog.InternalCatalog; import com.starrocks.common.DdlException; import com.starrocks.common.io.Text; import com.starrocks.common.io.Writable; diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/DictionaryMgr.java b/fe/fe-core/src/main/java/com/starrocks/catalog/DictionaryMgr.java index a676890bdc7c9..5e6ffb78aa8e1 100644 --- a/fe/fe-core/src/main/java/com/starrocks/catalog/DictionaryMgr.java +++ b/fe/fe-core/src/main/java/com/starrocks/catalog/DictionaryMgr.java @@ -19,7 +19,11 @@ import com.google.common.collect.Sets; import com.google.gson.annotations.SerializedName; import com.starrocks.analysis.DescriptorTable; +<<<<<<< HEAD import com.starrocks.catalog.Dictionary; +======= +import com.starrocks.authorization.PrivilegeBuiltinConstants; +>>>>>>> 4840470464 ([Refactor] Rename Package from privilege to authorization and optimize import (#53826)) import com.starrocks.common.AnalysisException; import com.starrocks.common.Config; import com.starrocks.common.DdlException; @@ -46,7 +50,6 @@ import com.starrocks.planner.DictionaryCacheSink; import com.starrocks.planner.PlanFragment; import com.starrocks.planner.ScanNode; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.proto.PProcessDictionaryCacheRequest; import com.starrocks.proto.PProcessDictionaryCacheRequestType; import com.starrocks.proto.PProcessDictionaryCacheResult; diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/MaterializedView.java b/fe/fe-core/src/main/java/com/starrocks/catalog/MaterializedView.java index 2b754e3e09bd6..3839b480d05ea 100644 --- a/fe/fe-core/src/main/java/com/starrocks/catalog/MaterializedView.java +++ b/fe/fe-core/src/main/java/com/starrocks/catalog/MaterializedView.java @@ -32,6 +32,7 @@ import com.starrocks.analysis.SlotRef; import com.starrocks.analysis.TableName; import com.starrocks.authentication.AuthenticationMgr; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.backup.Status; import com.starrocks.backup.mv.MvBackupInfo; import com.starrocks.backup.mv.MvBaseTableBackupInfo; @@ -55,7 +56,6 @@ import com.starrocks.persist.gson.GsonPostProcessable; import com.starrocks.persist.gson.GsonPreProcessable; import com.starrocks.persist.gson.GsonUtils; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.SqlModeHelper; import com.starrocks.scheduler.TableWithPartitions; diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/ResourceGroupMgr.java b/fe/fe-core/src/main/java/com/starrocks/catalog/ResourceGroupMgr.java index 40458f0d25ef5..00ae62f7e52a9 100644 --- a/fe/fe-core/src/main/java/com/starrocks/catalog/ResourceGroupMgr.java +++ b/fe/fe-core/src/main/java/com/starrocks/catalog/ResourceGroupMgr.java @@ -17,6 +17,10 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.gson.annotations.SerializedName; +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.PrivilegeBuiltinConstants; +import com.starrocks.authorization.PrivilegeException; +import com.starrocks.authorization.RolePrivilegeCollectionV2; import com.starrocks.common.DdlException; import com.starrocks.common.ErrorCode; import com.starrocks.common.ErrorReport; @@ -30,10 +34,6 @@ import com.starrocks.persist.metablock.SRMetaBlockID; import com.starrocks.persist.metablock.SRMetaBlockReader; import com.starrocks.persist.metablock.SRMetaBlockWriter; -import com.starrocks.privilege.AuthorizationMgr; -import com.starrocks.privilege.PrivilegeBuiltinConstants; -import com.starrocks.privilege.PrivilegeException; -import com.starrocks.privilege.RolePrivilegeCollectionV2; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.SemanticException; diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/ResourceMgr.java b/fe/fe-core/src/main/java/com/starrocks/catalog/ResourceMgr.java index cddd865f943b6..d3589b4857419 100644 --- a/fe/fe-core/src/main/java/com/starrocks/catalog/ResourceMgr.java +++ b/fe/fe-core/src/main/java/com/starrocks/catalog/ResourceMgr.java @@ -37,6 +37,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; import com.google.gson.annotations.SerializedName; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.common.DdlException; import com.starrocks.common.io.Text; import com.starrocks.common.io.Writable; @@ -51,7 +52,6 @@ import com.starrocks.persist.metablock.SRMetaBlockID; import com.starrocks.persist.metablock.SRMetaBlockReader; import com.starrocks.persist.metablock.SRMetaBlockWriter; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.Authorizer; diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/system/information/TaskRunsSystemTable.java b/fe/fe-core/src/main/java/com/starrocks/catalog/system/information/TaskRunsSystemTable.java index 7ead1ff5dc7f9..b418bc8780c7e 100644 --- a/fe/fe-core/src/main/java/com/starrocks/catalog/system/information/TaskRunsSystemTable.java +++ b/fe/fe-core/src/main/java/com/starrocks/catalog/system/information/TaskRunsSystemTable.java @@ -16,6 +16,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.catalog.Column; import com.starrocks.catalog.InternalCatalog; import com.starrocks.catalog.PrimitiveType; @@ -26,7 +27,6 @@ import com.starrocks.catalog.system.SystemTable; import com.starrocks.cluster.ClusterNamespace; import com.starrocks.common.util.DateUtils; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.qe.ConnectContext; import com.starrocks.scheduler.Task; import com.starrocks.scheduler.TaskManager; diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/system/information/TasksSystemTable.java b/fe/fe-core/src/main/java/com/starrocks/catalog/system/information/TasksSystemTable.java index 7d0c5be077ea9..05dbe35988504 100644 --- a/fe/fe-core/src/main/java/com/starrocks/catalog/system/information/TasksSystemTable.java +++ b/fe/fe-core/src/main/java/com/starrocks/catalog/system/information/TasksSystemTable.java @@ -14,6 +14,7 @@ package com.starrocks.catalog.system.information; import com.google.common.collect.Lists; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.catalog.InternalCatalog; import com.starrocks.catalog.PrimitiveType; import com.starrocks.catalog.ScalarType; @@ -21,7 +22,6 @@ import com.starrocks.catalog.system.SystemId; import com.starrocks.catalog.system.SystemTable; import com.starrocks.cluster.ClusterNamespace; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.scheduler.Constants; import com.starrocks.scheduler.Task; import com.starrocks.scheduler.TaskManager; diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/GrantsTo.java b/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/GrantsTo.java index 58509d27cc964..1209b35df60c3 100644 --- a/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/GrantsTo.java +++ b/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/GrantsTo.java @@ -15,6 +15,22 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; +import com.starrocks.authorization.ActionSet; +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.CatalogPEntryObject; +import com.starrocks.authorization.DbPEntryObject; +import com.starrocks.authorization.FunctionPEntryObject; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.PipePEntryObject; +import com.starrocks.authorization.PrivilegeBuiltinConstants; +import com.starrocks.authorization.PrivilegeEntry; +import com.starrocks.authorization.PrivilegeType; +import com.starrocks.authorization.ResourceGroupPEntryObject; +import com.starrocks.authorization.ResourcePEntryObject; +import com.starrocks.authorization.StorageVolumePEntryObject; +import com.starrocks.authorization.TablePEntryObject; +import com.starrocks.authorization.UserPEntryObject; +import com.starrocks.authorization.WarehousePEntryObject; import com.starrocks.catalog.Catalog; import com.starrocks.catalog.Database; import com.starrocks.catalog.ExternalCatalog; @@ -28,22 +44,6 @@ import com.starrocks.catalog.system.SystemTable; import com.starrocks.common.Config; import com.starrocks.common.DdlException; -import com.starrocks.privilege.ActionSet; -import com.starrocks.privilege.AuthorizationMgr; -import com.starrocks.privilege.CatalogPEntryObject; -import com.starrocks.privilege.DbPEntryObject; -import com.starrocks.privilege.FunctionPEntryObject; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.PipePEntryObject; -import com.starrocks.privilege.PrivilegeBuiltinConstants; -import com.starrocks.privilege.PrivilegeEntry; -import com.starrocks.privilege.PrivilegeType; -import com.starrocks.privilege.ResourceGroupPEntryObject; -import com.starrocks.privilege.ResourcePEntryObject; -import com.starrocks.privilege.StorageVolumePEntryObject; -import com.starrocks.privilege.TablePEntryObject; -import com.starrocks.privilege.UserPEntryObject; -import com.starrocks.privilege.WarehousePEntryObject; import com.starrocks.server.CatalogMgr; import com.starrocks.server.GlobalStateMgr; import com.starrocks.server.MetadataMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/RoleEdges.java b/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/RoleEdges.java index 47ad060bde550..be296e2a392b9 100644 --- a/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/RoleEdges.java +++ b/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/RoleEdges.java @@ -13,13 +13,13 @@ // limitations under the License. package com.starrocks.catalog.system.sys; +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.RolePrivilegeCollectionV2; +import com.starrocks.authorization.UserPrivilegeCollectionV2; import com.starrocks.catalog.ScalarType; import com.starrocks.catalog.Table; import com.starrocks.catalog.system.SystemId; import com.starrocks.catalog.system.SystemTable; -import com.starrocks.privilege.AuthorizationMgr; -import com.starrocks.privilege.RolePrivilegeCollectionV2; -import com.starrocks.privilege.UserPrivilegeCollectionV2; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.ast.UserIdentity; import com.starrocks.thrift.TGetRoleEdgesItem; diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/SysFeLocks.java b/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/SysFeLocks.java index 983be7ab01875..c65b40d3c0c29 100644 --- a/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/SysFeLocks.java +++ b/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/SysFeLocks.java @@ -18,6 +18,8 @@ import com.google.common.base.Joiner; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.Database; import com.starrocks.catalog.PrimitiveType; import com.starrocks.catalog.ScalarType; @@ -30,8 +32,6 @@ import com.starrocks.common.util.concurrent.lock.LockManager; import com.starrocks.common.util.concurrent.lock.Locker; import com.starrocks.consistency.LockChecker; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.Authorizer; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/SysFeMemoryUsage.java b/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/SysFeMemoryUsage.java index dce920f910968..1a7eb62ac4659 100644 --- a/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/SysFeMemoryUsage.java +++ b/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/SysFeMemoryUsage.java @@ -14,14 +14,14 @@ package com.starrocks.catalog.system.sys; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.PrimitiveType; import com.starrocks.catalog.ScalarType; import com.starrocks.catalog.Table; import com.starrocks.catalog.system.SystemId; import com.starrocks.catalog.system.SystemTable; import com.starrocks.memory.MemoryUsageTracker; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.sql.analyzer.Authorizer; import com.starrocks.sql.ast.UserIdentity; import com.starrocks.thrift.TAuthInfo; diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/SysObjectDependencies.java b/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/SysObjectDependencies.java index 31709bc7c07f3..b20d2ebd563bd 100644 --- a/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/SysObjectDependencies.java +++ b/fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/SysObjectDependencies.java @@ -14,6 +14,7 @@ package com.starrocks.catalog.system.sys; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.catalog.BaseTableInfo; import com.starrocks.catalog.Database; import com.starrocks.catalog.InternalCatalog; @@ -24,7 +25,6 @@ import com.starrocks.catalog.system.SystemTable; import com.starrocks.common.util.concurrent.lock.LockType; import com.starrocks.common.util.concurrent.lock.Locker; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.Authorizer; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/clone/TabletSchedCtx.java b/fe/fe-core/src/main/java/com/starrocks/clone/TabletSchedCtx.java index 41b421814dea2..4cb9e3bc43f16 100644 --- a/fe/fe-core/src/main/java/com/starrocks/clone/TabletSchedCtx.java +++ b/fe/fe-core/src/main/java/com/starrocks/clone/TabletSchedCtx.java @@ -39,6 +39,8 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.ColocateTableIndex.GroupId; import com.starrocks.catalog.Database; import com.starrocks.catalog.LocalTablet; @@ -61,8 +63,6 @@ import com.starrocks.common.util.concurrent.lock.LockType; import com.starrocks.common.util.concurrent.lock.Locker; import com.starrocks.persist.ReplicaPersistInfo; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.Authorizer; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/common/proc/ReplicasProcNode.java b/fe/fe-core/src/main/java/com/starrocks/common/proc/ReplicasProcNode.java index 55dc2b024df64..5dc517728b15b 100644 --- a/fe/fe-core/src/main/java/com/starrocks/common/proc/ReplicasProcNode.java +++ b/fe/fe-core/src/main/java/com/starrocks/common/proc/ReplicasProcNode.java @@ -36,6 +36,9 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.Database; import com.starrocks.catalog.InternalCatalog; import com.starrocks.catalog.OlapTable; @@ -43,9 +46,6 @@ import com.starrocks.common.Pair; import com.starrocks.common.util.NetUtils; import com.starrocks.common.util.TimeUtils; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.Authorizer; diff --git a/fe/fe-core/src/main/java/com/starrocks/connector/metadata/MetadataCollectJob.java b/fe/fe-core/src/main/java/com/starrocks/connector/metadata/MetadataCollectJob.java index cc1675e8299b3..5c66d57911cac 100644 --- a/fe/fe-core/src/main/java/com/starrocks/connector/metadata/MetadataCollectJob.java +++ b/fe/fe-core/src/main/java/com/starrocks/connector/metadata/MetadataCollectJob.java @@ -15,8 +15,8 @@ package com.starrocks.connector.metadata; import com.google.common.collect.Sets; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.common.util.UUIDUtil; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.SessionVariable; import com.starrocks.qe.scheduler.Coordinator; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/BaseAction.java b/fe/fe-core/src/main/java/com/starrocks/http/BaseAction.java index 7aca8dab1be12..782235e7b50d5 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/BaseAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/BaseAction.java @@ -36,12 +36,12 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.PrivilegeBuiltinConstants; +import com.starrocks.authorization.PrivilegeException; import com.starrocks.common.DdlException; import com.starrocks.common.util.DebugUtil; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.AuthorizationMgr; -import com.starrocks.privilege.PrivilegeBuiltinConstants; -import com.starrocks.privilege.PrivilegeException; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/action/WebBaseAction.java b/fe/fe-core/src/main/java/com/starrocks/http/action/WebBaseAction.java index 9dcc822c713af..29d3faccafd55 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/action/WebBaseAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/action/WebBaseAction.java @@ -35,6 +35,8 @@ package com.starrocks.http.action; import com.google.common.base.Strings; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.common.AnalysisException; import com.starrocks.common.Config; import com.starrocks.common.proc.ProcNodeInterface; @@ -47,8 +49,6 @@ import com.starrocks.http.HttpAuthManager; import com.starrocks.http.HttpAuthManager.SessionValue; import com.starrocks.http.rest.RestBaseResult; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.Authorizer; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/meta/ColocateMetaService.java b/fe/fe-core/src/main/java/com/starrocks/http/meta/ColocateMetaService.java index 23407e2a58e8d..95662cae6e70b 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/meta/ColocateMetaService.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/meta/ColocateMetaService.java @@ -38,6 +38,7 @@ import com.google.common.base.Strings; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.catalog.ColocateGroupSchema; import com.starrocks.catalog.ColocateTableIndex; import com.starrocks.catalog.ColocateTableIndex.GroupId; @@ -54,7 +55,6 @@ import com.starrocks.http.rest.RestBaseResult; import com.starrocks.http.rest.RestResult; import com.starrocks.persist.ColocatePersistInfo; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/meta/GlobalDictMetaService.java b/fe/fe-core/src/main/java/com/starrocks/http/meta/GlobalDictMetaService.java index 74c34acdf5987..370368e1063bf 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/meta/GlobalDictMetaService.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/meta/GlobalDictMetaService.java @@ -16,6 +16,7 @@ package com.starrocks.http.meta; import com.google.common.base.Strings; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.common.DdlException; import com.starrocks.http.ActionController; import com.starrocks.http.BaseRequest; @@ -23,7 +24,6 @@ import com.starrocks.http.IllegalArgException; import com.starrocks.http.rest.RestBaseAction; import com.starrocks.http.rest.RestBaseResult; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/CheckDecommissionAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/CheckDecommissionAction.java index 1e7b393375900..0fbd3a67c5482 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/CheckDecommissionAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/CheckDecommissionAction.java @@ -36,6 +36,8 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.common.DdlException; import com.starrocks.common.Pair; import com.starrocks.common.UserException; @@ -43,8 +45,6 @@ import com.starrocks.http.BaseRequest; import com.starrocks.http.BaseResponse; import com.starrocks.http.IllegalArgException; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.Authorizer; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/GetDdlStmtAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/GetDdlStmtAction.java index 15610beda7955..cb76f239201a2 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/GetDdlStmtAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/GetDdlStmtAction.java @@ -37,6 +37,7 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.catalog.Database; import com.starrocks.catalog.Table; import com.starrocks.common.DdlException; @@ -46,7 +47,6 @@ import com.starrocks.http.BaseRequest; import com.starrocks.http.BaseResponse; import com.starrocks.http.IllegalArgException; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.AstToStringBuilder; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/GetLoadInfoAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/GetLoadInfoAction.java index db329c8cb2b38..252f008253302 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/GetLoadInfoAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/GetLoadInfoAction.java @@ -35,14 +35,14 @@ package com.starrocks.http.rest; import com.google.common.base.Strings; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.common.DdlException; import com.starrocks.http.ActionController; import com.starrocks.http.BaseRequest; import com.starrocks.http.BaseResponse; import com.starrocks.http.IllegalArgException; import com.starrocks.load.Load; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.sql.analyzer.Authorizer; import io.netty.handler.codec.http.HttpMethod; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/GetLogFileAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/GetLogFileAction.java index d15d920d53037..fa48ce346d5f3 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/GetLogFileAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/GetLogFileAction.java @@ -38,13 +38,13 @@ import com.google.common.base.Strings; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.common.Config; import com.starrocks.http.ActionController; import com.starrocks.http.BaseRequest; import com.starrocks.http.BaseResponse; import com.starrocks.http.IllegalArgException; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.sql.analyzer.Authorizer; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/LoadAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/LoadAction.java index e67fae144b655..e552259ebff45 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/LoadAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/LoadAction.java @@ -35,6 +35,8 @@ package com.starrocks.http.rest; import com.google.common.base.Strings; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.common.DdlException; import com.starrocks.http.ActionController; import com.starrocks.http.BaseRequest; @@ -44,8 +46,6 @@ import com.starrocks.load.batchwrite.TableId; import com.starrocks.load.streamload.StreamLoadHttpHeader; import com.starrocks.load.streamload.StreamLoadKvParams; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.server.RunMode; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/MetaReplayerCheckAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/MetaReplayerCheckAction.java index e7c8623fe9681..478449e88e4b2 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/MetaReplayerCheckAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/MetaReplayerCheckAction.java @@ -34,12 +34,12 @@ package com.starrocks.http.rest; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.common.DdlException; import com.starrocks.http.ActionController; import com.starrocks.http.BaseRequest; import com.starrocks.http.BaseResponse; import com.starrocks.http.IllegalArgException; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/MetricsAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/MetricsAction.java index f3d5419e1d842..290eb01d66fbb 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/MetricsAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/MetricsAction.java @@ -36,6 +36,7 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.common.DdlException; import com.starrocks.http.ActionController; import com.starrocks.http.BaseRequest; @@ -46,7 +47,6 @@ import com.starrocks.metric.MetricVisitor; import com.starrocks.metric.PrometheusMetricVisitor; import com.starrocks.metric.SimpleCoreMetricVisitor; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.sql.ast.UserIdentity; import io.netty.handler.codec.http.HttpMethod; import org.apache.logging.log4j.LogManager; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/MigrationAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/MigrationAction.java index ba0d2e182b5c5..50cc46b91e5c9 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/MigrationAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/MigrationAction.java @@ -36,6 +36,7 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.catalog.Database; import com.starrocks.catalog.LocalTablet; import com.starrocks.catalog.MaterializedIndex; @@ -53,7 +54,6 @@ import com.starrocks.http.BaseRequest; import com.starrocks.http.BaseResponse; import com.starrocks.http.IllegalArgException; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/RestBaseAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/RestBaseAction.java index 20d2e43ced59b..85909badb2aeb 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/RestBaseAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/RestBaseAction.java @@ -37,6 +37,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.AuthorizationMgr; import com.starrocks.common.DdlException; import com.starrocks.common.ErrorCode; import com.starrocks.common.Pair; @@ -48,8 +50,6 @@ import com.starrocks.http.BaseResponse; import com.starrocks.http.HttpConnectContext; import com.starrocks.http.WebUtils; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.AuthorizationMgr; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/RowCountAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/RowCountAction.java index c0e5b648eceaf..95707e1e412dd 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/RowCountAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/RowCountAction.java @@ -37,6 +37,7 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.catalog.Database; import com.starrocks.catalog.MaterializedIndex; import com.starrocks.catalog.MaterializedIndex.IndexExtState; @@ -53,7 +54,6 @@ import com.starrocks.http.BaseRequest; import com.starrocks.http.BaseResponse; import com.starrocks.http.IllegalArgException; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/SetConfigAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/SetConfigAction.java index de763135180b9..ad43fd713ff91 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/SetConfigAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/SetConfigAction.java @@ -35,13 +35,13 @@ package com.starrocks.http.rest; import com.google.common.collect.Maps; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.common.ConfigBase; import com.starrocks.common.DdlException; import com.starrocks.http.ActionController; import com.starrocks.http.BaseRequest; import com.starrocks.http.BaseResponse; import com.starrocks.http.IllegalArgException; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.qe.ConnectContext; import com.starrocks.sql.ast.UserIdentity; import io.netty.handler.codec.http.HttpMethod; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/ShowProcAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/ShowProcAction.java index d46bf18ca866c..57b3e282353bf 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/ShowProcAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/ShowProcAction.java @@ -38,6 +38,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.starrocks.analysis.RedirectStatus; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.catalog.Column; import com.starrocks.common.AnalysisException; import com.starrocks.common.DdlException; @@ -48,7 +49,6 @@ import com.starrocks.http.BaseRequest; import com.starrocks.http.BaseResponse; import com.starrocks.http.IllegalArgException; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.LeaderOpExecutor; import com.starrocks.qe.OriginStatement; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/StopFeAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/StopFeAction.java index a87c413a0431e..cc3bb21447cc0 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/StopFeAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/StopFeAction.java @@ -15,12 +15,12 @@ package com.starrocks.http.rest; import com.starrocks.StarRocksFE; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.http.ActionController; import com.starrocks.http.BaseRequest; import com.starrocks.http.BaseResponse; import com.starrocks.http.IllegalArgException; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.sql.analyzer.Authorizer; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/StorageTypeCheckAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/StorageTypeCheckAction.java index 51656f8409c50..7a95e9c37a288 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/StorageTypeCheckAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/StorageTypeCheckAction.java @@ -35,6 +35,7 @@ package com.starrocks.http.rest; import com.google.common.base.Strings; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.catalog.Database; import com.starrocks.catalog.MaterializedIndexMeta; import com.starrocks.catalog.OlapTable; @@ -47,7 +48,6 @@ import com.starrocks.http.BaseRequest; import com.starrocks.http.BaseResponse; import com.starrocks.http.IllegalArgException; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/StreamLoadMetaAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/StreamLoadMetaAction.java index 80e8baa6f719b..29474c37b2b8e 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/StreamLoadMetaAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/StreamLoadMetaAction.java @@ -16,6 +16,8 @@ import com.google.common.base.Strings; import com.google.gson.annotations.SerializedName; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.common.DdlException; import com.starrocks.http.ActionController; import com.starrocks.http.BaseRequest; @@ -25,8 +27,6 @@ import com.starrocks.load.batchwrite.TableId; import com.starrocks.load.streamload.StreamLoadHttpHeader; import com.starrocks.load.streamload.StreamLoadKvParams; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.Authorizer; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/SyncCloudTableMetaAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/SyncCloudTableMetaAction.java index 33ea49fd7efa8..96f43db327701 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/SyncCloudTableMetaAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/SyncCloudTableMetaAction.java @@ -15,13 +15,13 @@ package com.starrocks.http.rest; import com.google.common.base.Strings; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.common.DdlException; import com.starrocks.common.StarRocksHttpException; import com.starrocks.http.ActionController; import com.starrocks.http.BaseRequest; import com.starrocks.http.BaseResponse; import com.starrocks.http.IllegalArgException; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.ast.UserIdentity; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/TableQueryPlanAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/TableQueryPlanAction.java index a70e811a0c5e3..dda973cb0596b 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/TableQueryPlanAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/TableQueryPlanAction.java @@ -38,6 +38,8 @@ import com.google.common.base.Strings; import com.google.common.collect.Maps; import com.starrocks.analysis.TableName; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.Database; import com.starrocks.catalog.Table; import com.starrocks.common.DdlException; @@ -51,8 +53,6 @@ import com.starrocks.http.BaseResponse; import com.starrocks.http.IllegalArgException; import com.starrocks.planner.PlanFragment; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.SessionVariable; import com.starrocks.rpc.ConfigurableSerDesFactory; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/TableRowCountAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/TableRowCountAction.java index 34e02e803fa17..1e29f7140773c 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/TableRowCountAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/TableRowCountAction.java @@ -36,6 +36,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Strings; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.Database; import com.starrocks.catalog.OlapTable; import com.starrocks.catalog.Table; @@ -47,8 +49,6 @@ import com.starrocks.http.BaseRequest; import com.starrocks.http.BaseResponse; import com.starrocks.http.IllegalArgException; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.Authorizer; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/TableSchemaAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/TableSchemaAction.java index 7cc287522e3c5..fdd278fb6aac5 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/TableSchemaAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/TableSchemaAction.java @@ -36,6 +36,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Strings; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.Column; import com.starrocks.catalog.Database; import com.starrocks.catalog.OlapTable; @@ -51,8 +53,6 @@ import com.starrocks.http.BaseRequest; import com.starrocks.http.BaseResponse; import com.starrocks.http.IllegalArgException; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.Authorizer; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/v2/TableBaseAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/v2/TableBaseAction.java index 465bb7a6e1e18..0c32862eebfca 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/v2/TableBaseAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/v2/TableBaseAction.java @@ -13,6 +13,8 @@ // limitations under the License. package com.starrocks.http.rest.v2; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.Database; import com.starrocks.catalog.OlapTable; import com.starrocks.catalog.Table; @@ -25,8 +27,6 @@ import com.starrocks.http.BaseRequest; import com.starrocks.http.BaseResponse; import com.starrocks.http.rest.RestBaseAction; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import io.netty.handler.codec.http.HttpResponseStatus; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/v2/TablePartitionAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/v2/TablePartitionAction.java index b7802f99a744a..7d8433af654e1 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/v2/TablePartitionAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/v2/TablePartitionAction.java @@ -14,7 +14,7 @@ package com.starrocks.http.rest.v2; - +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.catalog.Partition; import com.starrocks.http.ActionController; import com.starrocks.http.BaseRequest; @@ -22,7 +22,6 @@ import com.starrocks.http.IllegalArgException; import com.starrocks.http.rest.v2.RestBaseResultV2.PagedResult; import com.starrocks.http.rest.v2.vo.PartitionInfoView.PartitionView; -import com.starrocks.privilege.AccessDeniedException; import io.netty.handler.codec.http.HttpMethod; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; diff --git a/fe/fe-core/src/main/java/com/starrocks/http/rest/v2/TableSchemaAction.java b/fe/fe-core/src/main/java/com/starrocks/http/rest/v2/TableSchemaAction.java index b3b7fef347890..c8f2b22fe49bd 100644 --- a/fe/fe-core/src/main/java/com/starrocks/http/rest/v2/TableSchemaAction.java +++ b/fe/fe-core/src/main/java/com/starrocks/http/rest/v2/TableSchemaAction.java @@ -14,12 +14,12 @@ package com.starrocks.http.rest.v2; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.http.ActionController; import com.starrocks.http.BaseRequest; import com.starrocks.http.BaseResponse; import com.starrocks.http.IllegalArgException; import com.starrocks.http.rest.v2.vo.TableSchemaView; -import com.starrocks.privilege.AccessDeniedException; import io.netty.handler.codec.http.HttpMethod; import java.util.function.Function; diff --git a/fe/fe-core/src/main/java/com/starrocks/load/EtlStatus.java b/fe/fe-core/src/main/java/com/starrocks/load/EtlStatus.java index 1304ae2ffcb41..c4f1776336a1d 100644 --- a/fe/fe-core/src/main/java/com/starrocks/load/EtlStatus.java +++ b/fe/fe-core/src/main/java/com/starrocks/load/EtlStatus.java @@ -45,7 +45,6 @@ import com.starrocks.common.io.Text; import com.starrocks.common.io.Writable; import com.starrocks.common.util.DebugUtil; -import com.starrocks.load.LoadConstants; import com.starrocks.load.loadv2.dpp.DppResult; import com.starrocks.metric.TableMetricsEntity; import com.starrocks.persist.gson.GsonUtils; diff --git a/fe/fe-core/src/main/java/com/starrocks/load/ExportMgr.java b/fe/fe-core/src/main/java/com/starrocks/load/ExportMgr.java index 55d5eaed326d1..1e70431307115 100644 --- a/fe/fe-core/src/main/java/com/starrocks/load/ExportMgr.java +++ b/fe/fe-core/src/main/java/com/starrocks/load/ExportMgr.java @@ -39,6 +39,7 @@ import com.google.common.collect.Maps; import com.google.gson.Gson; import com.starrocks.analysis.TableName; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.catalog.Database; import com.starrocks.catalog.InternalCatalog; import com.starrocks.common.AnalysisException; @@ -56,7 +57,6 @@ import com.starrocks.persist.metablock.SRMetaBlockID; import com.starrocks.persist.metablock.SRMetaBlockReader; import com.starrocks.persist.metablock.SRMetaBlockWriter; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.Authorizer; diff --git a/fe/fe-core/src/main/java/com/starrocks/load/Load.java b/fe/fe-core/src/main/java/com/starrocks/load/Load.java index 649228e79b2d2..accd1b3f206b4 100644 --- a/fe/fe-core/src/main/java/com/starrocks/load/Load.java +++ b/fe/fe-core/src/main/java/com/starrocks/load/Load.java @@ -58,6 +58,7 @@ import com.starrocks.analysis.TableName; import com.starrocks.analysis.TupleDescriptor; import com.starrocks.authentication.AuthenticationMgr; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.catalog.Column; import com.starrocks.catalog.Database; import com.starrocks.catalog.FunctionSet; @@ -71,7 +72,6 @@ import com.starrocks.common.Pair; import com.starrocks.common.UserException; import com.starrocks.load.loadv2.JobState; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.AnalyzeState; diff --git a/fe/fe-core/src/main/java/com/starrocks/load/batchwrite/LoadExecutor.java b/fe/fe-core/src/main/java/com/starrocks/load/batchwrite/LoadExecutor.java index 72170d00d8e37..6bdca621b0d7f 100644 --- a/fe/fe-core/src/main/java/com/starrocks/load/batchwrite/LoadExecutor.java +++ b/fe/fe-core/src/main/java/com/starrocks/load/batchwrite/LoadExecutor.java @@ -17,6 +17,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.catalog.Database; import com.starrocks.catalog.OlapTable; import com.starrocks.catalog.Table; @@ -28,7 +29,6 @@ import com.starrocks.load.loadv2.LoadJobFinalOperation; import com.starrocks.load.streamload.StreamLoadInfo; import com.starrocks.load.streamload.StreamLoadKvParams; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.QeProcessorImpl; import com.starrocks.qe.scheduler.Coordinator; diff --git a/fe/fe-core/src/main/java/com/starrocks/load/routineload/RoutineLoadFunctionalExprProvider.java b/fe/fe-core/src/main/java/com/starrocks/load/routineload/RoutineLoadFunctionalExprProvider.java index 20c4a62cb65f2..416033f77a24a 100644 --- a/fe/fe-core/src/main/java/com/starrocks/load/routineload/RoutineLoadFunctionalExprProvider.java +++ b/fe/fe-core/src/main/java/com/starrocks/load/routineload/RoutineLoadFunctionalExprProvider.java @@ -16,12 +16,12 @@ import com.google.common.collect.ImmutableList; import com.starrocks.analysis.FunctionalExprProvider; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.PrimitiveType; import com.starrocks.common.MetaNotFoundException; import com.starrocks.common.util.LogBuilder; import com.starrocks.common.util.LogKey; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.sql.analyzer.Authorizer; import org.apache.logging.log4j.LogManager; diff --git a/fe/fe-core/src/main/java/com/starrocks/load/streamload/StreamLoadFunctionalExprProvider.java b/fe/fe-core/src/main/java/com/starrocks/load/streamload/StreamLoadFunctionalExprProvider.java index f028918a19422..2d0c35e1b4e84 100644 --- a/fe/fe-core/src/main/java/com/starrocks/load/streamload/StreamLoadFunctionalExprProvider.java +++ b/fe/fe-core/src/main/java/com/starrocks/load/streamload/StreamLoadFunctionalExprProvider.java @@ -16,9 +16,9 @@ import com.google.common.collect.ImmutableList; import com.starrocks.analysis.FunctionalExprProvider; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.PrimitiveType; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.sql.analyzer.Authorizer; import org.apache.logging.log4j.LogManager; diff --git a/fe/fe-core/src/main/java/com/starrocks/persist/CreateUserInfo.java b/fe/fe-core/src/main/java/com/starrocks/persist/CreateUserInfo.java index ba632e6e36e5c..275e8f70070b4 100644 --- a/fe/fe-core/src/main/java/com/starrocks/persist/CreateUserInfo.java +++ b/fe/fe-core/src/main/java/com/starrocks/persist/CreateUserInfo.java @@ -18,10 +18,10 @@ import com.starrocks.authentication.AuthenticationException; import com.starrocks.authentication.UserAuthenticationInfo; import com.starrocks.authentication.UserProperty; +import com.starrocks.authorization.UserPrivilegeCollectionV2; import com.starrocks.common.io.Text; import com.starrocks.common.io.Writable; import com.starrocks.persist.gson.GsonUtils; -import com.starrocks.privilege.UserPrivilegeCollectionV2; import com.starrocks.sql.ast.UserIdentity; import java.io.DataInput; diff --git a/fe/fe-core/src/main/java/com/starrocks/persist/EditLog.java b/fe/fe-core/src/main/java/com/starrocks/persist/EditLog.java index e51ed1c4b22ac..a38f5b58d1315 100644 --- a/fe/fe-core/src/main/java/com/starrocks/persist/EditLog.java +++ b/fe/fe-core/src/main/java/com/starrocks/persist/EditLog.java @@ -42,6 +42,8 @@ import com.starrocks.authentication.UserAuthenticationInfo; import com.starrocks.authentication.UserProperty; import com.starrocks.authentication.UserPropertyInfo; +import com.starrocks.authorization.RolePrivilegeCollectionV2; +import com.starrocks.authorization.UserPrivilegeCollectionV2; import com.starrocks.backup.BackupJob; import com.starrocks.backup.Repository; import com.starrocks.backup.RestoreJob; @@ -78,8 +80,6 @@ import com.starrocks.metric.MetricRepo; import com.starrocks.persist.gson.GsonUtils; import com.starrocks.plugin.PluginInfo; -import com.starrocks.privilege.RolePrivilegeCollectionV2; -import com.starrocks.privilege.UserPrivilegeCollectionV2; import com.starrocks.proto.EncryptionKeyPB; import com.starrocks.replication.ReplicationJob; import com.starrocks.scheduler.Task; diff --git a/fe/fe-core/src/main/java/com/starrocks/persist/RolePrivilegeCollectionInfo.java b/fe/fe-core/src/main/java/com/starrocks/persist/RolePrivilegeCollectionInfo.java index d1f32cb951f35..a492e67048cbf 100644 --- a/fe/fe-core/src/main/java/com/starrocks/persist/RolePrivilegeCollectionInfo.java +++ b/fe/fe-core/src/main/java/com/starrocks/persist/RolePrivilegeCollectionInfo.java @@ -15,10 +15,10 @@ package com.starrocks.persist; import com.google.gson.annotations.SerializedName; +import com.starrocks.authorization.RolePrivilegeCollectionV2; import com.starrocks.common.io.Text; import com.starrocks.common.io.Writable; import com.starrocks.persist.gson.GsonUtils; -import com.starrocks.privilege.RolePrivilegeCollectionV2; import java.io.DataInput; import java.io.DataOutput; diff --git a/fe/fe-core/src/main/java/com/starrocks/persist/UserPrivilegeCollectionInfo.java b/fe/fe-core/src/main/java/com/starrocks/persist/UserPrivilegeCollectionInfo.java index 2687e621af78b..dbe449bd271d8 100644 --- a/fe/fe-core/src/main/java/com/starrocks/persist/UserPrivilegeCollectionInfo.java +++ b/fe/fe-core/src/main/java/com/starrocks/persist/UserPrivilegeCollectionInfo.java @@ -16,10 +16,10 @@ package com.starrocks.persist; import com.google.gson.annotations.SerializedName; +import com.starrocks.authorization.UserPrivilegeCollectionV2; import com.starrocks.common.io.Text; import com.starrocks.common.io.Writable; import com.starrocks.persist.gson.GsonUtils; -import com.starrocks.privilege.UserPrivilegeCollectionV2; import com.starrocks.sql.ast.UserIdentity; import java.io.DataInput; diff --git a/fe/fe-core/src/main/java/com/starrocks/persist/gson/GsonUtils.java b/fe/fe-core/src/main/java/com/starrocks/persist/gson/GsonUtils.java index 3a1f4a10b857b..b0a81a76b38e0 100644 --- a/fe/fe-core/src/main/java/com/starrocks/persist/gson/GsonUtils.java +++ b/fe/fe-core/src/main/java/com/starrocks/persist/gson/GsonUtils.java @@ -70,6 +70,21 @@ import com.starrocks.alter.OptimizeJobV2; import com.starrocks.alter.RollupJobV2; import com.starrocks.alter.SchemaChangeJobV2; +import com.starrocks.authorization.CatalogPEntryObject; +import com.starrocks.authorization.DbPEntryObject; +import com.starrocks.authorization.FunctionPEntryObject; +import com.starrocks.authorization.GlobalFunctionPEntryObject; +import com.starrocks.authorization.MaterializedViewPEntryObject; +import com.starrocks.authorization.PEntryObject; +import com.starrocks.authorization.PipePEntryObject; +import com.starrocks.authorization.PolicyFCEntryObject; +import com.starrocks.authorization.ResourceGroupPEntryObject; +import com.starrocks.authorization.ResourcePEntryObject; +import com.starrocks.authorization.StorageVolumePEntryObject; +import com.starrocks.authorization.TablePEntryObject; +import com.starrocks.authorization.UserPEntryObject; +import com.starrocks.authorization.ViewPEntryObject; +import com.starrocks.authorization.WarehousePEntryObject; import com.starrocks.backup.AbstractJob; import com.starrocks.backup.BackupJob; import com.starrocks.backup.RestoreJob; @@ -152,21 +167,6 @@ import com.starrocks.persist.PartitionPersistInfoV2; import com.starrocks.persist.RangePartitionPersistInfo; import com.starrocks.persist.SinglePartitionPersistInfo; -import com.starrocks.privilege.CatalogPEntryObject; -import com.starrocks.privilege.DbPEntryObject; -import com.starrocks.privilege.FunctionPEntryObject; -import com.starrocks.privilege.GlobalFunctionPEntryObject; -import com.starrocks.privilege.MaterializedViewPEntryObject; -import com.starrocks.privilege.PEntryObject; -import com.starrocks.privilege.PipePEntryObject; -import com.starrocks.privilege.PolicyFCEntryObject; -import com.starrocks.privilege.ResourceGroupPEntryObject; -import com.starrocks.privilege.ResourcePEntryObject; -import com.starrocks.privilege.StorageVolumePEntryObject; -import com.starrocks.privilege.TablePEntryObject; -import com.starrocks.privilege.UserPEntryObject; -import com.starrocks.privilege.ViewPEntryObject; -import com.starrocks.privilege.WarehousePEntryObject; import com.starrocks.proto.EncryptionKeyPB; import com.starrocks.replication.ReplicationTxnCommitAttachment; import com.starrocks.server.SharedDataStorageVolumeMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/planner/ExportSink.java b/fe/fe-core/src/main/java/com/starrocks/planner/ExportSink.java index 2d231d49afd86..c23a33edbc37f 100644 --- a/fe/fe-core/src/main/java/com/starrocks/planner/ExportSink.java +++ b/fe/fe-core/src/main/java/com/starrocks/planner/ExportSink.java @@ -36,15 +36,15 @@ import com.starrocks.analysis.BrokerDesc; import com.starrocks.catalog.FsBroker; -import com.starrocks.common.util.PrintableMap; import com.starrocks.common.Config; +import com.starrocks.common.util.PrintableMap; import com.starrocks.server.GlobalStateMgr; import com.starrocks.thrift.TDataSink; import com.starrocks.thrift.TDataSinkType; import com.starrocks.thrift.TExplainLevel; -import com.starrocks.thrift.THdfsProperties; import com.starrocks.thrift.TExportSink; import com.starrocks.thrift.TFileType; +import com.starrocks.thrift.THdfsProperties; import com.starrocks.thrift.TNetworkAddress; import org.apache.commons.lang.StringEscapeUtils; diff --git a/fe/fe-core/src/main/java/com/starrocks/planner/HiveTableSink.java b/fe/fe-core/src/main/java/com/starrocks/planner/HiveTableSink.java index 70a260ee87083..e9dad71aa00a2 100644 --- a/fe/fe-core/src/main/java/com/starrocks/planner/HiveTableSink.java +++ b/fe/fe-core/src/main/java/com/starrocks/planner/HiveTableSink.java @@ -26,7 +26,6 @@ import com.starrocks.credential.CloudConfiguration; import com.starrocks.qe.SessionVariable; import com.starrocks.server.GlobalStateMgr; -import com.starrocks.sql.analyzer.SemanticException; import com.starrocks.thrift.TCloudConfiguration; import com.starrocks.thrift.TCompressionType; import com.starrocks.thrift.TDataSink; @@ -37,7 +36,6 @@ import java.util.List; import java.util.Optional; -import static com.starrocks.analysis.OutFileClause.PARQUET_COMPRESSION_TYPE_MAP; import static com.starrocks.connector.hive.HiveMetastoreApiConverter.toTextFileFormatDesc; public class HiveTableSink extends DataSink { diff --git a/fe/fe-core/src/main/java/com/starrocks/planner/OlapTableSink.java b/fe/fe-core/src/main/java/com/starrocks/planner/OlapTableSink.java index 835a70998b724..deeb6dfd5836b 100644 --- a/fe/fe-core/src/main/java/com/starrocks/planner/OlapTableSink.java +++ b/fe/fe-core/src/main/java/com/starrocks/planner/OlapTableSink.java @@ -74,8 +74,13 @@ import com.starrocks.common.ErrorCode; import com.starrocks.common.ErrorReport; import com.starrocks.common.InternalErrorCode; +<<<<<<< HEAD import com.starrocks.common.Status; import com.starrocks.common.UserException; +======= +import com.starrocks.common.StarRocksException; +import com.starrocks.common.Status; +>>>>>>> 4840470464 ([Refactor] Rename Package from privilege to authorization and optimize import (#53826)) import com.starrocks.lake.LakeTablet; import com.starrocks.load.Load; import com.starrocks.qe.ConnectContext; diff --git a/fe/fe-core/src/main/java/com/starrocks/planner/PlanFragment.java b/fe/fe-core/src/main/java/com/starrocks/planner/PlanFragment.java index d3fbcae9421f6..f641ec2f5fba4 100644 --- a/fe/fe-core/src/main/java/com/starrocks/planner/PlanFragment.java +++ b/fe/fe-core/src/main/java/com/starrocks/planner/PlanFragment.java @@ -63,7 +63,6 @@ import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.Deque; import java.util.LinkedList; @@ -72,7 +71,6 @@ import java.util.Queue; import java.util.Set; import java.util.function.Consumer; -import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/fe/fe-core/src/main/java/com/starrocks/planner/PlanNode.java b/fe/fe-core/src/main/java/com/starrocks/planner/PlanNode.java index 1b1f460a19ef7..4b93e39937d23 100644 --- a/fe/fe-core/src/main/java/com/starrocks/planner/PlanNode.java +++ b/fe/fe-core/src/main/java/com/starrocks/planner/PlanNode.java @@ -47,8 +47,13 @@ import com.starrocks.analysis.SlotRef; import com.starrocks.analysis.TupleId; import com.starrocks.common.AnalysisException; +<<<<<<< HEAD import com.starrocks.common.TreeNode; import com.starrocks.common.UserException; +======= +import com.starrocks.common.StarRocksException; +import com.starrocks.common.TreeNode; +>>>>>>> 4840470464 ([Refactor] Rename Package from privilege to authorization and optimize import (#53826)) import com.starrocks.sql.common.PermutationGenerator; import com.starrocks.sql.optimizer.Utils; import com.starrocks.sql.optimizer.operator.scalar.ColumnRefOperator; diff --git a/fe/fe-core/src/main/java/com/starrocks/planner/RuntimeFilterPushDownContext.java b/fe/fe-core/src/main/java/com/starrocks/planner/RuntimeFilterPushDownContext.java index 211e91fc77053..e80f4d6b4f09f 100644 --- a/fe/fe-core/src/main/java/com/starrocks/planner/RuntimeFilterPushDownContext.java +++ b/fe/fe-core/src/main/java/com/starrocks/planner/RuntimeFilterPushDownContext.java @@ -14,14 +14,8 @@ package com.starrocks.planner; -import com.google.api.client.util.Lists; import com.starrocks.analysis.DescriptorTable; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; -import java.util.Stack; - public class RuntimeFilterPushDownContext { private final RuntimeFilterDescription description; private final DescriptorTable descTbl; diff --git a/fe/fe-core/src/main/java/com/starrocks/planner/SetOperationNode.java b/fe/fe-core/src/main/java/com/starrocks/planner/SetOperationNode.java index 6c1848b1270f7..4d886d80087c0 100644 --- a/fe/fe-core/src/main/java/com/starrocks/planner/SetOperationNode.java +++ b/fe/fe-core/src/main/java/com/starrocks/planner/SetOperationNode.java @@ -41,7 +41,6 @@ import com.google.common.collect.Sets; import com.starrocks.analysis.Analyzer; import com.starrocks.analysis.Expr; -import com.starrocks.analysis.SlotDescriptor; import com.starrocks.analysis.SlotId; import com.starrocks.analysis.SlotRef; import com.starrocks.analysis.TupleId; @@ -58,7 +57,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/fe/fe-core/src/main/java/com/starrocks/qe/ConnectContext.java b/fe/fe-core/src/main/java/com/starrocks/qe/ConnectContext.java index 13e0b0e708714..fbb8db71c1fa7 100644 --- a/fe/fe-core/src/main/java/com/starrocks/qe/ConnectContext.java +++ b/fe/fe-core/src/main/java/com/starrocks/qe/ConnectContext.java @@ -42,6 +42,10 @@ import com.starrocks.analysis.StringLiteral; import com.starrocks.analysis.VariableExpr; import com.starrocks.authentication.UserProperty; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.PrivilegeException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.cluster.ClusterNamespace; import com.starrocks.common.DdlException; import com.starrocks.common.ErrorCode; @@ -57,10 +61,6 @@ import com.starrocks.mysql.ssl.SSLChannel; import com.starrocks.mysql.ssl.SSLChannelImpClassLoader; import com.starrocks.plugin.AuditEvent.AuditEventBuilder; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.PrivilegeException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.server.CatalogMgr; import com.starrocks.server.GlobalStateMgr; import com.starrocks.server.MetadataMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/qe/ConnectScheduler.java b/fe/fe-core/src/main/java/com/starrocks/qe/ConnectScheduler.java index c1bf8c6d1d139..c7e59b31cf2a3 100644 --- a/fe/fe-core/src/main/java/com/starrocks/qe/ConnectScheduler.java +++ b/fe/fe-core/src/main/java/com/starrocks/qe/ConnectScheduler.java @@ -37,6 +37,8 @@ import com.google.common.base.Predicate; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.common.Config; import com.starrocks.common.Pair; import com.starrocks.common.ThreadPoolManager; @@ -45,8 +47,6 @@ import com.starrocks.mysql.MysqlProto; import com.starrocks.mysql.NegotiateState; import com.starrocks.mysql.nio.NConnectContext; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.service.arrow.flight.sql.ArrowFlightSqlConnectContext; import com.starrocks.sql.analyzer.Authorizer; import org.apache.logging.log4j.LogManager; diff --git a/fe/fe-core/src/main/java/com/starrocks/qe/DefaultCoordinator.java b/fe/fe-core/src/main/java/com/starrocks/qe/DefaultCoordinator.java index 7a200a5f6f52b..937ca32b8529f 100644 --- a/fe/fe-core/src/main/java/com/starrocks/qe/DefaultCoordinator.java +++ b/fe/fe-core/src/main/java/com/starrocks/qe/DefaultCoordinator.java @@ -40,6 +40,7 @@ import com.google.common.collect.Sets; import com.starrocks.analysis.DescriptorTable; import com.starrocks.authentication.AuthenticationMgr; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.catalog.FsBroker; import com.starrocks.catalog.ResourceGroup; import com.starrocks.common.AnalysisException; @@ -65,7 +66,6 @@ import com.starrocks.planner.RuntimeFilterDescription; import com.starrocks.planner.ScanNode; import com.starrocks.planner.StreamLoadPlanner; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.proto.PPlanFragmentCancelReason; import com.starrocks.proto.PQueryStatistics; import com.starrocks.qe.scheduler.Coordinator; diff --git a/fe/fe-core/src/main/java/com/starrocks/qe/SetDefaultRoleExecutor.java b/fe/fe-core/src/main/java/com/starrocks/qe/SetDefaultRoleExecutor.java index 8703ce0ca68cc..a1409aa88d3b9 100644 --- a/fe/fe-core/src/main/java/com/starrocks/qe/SetDefaultRoleExecutor.java +++ b/fe/fe-core/src/main/java/com/starrocks/qe/SetDefaultRoleExecutor.java @@ -13,9 +13,15 @@ // limitations under the License. package com.starrocks.qe; +<<<<<<< HEAD import com.starrocks.common.UserException; import com.starrocks.privilege.AuthorizationMgr; import com.starrocks.privilege.PrivilegeException; +======= +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.PrivilegeException; +import com.starrocks.common.StarRocksException; +>>>>>>> 4840470464 ([Refactor] Rename Package from privilege to authorization and optimize import (#53826)) import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.ast.SetDefaultRoleStmt; import com.starrocks.sql.ast.SetRoleType; diff --git a/fe/fe-core/src/main/java/com/starrocks/qe/SetRoleExecutor.java b/fe/fe-core/src/main/java/com/starrocks/qe/SetRoleExecutor.java index 58e61806e6ce8..ddd7e5fd3fd7b 100644 --- a/fe/fe-core/src/main/java/com/starrocks/qe/SetRoleExecutor.java +++ b/fe/fe-core/src/main/java/com/starrocks/qe/SetRoleExecutor.java @@ -15,9 +15,15 @@ package com.starrocks.qe; +<<<<<<< HEAD import com.starrocks.common.UserException; import com.starrocks.privilege.AuthorizationMgr; import com.starrocks.privilege.PrivilegeException; +======= +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.PrivilegeException; +import com.starrocks.common.StarRocksException; +>>>>>>> 4840470464 ([Refactor] Rename Package from privilege to authorization and optimize import (#53826)) import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.ast.SetRoleStmt; import com.starrocks.sql.ast.SetRoleType; diff --git a/fe/fe-core/src/main/java/com/starrocks/qe/ShowExecutor.java b/fe/fe-core/src/main/java/com/starrocks/qe/ShowExecutor.java index f1d30b96f760d..46a6fab12672c 100644 --- a/fe/fe-core/src/main/java/com/starrocks/qe/ShowExecutor.java +++ b/fe/fe-core/src/main/java/com/starrocks/qe/ShowExecutor.java @@ -47,6 +47,17 @@ import com.starrocks.analysis.TableRef; import com.starrocks.authentication.AuthenticationMgr; import com.starrocks.authentication.UserAuthenticationInfo; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.ActionSet; +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.CatalogPEntryObject; +import com.starrocks.authorization.DbPEntryObject; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.PrivilegeBuiltinConstants; +import com.starrocks.authorization.PrivilegeEntry; +import com.starrocks.authorization.PrivilegeException; +import com.starrocks.authorization.PrivilegeType; +import com.starrocks.authorization.TablePEntryObject; import com.starrocks.backup.AbstractJob; import com.starrocks.backup.BackupJob; import com.starrocks.backup.Repository; @@ -119,17 +130,6 @@ import com.starrocks.load.streamload.StreamLoadTask; import com.starrocks.meta.BlackListSql; import com.starrocks.meta.SqlBlackList; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.ActionSet; -import com.starrocks.privilege.AuthorizationMgr; -import com.starrocks.privilege.CatalogPEntryObject; -import com.starrocks.privilege.DbPEntryObject; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.PrivilegeBuiltinConstants; -import com.starrocks.privilege.PrivilegeEntry; -import com.starrocks.privilege.PrivilegeException; -import com.starrocks.privilege.PrivilegeType; -import com.starrocks.privilege.TablePEntryObject; import com.starrocks.proto.FailPointTriggerModeType; import com.starrocks.proto.PFailPointInfo; import com.starrocks.proto.PFailPointTriggerMode; diff --git a/fe/fe-core/src/main/java/com/starrocks/qe/StmtExecutor.java b/fe/fe-core/src/main/java/com/starrocks/qe/StmtExecutor.java index 9889808af7169..d7468e263ceab 100644 --- a/fe/fe-core/src/main/java/com/starrocks/qe/StmtExecutor.java +++ b/fe/fe-core/src/main/java/com/starrocks/qe/StmtExecutor.java @@ -51,6 +51,10 @@ import com.starrocks.analysis.StringLiteral; import com.starrocks.analysis.TableName; import com.starrocks.analysis.UserVariableHint; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.PrivilegeException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.Column; import com.starrocks.catalog.Database; import com.starrocks.catalog.ExternalOlapTable; @@ -112,10 +116,6 @@ import com.starrocks.planner.PlanFragment; import com.starrocks.planner.PlanNodeId; import com.starrocks.planner.ScanNode; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.PrivilegeException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.proto.PPlanFragmentCancelReason; import com.starrocks.proto.PQueryStatistics; import com.starrocks.proto.QueryStatisticsItemPB; diff --git a/fe/fe-core/src/main/java/com/starrocks/server/CatalogMgr.java b/fe/fe-core/src/main/java/com/starrocks/server/CatalogMgr.java index 32e88ee64bd2a..9312e447df8c9 100644 --- a/fe/fe-core/src/main/java/com/starrocks/server/CatalogMgr.java +++ b/fe/fe-core/src/main/java/com/starrocks/server/CatalogMgr.java @@ -20,6 +20,9 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.starrocks.authorization.NativeAccessController; +import com.starrocks.authorization.ranger.hive.RangerHiveAccessController; +import com.starrocks.authorization.ranger.starrocks.RangerStarRocksAccessController; import com.starrocks.catalog.Catalog; import com.starrocks.catalog.ExternalCatalog; import com.starrocks.catalog.InternalCatalog; @@ -48,9 +51,6 @@ import com.starrocks.persist.metablock.SRMetaBlockID; import com.starrocks.persist.metablock.SRMetaBlockReader; import com.starrocks.persist.metablock.SRMetaBlockWriter; -import com.starrocks.privilege.NativeAccessController; -import com.starrocks.privilege.ranger.hive.RangerHiveAccessController; -import com.starrocks.privilege.ranger.starrocks.RangerStarRocksAccessController; import com.starrocks.sql.analyzer.Authorizer; import com.starrocks.sql.ast.AlterCatalogStmt; import com.starrocks.sql.ast.CreateCatalogStmt; diff --git a/fe/fe-core/src/main/java/com/starrocks/server/GlobalStateMgr.java b/fe/fe-core/src/main/java/com/starrocks/server/GlobalStateMgr.java index 9a0c471d419b2..6aa7ecec732e3 100644 --- a/fe/fe-core/src/main/java/com/starrocks/server/GlobalStateMgr.java +++ b/fe/fe-core/src/main/java/com/starrocks/server/GlobalStateMgr.java @@ -47,6 +47,12 @@ import com.starrocks.analysis.LiteralExpr; import com.starrocks.analysis.TableName; import com.starrocks.authentication.AuthenticationMgr; +import com.starrocks.authorization.AccessControlProvider; +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.DefaultAuthorizationProvider; +import com.starrocks.authorization.NativeAccessController; +import com.starrocks.authorization.PrivilegeException; +import com.starrocks.authorization.ranger.starrocks.RangerStarRocksAccessController; import com.starrocks.backup.BackupHandler; import com.starrocks.binlog.BinlogManager; import com.starrocks.catalog.BrokerMgr; @@ -175,12 +181,6 @@ import com.starrocks.persist.metablock.SRMetaBlockLoader; import com.starrocks.persist.metablock.SRMetaBlockReader; import com.starrocks.plugin.PluginMgr; -import com.starrocks.privilege.AccessControlProvider; -import com.starrocks.privilege.AuthorizationMgr; -import com.starrocks.privilege.DefaultAuthorizationProvider; -import com.starrocks.privilege.NativeAccessController; -import com.starrocks.privilege.PrivilegeException; -import com.starrocks.privilege.ranger.starrocks.RangerStarRocksAccessController; import com.starrocks.qe.AuditEventProcessor; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.DDLStmtExecutor; diff --git a/fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.java b/fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.java index 4c8fa0867443c..f33cb85345822 100644 --- a/fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.java +++ b/fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.java @@ -57,6 +57,9 @@ import com.starrocks.analysis.TableName; import com.starrocks.analysis.TableRef; import com.starrocks.analysis.UserVariableHint; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.binlog.BinlogConfig; import com.starrocks.catalog.CatalogRecycleBin; import com.starrocks.catalog.CatalogUtils; @@ -169,9 +172,6 @@ import com.starrocks.persist.metablock.SRMetaBlockID; import com.starrocks.persist.metablock.SRMetaBlockReader; import com.starrocks.persist.metablock.SRMetaBlockWriter; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.SessionVariable; import com.starrocks.scheduler.Constants; diff --git a/fe/fe-core/src/main/java/com/starrocks/service/FrontendServiceImpl.java b/fe/fe-core/src/main/java/com/starrocks/service/FrontendServiceImpl.java index d18eba142b709..08ad1506f47a3 100644 --- a/fe/fe-core/src/main/java/com/starrocks/service/FrontendServiceImpl.java +++ b/fe/fe-core/src/main/java/com/starrocks/service/FrontendServiceImpl.java @@ -48,6 +48,9 @@ import com.starrocks.analysis.TupleDescriptor; import com.starrocks.analysis.TupleId; import com.starrocks.authentication.AuthenticationMgr; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeBuiltinConstants; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.CatalogUtils; import com.starrocks.catalog.Column; import com.starrocks.catalog.Database; @@ -131,9 +134,6 @@ import com.starrocks.persist.AutoIncrementInfo; import com.starrocks.planner.OlapTableSink; import com.starrocks.planner.StreamLoadPlanner; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeBuiltinConstants; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.ConnectProcessor; import com.starrocks.qe.DefaultCoordinator; diff --git a/fe/fe-core/src/main/java/com/starrocks/service/InformationSchemaDataSource.java b/fe/fe-core/src/main/java/com/starrocks/service/InformationSchemaDataSource.java index d68024a285f54..ad9011bb6bd3f 100644 --- a/fe/fe-core/src/main/java/com/starrocks/service/InformationSchemaDataSource.java +++ b/fe/fe-core/src/main/java/com/starrocks/service/InformationSchemaDataSource.java @@ -17,6 +17,7 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.gson.Gson; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.catalog.BasicTable; import com.starrocks.catalog.Column; import com.starrocks.catalog.DataProperty; @@ -43,7 +44,6 @@ import com.starrocks.lake.compaction.PartitionStatistics; import com.starrocks.lake.compaction.Quantiles; import com.starrocks.monitor.unit.ByteSizeValue; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.server.GlobalStateMgr; import com.starrocks.server.MetadataMgr; import com.starrocks.server.TemporaryTableMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AnalyzerUtils.java b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AnalyzerUtils.java index 22212d87814cd..019fac05c1f9c 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AnalyzerUtils.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AnalyzerUtils.java @@ -44,6 +44,9 @@ import com.starrocks.analysis.StringLiteral; import com.starrocks.analysis.Subquery; import com.starrocks.analysis.TableName; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.AggregateFunction; import com.starrocks.catalog.ArrayType; import com.starrocks.catalog.Column; @@ -75,9 +78,6 @@ import com.starrocks.common.Pair; import com.starrocks.common.util.DateUtils; import com.starrocks.common.util.TimeUtils; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.server.CatalogMgr; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AstToStringBuilder.java b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AstToStringBuilder.java index 54496456cb9f6..7d103fc467b3e 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AstToStringBuilder.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AstToStringBuilder.java @@ -54,6 +54,9 @@ import com.starrocks.analysis.TimestampArithmeticExpr; import com.starrocks.analysis.UserVariableExpr; import com.starrocks.analysis.VariableExpr; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.PEntryObject; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.BrokerTable; import com.starrocks.catalog.Column; import com.starrocks.catalog.ConnectorView; @@ -82,9 +85,6 @@ import com.starrocks.common.util.ParseUtil; import com.starrocks.common.util.PrintableMap; import com.starrocks.credential.CredentialUtil; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.PEntryObject; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.sql.ast.AlterStorageVolumeStmt; import com.starrocks.sql.ast.AlterUserStmt; import com.starrocks.sql.ast.ArrayExpr; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AuthenticationAnalyzer.java b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AuthenticationAnalyzer.java index 4d794d43105eb..f828aca676b73 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AuthenticationAnalyzer.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AuthenticationAnalyzer.java @@ -19,8 +19,8 @@ import com.starrocks.authentication.AuthenticationProviderFactory; import com.starrocks.authentication.PlainPasswordAuthenticationProvider; import com.starrocks.authentication.UserAuthenticationInfo; +import com.starrocks.authorization.AuthorizationMgr; import com.starrocks.common.Config; -import com.starrocks.privilege.AuthorizationMgr; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.ast.AlterUserStmt; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AuthorizationAnalyzer.java b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AuthorizationAnalyzer.java index 680d9503a72df..952870c896c97 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AuthorizationAnalyzer.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AuthorizationAnalyzer.java @@ -19,18 +19,18 @@ import com.starrocks.analysis.FunctionName; import com.starrocks.analysis.TableName; import com.starrocks.authentication.AuthenticationMgr; +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.PEntryObject; +import com.starrocks.authorization.PrivilegeBuiltinConstants; +import com.starrocks.authorization.PrivilegeException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.Database; import com.starrocks.catalog.Function; import com.starrocks.catalog.FunctionSearchDesc; import com.starrocks.common.AnalysisException; import com.starrocks.common.Config; import com.starrocks.common.Pair; -import com.starrocks.privilege.AuthorizationMgr; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.PEntryObject; -import com.starrocks.privilege.PrivilegeBuiltinConstants; -import com.starrocks.privilege.PrivilegeException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.ast.AstVisitor; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/Authorizer.java b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/Authorizer.java index be1a2c8ff159c..bf9a3786975ff 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/Authorizer.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/Authorizer.java @@ -18,6 +18,12 @@ import com.google.common.collect.ImmutableList; import com.starrocks.analysis.Expr; import com.starrocks.analysis.TableName; +import com.starrocks.authorization.AccessControlProvider; +import com.starrocks.authorization.AccessController; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.PEntryObject; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.BasicTable; import com.starrocks.catalog.Column; import com.starrocks.catalog.Database; @@ -25,12 +31,6 @@ import com.starrocks.catalog.InternalCatalog; import com.starrocks.catalog.Table; import com.starrocks.common.Pair; -import com.starrocks.privilege.AccessControlProvider; -import com.starrocks.privilege.AccessController; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.PEntryObject; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.server.CatalogMgr; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AuthorizerStmtVisitor.java b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AuthorizerStmtVisitor.java index 7a55e13c449f4..efbe61d309e62 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AuthorizerStmtVisitor.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AuthorizerStmtVisitor.java @@ -20,6 +20,13 @@ import com.starrocks.analysis.SetVarHint; import com.starrocks.analysis.TableName; import com.starrocks.analysis.TableRef; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.ColumnPrivilege; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.PrivilegeBuiltinConstants; +import com.starrocks.authorization.PrivilegeException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.backup.AbstractJob; import com.starrocks.backup.BackupJob; import com.starrocks.catalog.BasicTable; @@ -40,13 +47,6 @@ import com.starrocks.load.loadv2.LoadJob; import com.starrocks.load.loadv2.SparkLoadJob; import com.starrocks.load.routineload.RoutineLoadJob; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.AuthorizationMgr; -import com.starrocks.privilege.ColumnPrivilege; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.PrivilegeBuiltinConstants; -import com.starrocks.privilege.PrivilegeException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.SessionVariable; import com.starrocks.server.CatalogMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/DictionaryAnalyzer.java b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/DictionaryAnalyzer.java index 44e44700969d5..da4a52dda1b18 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/DictionaryAnalyzer.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/DictionaryAnalyzer.java @@ -19,7 +19,6 @@ import com.starrocks.catalog.Type; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; -import com.starrocks.sql.analyzer.SemanticException; import com.starrocks.sql.ast.AstVisitor; import com.starrocks.sql.ast.CancelRefreshDictionaryStmt; import com.starrocks.sql.ast.CreateDictionaryStmt; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/DropStmtAnalyzer.java b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/DropStmtAnalyzer.java index 7ae1aeaaa3d13..37e8fd98a0745 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/DropStmtAnalyzer.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/DropStmtAnalyzer.java @@ -17,6 +17,9 @@ import com.google.common.base.Strings; import com.starrocks.analysis.FunctionName; import com.starrocks.analysis.TableName; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.Database; import com.starrocks.catalog.Function; import com.starrocks.catalog.FunctionSearchDesc; @@ -27,9 +30,6 @@ import com.starrocks.catalog.system.sys.SysDb; import com.starrocks.common.ErrorCode; import com.starrocks.common.ErrorReport; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.server.CatalogMgr; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/ExpressionAnalyzer.java b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/ExpressionAnalyzer.java index c8cc16c28be83..d7c29ee5f36d0 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/ExpressionAnalyzer.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/ExpressionAnalyzer.java @@ -62,6 +62,9 @@ import com.starrocks.analysis.TimestampArithmeticExpr; import com.starrocks.analysis.UserVariableExpr; import com.starrocks.analysis.VariableExpr; +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.PrivilegeException; +import com.starrocks.authorization.RolePrivilegeCollectionV2; import com.starrocks.catalog.ArrayType; import com.starrocks.catalog.Column; import com.starrocks.catalog.Database; @@ -82,9 +85,6 @@ import com.starrocks.cluster.ClusterNamespace; import com.starrocks.common.AnalysisException; import com.starrocks.common.DdlException; -import com.starrocks.privilege.AuthorizationMgr; -import com.starrocks.privilege.PrivilegeException; -import com.starrocks.privilege.RolePrivilegeCollectionV2; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.SessionVariable; import com.starrocks.qe.SqlModeHelper; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/QueryAnalyzer.java b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/QueryAnalyzer.java index 27c42a554e8e2..9096eedf90e09 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/QueryAnalyzer.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/QueryAnalyzer.java @@ -35,6 +35,7 @@ import com.starrocks.analysis.ParseNode; import com.starrocks.analysis.SlotRef; import com.starrocks.analysis.TableName; +import com.starrocks.authorization.SecurityPolicyRewriteRule; import com.starrocks.catalog.Column; import com.starrocks.catalog.ConnectorView; import com.starrocks.catalog.Database; @@ -56,7 +57,6 @@ import com.starrocks.common.Pair; import com.starrocks.common.profile.Timer; import com.starrocks.common.profile.Tracers; -import com.starrocks.privilege.SecurityPolicyRewriteRule; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.server.MetadataMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/ast/AbstractBackupStmt.java b/fe/fe-core/src/main/java/com/starrocks/sql/ast/AbstractBackupStmt.java index 18e87cf7c9d44..a528e9e1d5fdc 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/ast/AbstractBackupStmt.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/ast/AbstractBackupStmt.java @@ -20,8 +20,6 @@ import com.google.common.collect.Sets; import com.starrocks.analysis.LabelName; import com.starrocks.analysis.TableRef; -import com.starrocks.sql.ast.CatalogRef; -import com.starrocks.sql.ast.FunctionRef; import com.starrocks.sql.parser.NodePosition; import java.util.List; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/ast/AddFieldClause.java b/fe/fe-core/src/main/java/com/starrocks/sql/ast/AddFieldClause.java index 964c41cdd34db..cd479af278b6d 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/ast/AddFieldClause.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/ast/AddFieldClause.java @@ -17,7 +17,6 @@ import com.starrocks.alter.AlterOpType; import com.starrocks.analysis.ColumnPosition; import com.starrocks.catalog.Type; -import com.starrocks.sql.ast.StructFieldDesc; import com.starrocks.sql.parser.NodePosition; import java.util.List; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/ast/BackupStmt.java b/fe/fe-core/src/main/java/com/starrocks/sql/ast/BackupStmt.java index 678f6013851ea..5e17e6f7e2916 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/ast/BackupStmt.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/ast/BackupStmt.java @@ -17,7 +17,6 @@ import com.starrocks.analysis.LabelName; import com.starrocks.analysis.TableRef; -import com.starrocks.sql.ast.FunctionRef; import com.starrocks.sql.parser.NodePosition; import java.util.List; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/ast/BaseGrantRevokePrivilegeStmt.java b/fe/fe-core/src/main/java/com/starrocks/sql/ast/BaseGrantRevokePrivilegeStmt.java index c0f72456e3bd3..231760adc9180 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/ast/BaseGrantRevokePrivilegeStmt.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/ast/BaseGrantRevokePrivilegeStmt.java @@ -16,10 +16,10 @@ package com.starrocks.sql.ast; import com.starrocks.analysis.FunctionName; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.PEntryObject; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.common.Pair; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.PEntryObject; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.sql.parser.NodePosition; import java.util.List; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/ast/DataDescription.java b/fe/fe-core/src/main/java/com/starrocks/sql/ast/DataDescription.java index 273a775ffe762..a4a87fcb4131e 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/ast/DataDescription.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/ast/DataDescription.java @@ -28,6 +28,9 @@ import com.starrocks.analysis.ParseNode; import com.starrocks.analysis.SlotRef; import com.starrocks.analysis.StringLiteral; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.Column; import com.starrocks.catalog.FunctionSet; import com.starrocks.catalog.InternalCatalog; @@ -36,9 +39,6 @@ import com.starrocks.common.AnalysisException; import com.starrocks.common.CsvFormat; import com.starrocks.common.Pair; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.AstToSQLBuilder; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/ast/RestoreStmt.java b/fe/fe-core/src/main/java/com/starrocks/sql/ast/RestoreStmt.java index 5163b2050ab09..262609123e7c6 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/ast/RestoreStmt.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/ast/RestoreStmt.java @@ -18,7 +18,6 @@ import com.starrocks.analysis.LabelName; import com.starrocks.analysis.TableRef; import com.starrocks.server.RunMode; -import com.starrocks.sql.ast.FunctionRef; import com.starrocks.sql.parser.NodePosition; import java.util.List; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/ast/ShowAnalyzeJobStmt.java b/fe/fe-core/src/main/java/com/starrocks/sql/ast/ShowAnalyzeJobStmt.java index 65433ddd9584a..b17b3fba6f129 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/ast/ShowAnalyzeJobStmt.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/ast/ShowAnalyzeJobStmt.java @@ -18,12 +18,12 @@ import com.google.common.collect.Lists; import com.starrocks.analysis.Predicate; import com.starrocks.analysis.RedirectStatus; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.catalog.Column; import com.starrocks.catalog.Database; import com.starrocks.catalog.ScalarType; import com.starrocks.catalog.Table; import com.starrocks.common.MetaNotFoundException; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.ShowResultSetMetaData; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/ast/ShowBasicStatsMetaStmt.java b/fe/fe-core/src/main/java/com/starrocks/sql/ast/ShowBasicStatsMetaStmt.java index 1bb3735b1bf77..ac25533bbc724 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/ast/ShowBasicStatsMetaStmt.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/ast/ShowBasicStatsMetaStmt.java @@ -18,12 +18,12 @@ import com.starrocks.analysis.Predicate; import com.starrocks.analysis.RedirectStatus; import com.starrocks.analysis.TableName; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.catalog.Column; import com.starrocks.catalog.Database; import com.starrocks.catalog.ScalarType; import com.starrocks.catalog.Table; import com.starrocks.common.MetaNotFoundException; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.ShowResultSetMetaData; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/ast/ShowHistogramStatsMetaStmt.java b/fe/fe-core/src/main/java/com/starrocks/sql/ast/ShowHistogramStatsMetaStmt.java index d63ffd565bc24..d5101d7069da8 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/ast/ShowHistogramStatsMetaStmt.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/ast/ShowHistogramStatsMetaStmt.java @@ -18,12 +18,12 @@ import com.starrocks.analysis.Predicate; import com.starrocks.analysis.RedirectStatus; import com.starrocks.analysis.TableName; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.catalog.Column; import com.starrocks.catalog.Database; import com.starrocks.catalog.ScalarType; import com.starrocks.catalog.Table; import com.starrocks.common.MetaNotFoundException; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.ShowResultSetMetaData; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/function/MetaFunctions.java b/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/function/MetaFunctions.java index 53a52992cbbea..58804b4d6b8b5 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/function/MetaFunctions.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/function/MetaFunctions.java @@ -20,6 +20,9 @@ import com.google.gson.JsonPrimitive; import com.google.gson.annotations.SerializedName; import com.starrocks.analysis.TableName; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.Column; import com.starrocks.catalog.Database; import com.starrocks.catalog.InternalCatalog; @@ -41,9 +44,6 @@ import com.starrocks.memory.MemoryUsageTracker; import com.starrocks.monitor.unit.ByteSizeValue; import com.starrocks.persist.gson.GsonUtils; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.scheduler.TaskRunManager; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/operator/scalar/DictionaryGetOperator.java b/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/operator/scalar/DictionaryGetOperator.java index 35b95a4d1ec86..72eababe99d2f 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/operator/scalar/DictionaryGetOperator.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/operator/scalar/DictionaryGetOperator.java @@ -19,7 +19,6 @@ import com.starrocks.catalog.Type; import com.starrocks.sql.optimizer.base.ColumnRefSet; import com.starrocks.sql.optimizer.operator.OperatorType; -import com.starrocks.sql.optimizer.operator.scalar.ScalarOperator; import java.util.ArrayList; import java.util.List; diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rewrite/ScalarOperatorFunctions.java b/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rewrite/ScalarOperatorFunctions.java index 4604dfd5201dd..01fe65298352d 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rewrite/ScalarOperatorFunctions.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rewrite/ScalarOperatorFunctions.java @@ -38,6 +38,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.starrocks.analysis.DecimalLiteral; +import com.starrocks.authorization.AuthorizationMgr; import com.starrocks.catalog.ScalarType; import com.starrocks.catalog.Type; import com.starrocks.common.AnalysisException; @@ -45,7 +46,6 @@ import com.starrocks.common.Pair; import com.starrocks.common.util.DateUtils; import com.starrocks.common.util.TimeUtils; -import com.starrocks.privilege.AuthorizationMgr; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.optimizer.operator.scalar.ConstantOperator; diff --git a/fe/fe-core/src/main/java/com/starrocks/statistic/StatisticUtils.java b/fe/fe-core/src/main/java/com/starrocks/statistic/StatisticUtils.java index 93f9c345aca04..1edf36c775d05 100644 --- a/fe/fe-core/src/main/java/com/starrocks/statistic/StatisticUtils.java +++ b/fe/fe-core/src/main/java/com/starrocks/statistic/StatisticUtils.java @@ -24,6 +24,7 @@ import com.starrocks.analysis.SlotRef; import com.starrocks.analysis.SubfieldExpr; import com.starrocks.analysis.TypeDef; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.catalog.AggregateType; import com.starrocks.catalog.Column; import com.starrocks.catalog.Database; @@ -49,7 +50,6 @@ import com.starrocks.load.loadv2.LoadJobFinalOperation; import com.starrocks.load.pipe.filelist.RepoExecutor; import com.starrocks.load.streamload.StreamLoadTxnCommitAttachment; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.qe.ConnectContext; import com.starrocks.server.GlobalStateMgr; import com.starrocks.server.WarehouseManager; diff --git a/fe/fe-core/src/main/java/com/starrocks/task/RemoteSnapshotTask.java b/fe/fe-core/src/main/java/com/starrocks/task/RemoteSnapshotTask.java index 00a7a6d64212e..360bc67ba9e8e 100644 --- a/fe/fe-core/src/main/java/com/starrocks/task/RemoteSnapshotTask.java +++ b/fe/fe-core/src/main/java/com/starrocks/task/RemoteSnapshotTask.java @@ -14,7 +14,6 @@ package com.starrocks.task; -import com.starrocks.task.AgentTask; import com.starrocks.thrift.TBackend; import com.starrocks.thrift.TRemoteSnapshotRequest; import com.starrocks.thrift.TTabletType; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/ColumnDefTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/ColumnDefTest.java index ae0bbeb6c96a4..e99b39e37a142 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/ColumnDefTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/ColumnDefTest.java @@ -36,17 +36,17 @@ import com.google.common.collect.Lists; import com.starrocks.catalog.AggregateFunction; -import com.starrocks.catalog.FunctionSet; -import com.starrocks.catalog.combinator.AggStateDesc; -import com.starrocks.sql.analyzer.SemanticException; -import com.starrocks.sql.ast.ColumnDef; -import com.starrocks.sql.ast.ColumnDef.DefaultValueDef; import com.starrocks.catalog.AggregateType; import com.starrocks.catalog.ArrayType; +import com.starrocks.catalog.FunctionSet; import com.starrocks.catalog.PrimitiveType; import com.starrocks.catalog.ScalarType; import com.starrocks.catalog.Type; +import com.starrocks.catalog.combinator.AggStateDesc; import com.starrocks.common.AnalysisException; +import com.starrocks.sql.analyzer.SemanticException; +import com.starrocks.sql.ast.ColumnDef; +import com.starrocks.sql.ast.ColumnDef.DefaultValueDef; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/ColumnPositionTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/ColumnPositionTest.java index e90014954a529..0d208d5a15940 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/ColumnPositionTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/ColumnPositionTest.java @@ -18,7 +18,6 @@ package com.starrocks.analysis; import com.starrocks.common.AnalysisException; -import com.starrocks.sql.parser.NodePosition; import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/CreateDbStmtTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/CreateDbStmtTest.java index aa14ad5b61a40..087f27ec223c9 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/CreateDbStmtTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/CreateDbStmtTest.java @@ -16,9 +16,7 @@ package com.starrocks.analysis; import com.starrocks.qe.ConnectContext; -import com.starrocks.sql.analyzer.AnalyzeTestUtil; import com.starrocks.sql.ast.CreateDbStmt; -import com.starrocks.utframe.StarRocksAssert; import com.starrocks.utframe.UtFrameUtils; import org.junit.BeforeClass; import org.junit.Rule; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/CreateSyncMaterializedViewTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/CreateSyncMaterializedViewTest.java index 403516bcf10df..3ad62cadd35b0 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/CreateSyncMaterializedViewTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/CreateSyncMaterializedViewTest.java @@ -37,8 +37,6 @@ import com.starrocks.sql.plan.ExecPlan; import com.starrocks.utframe.StarRocksAssert; import com.starrocks.utframe.UtFrameUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.ClassRule; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/FailPointStmtTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/FailPointStmtTest.java index 196ae35e17c61..7577f645d3837 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/FailPointStmtTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/FailPointStmtTest.java @@ -16,7 +16,6 @@ import com.starrocks.sql.analyzer.AnalyzeTestUtil; import com.starrocks.sql.ast.StatementBase; -import com.starrocks.sql.ast.UpdateFailPointStatusStatement; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/GINIndexTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/GINIndexTest.java index b73f7c887658f..4472928f705da 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/GINIndexTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/GINIndexTest.java @@ -14,30 +14,19 @@ package com.starrocks.analysis; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import static com.starrocks.common.InvertedIndexParams.CommonIndexParamKey.IMP_LIB; - import com.google.common.collect.Lists; -import com.starrocks.catalog.ColumnId; -import com.starrocks.sql.ast.IndexDef.IndexType; import com.starrocks.catalog.Column; +import com.starrocks.catalog.ColumnId; import com.starrocks.catalog.Index; import com.starrocks.catalog.KeysType; import com.starrocks.catalog.Type; import com.starrocks.common.Config; -import com.starrocks.common.InvertedIndexParams; -import com.starrocks.common.InvertedIndexParams.CommonIndexParamKey; import com.starrocks.common.InvertedIndexParams.IndexParamsKey; import com.starrocks.common.InvertedIndexParams.InvertedIndexImpType; import com.starrocks.common.InvertedIndexParams.SearchParamsKey; import com.starrocks.server.RunMode; import com.starrocks.sql.analyzer.SemanticException; +import com.starrocks.sql.ast.IndexDef.IndexType; import com.starrocks.sql.plan.PlanTestBase; import com.starrocks.thrift.TIndexType; import com.starrocks.thrift.TOlapTableIndex; @@ -47,6 +36,13 @@ import org.junit.Test; import org.junit.jupiter.api.Assertions; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; + +import static com.starrocks.common.InvertedIndexParams.CommonIndexParamKey.IMP_LIB; + public class GINIndexTest extends PlanTestBase { @BeforeClass diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/IndexDefTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/IndexDefTest.java index 4f06db8f38ac2..1ff66ac9a65c3 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/IndexDefTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/IndexDefTest.java @@ -18,9 +18,9 @@ package com.starrocks.analysis; import com.google.common.collect.Lists; +import com.starrocks.sql.analyzer.SemanticException; import com.starrocks.sql.ast.IndexDef; import com.starrocks.sql.ast.IndexDef.IndexType; -import com.starrocks.sql.analyzer.SemanticException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/LoadStmtTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/LoadStmtTest.java index 8dcb13489f74c..9e0863ebf98cf 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/LoadStmtTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/LoadStmtTest.java @@ -34,9 +34,14 @@ package com.starrocks.analysis; +<<<<<<< HEAD import com.starrocks.common.UserException; import com.starrocks.sql.analyzer.AstToStringBuilder; +======= +import com.starrocks.common.StarRocksException; +>>>>>>> 4840470464 ([Refactor] Rename Package from privilege to authorization and optimize import (#53826)) import com.starrocks.sql.analyzer.AnalyzeTestUtil; +import com.starrocks.sql.analyzer.AstToStringBuilder; import com.starrocks.sql.ast.DataDescription; import com.starrocks.sql.ast.LoadStmt; import org.junit.Assert; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/MVColumnBitmapUnionPatternTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/MVColumnBitmapUnionPatternTest.java index 491e1762ee528..8069edb673cb1 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/MVColumnBitmapUnionPatternTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/MVColumnBitmapUnionPatternTest.java @@ -40,7 +40,6 @@ import com.starrocks.catalog.Type; import com.starrocks.common.jmockit.Deencapsulation; import com.starrocks.sql.analyzer.mvpattern.MVColumnBitmapUnionPattern; -import mockit.Expectations; import mockit.Injectable; import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/ModifyBackendClauseTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/ModifyBackendClauseTest.java index 30aeefa133e4f..b22d3b187d4ec 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/ModifyBackendClauseTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/ModifyBackendClauseTest.java @@ -16,7 +16,6 @@ package com.starrocks.analysis; import com.starrocks.common.AnalysisException; - import com.starrocks.sql.ast.ModifyBackendClause; import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/ModifyBrokerClauseTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/ModifyBrokerClauseTest.java index 4c507e0ddcb39..4f20c7db6dfc9 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/ModifyBrokerClauseTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/ModifyBrokerClauseTest.java @@ -22,7 +22,6 @@ import com.starrocks.sql.ast.AlterSystemStmt; import com.starrocks.sql.ast.ModifyBrokerClause; import com.starrocks.utframe.UtFrameUtils; - import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/ModifyFrontendAddressClauseTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/ModifyFrontendAddressClauseTest.java index 7fb95c8bbbe28..4a5105f5b58a2 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/ModifyFrontendAddressClauseTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/ModifyFrontendAddressClauseTest.java @@ -16,7 +16,6 @@ package com.starrocks.analysis; import com.starrocks.ha.FrontendNodeType; - import com.starrocks.sql.ast.ModifyFrontendAddressClause; import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/RestrictOpMaterializedViewTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/RestrictOpMaterializedViewTest.java index a21dace4a643a..8fac7a7d3a7ca 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/RestrictOpMaterializedViewTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/RestrictOpMaterializedViewTest.java @@ -16,8 +16,6 @@ package com.starrocks.analysis; import com.google.common.collect.Maps; -import com.starrocks.common.Config; -import com.starrocks.common.FeConstants; import com.starrocks.common.jmockit.Deencapsulation; import com.starrocks.load.DeleteMgr; import com.starrocks.load.routineload.KafkaRoutineLoadJob; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/SetCatalogStmtTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/SetCatalogStmtTest.java index d00c61d296d53..0c5b7a2ca085d 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/SetCatalogStmtTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/SetCatalogStmtTest.java @@ -15,8 +15,8 @@ package com.starrocks.analysis; import com.google.common.collect.Sets; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.common.util.UUIDUtil; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.StmtExecutor; import com.starrocks.server.CatalogMgr; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/SetPassVarTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/SetPassVarTest.java index 6b05d12c21c91..2d79ae3868050 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/SetPassVarTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/SetPassVarTest.java @@ -37,9 +37,14 @@ import com.google.common.collect.Lists; import com.starrocks.authentication.AuthenticationMgr; import com.starrocks.authentication.UserAuthenticationInfo; +import com.starrocks.authorization.AuthorizationMgr; import com.starrocks.common.ErrorReportException; +<<<<<<< HEAD import com.starrocks.common.UserException; import com.starrocks.privilege.AuthorizationMgr; +======= +import com.starrocks.common.StarRocksException; +>>>>>>> 4840470464 ([Refactor] Rename Package from privilege to authorization and optimize import (#53826)) import com.starrocks.qe.ConnectContext; import com.starrocks.qe.SetExecutor; import com.starrocks.qe.SqlModeHelper; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/ShowCatalogsStmtTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/ShowCatalogsStmtTest.java index 0c4021e0ef8d5..7f6fc165475cd 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/ShowCatalogsStmtTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/ShowCatalogsStmtTest.java @@ -16,10 +16,10 @@ package com.starrocks.analysis; import com.google.common.collect.Sets; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.common.AnalysisException; import com.starrocks.common.DdlException; import com.starrocks.common.jmockit.Deencapsulation; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.DDLStmtExecutor; import com.starrocks.qe.ShowExecutor; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/ShowCharsetStmtTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/ShowCharsetStmtTest.java index 37d26e7ce4a4f..6ef427ab0087f 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/ShowCharsetStmtTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/ShowCharsetStmtTest.java @@ -15,10 +15,10 @@ package com.starrocks.analysis; +import com.starrocks.qe.ConnectContext; import com.starrocks.sql.analyzer.Analyzer; import com.starrocks.sql.ast.ShowCharsetStmt; import com.starrocks.sql.parser.SqlParser; -import com.starrocks.qe.ConnectContext; import mockit.Mocked; import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/ShowCreateRoutineLoadStmtTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/ShowCreateRoutineLoadStmtTest.java index e645217a6986e..64ed35a592960 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/ShowCreateRoutineLoadStmtTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/ShowCreateRoutineLoadStmtTest.java @@ -17,7 +17,6 @@ import com.starrocks.qe.ConnectContext; import com.starrocks.sql.ast.ShowCreateRoutineLoadStmt; -import com.starrocks.sql.ast.ShowRoutineLoadStmt; import com.starrocks.sql.ast.StatementBase; import com.starrocks.utframe.UtFrameUtils; import org.junit.Assert; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/ShowRestoreStmtTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/ShowRestoreStmtTest.java index c857ff43aaaab..7a7233164e9c2 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/ShowRestoreStmtTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/ShowRestoreStmtTest.java @@ -15,11 +15,11 @@ package com.starrocks.analysis; -import static org.junit.Assert.assertEquals; - import com.starrocks.sql.ast.ShowRestoreStmt; import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class ShowRestoreStmtTest { @Test diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/SubmitTaskStmtTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/SubmitTaskStmtTest.java index 1a31a7692c872..bced7cf0192cd 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/SubmitTaskStmtTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/SubmitTaskStmtTest.java @@ -21,7 +21,6 @@ import com.starrocks.common.util.UUIDUtil; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.DDLStmtExecutor; -import com.starrocks.qe.SessionVariable; import com.starrocks.qe.ShowResultSet; import com.starrocks.scheduler.Constants; import com.starrocks.scheduler.Task; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/UseCatalogStmtTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/UseCatalogStmtTest.java index af4f83696cf95..99c088926353b 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/UseCatalogStmtTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/UseCatalogStmtTest.java @@ -16,8 +16,8 @@ package com.starrocks.analysis; import com.google.common.collect.Sets; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.common.util.UUIDUtil; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.QueryState; import com.starrocks.qe.StmtExecutor; diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/VectorIndexTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/VectorIndexTest.java index ea3b1f5c3ca19..43e4513c67f59 100644 --- a/fe/fe-core/src/test/java/com/starrocks/analysis/VectorIndexTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/analysis/VectorIndexTest.java @@ -14,13 +14,6 @@ package com.starrocks.analysis; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.stream.Collectors; - import com.starrocks.catalog.AggregateType; import com.starrocks.catalog.Column; import com.starrocks.catalog.ColumnId; @@ -46,6 +39,13 @@ import org.junit.Test; import org.junit.jupiter.api.Assertions; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.stream.Collectors; + public class VectorIndexTest extends PlanTestBase { @BeforeClass diff --git a/fe/fe-core/src/test/java/com/starrocks/authentication/AuthenticationManagerTest.java b/fe/fe-core/src/test/java/com/starrocks/authentication/AuthenticationManagerTest.java index 3c82a2830f6df..d49a83c0a2413 100644 --- a/fe/fe-core/src/test/java/com/starrocks/authentication/AuthenticationManagerTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/authentication/AuthenticationManagerTest.java @@ -15,6 +15,7 @@ package com.starrocks.authentication; +import com.starrocks.authorization.AuthorizationMgr; import com.starrocks.common.AnalysisException; import com.starrocks.mysql.MysqlPassword; import com.starrocks.persist.AlterUserInfo; @@ -22,7 +23,6 @@ import com.starrocks.persist.OperationType; import com.starrocks.persist.metablock.SRMetaBlockReader; import com.starrocks.persist.metablock.SRMetaBlockReaderV2; -import com.starrocks.privilege.AuthorizationMgr; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.DDLStmtExecutor; import com.starrocks.qe.SetDefaultRoleExecutor; diff --git a/fe/fe-core/src/test/java/com/starrocks/authentication/UserPropertyTest.java b/fe/fe-core/src/test/java/com/starrocks/authentication/UserPropertyTest.java index 84fae38360cd8..6bc741f42cadb 100644 --- a/fe/fe-core/src/test/java/com/starrocks/authentication/UserPropertyTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/authentication/UserPropertyTest.java @@ -15,10 +15,10 @@ package com.starrocks.authentication; +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.PrivilegeException; import com.starrocks.catalog.InternalCatalog; import com.starrocks.common.Pair; -import com.starrocks.privilege.AuthorizationMgr; -import com.starrocks.privilege.PrivilegeException; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.SessionVariable; import com.starrocks.qe.StmtExecutor; diff --git a/fe/fe-core/src/test/java/com/starrocks/privilege/AccessControlTest.java b/fe/fe-core/src/test/java/com/starrocks/authorization/AccessControlTest.java similarity index 99% rename from fe/fe-core/src/test/java/com/starrocks/privilege/AccessControlTest.java rename to fe/fe-core/src/test/java/com/starrocks/authorization/AccessControlTest.java index 2866856e6cc33..44134b6030440 100644 --- a/fe/fe-core/src/test/java/com/starrocks/privilege/AccessControlTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/authorization/AccessControlTest.java @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.common.collect.Lists; import com.starrocks.analysis.FunctionName; diff --git a/fe/fe-core/src/test/java/com/starrocks/privilege/ActionSetTest.java b/fe/fe-core/src/test/java/com/starrocks/authorization/ActionSetTest.java similarity index 99% rename from fe/fe-core/src/test/java/com/starrocks/privilege/ActionSetTest.java rename to fe/fe-core/src/test/java/com/starrocks/authorization/ActionSetTest.java index e7d05a5e14f20..e0b5721145915 100644 --- a/fe/fe-core/src/test/java/com/starrocks/privilege/ActionSetTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/authorization/ActionSetTest.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/com/starrocks/privilege/AuthorizationMgrTest.java b/fe/fe-core/src/test/java/com/starrocks/authorization/AuthorizationMgrTest.java similarity index 99% rename from fe/fe-core/src/test/java/com/starrocks/privilege/AuthorizationMgrTest.java rename to fe/fe-core/src/test/java/com/starrocks/authorization/AuthorizationMgrTest.java index dc5b7e94263c5..2a406287764bb 100644 --- a/fe/fe-core/src/test/java/com/starrocks/privilege/AuthorizationMgrTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/authorization/AuthorizationMgrTest.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.common.collect.Lists; import com.google.gson.stream.JsonReader; diff --git a/fe/fe-core/src/test/java/com/starrocks/privilege/IdGenerator.java b/fe/fe-core/src/test/java/com/starrocks/authorization/IdGenerator.java similarity index 96% rename from fe/fe-core/src/test/java/com/starrocks/privilege/IdGenerator.java rename to fe/fe-core/src/test/java/com/starrocks/authorization/IdGenerator.java index a1193a2503901..1eb7033c21fff 100644 --- a/fe/fe-core/src/test/java/com/starrocks/privilege/IdGenerator.java +++ b/fe/fe-core/src/test/java/com/starrocks/authorization/IdGenerator.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; public class IdGenerator { private static final int BATCH_ID_INTERVAL = 1000; diff --git a/fe/fe-core/src/test/java/com/starrocks/privilege/InvalidateObjectTest.java b/fe/fe-core/src/test/java/com/starrocks/authorization/InvalidateObjectTest.java similarity index 99% rename from fe/fe-core/src/test/java/com/starrocks/privilege/InvalidateObjectTest.java rename to fe/fe-core/src/test/java/com/starrocks/authorization/InvalidateObjectTest.java index d7ed4548a23d6..6a0e54aa5c812 100644 --- a/fe/fe-core/src/test/java/com/starrocks/privilege/InvalidateObjectTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/authorization/InvalidateObjectTest.java @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.starrocks.persist.gson.GsonUtils; import com.starrocks.qe.ConnectContext; diff --git a/fe/fe-core/src/test/java/com/starrocks/privilege/PrivilegeCollectionTest.java b/fe/fe-core/src/test/java/com/starrocks/authorization/PrivilegeCollectionTest.java similarity index 99% rename from fe/fe-core/src/test/java/com/starrocks/privilege/PrivilegeCollectionTest.java rename to fe/fe-core/src/test/java/com/starrocks/authorization/PrivilegeCollectionTest.java index fb312af1e435e..662f1a38dd334 100644 --- a/fe/fe-core/src/test/java/com/starrocks/privilege/PrivilegeCollectionTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/authorization/PrivilegeCollectionTest.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.google.common.collect.ImmutableList; import org.junit.Assert; diff --git a/fe/fe-core/src/test/java/com/starrocks/privilege/RBACMockedMetadataMgr.java b/fe/fe-core/src/test/java/com/starrocks/authorization/RBACMockedMetadataMgr.java similarity index 99% rename from fe/fe-core/src/test/java/com/starrocks/privilege/RBACMockedMetadataMgr.java rename to fe/fe-core/src/test/java/com/starrocks/authorization/RBACMockedMetadataMgr.java index e9d2a338d4c56..6a160cabb2636 100644 --- a/fe/fe-core/src/test/java/com/starrocks/privilege/RBACMockedMetadataMgr.java +++ b/fe/fe-core/src/test/java/com/starrocks/authorization/RBACMockedMetadataMgr.java @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import com.starrocks.analysis.TableName; import com.starrocks.catalog.Database; diff --git a/fe/fe-core/src/test/java/com/starrocks/privilege/RolePrivilegeCollectionTest.java b/fe/fe-core/src/test/java/com/starrocks/authorization/RolePrivilegeCollectionTest.java similarity index 98% rename from fe/fe-core/src/test/java/com/starrocks/privilege/RolePrivilegeCollectionTest.java rename to fe/fe-core/src/test/java/com/starrocks/authorization/RolePrivilegeCollectionTest.java index 4beaf913f3610..fe81268912f5e 100644 --- a/fe/fe-core/src/test/java/com/starrocks/privilege/RolePrivilegeCollectionTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/authorization/RolePrivilegeCollectionTest.java @@ -13,7 +13,7 @@ // limitations under the License. -package com.starrocks.privilege; +package com.starrocks.authorization; import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/com/starrocks/privilege/ranger/RangerInterfaceTest.java b/fe/fe-core/src/test/java/com/starrocks/authorization/ranger/RangerInterfaceTest.java similarity index 96% rename from fe/fe-core/src/test/java/com/starrocks/privilege/ranger/RangerInterfaceTest.java rename to fe/fe-core/src/test/java/com/starrocks/authorization/ranger/RangerInterfaceTest.java index 238a4a331fcdf..114582f700569 100644 --- a/fe/fe-core/src/test/java/com/starrocks/privilege/ranger/RangerInterfaceTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/authorization/ranger/RangerInterfaceTest.java @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege.ranger; +package com.starrocks.authorization.ranger; import com.google.common.collect.Lists; import com.starrocks.analysis.ArithmeticExpr; @@ -19,14 +19,14 @@ import com.starrocks.analysis.Expr; import com.starrocks.analysis.NullLiteral; import com.starrocks.analysis.TableName; +import com.starrocks.authorization.AccessControlProvider; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.NativeAccessController; +import com.starrocks.authorization.PrivilegeType; +import com.starrocks.authorization.ranger.starrocks.RangerStarRocksAccessController; +import com.starrocks.authorization.ranger.starrocks.RangerStarRocksResource; import com.starrocks.catalog.Column; import com.starrocks.catalog.Type; -import com.starrocks.privilege.AccessControlProvider; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.NativeAccessController; -import com.starrocks.privilege.PrivilegeType; -import com.starrocks.privilege.ranger.starrocks.RangerStarRocksAccessController; -import com.starrocks.privilege.ranger.starrocks.RangerStarRocksResource; import com.starrocks.qe.ConnectContext; import com.starrocks.sql.analyzer.Authorizer; import com.starrocks.sql.ast.AstTraverser; diff --git a/fe/fe-core/src/test/java/com/starrocks/privilege/ranger/RangerResourceTest.java b/fe/fe-core/src/test/java/com/starrocks/authorization/ranger/RangerResourceTest.java similarity index 97% rename from fe/fe-core/src/test/java/com/starrocks/privilege/ranger/RangerResourceTest.java rename to fe/fe-core/src/test/java/com/starrocks/authorization/ranger/RangerResourceTest.java index b92a837d1263a..8fd012dd6fcd3 100644 --- a/fe/fe-core/src/test/java/com/starrocks/privilege/ranger/RangerResourceTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/authorization/ranger/RangerResourceTest.java @@ -11,10 +11,10 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.starrocks.privilege.ranger; +package com.starrocks.authorization.ranger; +import com.starrocks.authorization.ranger.starrocks.RangerStarRocksResource; import com.starrocks.catalog.InternalCatalog; -import com.starrocks.privilege.ranger.starrocks.RangerStarRocksResource; import org.apache.ranger.plugin.policyengine.RangerAccessResourceImpl; import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/com/starrocks/catalog/DictionaryMgrTest.java b/fe/fe-core/src/test/java/com/starrocks/catalog/DictionaryMgrTest.java index 8a991dc944687..593a9fb0c417e 100644 --- a/fe/fe-core/src/test/java/com/starrocks/catalog/DictionaryMgrTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/catalog/DictionaryMgrTest.java @@ -15,8 +15,6 @@ package com.starrocks.catalog; import com.google.common.collect.Lists; -import com.starrocks.catalog.Dictionary; -import com.starrocks.catalog.DictionaryMgr; import com.starrocks.persist.DictionaryMgrInfo; import com.starrocks.proto.PProcessDictionaryCacheResult; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/test/java/com/starrocks/catalog/InfoSchemaDbTest.java b/fe/fe-core/src/test/java/com/starrocks/catalog/InfoSchemaDbTest.java index 96ebdb24f105f..51520d6d70458 100644 --- a/fe/fe-core/src/test/java/com/starrocks/catalog/InfoSchemaDbTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/catalog/InfoSchemaDbTest.java @@ -17,15 +17,15 @@ import com.google.common.collect.Lists; import com.starrocks.analysis.FunctionName; import com.starrocks.authentication.AuthenticationMgr; +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.DefaultAuthorizationProvider; +import com.starrocks.authorization.ObjectType; +import com.starrocks.authorization.PrivilegeEntry; import com.starrocks.catalog.system.information.InfoSchemaDb; import com.starrocks.catalog.system.sys.GrantsTo; import com.starrocks.common.AnalysisException; import com.starrocks.common.Config; import com.starrocks.common.jmockit.Deencapsulation; -import com.starrocks.privilege.AuthorizationMgr; -import com.starrocks.privilege.DefaultAuthorizationProvider; -import com.starrocks.privilege.ObjectType; -import com.starrocks.privilege.PrivilegeEntry; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.DDLStmtExecutor; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/test/java/com/starrocks/catalog/system/sys/SysFeMemoryUsageTest.java b/fe/fe-core/src/test/java/com/starrocks/catalog/system/sys/SysFeMemoryUsageTest.java index e948fb6d545df..94966f986daa4 100644 --- a/fe/fe-core/src/test/java/com/starrocks/catalog/system/sys/SysFeMemoryUsageTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/catalog/system/sys/SysFeMemoryUsageTest.java @@ -15,11 +15,11 @@ package com.starrocks.catalog.system.sys; import com.google.common.collect.ImmutableMap; +import com.starrocks.authorization.AccessControlProvider; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.memory.MemoryStat; import com.starrocks.memory.MemoryUsageTracker; -import com.starrocks.privilege.AccessControlProvider; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.sql.analyzer.Authorizer; import com.starrocks.sql.ast.UserIdentity; import com.starrocks.thrift.TAuthInfo; diff --git a/fe/fe-core/src/test/java/com/starrocks/connector/elasticsearch/QueryBuildersTest.java b/fe/fe-core/src/test/java/com/starrocks/connector/elasticsearch/QueryBuildersTest.java index 736fa91c69220..43e854f4fd2e8 100644 --- a/fe/fe-core/src/test/java/com/starrocks/connector/elasticsearch/QueryBuildersTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/connector/elasticsearch/QueryBuildersTest.java @@ -19,7 +19,6 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; -import com.starrocks.connector.elasticsearch.QueryBuilders; import org.junit.Test; import java.io.IOException; diff --git a/fe/fe-core/src/test/java/com/starrocks/planner/HudiScanNodeTest.java b/fe/fe-core/src/test/java/com/starrocks/planner/HudiScanNodeTest.java index 91cf82b066cdd..bfea4f7d29ac1 100644 --- a/fe/fe-core/src/test/java/com/starrocks/planner/HudiScanNodeTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/planner/HudiScanNodeTest.java @@ -17,7 +17,6 @@ import com.starrocks.analysis.TupleDescriptor; import com.starrocks.analysis.TupleId; import com.starrocks.catalog.HudiTable; -import com.starrocks.catalog.PaimonTable; import com.starrocks.connector.CatalogConnector; import com.starrocks.credential.CloudConfiguration; import com.starrocks.credential.CloudConfigurationFactory; diff --git a/fe/fe-core/src/test/java/com/starrocks/planner/OlapTableSinkTest.java b/fe/fe-core/src/test/java/com/starrocks/planner/OlapTableSinkTest.java index 652c233c05ea8..9de6675af05e3 100644 --- a/fe/fe-core/src/test/java/com/starrocks/planner/OlapTableSinkTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/planner/OlapTableSinkTest.java @@ -48,8 +48,13 @@ import com.starrocks.catalog.TabletMeta; import com.starrocks.catalog.Type; import com.starrocks.common.Config; +<<<<<<< HEAD import com.starrocks.common.Status; import com.starrocks.common.UserException; +======= +import com.starrocks.common.StarRocksException; +import com.starrocks.common.Status; +>>>>>>> 4840470464 ([Refactor] Rename Package from privilege to authorization and optimize import (#53826)) import com.starrocks.common.jmockit.Deencapsulation; import com.starrocks.lake.LakeTablet; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/test/java/com/starrocks/planner/StreamLoadPlannerTest.java b/fe/fe-core/src/test/java/com/starrocks/planner/StreamLoadPlannerTest.java index d650368d71711..b9e0e466efb6e 100644 --- a/fe/fe-core/src/test/java/com/starrocks/planner/StreamLoadPlannerTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/planner/StreamLoadPlannerTest.java @@ -39,20 +39,24 @@ import com.starrocks.analysis.Analyzer; import com.starrocks.analysis.CompoundPredicate; import com.starrocks.analysis.Expr; -import com.starrocks.lake.LakeTablet; -import com.starrocks.load.streamload.StreamLoadKvParams; -import com.starrocks.server.WarehouseManager; -import com.starrocks.sql.ast.ImportColumnsStmt; import com.starrocks.catalog.Column; import com.starrocks.catalog.Database; import com.starrocks.catalog.KeysType; import com.starrocks.catalog.OlapTable; import com.starrocks.catalog.Partition; import com.starrocks.catalog.Type; +<<<<<<< HEAD import com.starrocks.common.UserException; +======= +import com.starrocks.common.StarRocksException; +import com.starrocks.lake.LakeTablet; +>>>>>>> 4840470464 ([Refactor] Rename Package from privilege to authorization and optimize import (#53826)) import com.starrocks.load.routineload.KafkaRoutineLoadJob; import com.starrocks.load.routineload.RoutineLoadJob; import com.starrocks.load.streamload.StreamLoadInfo; +import com.starrocks.load.streamload.StreamLoadKvParams; +import com.starrocks.server.WarehouseManager; +import com.starrocks.sql.ast.ImportColumnsStmt; import com.starrocks.system.ComputeNode; import com.starrocks.thrift.TCompressionType; import com.starrocks.thrift.TFileFormatType; diff --git a/fe/fe-core/src/test/java/com/starrocks/planner/TableFunctionTableSinkTest.java b/fe/fe-core/src/test/java/com/starrocks/planner/TableFunctionTableSinkTest.java index 0756f83923912..9deb09e9a4a5f 100644 --- a/fe/fe-core/src/test/java/com/starrocks/planner/TableFunctionTableSinkTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/planner/TableFunctionTableSinkTest.java @@ -15,7 +15,6 @@ package com.starrocks.planner; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.starrocks.catalog.Column; import com.starrocks.catalog.TableFunctionTable; import com.starrocks.catalog.Type; diff --git a/fe/fe-core/src/test/java/com/starrocks/planner/VectorIndexTest.java b/fe/fe-core/src/test/java/com/starrocks/planner/VectorIndexTest.java index e9e0691c3f2dd..152504daebda7 100644 --- a/fe/fe-core/src/test/java/com/starrocks/planner/VectorIndexTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/planner/VectorIndexTest.java @@ -37,7 +37,6 @@ import com.starrocks.common.Config; import com.starrocks.common.FeConstants; import com.starrocks.sql.plan.PlanTestBase; - import org.junit.BeforeClass; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/com/starrocks/qe/ConnectProcessorTest.java b/fe/fe-core/src/test/java/com/starrocks/qe/ConnectProcessorTest.java index 77ce0f2ed8788..436d0922c0c84 100644 --- a/fe/fe-core/src/test/java/com/starrocks/qe/ConnectProcessorTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/qe/ConnectProcessorTest.java @@ -38,6 +38,7 @@ import com.google.common.collect.Sets; import com.starrocks.analysis.AccessTestUtil; import com.starrocks.authentication.AuthenticationMgr; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.common.jmockit.Deencapsulation; import com.starrocks.common.util.UUIDUtil; import com.starrocks.mysql.MysqlCapability; @@ -48,7 +49,6 @@ import com.starrocks.mysql.MysqlOkPacket; import com.starrocks.mysql.MysqlSerializer; import com.starrocks.plugin.AuditEvent.AuditEventBuilder; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.proto.PQueryStatistics; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.DDLTestBase; diff --git a/fe/fe-core/src/test/java/com/starrocks/qe/RBACExecutorTest.java b/fe/fe-core/src/test/java/com/starrocks/qe/RBACExecutorTest.java index 13bcb3b359cff..49d3178775b80 100644 --- a/fe/fe-core/src/test/java/com/starrocks/qe/RBACExecutorTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/qe/RBACExecutorTest.java @@ -16,14 +16,14 @@ import com.starrocks.analysis.FunctionName; import com.starrocks.analysis.InformationFunction; import com.starrocks.authentication.AuthenticationMgr; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.DefaultAuthorizationProvider; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.Function; import com.starrocks.catalog.ScalarFunction; import com.starrocks.catalog.Type; import com.starrocks.common.AnalysisException; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.AuthorizationMgr; -import com.starrocks.privilege.DefaultAuthorizationProvider; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.analyzer.AuthorizationAnalyzer; import com.starrocks.sql.analyzer.Authorizer; diff --git a/fe/fe-core/src/test/java/com/starrocks/qe/ShowExecutorTest.java b/fe/fe-core/src/test/java/com/starrocks/qe/ShowExecutorTest.java index d073fdf9b1180..6edd0ce3dae93 100644 --- a/fe/fe-core/src/test/java/com/starrocks/qe/ShowExecutorTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/qe/ShowExecutorTest.java @@ -43,6 +43,7 @@ import com.starrocks.analysis.SlotRef; import com.starrocks.analysis.StringLiteral; import com.starrocks.analysis.TableName; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.catalog.BaseTableInfo; import com.starrocks.catalog.Catalog; import com.starrocks.catalog.Column; @@ -79,7 +80,6 @@ import com.starrocks.lake.StarOSAgent; import com.starrocks.mysql.MysqlCommand; import com.starrocks.persist.ColumnIdExpr; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.server.CatalogMgr; import com.starrocks.server.GlobalStateMgr; import com.starrocks.server.LocalMetastore; diff --git a/fe/fe-core/src/test/java/com/starrocks/qe/ShowTableMockMeta.java b/fe/fe-core/src/test/java/com/starrocks/qe/ShowTableMockMeta.java index 9cb52e455cdcc..84212d48581e1 100644 --- a/fe/fe-core/src/test/java/com/starrocks/qe/ShowTableMockMeta.java +++ b/fe/fe-core/src/test/java/com/starrocks/qe/ShowTableMockMeta.java @@ -15,6 +15,7 @@ import com.google.common.collect.Maps; import com.starrocks.analysis.TableName; +import com.starrocks.authorization.IdGenerator; import com.starrocks.catalog.Database; import com.starrocks.catalog.HiveTable; import com.starrocks.catalog.MaterializedView; @@ -23,7 +24,6 @@ import com.starrocks.common.DdlException; import com.starrocks.connector.ConnectorMgr; import com.starrocks.connector.ConnectorTblMetaInfoMgr; -import com.starrocks.privilege.IdGenerator; import com.starrocks.server.GlobalStateMgr; import com.starrocks.server.LocalMetastore; import com.starrocks.server.MetadataMgr; diff --git a/fe/fe-core/src/test/java/com/starrocks/qe/ShowTablesTest.java b/fe/fe-core/src/test/java/com/starrocks/qe/ShowTablesTest.java index efb011e0f2382..d481d9b8ff23f 100644 --- a/fe/fe-core/src/test/java/com/starrocks/qe/ShowTablesTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/qe/ShowTablesTest.java @@ -14,9 +14,9 @@ package com.starrocks.qe; import com.google.common.collect.Sets; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.catalog.InternalCatalog; import com.starrocks.common.ErrorReportException; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.server.GlobalStateMgr; import com.starrocks.sql.ast.CreateUserStmt; import com.starrocks.sql.ast.GrantPrivilegeStmt; diff --git a/fe/fe-core/src/test/java/com/starrocks/server/CatalogLevelTest.java b/fe/fe-core/src/test/java/com/starrocks/server/CatalogLevelTest.java index 6789432275efd..e478fcf8abf89 100644 --- a/fe/fe-core/src/test/java/com/starrocks/server/CatalogLevelTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/server/CatalogLevelTest.java @@ -17,6 +17,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.starrocks.authorization.AccessDeniedException; import com.starrocks.catalog.Column; import com.starrocks.catalog.Database; import com.starrocks.catalog.IcebergTable; @@ -24,7 +25,6 @@ import com.starrocks.connector.hive.HiveMetaClient; import com.starrocks.connector.hive.HiveMetastoreApiConverter; import com.starrocks.connector.hive.HiveMetastoreTest; -import com.starrocks.privilege.AccessDeniedException; import com.starrocks.qe.DDLStmtExecutor; import com.starrocks.sql.analyzer.AnalyzeTestUtil; import com.starrocks.sql.analyzer.Authorizer; diff --git a/fe/fe-core/src/test/java/com/starrocks/service/LakeInformationSchemaDataSourceTest.java b/fe/fe-core/src/test/java/com/starrocks/service/LakeInformationSchemaDataSourceTest.java index 68affb6a93abc..b07854fef60ab 100644 --- a/fe/fe-core/src/test/java/com/starrocks/service/LakeInformationSchemaDataSourceTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/service/LakeInformationSchemaDataSourceTest.java @@ -16,8 +16,6 @@ import com.google.gson.Gson; import com.starrocks.server.RunMode; -import com.starrocks.service.ExecuteEnv; -import com.starrocks.service.FrontendServiceImpl; import com.starrocks.sql.ast.UserIdentity; import com.starrocks.thrift.TAuthInfo; import com.starrocks.thrift.TGetTablesConfigRequest; diff --git a/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/AlterDbRenameAnalyzerTest.java b/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/AlterDbRenameAnalyzerTest.java index da00540f55cf8..5693ea2369e93 100644 --- a/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/AlterDbRenameAnalyzerTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/AlterDbRenameAnalyzerTest.java @@ -16,9 +16,9 @@ import com.google.common.collect.Sets; import com.starrocks.analysis.AccessTestUtil; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.common.AnalysisException; import com.starrocks.common.jmockit.Deencapsulation; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.DDLStmtExecutor; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/ExternalDbTablePrivTest.java b/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/ExternalDbTablePrivTest.java index dd2296c496751..e908089f507f8 100644 --- a/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/ExternalDbTablePrivTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/ExternalDbTablePrivTest.java @@ -15,14 +15,14 @@ package com.starrocks.sql.analyzer; import com.starrocks.authentication.AuthenticationMgr; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.PrivilegeType; import com.starrocks.catalog.Database; import com.starrocks.catalog.InternalCatalog; import com.starrocks.catalog.OlapTable; import com.starrocks.catalog.Table; import com.starrocks.common.DdlException; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.AuthorizationMgr; -import com.starrocks.privilege.PrivilegeType; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.DDLStmtExecutor; import com.starrocks.server.MetadataMgr; diff --git a/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/PrivilegeCheckerTest.java b/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/PrivilegeCheckerTest.java index 2153e5194b13d..631f5a874d27e 100644 --- a/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/PrivilegeCheckerTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/PrivilegeCheckerTest.java @@ -23,6 +23,14 @@ import com.starrocks.analysis.FunctionName; import com.starrocks.analysis.TableName; import com.starrocks.authentication.AuthenticationMgr; +import com.starrocks.authorization.AccessDeniedException; +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.DbPEntryObject; +import com.starrocks.authorization.PipePEntryObject; +import com.starrocks.authorization.PrivObjNotFoundException; +import com.starrocks.authorization.PrivilegeException; +import com.starrocks.authorization.PrivilegeType; +import com.starrocks.authorization.TablePEntryObject; import com.starrocks.backup.BlobStorage; import com.starrocks.backup.RemoteFile; import com.starrocks.backup.Repository; @@ -50,14 +58,6 @@ import com.starrocks.load.pipe.PipeManagerTest; import com.starrocks.load.routineload.RoutineLoadMgr; import com.starrocks.mysql.MysqlChannel; -import com.starrocks.privilege.AccessDeniedException; -import com.starrocks.privilege.AuthorizationMgr; -import com.starrocks.privilege.DbPEntryObject; -import com.starrocks.privilege.PipePEntryObject; -import com.starrocks.privilege.PrivObjNotFoundException; -import com.starrocks.privilege.PrivilegeException; -import com.starrocks.privilege.PrivilegeType; -import com.starrocks.privilege.TablePEntryObject; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.ConnectScheduler; import com.starrocks.qe.DDLStmtExecutor; diff --git a/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/PrivilegeStmtAnalyzerV2Test.java b/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/PrivilegeStmtAnalyzerV2Test.java index 7d2d548334a8f..e6ec6cccc27b4 100644 --- a/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/PrivilegeStmtAnalyzerV2Test.java +++ b/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/PrivilegeStmtAnalyzerV2Test.java @@ -14,9 +14,9 @@ package com.starrocks.sql.analyzer; +import com.starrocks.authorization.AuthorizationMgr; import com.starrocks.common.AnalysisException; import com.starrocks.common.ErrorReportException; -import com.starrocks.privilege.AuthorizationMgr; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.DDLStmtExecutor; import com.starrocks.qe.SetDefaultRoleExecutor; diff --git a/fe/fe-core/src/test/java/com/starrocks/sql/ast/ExecuteAsStmtTest.java b/fe/fe-core/src/test/java/com/starrocks/sql/ast/ExecuteAsStmtTest.java index 23c80c47ddb12..6aeb2ed698e6b 100644 --- a/fe/fe-core/src/test/java/com/starrocks/sql/ast/ExecuteAsStmtTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/sql/ast/ExecuteAsStmtTest.java @@ -17,8 +17,8 @@ import com.starrocks.authentication.AuthenticationMgr; import com.starrocks.authentication.UserProperty; -import com.starrocks.privilege.AuthorizationMgr; -import com.starrocks.privilege.PrivilegeException; +import com.starrocks.authorization.AuthorizationMgr; +import com.starrocks.authorization.PrivilegeException; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.ExecuteAsExecutor; import com.starrocks.server.GlobalStateMgr; diff --git a/fe/fe-core/src/test/java/com/starrocks/transaction/GtidGeneratorTest.java b/fe/fe-core/src/test/java/com/starrocks/transaction/GtidGeneratorTest.java index 359498f1f880c..8b9773fb8afbe 100644 --- a/fe/fe-core/src/test/java/com/starrocks/transaction/GtidGeneratorTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/transaction/GtidGeneratorTest.java @@ -14,7 +14,6 @@ package com.starrocks.transaction; -import com.starrocks.transaction.GtidGenerator; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/fe/fe-core/src/test/java/com/starrocks/utframe/UtFrameUtils.java b/fe/fe-core/src/test/java/com/starrocks/utframe/UtFrameUtils.java index ea1b4e6e83f32..976045d1c3cfc 100644 --- a/fe/fe-core/src/test/java/com/starrocks/utframe/UtFrameUtils.java +++ b/fe/fe-core/src/test/java/com/starrocks/utframe/UtFrameUtils.java @@ -48,6 +48,7 @@ import com.starrocks.analysis.TableName; import com.starrocks.analysis.UserVariableHint; import com.starrocks.authentication.AuthenticationMgr; +import com.starrocks.authorization.PrivilegeBuiltinConstants; import com.starrocks.catalog.Database; import com.starrocks.catalog.DiskInfo; import com.starrocks.catalog.LocalTablet; @@ -87,7 +88,6 @@ import com.starrocks.persist.metablock.SRMetaBlockReader; import com.starrocks.persist.metablock.SRMetaBlockReaderV2; import com.starrocks.planner.PlanFragment; -import com.starrocks.privilege.PrivilegeBuiltinConstants; import com.starrocks.qe.ConnectContext; import com.starrocks.qe.ConnectProcessor; import com.starrocks.qe.DefaultCoordinator;