[Refactor] Rename Package from privilege to authorization and optimiz…

…e import (#53826) (cherry picked from commit 4840470) # Conflicts: # fe/fe-core/src/main/java/com/starrocks/catalog/DictionaryMgr.java # fe/fe-core/src/main/java/com/starrocks/planner/OlapTableSink.java # fe/fe-core/src/main/java/com/starrocks/planner/PlanNode.java # fe/fe-core/src/main/java/com/starrocks/qe/SetDefaultRoleExecutor.java # fe/fe-core/src/main/java/com/starrocks/qe/SetRoleExecutor.java # fe/fe-core/src/test/java/com/starrocks/analysis/LoadStmtTest.java # fe/fe-core/src/test/java/com/starrocks/analysis/SetPassVarTest.java # fe/fe-core/src/test/java/com/starrocks/planner/OlapTableSinkTest.java # fe/fe-core/src/test/java/com/starrocks/planner/StreamLoadPlannerTest.java
StarRocks · Dec 13, 2024 · 6f726be · 6f726be
1 parent ca834d0
commit 6f726be
Show file tree

Hide file tree

Showing 209 changed files with 406 additions and 416 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<String, String> 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
@@ -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/...ocks/privilege/AccessControlProvider.java → .../authorization/AccessControlProvider.java b/...ocks/privilege/AccessControlProvider.java → .../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/...starrocks/privilege/AccessController.java → ...rocks/authorization/AccessController.java b/...starrocks/privilege/AccessController.java → ...rocks/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/...ocks/privilege/AccessDeniedException.java → .../authorization/AccessDeniedException.java b/...ocks/privilege/AccessDeniedException.java → .../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/...va/com/starrocks/privilege/ActionSet.java → ...om/starrocks/authorization/ActionSet.java b/...va/com/starrocks/privilege/ActionSet.java → ...om/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/...starrocks/privilege/AuthorizationMgr.java → ...rocks/authorization/AuthorizationMgr.java b/...starrocks/privilege/AuthorizationMgr.java → ...rocks/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/...ocks/privilege/AuthorizationProvider.java → .../authorization/AuthorizationProvider.java b/...ocks/privilege/AuthorizationProvider.java → .../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/...rrocks/privilege/CatalogPEntryObject.java → ...ks/authorization/CatalogPEntryObject.java b/...rrocks/privilege/CatalogPEntryObject.java → ...ks/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/.../starrocks/privilege/ColumnPrivilege.java → ...rrocks/authorization/ColumnPrivilege.java b/.../starrocks/privilege/ColumnPrivilege.java → ...rrocks/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/...m/starrocks/privilege/DbPEntryObject.java → ...arrocks/authorization/DbPEntryObject.java b/...m/starrocks/privilege/DbPEntryObject.java → ...arrocks/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/...ivilege/DefaultAuthorizationProvider.java → ...ization/DefaultAuthorizationProvider.java b/...ivilege/DefaultAuthorizationProvider.java → ...ization/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/...s/privilege/ExternalAccessController.java → ...thorization/ExternalAccessController.java b/...s/privilege/ExternalAccessController.java → ...thorization/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/...vilege/ForwardCompatiblePEntryObject.java → ...zation/ForwardCompatiblePEntryObject.java b/...vilege/ForwardCompatiblePEntryObject.java → ...zation/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/...rocks/privilege/FunctionPEntryObject.java → ...s/authorization/FunctionPEntryObject.java b/...rocks/privilege/FunctionPEntryObject.java → ...s/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/...privilege/GlobalFunctionPEntryObject.java → ...orization/GlobalFunctionPEntryObject.java b/...privilege/GlobalFunctionPEntryObject.java → ...orization/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/...ivilege/MaterializedViewPEntryObject.java → ...ization/MaterializedViewPEntryObject.java b/...ivilege/MaterializedViewPEntryObject.java → ...ization/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/...cks/privilege/NativeAccessController.java → ...authorization/NativeAccessController.java b/...cks/privilege/NativeAccessController.java → ...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/...a/com/starrocks/privilege/ObjectType.java → ...m/starrocks/authorization/ObjectType.java b/...a/com/starrocks/privilege/ObjectType.java → ...m/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/...com/starrocks/privilege/PEntryObject.java → ...starrocks/authorization/PEntryObject.java b/...com/starrocks/privilege/PEntryObject.java → ...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/...starrocks/privilege/PipePEntryObject.java → ...rocks/authorization/PipePEntryObject.java b/...starrocks/privilege/PipePEntryObject.java → ...rocks/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/...rrocks/privilege/PolicyFCEntryObject.java → ...ks/authorization/PolicyFCEntryObject.java b/...rrocks/privilege/PolicyFCEntryObject.java → ...ks/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/...s/privilege/PrivObjNotFoundException.java → ...thorization/PrivObjNotFoundException.java b/...s/privilege/PrivObjNotFoundException.java → ...thorization/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/.../privilege/PrivilegeBuiltinConstants.java → ...horization/PrivilegeBuiltinConstants.java b/.../privilege/PrivilegeBuiltinConstants.java → ...horization/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/...ocks/privilege/PrivilegeCollectionV2.java → .../authorization/PrivilegeCollectionV2.java b/...ocks/privilege/PrivilegeCollectionV2.java → .../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/...m/starrocks/privilege/PrivilegeEntry.java → ...arrocks/authorization/PrivilegeEntry.java b/...m/starrocks/privilege/PrivilegeEntry.java → ...arrocks/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/...arrocks/privilege/PrivilegeException.java → ...cks/authorization/PrivilegeException.java b/...arrocks/privilege/PrivilegeException.java → ...cks/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/...om/starrocks/privilege/PrivilegeType.java → ...tarrocks/authorization/PrivilegeType.java b/...om/starrocks/privilege/PrivilegeType.java → ...tarrocks/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;