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

[enhancement](jdbc catalog) Enhance function pushdown of Jdbc Oracle Catalog (#29972)

Browse Source
This commit is contained in:
zy-kkk
2024-01-16 15:55:43 +08:00
committed by yiguolei
parent f53d2c28cb
commit 75cafa8672
5 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,13 @@ public class JdbcFunctionPushDownRule {
CLICKHOUSE_SUPPORTED_FUNCTIONS.add("unix_timestamp");
}
private static final TreeSet<String> ORACLE_SUPPORTED_FUNCTIONS = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
static {
ORACLE_SUPPORTED_FUNCTIONS.add("nvl");
ORACLE_SUPPORTED_FUNCTIONS.add("ifnull");
}
private static boolean isMySQLFunctionUnsupported(String functionName) {
return MYSQL_UNSUPPORTED_FUNCTIONS.contains(functionName.toLowerCase());
}
@ -57,6 +64,9 @@ public class JdbcFunctionPushDownRule {
return !CLICKHOUSE_SUPPORTED_FUNCTIONS.contains(functionName.toLowerCase());
}
private static boolean isOracleFunctionUnsupported(String functionName) {
return !ORACLE_SUPPORTED_FUNCTIONS.contains(functionName.toLowerCase());
}
private static final Map<String, String> REPLACE_MYSQL_FUNCTIONS = Maps.newHashMap();
@ -80,6 +90,16 @@ public class JdbcFunctionPushDownRule {
return REPLACE_CLICKHOUSE_FUNCTIONS.containsKey(functionName.toLowerCase());
}
private static final Map<String, String> REPLACE_ORACLE_FUNCTIONS = Maps.newHashMap();
static {
REPLACE_ORACLE_FUNCTIONS.put("ifnull", "nvl");
}
private static boolean isReplaceOracleFunctions(String functionName) {
return REPLACE_ORACLE_FUNCTIONS.containsKey(functionName.toLowerCase());
}
public static Expr processFunctions(TOdbcTableType tableType, Expr expr, List<String> errors) {
if (tableType == null || expr == null) {
return expr;
@ -94,6 +114,9 @@ public class JdbcFunctionPushDownRule {
} else if (TOdbcTableType.CLICKHOUSE.equals(tableType)) {
replaceFunction = JdbcFunctionPushDownRule::isReplaceClickHouseFunctions;
checkFunction = JdbcFunctionPushDownRule::isClickHouseFunctionUnsupported;
} else if (TOdbcTableType.ORACLE.equals(tableType)) {
replaceFunction = JdbcFunctionPushDownRule::isReplaceOracleFunctions;
checkFunction = JdbcFunctionPushDownRule::isOracleFunctionUnsupported;
} else {
return expr;
}
@ -138,6 +161,8 @@ public class JdbcFunctionPushDownRule {
newFunc = REPLACE_MYSQL_FUNCTIONS.get(func.toLowerCase());
} else if (TOdbcTableType.CLICKHOUSE.equals(tableType)) {
newFunc = REPLACE_CLICKHOUSE_FUNCTIONS.get(func);
} else if (TOdbcTableType.ORACLE.equals(tableType)) {
newFunc = REPLACE_ORACLE_FUNCTIONS.get(func);
} else {
newFunc = null;
}

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

@ -311,7 +311,8 @@ public class JdbcScanNode extends ExternalScanNode {
private static boolean shouldPushDownConjunct(TOdbcTableType tableType, Expr expr) {
if (containsFunctionCallExpr(expr)) {
if (tableType.equals(TOdbcTableType.MYSQL) || tableType.equals(TOdbcTableType.CLICKHOUSE)) {
if (tableType.equals(TOdbcTableType.MYSQL) || tableType.equals(TOdbcTableType.CLICKHOUSE)
|| tableType.equals(TOdbcTableType.ORACLE)) {
return Config.enable_func_pushdown;
} else {
return false;