-
Notifications
You must be signed in to change notification settings - Fork 387
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
[#5991] feat(gcs): unify the GCS server acount path configuration for fileset and GCSCredentialProvider #5992
Merged
Merged
Changes from all commits
Commits
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
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
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
49 changes: 49 additions & 0 deletions
49
...-server/src/test/java/org/apache/gravitino/iceberg/service/TestCatalogWrapperForREST.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,49 @@ | ||
| /* | ||
| * 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.gravitino.iceberg.service; | ||
|
|
||
| import java.util.Map; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; | ||
|
|
||
| public class TestCatalogWrapperForREST { | ||
|
|
||
| @Test | ||
| void testCheckPropertiesForCompatibility() { | ||
| ImmutableMap<String, String> deprecatedMap = ImmutableMap.of("deprecated", "new"); | ||
| ImmutableMap<String, String> propertiesWithDeprecatedKey = ImmutableMap.of("deprecated", "v"); | ||
| Map<String, String> newProperties = | ||
| CatalogWrapperForREST.checkForCompatibility(propertiesWithDeprecatedKey, deprecatedMap); | ||
| Assertions.assertEquals(newProperties, ImmutableMap.of("new", "v")); | ||
|
|
||
| ImmutableMap<String, String> propertiesWithoutDeprecatedKey = ImmutableMap.of("k", "v"); | ||
| newProperties = | ||
| CatalogWrapperForREST.checkForCompatibility(propertiesWithoutDeprecatedKey, deprecatedMap); | ||
| Assertions.assertEquals(newProperties, ImmutableMap.of("k", "v")); | ||
|
|
||
| ImmutableMap<String, String> propertiesWithBothKey = | ||
| ImmutableMap.of("deprecated", "v", "new", "v"); | ||
|
|
||
| Assertions.assertThrowsExactly( | ||
| IllegalArgumentException.class, | ||
| () -> CatalogWrapperForREST.checkForCompatibility(propertiesWithBothKey, deprecatedMap)); | ||
| } | ||
| } |
Oops, something went wrong.
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.
Can you help explain why this change is necessary?
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.
Adding an
GRAVITINOprefix declares this is a configuration for Gravitino , not for Iceberg, spark, or others, and keep consistent with other properties defined inS3PropertiesOSSProperties, etcThere 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.
@FANNG1 Yes. That was also my first perception of this naming style after having seen it prevail in many packages. But I'm still confused by such
public static final strings.You know, we are writing these code in Java, which is notorious/famous by its class hierarchies. In other words, we are not supposed to write two
Fooclasses in the same package. EachFoohas its own namespace. AFoocan be a GravitinoFooand it can be a IcebergFoo. We differentiate these twoFooclasses by using their fully-qualified names. We are not supposed to add another level of complexity to the class hierarchy.For most of the cases, a
org.gravitino.Foo.CONFIG_FILEcan be easily differentiated from aorg.iceberg.Foo.CONFIG_FILE. PrependingGRAVATINO_orICEBERG_to those variable/constant names is making them longer for no good. If these code is written in Go, for example, I'd strongly advise the other way around. A prefix can help us quickly locate the file where it is defined. Without a prefix, I have to grep the whole directory because GoLang compiler treats the whole directory as a single compilation unit. A variable can be defined in any source code. That design sucks.I have seen simply too many cases where our contributors are repeating (copy-pasting) this pattern, and that is the reason I'm putting this forward for the team to reconsider, if appropriate.
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.
Gravitino as a metadata manage system, there are heavy works to transform different properties across different systems, take jdbc user for example, the name is
jdbc-userfor Gravitino,jdbc.userfor Iceberg, adding a prefix likeGRAVITINO_JDBC_USER,ICEBERG_JDBC_USERis clear to me, without the prefix we may use it by mistake more easily.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.
another pattern is splitting to something like
GravitinoProperties.JDBC_USERIcebergProperties.JDBC_USER, I agree this is more elegant and clear too, but requires an heavy refactor work for now.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.
How about start this practice from today, in this PR, rather than deferring this to a huge refactor work later which may never happen?
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.
This should be
GravitinoProperties.SERVICE_ACCOUNT_FILE, if usingGCSPropertiesseems missing Gravitino information.