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

[minor](lower-table-names) use GlobalVariable.lowerCaseTableNames instead of Config.lower_case_table_names (#27911)

Browse Source 
GlobalVariable.lowerCaseTableNames instead of Config.lower_case_table_names
This commit is contained in:
Mingyu Chen
2023-12-09 12:04:26 +08:00
committed by GitHub
parent 363721e066
commit 16e232a8a1
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fe/fe-core/src/main/java/org/apache/doris/analysis/LateralViewRef.java
View File

@ -21,8 +21,8 @@ import org.apache.doris.catalog.Column;
import org.apache.doris.catalog.Function.NullableMode;
import org.apache.doris.catalog.InlineView;
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.Config;
import org.apache.doris.common.UserException;
import org.apache.doris.qe.GlobalVariable;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
@ -146,7 +146,7 @@ public class LateralViewRef extends TableRef {
}
if (tableName.getTbl() != null) {
switch (Config.lower_case_table_names) {
switch (GlobalVariable.lowerCaseTableNames) {
case 0:
if (tableName.getTbl().equals(relatedTableName.getTbl())) {
// t1 lateral view explode_split(t1.k1, ",")

4
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java
View File

@ -19,7 +19,6 @@ package org.apache.doris.datasource.jdbc;
import org.apache.doris.catalog.JdbcResource;
import org.apache.doris.catalog.external.JdbcExternalDatabase;
import org.apache.doris.common.Config;
import org.apache.doris.common.DdlException;
import org.apache.doris.datasource.CatalogProperty;
import org.apache.doris.datasource.ExternalCatalog;
@ -27,6 +26,7 @@ import org.apache.doris.datasource.InitCatalogLog;
import org.apache.doris.datasource.SessionContext;
import org.apache.doris.datasource.jdbc.client.JdbcClient;
import org.apache.doris.datasource.jdbc.client.JdbcClientConfig;
import org.apache.doris.qe.GlobalVariable;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
@ -127,7 +127,7 @@ public class JdbcExternalCatalog extends ExternalCatalog {
public String getLowerCaseTableNames() {
// Forced to true if Config.lower_case_table_names has a value of 1 or 2
if (Config.lower_case_table_names == 1 || Config.lower_case_table_names == 2) {
if (GlobalVariable.lowerCaseTableNames == 1 || GlobalVariable.lowerCaseTableNames == 2) {
return "true";
}

6
fe/fe-core/src/main/java/org/apache/doris/nereids/CTEContext.java
View File

@ -17,12 +17,12 @@
package org.apache.doris.nereids;
import org.apache.doris.common.Config;
import org.apache.doris.nereids.exceptions.AnalysisException;
import org.apache.doris.nereids.trees.expressions.CTEId;
import org.apache.doris.nereids.trees.plans.Plan;
import org.apache.doris.nereids.trees.plans.logical.LogicalPlan;
import org.apache.doris.nereids.trees.plans.logical.LogicalSubQueryAlias;
import org.apache.doris.qe.GlobalVariable;
import com.google.common.collect.ImmutableMap;
@ -56,7 +56,7 @@ public class CTEContext {
if ((parsedPlan == null && previousCteContext != null) || (parsedPlan != null && previousCteContext == null)) {
throw new AnalysisException("Only first CteContext can contains null cte plan or previousCteContext");
}
this.name = parsedPlan == null ? null : Config.lower_case_table_names != 0
this.name = parsedPlan == null ? null : GlobalVariable.lowerCaseTableNames != 0
? parsedPlan.getAlias().toLowerCase(Locale.ROOT) : parsedPlan.getAlias();
this.cteContextMap = previousCteContext == null
? ImmutableMap.of()
@ -86,7 +86,7 @@ public class CTEContext {
* findCTEContext
*/
public Optional<CTEContext> findCTEContext(String cteName) {
if (Config.lower_case_table_names != 0) {
if (GlobalVariable.lowerCaseTableNames != 0) {
cteName = cteName.toLowerCase(Locale.ROOT);
}
if (cteName.equals(name)) {

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

@ -19,7 +19,6 @@ package org.apache.doris.nereids.rules.analysis;
import org.apache.doris.analysis.SetType;
import org.apache.doris.cluster.ClusterNamespace;
import org.apache.doris.common.Config;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.util.Util;
import org.apache.doris.nereids.CascadesContext;
@ -41,6 +40,7 @@ import org.apache.doris.nereids.trees.expressions.literal.IntegerLikeLiteral;
import org.apache.doris.nereids.trees.expressions.literal.Literal;
import org.apache.doris.nereids.trees.expressions.literal.StringLiteral;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.GlobalVariable;
import org.apache.doris.qe.SessionVariable;
import org.apache.doris.qe.VariableMgr;
import org.apache.doris.qe.VariableVarConverters;
@ -315,7 +315,7 @@ public class SlotBinder extends SubExprAnalyzer {
}
private boolean sameTableName(String boundSlot, String unboundSlot) {
if (Config.lower_case_table_names != 1) {
if (GlobalVariable.lowerCaseTableNames != 1) {
return boundSlot.equals(unboundSlot);
} else {
return boundSlot.equalsIgnoreCase(unboundSlot);