[Fix](nereids) fix qualifier problem that affects delete stmt in anot…

…her catalog
feiniaofeiafei · Mar 26, 2024 · fbbeb45 · fbbeb45
1 parent 82b93eb
commit fbbeb45
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindRelation.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindRelation.java
@@ -64,9 +64,9 @@
 import org.apache.doris.nereids.util.RelationUtil;
 import org.apache.doris.qe.ConnectContext;
 
-import com.clearspring.analytics.util.Lists;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import org.apache.commons.collections.CollectionUtils;
 

diff --git a/...re/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalCatalogRelation.java b/...re/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalCatalogRelation.java
@@ -84,8 +84,9 @@ public DatabaseIf getDatabase() throws AnalysisException {
         try {
             int len = qualifier.size();
             if (2 == len) {
-                CatalogIf<DatabaseIf> catalog = Env.getCurrentEnv().getCatalogMgr().getCatalogOrException(qualifier.get(0),
-                        s -> new Exception("Catalog [" + qualifier.get(0) + "] does not exist."));
+                CatalogIf<DatabaseIf> catalog = Env.getCurrentEnv().getCatalogMgr()
+                        .getCatalogOrException(qualifier.get(0),
+                                s -> new Exception("Catalog [" + qualifier.get(0) + "] does not exist."));
                 return catalog.getDbOrException(qualifier.get(1),
                         s -> new Exception("Database [" + qualifier.get(1) + "] does not exist in catalog ["
                                 + catalog.getName() + "]."));

diff --git a/.../src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalCatalogRelation.java b/.../src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalCatalogRelation.java
@@ -88,8 +88,9 @@ public DatabaseIf getDatabase() throws AnalysisException {
         try {
             int len = qualifier.size();
             if (2 == len) {
-                CatalogIf<DatabaseIf> catalog = Env.getCurrentEnv().getCatalogMgr().getCatalogOrException(qualifier.get(0),
-                        s -> new Exception("Catalog [" + qualifier.get(0) + "] does not exist."));
+                CatalogIf<DatabaseIf> catalog = Env.getCurrentEnv().getCatalogMgr()
+                        .getCatalogOrException(qualifier.get(0),
+                                s -> new Exception("Catalog [" + qualifier.get(0) + "] does not exist."));
                 return catalog.getDbOrException(qualifier.get(1),
                         s -> new Exception("Database [" + qualifier.get(1) + "] does not exist in catalog ["
                                 + catalog.getName() + "]."));