[calcite] branch main updated: [CALCITE-5355] Use the Presto SQL dialect for AWS Athena

[vo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

volodymyr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/main by this push:
     new b36e4a4ac2 [CALCITE-5355] Use the Presto SQL dialect for AWS Athena
b36e4a4ac2 is described below

commit b36e4a4ac2cf194eab89cc5c782a3377eff59732
Author: James Turton <ja...@somecomputer.xyz>
AuthorDate: Mon Oct 31 18:13:54 2022 +0200

    [CALCITE-5355] Use the Presto SQL dialect for AWS Athena
---
 core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcSchema.java  | 6 +++++-
 core/src/main/java/org/apache/calcite/sql/SqlDialect.java           | 1 +
 .../src/main/java/org/apache/calcite/sql/SqlDialectFactoryImpl.java | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcSchema.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcSchema.java
index e09de96e82..5d5205add7 100644
--- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcSchema.java
+++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcSchema.java
@@ -49,6 +49,8 @@ import com.google.common.collect.Multimap;
 import com.google.common.collect.Ordering;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -74,6 +76,8 @@ import static java.util.Objects.requireNonNull;
  * as much as possible of the query logic to SQL.</p>
  */
 public class JdbcSchema implements Schema {
+  private static final Logger LOGGER = LoggerFactory.getLogger(JdbcSchema.class);
+
   final DataSource dataSource;
   final @Nullable String catalog;
   final @Nullable String schema;
@@ -290,7 +294,7 @@ public class JdbcSchema implements Schema {
         final TableType tableType =
             Util.enumVal(TableType.OTHER, tableTypeName2);
         if (tableType == TableType.OTHER  && tableTypeName2 != null) {
-          System.out.println("Unknown table type: " + tableTypeName2);
+          LOGGER.info("Unknown table type: {}", tableTypeName2);
         }
         final JdbcTable table =
             new JdbcTable(this, tableDef.tableCat, tableDef.tableSchem,
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlDialect.java b/core/src/main/java/org/apache/calcite/sql/SqlDialect.java
index 5172831e42..1e48cabe50 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlDialect.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlDialect.java
@@ -289,6 +289,7 @@ public class SqlDialect {
     case "PHOENIX":
       return DatabaseProduct.PHOENIX;
     case "PRESTO":
+    case "AWS.ATHENA":
       return DatabaseProduct.PRESTO;
     case "MYSQL (INFOBRIGHT)":
       return DatabaseProduct.INFOBRIGHT;
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlDialectFactoryImpl.java b/core/src/main/java/org/apache/calcite/sql/SqlDialectFactoryImpl.java
index 1454620bb5..e44b6f0435 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlDialectFactoryImpl.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlDialectFactoryImpl.java
@@ -107,6 +107,9 @@ public class SqlDialectFactoryImpl implements SqlDialectFactory {
       return new OracleSqlDialect(c);
     case "PHOENIX":
       return new PhoenixSqlDialect(c);
+    case "PRESTO":
+    case "AWS.ATHENA":
+      return new PrestoSqlDialect(c);
     case "MYSQL (INFOBRIGHT)":
       return new InfobrightSqlDialect(c);
     case "MYSQL":