From 51a71fe4b2a01bb5d66d604c5c65c370529ceccb Mon Sep 17 00:00:00 2001 From: Xinyi Zou Date: Mon, 5 Feb 2024 11:29:14 +0800 Subject: [PATCH] 5 --- fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java | 2 +- .../main/java/org/apache/doris/journal/JournalEntity.java | 6 +++--- .../trees/plans/commands/CreateProcedureCommand.java | 2 +- .../src/main/java/org/apache/doris/persist/EditLog.java | 6 +++--- fe/fe-core/src/main/java/org/apache/doris/plsql/Exec.java | 2 +- .../apache/doris/plsql/functions/DorisFunctionRegistry.java | 4 ++-- .../doris/plsql/{plsql => metastore}/PlsqlManager.java | 2 +- .../doris/plsql/{plsql => metastore}/PlsqlMetaClient.java | 2 +- .../doris/plsql/{plsql => metastore}/PlsqlPackage.java | 2 +- .../doris/plsql/{plsql => metastore}/PlsqlProcedureKey.java | 2 +- .../plsql/{plsql => metastore}/PlsqlStoredProcedure.java | 2 +- .../apache/doris/plsql/packages/DorisPackageRegistry.java | 4 ++-- .../java/org/apache/doris/service/FrontendServiceImpl.java | 6 +++--- 13 files changed, 21 insertions(+), 21 deletions(-) rename fe/fe-core/src/main/java/org/apache/doris/plsql/{plsql => metastore}/PlsqlManager.java (99%) rename fe/fe-core/src/main/java/org/apache/doris/plsql/{plsql => metastore}/PlsqlMetaClient.java (99%) rename fe/fe-core/src/main/java/org/apache/doris/plsql/{plsql => metastore}/PlsqlPackage.java (98%) rename fe/fe-core/src/main/java/org/apache/doris/plsql/{plsql => metastore}/PlsqlProcedureKey.java (98%) rename fe/fe-core/src/main/java/org/apache/doris/plsql/{plsql => metastore}/PlsqlStoredProcedure.java (98%) diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java index 94ceebb3990beb..c4ae1b005e0e39 100755 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java @@ -221,7 +221,7 @@ import org.apache.doris.persist.meta.MetaReader; import org.apache.doris.persist.meta.MetaWriter; import org.apache.doris.planner.TabletLoadIndexRecorderMgr; -import org.apache.doris.plsql.plsql.PlsqlManager; +import org.apache.doris.plsql.metastore.PlsqlManager; import org.apache.doris.plugin.PluginInfo; import org.apache.doris.plugin.PluginMgr; import org.apache.doris.policy.PolicyMgr; diff --git a/fe/fe-core/src/main/java/org/apache/doris/journal/JournalEntity.java b/fe/fe-core/src/main/java/org/apache/doris/journal/JournalEntity.java index 414676e60504ca..e356bbaa6551aa 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/journal/JournalEntity.java +++ b/fe/fe-core/src/main/java/org/apache/doris/journal/JournalEntity.java @@ -117,9 +117,9 @@ import org.apache.doris.persist.TableRenameColumnInfo; import org.apache.doris.persist.TableStatsDeletionLog; import org.apache.doris.persist.TruncateTableInfo; -import org.apache.doris.plsql.plsql.PlsqlPackage; -import org.apache.doris.plsql.plsql.PlsqlProcedureKey; -import org.apache.doris.plsql.plsql.PlsqlStoredProcedure; +import org.apache.doris.plsql.metastore.PlsqlPackage; +import org.apache.doris.plsql.metastore.PlsqlProcedureKey; +import org.apache.doris.plsql.metastore.PlsqlStoredProcedure; import org.apache.doris.plugin.PluginInfo; import org.apache.doris.policy.DropPolicyLog; import org.apache.doris.policy.Policy; diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/CreateProcedureCommand.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/CreateProcedureCommand.java index 0cecc9559e18d2..54bc5042fe5224 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/CreateProcedureCommand.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/CreateProcedureCommand.java @@ -20,7 +20,7 @@ import org.apache.doris.nereids.annotation.Developing; import org.apache.doris.nereids.trees.plans.PlanType; import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor; -import org.apache.doris.plsql.plsql.PlsqlMetaClient; +import org.apache.doris.plsql.metastore.PlsqlMetaClient; import org.apache.doris.qe.ConnectContext; import org.apache.doris.qe.StmtExecutor; diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java index da96914dedefb2..28b8aa31c0187c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java @@ -75,9 +75,9 @@ import org.apache.doris.meta.MetaContext; import org.apache.doris.metric.MetricRepo; import org.apache.doris.mysql.privilege.UserPropertyInfo; -import org.apache.doris.plsql.plsql.PlsqlPackage; -import org.apache.doris.plsql.plsql.PlsqlProcedureKey; -import org.apache.doris.plsql.plsql.PlsqlStoredProcedure; +import org.apache.doris.plsql.metastore.PlsqlPackage; +import org.apache.doris.plsql.metastore.PlsqlProcedureKey; +import org.apache.doris.plsql.metastore.PlsqlStoredProcedure; import org.apache.doris.plugin.PluginInfo; import org.apache.doris.policy.DropPolicyLog; import org.apache.doris.policy.Policy; diff --git a/fe/fe-core/src/main/java/org/apache/doris/plsql/Exec.java b/fe/fe-core/src/main/java/org/apache/doris/plsql/Exec.java index 965e95088e8d86..4f2d4dc0fdb05c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/plsql/Exec.java +++ b/fe/fe-core/src/main/java/org/apache/doris/plsql/Exec.java @@ -133,7 +133,7 @@ import org.apache.doris.plsql.packages.DorisPackageRegistry; import org.apache.doris.plsql.packages.InMemoryPackageRegistry; import org.apache.doris.plsql.packages.PackageRegistry; -import org.apache.doris.plsql.plsql.PlsqlMetaClient; +import org.apache.doris.plsql.metastore.PlsqlMetaClient; import com.google.common.collect.ImmutableList; import org.antlr.v4.runtime.ANTLRInputStream; diff --git a/fe/fe-core/src/main/java/org/apache/doris/plsql/functions/DorisFunctionRegistry.java b/fe/fe-core/src/main/java/org/apache/doris/plsql/functions/DorisFunctionRegistry.java index 8095cac7baa66a..c5350bb3657097 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/plsql/functions/DorisFunctionRegistry.java +++ b/fe/fe-core/src/main/java/org/apache/doris/plsql/functions/DorisFunctionRegistry.java @@ -30,8 +30,8 @@ import org.apache.doris.plsql.Exec; import org.apache.doris.plsql.Scope; import org.apache.doris.plsql.Var; -import org.apache.doris.plsql.plsql.PlsqlMetaClient; -import org.apache.doris.plsql.plsql.PlsqlStoredProcedure; +import org.apache.doris.plsql.metastore.PlsqlMetaClient; +import org.apache.doris.plsql.metastore.PlsqlStoredProcedure; import org.apache.doris.qe.ConnectContext; import org.antlr.v4.runtime.CharStreams; diff --git a/fe/fe-core/src/main/java/org/apache/doris/plsql/plsql/PlsqlManager.java b/fe/fe-core/src/main/java/org/apache/doris/plsql/metastore/PlsqlManager.java similarity index 99% rename from fe/fe-core/src/main/java/org/apache/doris/plsql/plsql/PlsqlManager.java rename to fe/fe-core/src/main/java/org/apache/doris/plsql/metastore/PlsqlManager.java index 69a0442a008a11..b1ee73e544d464 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/plsql/plsql/PlsqlManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/plsql/metastore/PlsqlManager.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.doris.plsql.plsql; +package org.apache.doris.plsql.metastore; import org.apache.doris.catalog.Env; import org.apache.doris.common.io.Text; diff --git a/fe/fe-core/src/main/java/org/apache/doris/plsql/plsql/PlsqlMetaClient.java b/fe/fe-core/src/main/java/org/apache/doris/plsql/metastore/PlsqlMetaClient.java similarity index 99% rename from fe/fe-core/src/main/java/org/apache/doris/plsql/plsql/PlsqlMetaClient.java rename to fe/fe-core/src/main/java/org/apache/doris/plsql/metastore/PlsqlMetaClient.java index fb36eceda9b03d..86d4474ca76f1e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/plsql/plsql/PlsqlMetaClient.java +++ b/fe/fe-core/src/main/java/org/apache/doris/plsql/metastore/PlsqlMetaClient.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.doris.plsql.plsql; +package org.apache.doris.plsql.metastore; import org.apache.doris.catalog.Env; import org.apache.doris.common.ClientPool; diff --git a/fe/fe-core/src/main/java/org/apache/doris/plsql/plsql/PlsqlPackage.java b/fe/fe-core/src/main/java/org/apache/doris/plsql/metastore/PlsqlPackage.java similarity index 98% rename from fe/fe-core/src/main/java/org/apache/doris/plsql/plsql/PlsqlPackage.java rename to fe/fe-core/src/main/java/org/apache/doris/plsql/metastore/PlsqlPackage.java index 11f7ee694fba5f..41114890c5837b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/plsql/plsql/PlsqlPackage.java +++ b/fe/fe-core/src/main/java/org/apache/doris/plsql/metastore/PlsqlPackage.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.doris.plsql.plsql; +package org.apache.doris.plsql.metastore; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; diff --git a/fe/fe-core/src/main/java/org/apache/doris/plsql/plsql/PlsqlProcedureKey.java b/fe/fe-core/src/main/java/org/apache/doris/plsql/metastore/PlsqlProcedureKey.java similarity index 98% rename from fe/fe-core/src/main/java/org/apache/doris/plsql/plsql/PlsqlProcedureKey.java rename to fe/fe-core/src/main/java/org/apache/doris/plsql/metastore/PlsqlProcedureKey.java index ff1df65c289d37..c2472c073828f1 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/plsql/plsql/PlsqlProcedureKey.java +++ b/fe/fe-core/src/main/java/org/apache/doris/plsql/metastore/PlsqlProcedureKey.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.doris.plsql.plsql; +package org.apache.doris.plsql.metastore; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; diff --git a/fe/fe-core/src/main/java/org/apache/doris/plsql/plsql/PlsqlStoredProcedure.java b/fe/fe-core/src/main/java/org/apache/doris/plsql/metastore/PlsqlStoredProcedure.java similarity index 98% rename from fe/fe-core/src/main/java/org/apache/doris/plsql/plsql/PlsqlStoredProcedure.java rename to fe/fe-core/src/main/java/org/apache/doris/plsql/metastore/PlsqlStoredProcedure.java index f2d26ffe7d3e63..b181b19473d5a5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/plsql/plsql/PlsqlStoredProcedure.java +++ b/fe/fe-core/src/main/java/org/apache/doris/plsql/metastore/PlsqlStoredProcedure.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.doris.plsql.plsql; +package org.apache.doris.plsql.metastore; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; diff --git a/fe/fe-core/src/main/java/org/apache/doris/plsql/packages/DorisPackageRegistry.java b/fe/fe-core/src/main/java/org/apache/doris/plsql/packages/DorisPackageRegistry.java index 3b761af2bda594..ae0222cc40531c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/plsql/packages/DorisPackageRegistry.java +++ b/fe/fe-core/src/main/java/org/apache/doris/plsql/packages/DorisPackageRegistry.java @@ -20,8 +20,8 @@ package org.apache.doris.plsql.packages; -import org.apache.doris.plsql.plsql.PlsqlMetaClient; -import org.apache.doris.plsql.plsql.PlsqlPackage; +import org.apache.doris.plsql.metastore.PlsqlMetaClient; +import org.apache.doris.plsql.metastore.PlsqlPackage; import org.apache.doris.qe.ConnectContext; import org.apache.commons.lang3.StringUtils; diff --git a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java index 74b622109a80e1..798d3900ce8e71 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java +++ b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java @@ -82,9 +82,9 @@ import org.apache.doris.persist.gson.GsonUtils; import org.apache.doris.planner.OlapTableSink; import org.apache.doris.planner.StreamLoadPlanner; -import org.apache.doris.plsql.plsql.PlsqlPackage; -import org.apache.doris.plsql.plsql.PlsqlProcedureKey; -import org.apache.doris.plsql.plsql.PlsqlStoredProcedure; +import org.apache.doris.plsql.metastore.PlsqlPackage; +import org.apache.doris.plsql.metastore.PlsqlProcedureKey; +import org.apache.doris.plsql.metastore.PlsqlStoredProcedure; import org.apache.doris.qe.ConnectContext; import org.apache.doris.qe.ConnectContext.ConnectType; import org.apache.doris.qe.ConnectProcessor;