Make Shadow feature available again in GraalVM Native Image

apache · Sep 30, 2024 · ff39dfb · ff39dfb
1 parent e935d21
commit ff39dfb
Show file tree

Hide file tree

Showing 6 changed files with 133 additions and 27 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -14,6 +14,7 @@
 
 1. Sharding: Fix alter view exception when config sharding rule and binding table rule - [#32696](https://github.com/apache/shardingsphere/issues/32696)
 2. Shadow: Use hintValueContext to replace extract sql hint from sql statement for solving shadow sql hint bug - [#33063](https://github.com/apache/shardingsphere/pull/33063)
+3. Shadow: Make Shadow feature available again in GraalVM Native Image - [#33080](https://github.com/apache/shardingsphere/pull/33080)
 
 ### Change Log
 

diff --git a/...ative-image/org.apache.shardingsphere/generated-reachability-metadata/reflect-config.json b/...ative-image/org.apache.shardingsphere/generated-reachability-metadata/reflect-config.json
@@ -156,7 +156,7 @@
  "name":"org.apache.shardingsphere.driver.yaml.YamlJDBCConfiguration",
  "allDeclaredFields":true,
  "queryAllPublicMethods":true,
- "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setDataSources","parameterTypes":["java.util.Map"] }, {"name":"setMode","parameterTypes":["org.apache.shardingsphere.infra.yaml.config.pojo.mode.YamlModeConfiguration"] }, {"name":"setProps","parameterTypes":["java.util.Properties"] }, {"name":"setRules","parameterTypes":["java.util.Collection"] }, {"name":"setTransaction","parameterTypes":["org.apache.shardingsphere.transaction.yaml.config.YamlTransactionRuleConfiguration"] }]
+ "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setDataSources","parameterTypes":["java.util.Map"] }, {"name":"setMode","parameterTypes":["org.apache.shardingsphere.infra.yaml.config.pojo.mode.YamlModeConfiguration"] }, {"name":"setProps","parameterTypes":["java.util.Properties"] }, {"name":"setRules","parameterTypes":["java.util.Collection"] }, {"name":"setSqlParser","parameterTypes":["org.apache.shardingsphere.parser.yaml.config.YamlSQLParserRuleConfiguration"] }, {"name":"setTransaction","parameterTypes":["org.apache.shardingsphere.transaction.yaml.config.YamlTransactionRuleConfiguration"] }]
 },
 {
  "condition":{"typeReachable":"org.apache.shardingsphere.infra.util.yaml.YamlEngine"},
@@ -609,7 +609,7 @@
  "queryAllPublicMethods":true
 },
 {
- "condition":{"typeReachable":"org.apache.shardingsphere.metadata.persist.service.schema.ShardingSphereTableRowDataPersistService"},
+ "condition":{"typeReachable":"org.apache.shardingsphere.metadata.persist.service.metadata.table.TableRowDataPersistService"},
  "name":"org.apache.shardingsphere.infra.util.yaml.YamlConfiguration",
  "queryAllPublicMethods":true
 },
@@ -674,18 +674,18 @@
  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
