From 672908431441163d49871180ff6c99e81a7ec04e Mon Sep 17 00:00:00 2001 From: seawinde Date: Wed, 8 Nov 2023 13:11:34 +0800 Subject: [PATCH] rebase code --- .../src/main/java/org/apache/doris/analysis/AnalyticExpr.java | 2 +- .../src/main/java/org/apache/doris/analysis/ColumnRefExpr.java | 2 +- fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java | 2 +- .../main/java/org/apache/doris/analysis/FunctionCallExpr.java | 2 +- .../src/main/java/org/apache/doris/analysis/LiteralExpr.java | 2 +- fe/fe-core/src/main/java/org/apache/doris/analysis/SlotRef.java | 2 +- .../src/main/java/org/apache/doris/analysis/VirtualSlotRef.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticExpr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticExpr.java index 7401fd16efeb69..2f29dd046e1da0 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticExpr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticExpr.java @@ -147,7 +147,7 @@ public AnalyticWindow getWindow() { } @Override - protected String getExprName() { + public String getExprName() { if (!this.exprName.isPresent()) { this.exprName = Optional.of(Utils.normalizeName(getFnCall().getExprName(), DEFAULT_EXPR_NAME)); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ColumnRefExpr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ColumnRefExpr.java index 6dec55444fb840..5a47ab69402e30 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ColumnRefExpr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ColumnRefExpr.java @@ -57,7 +57,7 @@ public String getName() { } @Override - protected String getExprName() { + public String getExprName() { if (!this.exprName.isPresent()) { this.exprName = Optional.of(Utils.normalizeName(getName(), DEFAULT_EXPR_NAME)); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java index 8029b8f366dea7..31222369c708df 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java @@ -340,7 +340,7 @@ public void setId(ExprId id) { // Name of expr, this is used by generating column name automatically when there is no // alias or is not slotRef - protected String getExprName() { + public String getExprName() { if (!this.exprName.isPresent()) { this.exprName = Optional.of(Utils.normalizeName(this.getClass().getSimpleName(), DEFAULT_EXPR_NAME)); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java index 6eb89bc9a85052..0982dd532088b3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java @@ -312,7 +312,7 @@ private FunctionCallExpr() { } @Override - protected String getExprName() { + public String getExprName() { if (!this.exprName.isPresent()) { this.exprName = Optional.of(Utils.normalizeName(this.getFnName().getFunction(), DEFAULT_EXPR_NAME)); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/LiteralExpr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/LiteralExpr.java index c35220c52a1399..7047a8d900f245 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/LiteralExpr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/LiteralExpr.java @@ -366,7 +366,7 @@ public static LiteralExpr getLiteralByMysqlType(int mysqlType) throws AnalysisEx } @Override - protected String getExprName() { + public String getExprName() { if (!this.exprName.isPresent()) { this.exprName = Optional.of("literal"); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotRef.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotRef.java index 97b98f81d2caea..ec5221bf6ef7e2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotRef.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotRef.java @@ -308,7 +308,7 @@ public String toColumnLabel() { } @Override - protected String getExprName() { + public String getExprName() { if (!this.exprName.isPresent()) { this.exprName = Optional.of(toColumnLabel()); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/VirtualSlotRef.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/VirtualSlotRef.java index 07eba56652a159..60cf3577d728cc 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/VirtualSlotRef.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/VirtualSlotRef.java @@ -123,7 +123,7 @@ public void analyzeImpl(Analyzer analyzer) throws AnalysisException { } @Override - protected String getExprName() { + public String getExprName() { return super.getExprName(); } }