-
Notifications
You must be signed in to change notification settings - Fork 132
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
[FEATURE REQUEST] Support endpoints field in the config endpoint #383
Draft
danielhumanmod
wants to merge
3
commits into
apache:main
Choose a base branch
from
danielhumanmod:support-endpoints
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
106 changes: 106 additions & 0 deletions
106
polaris-service/src/main/java/org/apache/polaris/service/catalog/ExtendedConfigResponse.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,106 @@ | ||
| /* | ||
| * 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.service.catalog; | ||
|
|
||
| import com.google.common.base.MoreObjects; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import org.apache.iceberg.rest.responses.ConfigResponse; | ||
|
|
||
| // TODO: Replace with Iceberg's ConfigResponse after integrating Iceberg 1.7.0 | ||
| // Related PR: https://github.com/apache/iceberg/pull/10929#issuecomment-2418591566 | ||
| public class ExtendedConfigResponse extends ConfigResponse { | ||
| private final ConfigResponse configResponse; | ||
| private List<String> endpoints; | ||
|
|
||
| public ExtendedConfigResponse(ConfigResponse configResponse, List<String> endpoints) { | ||
| this.configResponse = configResponse; | ||
| this.endpoints = endpoints; | ||
| } | ||
|
|
||
| public List<String> endpoints() { | ||
| return endpoints; | ||
| } | ||
|
|
||
| public void setEndpoints(List<String> endpoints) { | ||
| this.endpoints = endpoints; | ||
| } | ||
|
|
||
| @Override | ||
| public Map<String, String> defaults() { | ||
| return configResponse.defaults(); | ||
| } | ||
|
|
||
| @Override | ||
| public Map<String, String> overrides() { | ||
| return configResponse.overrides(); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return MoreObjects.toStringHelper(this) | ||
| .add("defaults", this.defaults()) | ||
| .add("overrides", this.overrides()) | ||
| .add("endpoints", this.endpoints()) | ||
| .toString(); | ||
| } | ||
|
|
||
| public static Builder extendedBuilder() { | ||
| return new Builder(); | ||
| } | ||
|
|
||
| public static class Builder { | ||
| private final ConfigResponse.Builder configBuilder; | ||
| private List<String> endpoints; | ||
|
|
||
| public Builder() { | ||
| this.configBuilder = ConfigResponse.builder(); | ||
| } | ||
|
|
||
| public Builder withDefault(String key, String value) { | ||
| configBuilder.withDefault(key, value); | ||
| return this; | ||
| } | ||
|
|
||
| public Builder withDefaults(Map<String, String> defaultsToAdd) { | ||
| configBuilder.withDefaults(defaultsToAdd); | ||
| return this; | ||
| } | ||
|
|
||
| public Builder withOverride(String key, String value) { | ||
| configBuilder.withOverride(key, value); | ||
| return this; | ||
| } | ||
|
|
||
| public Builder withOverrides(Map<String, String> overridesToAdd) { | ||
| configBuilder.withOverrides(overridesToAdd); | ||
| return this; | ||
| } | ||
|
|
||
| public Builder withEndpoints(List<String> endpoints) { | ||
| this.endpoints = endpoints; | ||
| return this; | ||
| } | ||
|
|
||
| public ExtendedConfigResponse build() { | ||
| ConfigResponse configResponse = configBuilder.build(); | ||
| return new ExtendedConfigResponse(configResponse, endpoints); | ||
| } | ||
| } | ||
| } | ||
44 changes: 44 additions & 0 deletions
44
polaris-service/src/main/java/org/apache/polaris/service/catalog/ExtendedResourcePaths.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,44 @@ | ||
| /* | ||
| * 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.service.catalog; | ||
|
|
||
| import org.apache.iceberg.rest.ResourcePaths; | ||
|
|
||
| // TODO: Replace with Iceberg's ResourcePaths after integrating Iceberg 1.7.0 | ||
| // Related PR: https://github.com/apache/iceberg/pull/10929#issuecomment-2418591566 | ||
| public class ExtendedResourcePaths extends ResourcePaths { | ||
| public static final String V1_NAMESPACES = "/v1/{prefix}/namespaces"; | ||
| public static final String V1_NAMESPACE = "/v1/{prefix}/namespaces/{namespace}"; | ||
| public static final String V1_NAMESPACE_PROPERTIES = | ||
| "/v1/{prefix}/namespaces/{namespace}/properties"; | ||
| public static final String V1_TABLES = "/v1/{prefix}/namespaces/{namespace}/tables"; | ||
| public static final String V1_TABLE = "/v1/{prefix}/namespaces/{namespace}/tables/{table}"; | ||
| public static final String V1_TABLE_REGISTER = "/v1/{prefix}/namespaces/{namespace}/register"; | ||
| public static final String V1_TABLE_METRICS = | ||
| "/v1/{prefix}/namespaces/{namespace}/tables/{table}/metrics"; | ||
| public static final String V1_TABLE_RENAME = "/v1/{prefix}/tables/rename"; | ||
| public static final String V1_TRANSACTIONS_COMMIT = "/v1/{prefix}/transactions/commit"; | ||
| public static final String V1_VIEWS = "/v1/{prefix}/namespaces/{namespace}/views"; | ||
| public static final String V1_VIEW = "/v1/{prefix}/namespaces/{namespace}/views/{view}"; | ||
| public static final String V1_VIEW_RENAME = "/v1/{prefix}/views/rename"; | ||
|
|
||
| public ExtendedResourcePaths(String prefix) { | ||
| super(prefix); | ||
| } | ||
| } |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Does it make sense to hold off until 1.7.0?
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.
Yes, we will hold if off until 17.0 based on the discussion here: #316