This is an automated email from the ASF dual-hosted git repository.
xuyang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new ebfc4f6aa3d [bug](prepared statement) Fix an analysis bug in legacy
planner (#36703)
ebfc4f6aa3d is described below
commit ebfc4f6aa3d135f067814d398374352753f94e39
Author: xy720 <22125576+xy...@users.noreply.github.com>
AuthorDate: Mon Jun 24 15:58:20 2024 +0800
[bug](prepared statement) Fix an analysis bug in legacy planner (#36703)
## Proposed changes
Fix an analysis bug in legacy planner.
<!--Describe your changes.-->
---
fe/fe-core/src/main/java/org/apache/doris/analysis/BoolLiteral.java | 3 +++
fe/fe-core/src/main/java/org/apache/doris/analysis/DateLiteral.java | 3 +++
fe/fe-core/src/main/java/org/apache/doris/analysis/DecimalLiteral.java | 3 +++
fe/fe-core/src/main/java/org/apache/doris/analysis/FloatLiteral.java | 3 +++
fe/fe-core/src/main/java/org/apache/doris/analysis/IntLiteral.java | 3 +++
.../src/main/java/org/apache/doris/analysis/LargeIntLiteral.java | 3 +++
fe/fe-core/src/main/java/org/apache/doris/analysis/NullLiteral.java | 3 +++
fe/fe-core/src/main/java/org/apache/doris/analysis/StringLiteral.java | 3 +++
8 files changed, 24 insertions(+)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/BoolLiteral.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/BoolLiteral.java
index dc7ba24030d..826f688396b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/BoolLiteral.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/BoolLiteral.java
@@ -88,6 +88,9 @@ public class BoolLiteral extends LiteralExpr {
@Override
public int compareLiteral(LiteralExpr expr) {
+ if (expr instanceof PlaceHolderExpr) {
+ return this.compareLiteral(((PlaceHolderExpr) expr).getLiteral());
+ }
if (expr instanceof NullLiteral) {
return 1;
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/DateLiteral.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/DateLiteral.java
index 3043656b836..8bb7fab4a41 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DateLiteral.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DateLiteral.java
@@ -629,6 +629,9 @@ public class DateLiteral extends LiteralExpr {
@Override
public int compareLiteral(LiteralExpr expr) {
+ if (expr instanceof PlaceHolderExpr) {
+ return this.compareLiteral(((PlaceHolderExpr) expr).getLiteral());
+ }
if (expr instanceof NullLiteral) {
return 1;
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/DecimalLiteral.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/DecimalLiteral.java
index e550df64871..35b7c01ef6b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DecimalLiteral.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DecimalLiteral.java
@@ -242,6 +242,9 @@ public class DecimalLiteral extends NumericLiteralExpr {
@Override
public int compareLiteral(LiteralExpr expr) {
+ if (expr instanceof PlaceHolderExpr) {
+ return this.compareLiteral(((PlaceHolderExpr) expr).getLiteral());
+ }
if (expr instanceof NullLiteral) {
return 1;
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/FloatLiteral.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/FloatLiteral.java
index 5a8544e61a6..3cb0a20e50f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/FloatLiteral.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/FloatLiteral.java
@@ -119,6 +119,9 @@ public class FloatLiteral extends NumericLiteralExpr {
@Override
public int compareLiteral(LiteralExpr expr) {
+ if (expr instanceof PlaceHolderExpr) {
+ return this.compareLiteral(((PlaceHolderExpr) expr).getLiteral());
+ }
if (expr instanceof NullLiteral) {
return 1;
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/IntLiteral.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/IntLiteral.java
index f4724d229cf..5ec08b7176b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/IntLiteral.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/IntLiteral.java
@@ -254,6 +254,9 @@ public class IntLiteral extends NumericLiteralExpr {
@Override
public int compareLiteral(LiteralExpr expr) {
+ if (expr instanceof PlaceHolderExpr) {
+ return this.compareLiteral(((PlaceHolderExpr) expr).getLiteral());
+ }
if (expr instanceof NullLiteral) {
return 1;
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/LargeIntLiteral.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/LargeIntLiteral.java
index a45551e971a..3c4f00e6d63 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/LargeIntLiteral.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/LargeIntLiteral.java
@@ -174,6 +174,9 @@ public class LargeIntLiteral extends NumericLiteralExpr {
@Override
public int compareLiteral(LiteralExpr expr) {
+ if (expr instanceof PlaceHolderExpr) {
+ return this.compareLiteral(((PlaceHolderExpr) expr).getLiteral());
+ }
if (expr instanceof NullLiteral) {
return 1;
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/NullLiteral.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/NullLiteral.java
index 740ed4ac22f..ac82ddf62ff 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/NullLiteral.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/NullLiteral.java
@@ -84,6 +84,9 @@ public class NullLiteral extends LiteralExpr {
@Override
public int compareLiteral(LiteralExpr expr) {
+ if (expr instanceof PlaceHolderExpr) {
+ return this.compareLiteral(((PlaceHolderExpr) expr).getLiteral());
+ }
if (expr instanceof NullLiteral) {
return 0;
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/StringLiteral.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/StringLiteral.java
index 806c0cc2ed3..e26cbffe642 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/StringLiteral.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/StringLiteral.java
@@ -77,6 +77,9 @@ public class StringLiteral extends LiteralExpr {
@Override
public int compareLiteral(LiteralExpr expr) {
+ if (expr instanceof PlaceHolderExpr) {
+ return this.compareLiteral(((PlaceHolderExpr) expr).getLiteral());
+ }
if (expr instanceof NullLiteral) {
return 1;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
