-
Notifications
You must be signed in to change notification settings - Fork 327
Spanner Persistence Backend for Polaris #2328
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
c9a69db
309b5ca
09c4d42
6819410
5ee86ee
191e14f
e04ca6a
4c976cc
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -100,3 +100,6 @@ hs_err_pid* | |
|
|
||
| # macOS | ||
| *.DS_Store | ||
|
|
||
| # VSCode | ||
| .vscode/settings.json | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,7 +49,7 @@ commons-lang3 = { module = "org.apache.commons:commons-lang3", version = "3.18.0 | |
| commons-text = { module = "org.apache.commons:commons-text", version = "1.14.0" } | ||
| eclipselink = { module = "org.eclipse.persistence:eclipselink", version = "4.0.7" } | ||
| errorprone = { module = "com.google.errorprone:error_prone_core", version = "2.41.0" } | ||
| google-cloud-storage-bom = { module = "com.google.cloud:google-cloud-storage-bom", version = "2.55.0" } | ||
| google-cloud-libraries-bom = { module = "com.google.cloud:libraries-bom", version = "26.64.0" } | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just wondering: does There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I believe most of the Cloud SDKs, libraries included, are on a two week cadence more or less. The advantage (coming from the Beam experience with the Cloud Java SDKs) of using the BOM is that it keeps the various support libraries synchronized across specific SDKS. What happens otherwise is you get version drift in shared components like Protobuf or gRPC core libraries which can be really hard to spot. |
||
| guava = { module = "com.google.guava:guava", version = "33.4.8-jre" } | ||
| h2 = { module = "com.h2database:h2", version = "2.3.232" } | ||
| dnsjava = { module = "dnsjava:dnsjava", version = "3.6.3" } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 | ||
| * | ||
| * http://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. | ||
| */ | ||
|
|
||
| plugins { | ||
| id("polaris-server") | ||
| alias(libs.plugins.jandex) | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation(project(":polaris-core")) | ||
| implementation(libs.slf4j.api) | ||
| implementation(libs.guava) | ||
|
|
||
| implementation(platform(libs.google.cloud.libraries.bom)) | ||
| implementation("com.google.cloud:google-cloud-spanner") | ||
|
|
||
| compileOnly(libs.jakarta.annotation.api) | ||
| compileOnly(libs.jakarta.enterprise.cdi.api) | ||
| compileOnly(libs.jakarta.inject.api) | ||
|
|
||
| compileOnly(libs.smallrye.common.annotation) // @Identifier | ||
| compileOnly(libs.smallrye.config.core) // @ConfigMapping | ||
|
|
||
| testImplementation(libs.mockito.junit.jupiter) | ||
| testImplementation(libs.h2) | ||
| testImplementation(testFixtures(project(":polaris-core"))) | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 | ||
| * | ||
| * http://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 org.apache.polaris.persistence.spanner; | ||
|
|
||
| import com.google.cloud.spanner.DatabaseAdminClient; | ||
| import java.util.function.Supplier; | ||
|
|
||
| public interface DatabaseAdminClientSupplier extends Supplier<DatabaseAdminClient> {} |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 | ||
| * | ||
| * http://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 org.apache.polaris.persistence.spanner; | ||
|
|
||
| import com.google.cloud.spanner.DatabaseClient; | ||
| import java.util.function.Supplier; | ||
|
|
||
| public interface DatabaseClientSupplier extends Supplier<DatabaseClient> {} |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 | ||
| * | ||
| * http://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 org.apache.polaris.persistence.spanner; | ||
|
|
||
| import io.smallrye.config.ConfigMapping; | ||
| import java.util.Optional; | ||
|
|
||
| @ConfigMapping(prefix = "polaris.persistence.spanner") | ||
| public interface GoogleCloudSpannerConfiguration { | ||
|
|
||
| public Optional<String> quotaProjectId(); | ||
|
|
||
| public Optional<String> projectId(); | ||
|
|
||
| public Optional<String> instanceId(); | ||
|
|
||
| public Optional<String> databaseId(); | ||
|
|
||
| public Optional<String> emulatorHost(); | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 | ||
| * | ||
| * http://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 org.apache.polaris.persistence.spanner; | ||
|
|
||
| import com.google.cloud.spanner.Database; | ||
| import com.google.cloud.spanner.DatabaseAdminClient; | ||
| import com.google.cloud.spanner.DatabaseId; | ||
| import com.google.cloud.spanner.Dialect; | ||
| import com.google.cloud.spanner.Spanner; | ||
| import jakarta.enterprise.context.ApplicationScoped; | ||
| import jakarta.enterprise.inject.Produces; | ||
| import java.io.FileInputStream; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.nio.charset.Charset; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.concurrent.ExecutionException; | ||
| import org.apache.polaris.core.persistence.bootstrap.SchemaOptions; | ||
| import org.apache.polaris.persistence.spanner.util.SpannerUtil; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| @ApplicationScoped | ||
| public class GoogleCloudSpannerDatabaseClientLifecycleManager { | ||
|
|
||
| private static final Logger LOGGER = | ||
| LoggerFactory.getLogger(GoogleCloudSpannerDatabaseClientLifecycleManager.class); | ||
|
|
||
| protected final GoogleCloudSpannerConfiguration spannerConfiguration; | ||
| protected final Spanner spanner; | ||
| protected final DatabaseId databaseId; | ||
|
|
||
| public GoogleCloudSpannerDatabaseClientLifecycleManager( | ||
| GoogleCloudSpannerConfiguration spannerConfiguration) { | ||
| this.spannerConfiguration = spannerConfiguration; | ||
| spanner = SpannerUtil.spannerFromConfiguration(spannerConfiguration); | ||
| databaseId = SpannerUtil.databaseFromConfiguration(spannerConfiguration); | ||
| } | ||
|
|
||
| protected List<String> getSpannerDatabaseDdl(SchemaOptions options) { | ||
| final InputStream schemaStream; | ||
| if (options.schemaFile() != null) { | ||
| try { | ||
| schemaStream = new FileInputStream(options.schemaFile()); | ||
| } catch (IOException e) { | ||
| throw new IllegalArgumentException("Unable to load file " + options.schemaFile(), e); | ||
| } | ||
| } else { | ||
| if (options.schemaVersion() == null || options.schemaVersion() == 1) { | ||
| schemaStream = | ||
| getClass().getResourceAsStream("/org/apache/polaris/persistence/spanner/schema-v1.sql"); | ||
| } else { | ||
| throw new IllegalArgumentException("Unknown schema version " + options.schemaVersion()); | ||
| } | ||
| } | ||
| try (schemaStream) { | ||
| String schema = new String(schemaStream.readAllBytes(), Charset.forName("UTF-8")); | ||
| List<String> lines = new ArrayList<>(); | ||
| for (String s : schema.split("\n")) { | ||
| s = s.trim(); | ||
| // Drop comments and empty lines. | ||
| if (s.startsWith("--") || s.length() == 0 || s.equals(";")) { | ||
| continue; | ||
| } | ||
| lines.add(s); | ||
| } | ||
| return List.of(String.join(" ", lines).split(";")); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException("Unable to retrieve DDL statements", e); | ||
| } | ||
| } | ||
|
|
||
| @Produces | ||
| public SchemaInitializer getSchemaInitializer() { | ||
| return (options) -> { | ||
| List<String> ddlStatements = getSpannerDatabaseDdl(options); | ||
| LOGGER.info( | ||
| "Attempting to initialize Spanner database DDL with {} statements,", | ||
| ddlStatements.size()); | ||
| DatabaseAdminClient client = spanner.getDatabaseAdminClient(); | ||
| Database dbInfo = | ||
| client.newDatabaseBuilder(databaseId).setDialect(Dialect.GOOGLE_STANDARD_SQL).build(); | ||
| try { | ||
| client.updateDatabaseDdl(dbInfo, ddlStatements, null).get(); | ||
| LOGGER.info("Successfully applied DDL update."); | ||
| } catch (InterruptedException | ExecutionException e) { | ||
| throw new RuntimeException( | ||
| "Unable to update Spanner DDL. Please disable this option for this database configuration.", | ||
| e); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| @Produces | ||
| public DatabaseClientSupplier getDatabaseClientSupplier() { | ||
| return () -> spanner.getDatabaseClient(databaseId); | ||
| } | ||
|
|
||
| @Produces | ||
| public DatabaseAdminClientSupplier getDatabaseAdminClientSupplier() { | ||
| return () -> spanner.getDatabaseAdminClient(); | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 | ||
| * | ||
| * http://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 org.apache.polaris.persistence.spanner; | ||
|
|
||
| import java.util.function.Consumer; | ||
| import org.apache.polaris.core.persistence.bootstrap.SchemaOptions; | ||
|
|
||
| public interface SchemaInitializer extends Consumer<SchemaOptions> {} |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 | ||
| * | ||
| * http://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 org.apache.polaris.persistence.spanner.model; | ||
|
|
||
| import com.google.cloud.spanner.Key; | ||
| import com.google.cloud.spanner.Mutation; | ||
|
|
||
| public final class Realm { | ||
|
|
||
| public static final String TABLE_NAME = "Realms"; | ||
|
|
||
| public static Mutation upsert(String realmId) { | ||
| return Mutation.newInsertOrUpdateBuilder(TABLE_NAME).set("RealmId").to(realmId).build(); | ||
| } | ||
|
|
||
| public static Mutation delete(String realmId) { | ||
| return Mutation.delete(TABLE_NAME, Key.of(realmId)); | ||
| } | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We will need to change the License file for this change, somewhere like here
polaris/runtime/server/distribution/LICENSE
Line 556 in d7f15a2
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point about LICENSE updates, however using a BOM does not necessary require LICENSE changes... only real dependencies need to be mentioned... IMHO, that can be done later (we have to double check dependencies for every release anyway).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm OK with a followup PR.