- "condition":{"typeReachable":"org.apache.shardingsphere.metadata.persist.service.schema.ShardingSphereTableRowDataPersistService"},
+ "condition":{"typeReachable":"org.apache.shardingsphere.metadata.persist.service.metadata.table.TableRowDataPersistService"},
  "name":"org.apache.shardingsphere.infra.yaml.data.pojo.YamlShardingSphereRowData",
  "allDeclaredFields":true,
  "queryAllPublicMethods":true,
  "methods":[{"name":"getRows","parameterTypes":[] }, {"name":"getUniqueKey","parameterTypes":[] }]
 },
 {
- "condition":{"typeReachable":"org.apache.shardingsphere.metadata.persist.service.schema.ShardingSphereTableRowDataPersistService"},
+ "condition":{"typeReachable":"org.apache.shardingsphere.metadata.persist.service.metadata.table.TableRowDataPersistService"},
  "name":"org.apache.shardingsphere.infra.yaml.data.pojo.YamlShardingSphereRowDataBeanInfo"
 },
 {
- "condition":{"typeReachable":"org.apache.shardingsphere.metadata.persist.service.schema.ShardingSphereTableRowDataPersistService"},
+ "condition":{"typeReachable":"org.apache.shardingsphere.metadata.persist.service.metadata.table.TableRowDataPersistService"},
  "name":"org.apache.shardingsphere.infra.yaml.data.pojo.YamlShardingSphereRowDataCustomizer"
 },
 {
@@ -700,7 +700,7 @@
  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setCaseSensitive","parameterTypes":["boolean"] }, {"name":"setDataType","parameterTypes":["int"] }, {"name":"setGenerated","parameterTypes":["boolean"] }, {"name":"setName","parameterTypes":["java.lang.String"] }, {"name":"setPrimaryKey","parameterTypes":["boolean"] }, {"name":"setUnsigned","parameterTypes":["boolean"] }, {"name":"setVisible","parameterTypes":["boolean"] }]
 },
 {
- "condition":{"typeReachable":"org.apache.shardingsphere.metadata.persist.service.schema.TableMetaDataPersistService"},
+ "condition":{"typeReachable":"org.apache.shardingsphere.metadata.persist.service.metadata.table.TableMetaDataPersistService"},
  "name":"org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereColumn",
  "allDeclaredFields":true,
  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setCaseSensitive","parameterTypes":["boolean"] }, {"name":"setDataType","parameterTypes":["int"] }, {"name":"setGenerated","parameterTypes":["boolean"] }, {"name":"setName","parameterTypes":["java.lang.String"] }, {"name":"setNullable","parameterTypes":["boolean"] }, {"name":"setPrimaryKey","parameterTypes":["boolean"] }, {"name":"setUnsigned","parameterTypes":["boolean"] }, {"name":"setVisible","parameterTypes":["boolean"] }]
@@ -717,7 +717,7 @@
  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setName","parameterTypes":["java.lang.String"] }]
 },
 {
- "condition":{"typeReachable":"org.apache.shardingsphere.metadata.persist.service.schema.TableMetaDataPersistService"},
+ "condition":{"typeReachable":"org.apache.shardingsphere.metadata.persist.service.metadata.table.TableMetaDataPersistService"},
  "name":"org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereIndex",
  "allDeclaredFields":true,
  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setName","parameterTypes":["java.lang.String"] }, {"name":"setUnique","parameterTypes":["boolean"] }]
@@ -734,7 +734,7 @@
  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setColumns","parameterTypes":["java.util.Map"] }, {"name":"setIndexes","parameterTypes":["java.util.Map"] }, {"name":"setName","parameterTypes":["java.lang.String"] }]
 },
 {
- "condition":{"typeReachable":"org.apache.shardingsphere.metadata.persist.service.schema.TableMetaDataPersistService"},
+ "condition":{"typeReachable":"org.apache.shardingsphere.metadata.persist.service.metadata.table.TableMetaDataPersistService"},
  "name":"org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereTable",
  "allDeclaredFields":true,
  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getColumns","parameterTypes":[] }, {"name":"getConstraints","parameterTypes":[] }, {"name":"getIndexes","parameterTypes":[] }, {"name":"getName","parameterTypes":[] }, {"name":"getType","parameterTypes":[] }, {"name":"setColumns","parameterTypes":["java.util.Map"] }, {"name":"setIndexes","parameterTypes":["java.util.Map"] }, {"name":"setName","parameterTypes":["java.lang.String"] }, {"name":"setType","parameterTypes":["org.apache.shardingsphere.infra.database.core.metadata.database.enums.TableType"] }]
@@ -972,7 +972,7 @@
  "queryAllDeclaredMethods":true
 },
 {
- "condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.listener.DatabaseMetaDataChangedListener$$Lambda/0x00007f11035c8eb8"},
+ "condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.listener.DatabaseMetaDataChangedListener$$Lambda/0x00007fdb8b5dc4f0"},
  "name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.MetaDataChangedSubscriber"
 },
 {
@@ -1066,6 +1066,18 @@
  "condition":{"typeReachable":"org.apache.shardingsphere.infra.rule.builder.global.GlobalRulesBuilder"},
  "name":"org.apache.shardingsphere.parser.rule.builder.SQLParserRuleBuilder"
 },
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.infra.util.yaml.YamlEngine"},
+ "name":"org.apache.shardingsphere.parser.yaml.config.YamlSQLParserCacheOptionRuleConfiguration",
+ "allDeclaredFields":true,
+ "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setInitialCapacity","parameterTypes":["int"] }, {"name":"setMaximumSize","parameterTypes":["long"] }]
+},
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.infra.util.yaml.YamlEngine"},
+ "name":"org.apache.shardingsphere.parser.yaml.config.YamlSQLParserRuleConfiguration",
+ "allDeclaredFields":true,
+ "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setParseTreeCache","parameterTypes":["org.apache.shardingsphere.parser.yaml.config.YamlSQLParserCacheOptionRuleConfiguration"] }, {"name":"setSqlStatementCache","parameterTypes":["org.apache.shardingsphere.parser.yaml.config.YamlSQLParserCacheOptionRuleConfiguration"] }]
+},
 {
  "condition":{"typeReachable":"org.apache.shardingsphere.infra.yaml.config.shortcut.YamlRuleConfigurationShortcuts"},
  "name":"org.apache.shardingsphere.parser.yaml.config.YamlSQLParserRuleConfiguration"
@@ -1154,6 +1166,36 @@
  "condition":{"typeReachable":"org.apache.shardingsphere.infra.util.yaml.YamlEngine"},
  "name":"org.apache.shardingsphere.readwritesplitting.yaml.config.rule.YamlReadwriteSplittingDataSourceGroupRuleConfigurationCustomizer"
 },
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.shadow.checker.ShadowRuleConfigurationChecker"},
+ "name":"org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnRegexMatchedShadowAlgorithm",
+ "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.shadow.rule.ShadowRule"},
+ "name":"org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnRegexMatchedShadowAlgorithm",
+ "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.shadow.checker.ShadowRuleConfigurationChecker"},
+ "name":"org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnValueMatchedShadowAlgorithm",
+ "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.shadow.rule.ShadowRule"},
+ "name":"org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnValueMatchedShadowAlgorithm",
+ "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.shadow.checker.ShadowRuleConfigurationChecker"},
+ "name":"org.apache.shardingsphere.shadow.algorithm.shadow.hint.SQLHintShadowAlgorithm",
+ "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.shadow.rule.ShadowRule"},
+ "name":"org.apache.shardingsphere.shadow.algorithm.shadow.hint.SQLHintShadowAlgorithm",
+ "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
  "condition":{"typeReachable":"org.apache.shardingsphere.infra.spi.type.ordered.OrderedSPILoader"},
  "name":"org.apache.shardingsphere.shadow.checker.ShadowRuleConfigurationChecker"
