This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/dev-1.1.2 by this push:
new 8eff4765a8 fix build bugs
8eff4765a8 is described below
commit 8eff4765a82c3ecd8a1da0a2736d0efc04ae8a9f
Author: yiguolei <[email protected]>
AuthorDate: Wed Aug 31 11:18:51 2022 +0800
fix build bugs
---
.../src/main/java/org/apache/doris/common/util/LiteralUtils.java | 2 +-
fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java | 4 +---
fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/util/LiteralUtils.java
b/fe/fe-core/src/main/java/org/apache/doris/common/util/LiteralUtils.java
index 3820f0465d..358111b611 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/util/LiteralUtils.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/LiteralUtils.java
@@ -32,7 +32,7 @@ import java.util.List;
public class LiteralUtils {
public static String getStringValue(FloatLiteral literal) {
- if (literal.getType() == Type.TIME || literal.getType() ==
Type.TIMEV2) {
+ if (literal.getType() == Type.TIME) {
// FloatLiteral used to represent TIME type, here we need to
remove apostrophe from timeStr
// for example '11:22:33' -> 11:22:33
String timeStr = literal.getStringValue();
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
index 47d19af5e2..78a28269b0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
@@ -890,9 +890,7 @@ public class OlapScanNode extends ScanNode {
Expr conjunct = new BinaryPredicate(BinaryPredicate.Operator.EQ,
deleteSignSlot, new IntLiteral(0));
conjunct.analyze(analyzer);
conjuncts.add(conjunct);
- if (!olapTable.getEnableUniqueKeyMergeOnWrite()) {
- closePreAggregation(Column.DELETE_SIGN + " is used as
conjuncts.");
- }
+ closePreAggregation(Column.DELETE_SIGN + " is used as conjuncts.");
}
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
index 17c4a88e6e..5acf31d0b2 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
@@ -936,7 +936,7 @@ public class StmtExecutor implements ProfileWriter {
QueryDetailQueue.addOrUpdateQueryDetail(queryDetail);
if (queryStmt.isExplain()) {
- String explainString =
planner.getExplainString(queryStmt.getExplainOptions());
+ String explainString =
planner.getExplainString(planner.getFragments(), queryStmt.getExplainOptions());
handleExplainStmt(explainString);
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
