From e78afedd0a46ce2d49d547558f35b0507178159b Mon Sep 17 00:00:00 2001 From: Gabriel Date: Thu, 27 Jul 2023 15:09:23 +0800 Subject: [PATCH] [minor](refactor) refine function logics (#22280) --- .../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 881b507fee7cd4..869b59cd86a568 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 static boolean isCastMatchAllowed(Function desc, Function candicate) { 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 b2f6d411254874..9417bcb9e0ae87 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'