@@ -1170,10 +1212,72 @@
  "condition":{"typeReachable":"org.apache.shardingsphere.infra.rule.builder.database.DatabaseRulesBuilder"},
  "name":"org.apache.shardingsphere.shadow.rule.builder.ShadowRuleBuilder"
 },
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.infra.util.yaml.YamlEngine"},
+ "name":"org.apache.shardingsphere.shadow.yaml.config.YamlShadowRuleConfiguration",
+ "allDeclaredFields":true,
+ "queryAllPublicMethods":true,
+ "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setDataSources","parameterTypes":["java.util.Map"] }, {"name":"setDefaultShadowAlgorithmName","parameterTypes":["java.lang.String"] }, {"name":"setShadowAlgorithms","parameterTypes":["java.util.Map"] }, {"name":"setTables","parameterTypes":["java.util.Map"] }]
+},
 {
  "condition":{"typeReachable":"org.apache.shardingsphere.infra.yaml.config.shortcut.YamlRuleConfigurationShortcuts"},
  "name":"org.apache.shardingsphere.shadow.yaml.config.YamlShadowRuleConfiguration"
 },
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.standalone.StandaloneContextManagerBuilder"},
+ "name":"org.apache.shardingsphere.shadow.yaml.config.YamlShadowRuleConfiguration",
+ "allDeclaredFields":true
+},
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.infra.util.yaml.YamlEngine"},
+ "name":"org.apache.shardingsphere.shadow.yaml.config.YamlShadowRuleConfigurationBeanInfo"
+},
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.infra.util.yaml.YamlEngine"},
+ "name":"org.apache.shardingsphere.shadow.yaml.config.YamlShadowRuleConfigurationCustomizer"
+},
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.infra.util.yaml.YamlEngine"},
+ "name":"org.apache.shardingsphere.shadow.yaml.config.datasource.YamlShadowDataSourceConfiguration",
+ "allDeclaredFields":true,
+ "queryAllPublicMethods":true,
+ "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setProductionDataSourceName","parameterTypes":["java.lang.String"] }, {"name":"setShadowDataSourceName","parameterTypes":["java.lang.String"] }]
+},
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.standalone.StandaloneContextManagerBuilder"},
+ "name":"org.apache.shardingsphere.shadow.yaml.config.datasource.YamlShadowDataSourceConfiguration",
+ "allDeclaredFields":true,
+ "methods":[{"name":"getProductionDataSourceName","parameterTypes":[] }, {"name":"getShadowDataSourceName","parameterTypes":[] }]
+},
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.infra.util.yaml.YamlEngine"},
+ "name":"org.apache.shardingsphere.shadow.yaml.config.datasource.YamlShadowDataSourceConfigurationBeanInfo"
+},
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.infra.util.yaml.YamlEngine"},
+ "name":"org.apache.shardingsphere.shadow.yaml.config.datasource.YamlShadowDataSourceConfigurationCustomizer"
+},
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.infra.util.yaml.YamlEngine"},
+ "name":"org.apache.shardingsphere.shadow.yaml.config.table.YamlShadowTableConfiguration",
+ "allDeclaredFields":true,
+ "queryAllPublicMethods":true,
+ "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setDataSourceNames","parameterTypes":["java.util.Collection"] }, {"name":"setShadowAlgorithmNames","parameterTypes":["java.util.Collection"] }]
+},
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.standalone.StandaloneContextManagerBuilder"},
+ "name":"org.apache.shardingsphere.shadow.yaml.config.table.YamlShadowTableConfiguration",
+ "allDeclaredFields":true,
+ "methods":[{"name":"getDataSourceNames","parameterTypes":[] }, {"name":"getShadowAlgorithmNames","parameterTypes":[] }]
+},
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.infra.util.yaml.YamlEngine"},
+ "name":"org.apache.shardingsphere.shadow.yaml.config.table.YamlShadowTableConfigurationBeanInfo"
+},
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.infra.util.yaml.YamlEngine"},
+ "name":"org.apache.shardingsphere.shadow.yaml.config.table.YamlShadowTableConfigurationCustomizer"
+},
 {
  "condition":{"typeReachable":"org.apache.shardingsphere.sharding.rule.ShardingRule"},
  "name":"org.apache.shardingsphere.sharding.algorithm.audit.DMLShardingConditionsShardingAuditAlgorithm",
@@ -1438,11 +1542,11 @@
 },
 {
  "condition":{"typeReachable":"org.apache.shardingsphere.infra.yaml.config.shortcut.YamlRuleConfigurationShortcuts"},
- "name":"org.apache.shardingsphere.single.yaml.config.pojo.YamlSingleRuleConfiguration"
+ "name":"org.apache.shardingsphere.single.yaml.config.YamlSingleRuleConfiguration"
 },
 {
  "condition":{"typeReachable":"org.apache.shardingsphere.mode.tuple.RepositoryTupleSwapperEngine"},
- "name":"org.apache.shardingsphere.single.yaml.config.pojo.YamlSingleRuleConfiguration",
+ "name":"org.apache.shardingsphere.single.yaml.config.YamlSingleRuleConfiguration",
  "allDeclaredFields":true
 },
 {
@@ -1594,11 +1698,21 @@
  "name":"org.apache.shardingsphere.sql.parser.statement.clickhouse.dml.ClickHouseInsertStatement",
  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.driver.jdbc.core.statement.ShardingSpherePreparedStatement"},
+ "name":"org.apache.shardingsphere.sql.parser.statement.clickhouse.dml.ClickHouseSelectStatement",
+ "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
  "condition":{"typeReachable":"org.apache.shardingsphere.infra.binder.engine.statement.dml.DeleteStatementBinder"},
  "name":"org.apache.shardingsphere.sql.parser.statement.hive.dml.HiveDeleteStatement",
  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+ "condition":{"typeReachable":"org.apache.shardingsphere.driver.jdbc.core.statement.ShardingSpherePreparedStatement"},
+ "name":"org.apache.shardingsphere.sql.parser.statement.hive.dml.HiveSelectStatement",
+ "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
  "condition":{"typeReachable":"org.apache.shardingsphere.infra.binder.engine.statement.dml.DeleteStatementBinder"},
  "name":"org.apache.shardingsphere.sql.parser.statement.mysql.dml.MySQLDeleteStatement",

diff --git a/...tive-image/org.apache.shardingsphere/generated-reachability-metadata/resource-config.json b/...tive-image/org.apache.shardingsphere/generated-reachability-metadata/resource-config.json
@@ -2802,6 +2802,9 @@
  }, {
  "condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
  "pattern":"\\Qtest-native/yaml/features/readwrite-splitting.yaml\\E"
+ }, {
+ "condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
+ "pattern":"\\Qtest-native/yaml/features/shadow.yaml\\E"
  }, {
  "condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
  "pattern":"\\Qtest-native/yaml/features/sharding.yaml\\E"

diff --git a/.../org.apache.shardingsphere/shardingsphere-infra-reachability-metadata/reflect-config.json b/.../org.apache.shardingsphere/shardingsphere-infra-reachability-metadata/reflect-config.json
@@ -54,11 +54,6 @@
  "name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.StateChangedSubscriber",
  "allPublicMethods":true
 },
