This is an automated email from the ASF dual-hosted git repository.
gabriellee 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 e78afedd0a [minor](refactor) refine function logics (#22280)
e78afedd0a is described below
commit e78afedd0a46ce2d49d547558f35b0507178159b
Author: Gabriel <[email protected]>
AuthorDate: Thu Jul 27 15:09:23 2023 +0800
[minor](refactor) refine function logics (#22280)
---
.../src/main/java/org/apache/doris/catalog/FunctionSet.java | 9 ++-------
tools/tpch-tools/conf/doris-cluster.conf | 2 +-
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/FunctionSet.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/FunctionSet.java
index 881b507fee..869b59cd86 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/FunctionSet.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/FunctionSet.java
@@ -459,13 +459,8 @@ public class FunctionSet<T> {
if (ConnectContext.get() != null
&&
ConnectContext.get().getSessionVariable().roundPreciseDecimalV2Value
&&
FunctionCallExpr.ROUND_FUNCTION_SET.contains(desc.functionName())
- && descArgType.isDecimalV2() &&
candicateArgType.getPrimitiveType() != PrimitiveType.DECIMAL128) {
- return false;
- } else if (ConnectContext.get() != null
- &&
ConnectContext.get().getSessionVariable().roundPreciseDecimalV2Value
- &&
FunctionCallExpr.ROUND_FUNCTION_SET.contains(desc.functionName())
- && descArgType.isDecimalV2() &&
candicateArgType.getPrimitiveType() == PrimitiveType.DECIMAL128) {
- return true;
+ && descArgType.isDecimalV2()) {
+ return candicateArgType.getPrimitiveType() ==
PrimitiveType.DECIMAL128;
}
if ((descArgType.isDecimalV3() && candicateArgType.isDecimalV2())
|| (descArgType.isDecimalV2() &&
candicateArgType.isDecimalV3())) {
diff --git a/tools/tpch-tools/conf/doris-cluster.conf
b/tools/tpch-tools/conf/doris-cluster.conf
index b2f6d41125..9417bcb9e0 100644
--- a/tools/tpch-tools/conf/doris-cluster.conf
+++ b/tools/tpch-tools/conf/doris-cluster.conf
@@ -26,4 +26,4 @@ export USER='root'
# Doris password
export PASSWORD=''
# The database where TPC-H tables located
-export DB='tpch1G'
+export DB='tpch'
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
