Add GraalVM Reachability Metadata and corresponding nativeTest for Pr…

…esto
apache · Jan 26, 2025 · 727cdd7 · 727cdd7
1 parent 944fd32
commit 727cdd7
Show file tree

Hide file tree

Showing 18 changed files with 654 additions and 43 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -9,6 +9,7 @@
 1. Infra: Support for connecting to Presto's Memory Connector in ShardingSphere config - [#34432](https://github.com/apache/shardingsphere/pull/34432)
 1. Metadata: Add support for partition tables in PostgreSQL [#34346](https://github.com/apache/shardingsphere/pull/34346)
 1. SQL Binder: Support select aggregation function sql bind in projection and having - [#34379](https://github.com/apache/shardingsphere/pull/34379)
+1. Proxy Native: Add GraalVM Reachability Metadata and corresponding nativeTest for Presto - [#34429](https://github.com/apache/shardingsphere/pull/34429)
 
 ### Bug Fixes
 

diff --git a/...ument/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.cn.md b/...ument/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.cn.md
@@ -330,9 +330,6 @@ ShardingSphere 的单元测试仅使用 Maven 模块 `io.github.linghengqian:hiv
 9. 由于 https://github.com/apache/doris/issues/9426 的影响，当通过 Shardinghere JDBC 连接至 Apache Doris FE，
 用户需自行提供 `apache/doris` 集成模块相关的 GraalVM Reachability Metadata。
 
-10. 由于 https://github.com/prestodb/presto/issues/23226 的影响，当通过 Shardinghere JDBC 连接至 Presto Server，
-用户需自行提供 `com.facebook.presto:presto-jdbc` 和 `prestodb/presto` 集成模块相关的 GraalVM Reachability Metadata。
-
 ## 贡献 GraalVM Reachability Metadata
 
 ShardingSphere 对在 GraalVM Native Image 下的可用性的验证，是通过 GraalVM Native Build Tools 的 Maven Plugin 子项目来完成的。

diff --git a/...ument/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.en.md b/...ument/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.en.md
@@ -344,9 +344,6 @@ the Oracle JDBC Driver corresponding to the `com.oracle.database.jdbc:ojdbc8` Ma
 9. Due to https://github.com/apache/doris/issues/9426, when connecting to Apache Doris FE via Shardinghere JDBC,
    users need to provide GraalVM Reachability Metadata related to the `apache/doris` integration module.
 
-10. Due to https://github.com/prestodb/presto/issues/23226, when connecting to Presto Server via Shardinghere JDBC,
-    users need to provide GraalVM Reachability Metadata related to the `com.facebook.presto:presto-jdbc` and `prestodb/presto` integration module.
-
 ## Contribute GraalVM Reachability Metadata
 
 The verification of ShardingSphere's availability under GraalVM Native Image is completed through the Maven Plugin subproject 

diff --git a/...apache/shardingsphere/infra/database/presto/metadata/database/PrestoDatabaseMetaData.java b/...apache/shardingsphere/infra/database/presto/metadata/database/PrestoDatabaseMetaData.java
@@ -17,10 +17,13 @@
 
 package org.apache.shardingsphere.infra.database.presto.metadata.database;
 
+import com.cedarsoftware.util.CaseInsensitiveMap;
 import org.apache.shardingsphere.infra.database.core.metadata.database.DialectDatabaseMetaData;
 import org.apache.shardingsphere.infra.database.core.metadata.database.enums.NullsOrderType;
 import org.apache.shardingsphere.infra.database.core.metadata.database.enums.QuoteCharacter;
 
+import java.sql.Types;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -43,6 +46,21 @@ public Optional<String> getDefaultSchema() {
         return Optional.of("default");
     }
 
+    /**
+     * TODO For prestodb/presto 0.290,
+     *  the `DATA_TYPE` column of the `INFORMATION_SCHEMA.COLUMNS` table of `Memory` catalog only records strings like `varchar(50)`,
+     *  which is expected to have potential optimizations on ShardingSphere side.
+     *
+     * @return Extra data types
+     */
+    @Override
+    public Map<String, Integer> getExtraDataTypes() {
+        Map<String, Integer> result = new CaseInsensitiveMap<>();
+        result.put("varchar(50)", Types.VARCHAR);
+        result.put("varchar(100)", Types.VARCHAR);
+        return result;
+    }
+
     @Override
     public String getDatabaseType() {
         return "Presto";

diff --git a/...n/resources/META-INF/native-image/com.facebook.presto/presto-jdbc/0.290/proxy-config.json b/...n/resources/META-INF/native-image/com.facebook.presto/presto-jdbc/0.290/proxy-config.json
@@ -0,0 +1,6 @@
+[
+  {
+    "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.guava.reflect.Reflection"},
+    "interfaces":["java.lang.reflect.TypeVariable"]
+  }
+]
diff --git a/...resources/META-INF/native-image/com.facebook.presto/presto-jdbc/0.290/reflect-config.json b/...resources/META-INF/native-image/com.facebook.presto/presto-jdbc/0.290/reflect-config.json
@@ -0,0 +1,182 @@
+[
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.client.StatementClientV1"},
+  "name":"com.facebook.presto.jdbc.internal.client.ClientTypeSignature",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.util.List","java.util.List","java.util.List"] }]
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.ObjectReader"},
+  "name":"com.facebook.presto.jdbc.internal.client.ClientTypeSignature",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.deser.DefaultDeserializationContext"},
+  "name":"com.facebook.presto.jdbc.internal.client.ClientTypeSignatureParameter$ClientTypeSignatureParameterDeserializer",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.client.StatementClientV1"},
+  "name":"com.facebook.presto.jdbc.internal.client.Column",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","com.facebook.presto.jdbc.internal.client.ClientTypeSignature"] }]
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.ObjectReader"},
+  "name":"com.facebook.presto.jdbc.internal.client.Column",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.ObjectReader"},
+  "name":"com.facebook.presto.jdbc.internal.client.ErrorLocation",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.ObjectReader"},
+  "name":"com.facebook.presto.jdbc.internal.client.FailureInfo",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "allPublicConstructors": true
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.ObjectReader"},
+  "name":"com.facebook.presto.jdbc.internal.client.QueryData",
+  "queryAllDeclaredMethods":true
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.ObjectReader"},
+  "name":"com.facebook.presto.jdbc.internal.client.QueryError",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "allPublicConstructors": true
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.ObjectReader"},
+  "name":"com.facebook.presto.jdbc.internal.client.QueryResults",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.net.URI","java.net.URI","java.net.URI","java.util.List","java.util.List","java.util.List","com.facebook.presto.jdbc.internal.client.StatementStats","com.facebook.presto.jdbc.internal.client.QueryError","java.util.List","java.lang.String","java.lang.Long"] }]
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.ObjectReader"},
+  "name":"com.facebook.presto.jdbc.internal.client.QueryStatusInfo",
+  "queryAllDeclaredMethods":true
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.PrestoPreparedStatement"},
+  "name":"com.facebook.presto.jdbc.internal.client.StageStats",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","boolean","int","int","int","int","int","long","long","long","long","java.util.List"] }]
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.PrestoResultSet$ResultsPageIterator"},
+  "name":"com.facebook.presto.jdbc.internal.client.StageStats",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","boolean","int","int","int","int","int","long","long","long","long","java.util.List"] }]
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.PrestoStatement"},
+  "name":"com.facebook.presto.jdbc.internal.client.StageStats",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","boolean","int","int","int","int","int","long","long","long","long","java.util.List"] }]
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.ObjectReader"},
+  "name":"com.facebook.presto.jdbc.internal.client.StageStats",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.ObjectReader"},
+  "name":"com.facebook.presto.jdbc.internal.client.StatementStats",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","boolean","boolean","boolean","int","int","int","int","int","long","long","long","long","long","long","long","long","long","long","long","com.facebook.presto.jdbc.internal.client.StageStats","com.facebook.presto.jdbc.internal.common.RuntimeStats"] }]
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.deser.std.MapDeserializer"},
+  "name":"com.facebook.presto.jdbc.internal.common.RuntimeMetric",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","com.facebook.presto.jdbc.internal.common.RuntimeUnit","long","long","long","long"] }]
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.ObjectReader"},
+  "name":"com.facebook.presto.jdbc.internal.common.RuntimeStats",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.introspect.AnnotatedConstructor"},
+  "name":"com.facebook.presto.jdbc.internal.common.RuntimeStats",
+  "methods":[{"name":"<init>","parameterTypes":["java.util.Map"] }]
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.deser.std.MapDeserializer"},
+  "name":"com.facebook.presto.jdbc.internal.common.RuntimeUnit",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.introspect.JacksonAnnotationIntrospector"},
+  "name":"com.facebook.presto.jdbc.internal.common.RuntimeUnit",
+  "allDeclaredFields":true
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.util.ClassUtil"},
+  "name":"com.facebook.presto.jdbc.internal.common.RuntimeUnit",
+  "allDeclaredFields":true
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.ObjectMapper"},
+  "name":"com.facebook.presto.jdbc.internal.common.type.ParameterKind",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.introspect.AnnotatedMethod"},
+  "name":"com.facebook.presto.jdbc.internal.common.type.ParameterKind",
+  "methods":[{"name":"fromJsonValue","parameterTypes":["java.lang.String"] }]
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.guava.reflect.Types$TypeVariableInvocationHandler"},
+  "name":"com.facebook.presto.jdbc.internal.guava.reflect.Types$TypeVariableImpl",
+  "queryAllPublicMethods":true
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.ext.Java7Handlers"},
+  "name":"com.facebook.presto.jdbc.internal.jackson.databind.ext.Java7HandlersImpl",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.ext.Java7Support"},
+  "name":"com.facebook.presto.jdbc.internal.jackson.databind.ext.Java7SupportImpl",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.com.facebook.airlift.json.ObjectMapperProvider"},
+  "name":"com.facebook.presto.jdbc.internal.joda.time.DateTime"
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.ObjectReader"},
+  "name":"com.facebook.presto.jdbc.internal.spi.PrestoWarning",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.jackson.databind.ObjectReader"},
+  "name":"com.facebook.presto.jdbc.internal.spi.WarningCode",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+}
+]
diff --git a/...esources/META-INF/native-image/com.facebook.presto/presto-jdbc/0.290/resource-config.json b/...esources/META-INF/native-image/com.facebook.presto/presto-jdbc/0.290/resource-config.json
@@ -0,0 +1,17 @@
+{
+  "resources":{
+  "includes":[{
+    "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.common.type.TimeZoneKey"},
+    "pattern":"\\Qcom/facebook/presto/jdbc/internal/common/type/zone-index.properties\\E"
+  }, {
+    "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.joda.time.tz.ZoneInfoProvider"},
+    "pattern":"\\Qcom/facebook/presto/jdbc/internal/joda/time/tz/data/ZoneInfoMap\\E"
+  }, {
+    "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.joda.time.tz.ZoneInfoProvider"},
+    "pattern":"\\Qcom/facebook/presto/jdbc/internal/joda/time/tz/data/Asia/Shanghai\\E"
+  }, {
+    "condition":{"typeReachable":"com.facebook.presto.jdbc.internal.joda.time.tz.ZoneInfoProvider"},
+    "pattern":"\\Qcom/facebook/presto/jdbc/internal/joda/time/tz/data/Etc/UTC\\E"
+  }]},
+  "bundles":[]
+}