-
Notifications
You must be signed in to change notification settings - Fork 123
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: add native image configurations for Spanner classes (#1858)
* fix: add native image configurations for Spanner classes
- Loading branch information
Showing
14 changed files
with
242 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 116 additions & 0 deletions
116
google-cloud-spanner/src/main/java/com/google/cloud/spanner/nativeimage/SpannerFeature.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| /* | ||
| * Copyright 2022 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.cloud.spanner.nativeimage; | ||
|
|
||
| import com.google.api.gax.nativeimage.NativeImageUtils; | ||
| import org.graalvm.nativeimage.hosted.Feature; | ||
|
|
||
| /** Registers Spanner library classes for reflection. */ | ||
| final class SpannerFeature implements Feature { | ||
|
|
||
| private static final String SPANNER_CLASS = "com.google.spanner.v1.SpannerGrpc"; | ||
| private static final String SPANNER_TEST_CLASS = "com.google.cloud.spanner.GceTestEnvConfig"; | ||
| private static final String MOCK_CLASS = "com.google.cloud.spanner.MockDatabaseAdminServiceImpl"; | ||
| private static final String CLIENT_SIDE_IMPL_CLASS = | ||
| "com.google.cloud.spanner.connection.ClientSideStatementImpl"; | ||
| private static final String CLIENT_SIDE_VALUE_CONVERTER = | ||
| "com.google.cloud.spanner.connection.ClientSideStatementValueConverters"; | ||
| private static final String CONNECTION_IMPL = | ||
| "com.google.cloud.spanner.connection.ConnectionImpl"; | ||
| private static final String CLIENT_SIDE_STATEMENTS = | ||
| "com.google.cloud.spanner.connection.ClientSideStatements"; | ||
| private static final String CONNECTION_STATEMENT_EXECUTOR = | ||
| "com.google.cloud.spanner.connection.ConnectionStatementExecutor"; | ||
| private static final String CLIENT_SIDE_STATEMENT_NO_PARAM_EXECUTOR = | ||
| "com.google.cloud.spanner.connection.ClientSideStatementNoParamExecutor"; | ||
| private static final String CLIENT_SIDE_STATEMENT_SET_EXECUTOR = | ||
| "com.google.cloud.spanner.connection.ClientSideStatementSetExecutor"; | ||
| private static final String CLIENT_SIDE_STATEMENT_PG_EXECUTOR = | ||
| "com.google.cloud.spanner.connection.ClientSideStatementPgBeginExecutor"; | ||
| private static final String ABSTRACT_STATEMENT_PARSER = | ||
| "com.google.cloud.spanner.connection.AbstractStatementParser"; | ||
| private static final String STATEMENT_PARSER = | ||
| "com.google.cloud.spanner.connection.SpannerStatementParser"; | ||
| private static final String POSTGRESQL_STATEMENT_PARSER = | ||
| "com.google.cloud.spanner.connection.PostgreSQLStatementParser"; | ||
| private static final String STATEMENT_RESULT = | ||
| "com.google.cloud.spanner.connection.StatementResult$ResultType"; | ||
|
|
||
| @Override | ||
| public void beforeAnalysis(BeforeAnalysisAccess access) { | ||
| registerSpannerTestClasses(access); | ||
| if (access.findClassByName(CLIENT_SIDE_IMPL_CLASS) != null) { | ||
| NativeImageUtils.registerClassHierarchyForReflection(access, CLIENT_SIDE_IMPL_CLASS); | ||
| } | ||
| if (access.findClassByName(CLIENT_SIDE_STATEMENT_NO_PARAM_EXECUTOR) != null) { | ||
| NativeImageUtils.registerClassForReflection(access, CLIENT_SIDE_STATEMENT_NO_PARAM_EXECUTOR); | ||
| } | ||
| if (access.findClassByName(CLIENT_SIDE_STATEMENT_PG_EXECUTOR) != null) { | ||
| NativeImageUtils.registerClassForReflection(access, CLIENT_SIDE_STATEMENT_PG_EXECUTOR); | ||
| } | ||
| if (access.findClassByName(CLIENT_SIDE_STATEMENT_SET_EXECUTOR) != null) { | ||
| NativeImageUtils.registerClassForReflection(access, CLIENT_SIDE_STATEMENT_SET_EXECUTOR); | ||
| } | ||
| if (access.findClassByName(CLIENT_SIDE_VALUE_CONVERTER) != null) { | ||
| NativeImageUtils.registerClassHierarchyForReflection(access, CLIENT_SIDE_VALUE_CONVERTER); | ||
| } | ||
| if (access.findClassByName(CLIENT_SIDE_STATEMENTS) != null) { | ||
| NativeImageUtils.registerClassForReflection(access, CLIENT_SIDE_STATEMENTS); | ||
| } | ||
| if (access.findClassByName(CONNECTION_STATEMENT_EXECUTOR) != null) { | ||
| NativeImageUtils.registerClassForReflection(access, CONNECTION_STATEMENT_EXECUTOR); | ||
| } | ||
| if (access.findClassByName(CONNECTION_IMPL) != null) { | ||
| NativeImageUtils.registerClassForReflection(access, CONNECTION_IMPL); | ||
| } | ||
| if (access.findClassByName(ABSTRACT_STATEMENT_PARSER) != null) { | ||
| NativeImageUtils.registerClassHierarchyForReflection(access, ABSTRACT_STATEMENT_PARSER); | ||
| NativeImageUtils.registerClassForReflection(access, "com.google.cloud.spanner.Dialect"); | ||
| } | ||
| if (access.findClassByName(STATEMENT_PARSER) != null) { | ||
| NativeImageUtils.registerConstructorsForReflection(access, STATEMENT_PARSER); | ||
| } | ||
| if (access.findClassByName(POSTGRESQL_STATEMENT_PARSER) != null) { | ||
| NativeImageUtils.registerConstructorsForReflection(access, POSTGRESQL_STATEMENT_PARSER); | ||
| } | ||
| if (access.findClassByName(STATEMENT_RESULT) != null) { | ||
| NativeImageUtils.registerClassForReflection(access, STATEMENT_RESULT); | ||
| } | ||
|
|
||
| Class<?> spannerClass = access.findClassByName(SPANNER_CLASS); | ||
| if (spannerClass != null) { | ||
| NativeImageUtils.registerClassHierarchyForReflection( | ||
| access, "com.google.spanner.admin.database.v1.Database"); | ||
| NativeImageUtils.registerClassHierarchyForReflection( | ||
| access, "com.google.spanner.admin.instance.v1.Instance"); | ||
| NativeImageUtils.registerClassForReflection( | ||
| access, "com.google.spanner.admin.database.v1.RestoreInfo"); | ||
| } | ||
| } | ||
|
|
||
| private void registerSpannerTestClasses(BeforeAnalysisAccess access) { | ||
| Class<?> spannerTestClass = access.findClassByName(SPANNER_TEST_CLASS); | ||
| if (spannerTestClass != null) { | ||
| NativeImageUtils.registerConstructorsForReflection(access, SPANNER_TEST_CLASS); | ||
| } | ||
| Class<?> mockClass = access.findClassByName(MOCK_CLASS); | ||
| if (mockClass != null) { | ||
| NativeImageUtils.registerClassForReflection( | ||
| access, "com.google.cloud.spanner.MockDatabaseAdminServiceImpl$MockBackup"); | ||
| } | ||
| } | ||
| } |
4 changes: 4 additions & 0 deletions
4
google-cloud-spanner/src/main/resources/META-INF/native-image/native-image.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| Args = --initialize-at-build-time=com.google.cloud.spanner.IntegrationTestEnv,\ | ||
| org.junit.experimental.categories.CategoryValidator,\ | ||
| org.junit.validator.AnnotationValidator \ | ||
| --features=com.google.cloud.spanner.nativeimage.SpannerFeature |
8 changes: 8 additions & 0 deletions
8
google-cloud-spanner/src/main/resources/META-INF/native-image/resource-config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| { | ||
| "resources": [ | ||
| {"pattern": "\\Qcom/google/cloud/spanner/connection/ClientSideStatements.json\\E"}, | ||
| {"pattern": "\\Qcom/google/cloud/spanner/connection/PG_ClientSideStatements.json\\E"}, | ||
| {"pattern": "\\Qcom/google/cloud/spanner/spi/v1/grpc-gcp-apiconfig.json\\E"}, | ||
| {"pattern": "\\Qcom/google/cloud/spanner/connection/ITSqlScriptTest_TestQueryOptions.sql\\E"} | ||
| ] | ||
| } |
Oops, something went wrong.