-{
- "condition":{"typeReachable":"org.apache.shardingsphere.driver.jdbc.core.statement.ShardingSpherePreparedStatement"},
- "name":"org.apache.shardingsphere.sql.parser.statement.clickhouse.dml.ClickHouseSelectStatement",
- "methods":[{"name":"<init>","parameterTypes":[] }]
-},
 {
  "condition":{"typeReachable":"org.apache.shardingsphere.metadata.persist.service.config.global.GlobalRulePersistService"},
  "name":"org.apache.shardingsphere.transaction.yaml.config.YamlTransactionRuleConfiguration",
@@ -84,10 +79,5 @@
  "condition":{"typeReachable":"org.apache.shardingsphere.sql.parser.statement.hive.dml.HiveInsertStatement"},
  "name":"org.apache.shardingsphere.sql.parser.statement.hive.dml.HiveInsertStatement",
  "methods":[{"name":"<init>","parameterTypes":[] }]
-},
-{
- "condition":{"typeReachable":"org.apache.shardingsphere.driver.jdbc.core.statement.ShardingSpherePreparedStatement"},
- "name":"org.apache.shardingsphere.sql.parser.statement.hive.dml.HiveSelectStatement",
- "methods":[{"name":"<init>","parameterTypes":[] }]
 }
 ]
