database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](Nereids) Fixed a problem with completing ClusterName (#18366)

Browse Source
This commit is contained in:
ElvinWei
2023-04-07 13:35:03 +08:00
committed by GitHub
parent b1956b42fb
commit f42db08ccc
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindRelation.java
View File

@ -27,6 +27,7 @@ import org.apache.doris.catalog.View;
import org.apache.doris.catalog.external.EsExternalTable;
import org.apache.doris.catalog.external.HMSExternalTable;
import org.apache.doris.catalog.external.JdbcExternalTable;
import org.apache.doris.cluster.ClusterNamespace;
import org.apache.doris.common.util.Util;
import org.apache.doris.datasource.CatalogIf;
import org.apache.doris.nereids.CascadesContext;
@ -150,8 +151,8 @@ public class BindRelation extends OneAnalysisRuleFactory {
String catalogName = cascadesContext.getConnectContext().getCurrentCatalog().getName();
// if the relation is view, nameParts.get(0) is dbName.
String dbName = nameParts.get(0);
if (!dbName.equals(connectContext.getDatabase())) {
dbName = connectContext.getClusterName() + ":" + dbName;
if (!dbName.contains(ClusterNamespace.CLUSTER_DELIMITER)) {
dbName = connectContext.getClusterName() + ClusterNamespace.CLUSTER_DELIMITER + dbName;
}
String tableName = nameParts.get(1);
TableIf table = getTable(catalogName, dbName, tableName, connectContext.getEnv());
@ -165,8 +166,8 @@ public class BindRelation extends OneAnalysisRuleFactory {
ConnectContext connectContext = cascadesContext.getConnectContext();
String catalogName = nameParts.get(0);
String dbName = nameParts.get(1);
if (!dbName.equals(connectContext.getDatabase())) {
dbName = connectContext.getClusterName() + ":" + dbName;
if (!dbName.contains(ClusterNamespace.CLUSTER_DELIMITER)) {
dbName = connectContext.getClusterName() + ClusterNamespace.CLUSTER_DELIMITER + dbName;
}
String tableName = nameParts.get(2);
TableIf table = getTable(catalogName, dbName, tableName, connectContext.getEnv());