database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[improvement](jdbc catalog) Adjust function replacement order and add new function support (#24685)

Browse Source
This commit is contained in:
zy-kkk
2023-09-21 08:45:27 +08:00
committed by GitHub
parent 5e82aebd25
commit 4ca650f306
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fe/fe-core/src/main/java/org/apache/doris/planner/external/jdbc/JdbcFunctionPushDownRule.java vendored
View File

@ -45,6 +45,7 @@ public class JdbcFunctionPushDownRule {
static {
CLICKHOUSE_SUPPORTED_FUNCTIONS.add("from_unixtime");
CLICKHOUSE_SUPPORTED_FUNCTIONS.add("unix_timestamp");
}
private static boolean isMySQLFunctionUnsupported(String functionName) {
@ -70,6 +71,7 @@ public class JdbcFunctionPushDownRule {
static {
REPLACE_CLICKHOUSE_FUNCTIONS.put("from_unixtime", "FROM_UNIXTIME");
REPLACE_CLICKHOUSE_FUNCTIONS.put("unix_timestamp", "toUnixTimestamp");
}
private static boolean isReplaceClickHouseFunctions(String functionName) {
@ -105,14 +107,14 @@ public class JdbcFunctionPushDownRule {
Preconditions.checkArgument(!func.isEmpty(), "function can not be empty");
func = replaceFunctionNameIfNecessary(func, replaceFunction, functionCallExpr, tableType);
if (!func.isEmpty() && checkFunction.test(func)) {
if (checkFunction.test(func)) {
String errMsg = "Unsupported function: " + func + " in expr: " + expr.toMySql()
+ " in JDBC Table Type: " + tableType;
LOG.warn(errMsg);
errors.add(errMsg);
}
replaceFunctionNameIfNecessary(func, replaceFunction, functionCallExpr, tableType);
}
List<Expr> children = expr.getChildren();

BIN
regression-test/data/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.out
View File

Binary file not shown.

7
regression-test/suites/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.groovy
View File

@ -75,7 +75,12 @@ suite("test_clickhouse_jdbc_catalog", "p0,external,clickhouse,external_docker,ex
}
explain {
sql("select * from ts where nvl(ts,null) >= '2022-01-01';")
contains """QUERY: SELECT "id", "ts" FROM "doris_test"."ts""""
contains """QUERY: SELECT "id", "ts" FROM "doris_test"."ts"""
}
order_qt_func_push2 """select * from ts where ts <= unix_timestamp(from_unixtime(ts,'yyyyMMdd'));"""
explain {
sql("select * from ts where ts <= unix_timestamp(from_unixtime(ts,'yyyy-MM-dd'));")
contains """QUERY: SELECT "id", "ts" FROM "doris_test"."ts" WHERE (ts <= toUnixTimestamp(FROM_UNIXTIME(ts, '%Y-%m-%d')))"""
}
sql """ drop catalog if exists ${catalog_name} """