diff --git a/pom.xml b/pom.xml
@@ -137,10 +137,10 @@
  <opentelemetry-semconv.version>1.27.0-alpha</opentelemetry-semconv.version>
  <kotlin-stdlib.version>1.9.10</kotlin-stdlib.version>
 
- <junit.version>5.10.3</junit.version>
- <hamcrest.version>2.2</hamcrest.version>
+ <junit.version>5.11.1</junit.version>
+ <hamcrest.version>3.0</hamcrest.version>
  <mockito.version>4.11.0</mockito.version>
- <awaitility.version>4.2.0</awaitility.version>
+ <awaitility.version>4.2.2</awaitility.version>
  <testcontainers.version>1.20.1</testcontainers.version>
  <commons-csv.version>1.9.0</commons-csv.version>
 
@@ -151,7 +151,7 @@
  <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
  <dockerfile-maven.version>1.4.13</dockerfile-maven.version>
  <os-detector-maven-plugin.version>0.3.1</os-detector-maven-plugin.version>
- <native-maven-plugin.version>0.10.2</native-maven-plugin.version>
+ <native-maven-plugin.version>0.10.3</native-maven-plugin.version>
 
  <!-- Compile plugin versions -->
  <templating-maven-plugin.version>1.0.0</templating-maven-plugin.version>