This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
new d40dbf5023 [1.2][fix](jdbc) fix presto jdbc catalog pushDown and
nameFormat (#21448)
d40dbf5023 is described below
commit d40dbf5023e2260cff62e13c8183bf22c3be5fba
Author: zy-kkk <[email protected]>
AuthorDate: Mon Jul 3 23:40:13 2023 +0800
[1.2][fix](jdbc) fix presto jdbc catalog pushDown and nameFormat (#21448)
---
fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcTable.java | 1 +
fe/fe-core/src/main/java/org/apache/doris/planner/JdbcScanNode.java | 3 ++-
fe/fe-core/src/main/java/org/apache/doris/planner/OdbcScanNode.java | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcTable.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcTable.java
index 2efda9bc24..f90672b39c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcTable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcTable.java
@@ -130,6 +130,7 @@ public class OdbcTable extends Table {
case POSTGRESQL:
case CLICKHOUSE:
case TRINO:
+ case PRESTO:
case SAP_HANA:
return formatName(name, "\"", "\"", false, false);
case ORACLE:
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/JdbcScanNode.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/JdbcScanNode.java
index c7bb47b7b7..7af24dfa35 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/JdbcScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/JdbcScanNode.java
@@ -149,7 +149,8 @@ public class JdbcScanNode extends ScanNode {
|| jdbcType == TOdbcTableType.MONGODB
|| jdbcType == TOdbcTableType.CLICKHOUSE
|| jdbcType == TOdbcTableType.SAP_HANA
- || jdbcType == TOdbcTableType.TRINO)) {
+ || jdbcType == TOdbcTableType.TRINO
+ || jdbcType == TOdbcTableType.PRESTO)) {
sql.append(" LIMIT ").append(limit);
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/OdbcScanNode.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/OdbcScanNode.java
index d606a1ae93..055269f68d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/OdbcScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/OdbcScanNode.java
@@ -82,8 +82,8 @@ public class OdbcScanNode extends ScanNode {
return filter;
}
}
- if (tableType.equals(TOdbcTableType.TRINO) &&
expr.contains(DateLiteral.class)
- && (expr instanceof BinaryPredicate)) {
+ if ((tableType.equals(TOdbcTableType.TRINO) ||
tableType.equals(TOdbcTableType.PRESTO))
+ && expr.contains(DateLiteral.class) && (expr instanceof
BinaryPredicate)) {
ArrayList<Expr> children = expr.getChildren();
if (children.get(1).isConstant() &&
(children.get(1).getType().isDate()) || children
.get(1).getType().isDateV2()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
