-
Notifications
You must be signed in to change notification settings - Fork 2.5k
[HUDI-3593] Restore TypedProperties and flush checksum in table config #5013
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
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
100 changes: 100 additions & 0 deletions
100
hudi-common/src/main/java/org/apache/hudi/common/config/OrderedProperties.java
This file contains hidden or 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,100 @@ | ||
| /* | ||
| * 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.hudi.common.config; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.Enumeration; | ||
| import java.util.HashSet; | ||
| import java.util.LinkedHashSet; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
| import java.util.Properties; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * An extension of {@link java.util.Properties} that maintains the order. | ||
| * The implementation is not thread-safe. | ||
| */ | ||
| public class OrderedProperties extends Properties { | ||
|
|
||
| private final HashSet<Object> keys = new LinkedHashSet<>(); | ||
|
|
||
| public OrderedProperties() { | ||
| super(null); | ||
| } | ||
|
|
||
| public OrderedProperties(Properties defaults) { | ||
| if (Objects.nonNull(defaults)) { | ||
| for (String key : defaults.stringPropertyNames()) { | ||
| put(key, defaults.getProperty(key)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public Enumeration propertyNames() { | ||
| return Collections.enumeration(keys); | ||
| } | ||
|
|
||
| @Override | ||
| public synchronized Enumeration<Object> keys() { | ||
| return Collections.enumeration(keys); | ||
| } | ||
|
|
||
| @Override | ||
| public Set<String> stringPropertyNames() { | ||
| Set<String> set = new LinkedHashSet<>(); | ||
| for (Object key : this.keys) { | ||
| if (key instanceof String) { | ||
| set.add((String) key); | ||
| } | ||
| } | ||
| return set; | ||
| } | ||
|
|
||
| public synchronized void putAll(Properties t) { | ||
| for (Map.Entry<?, ?> e : t.entrySet()) { | ||
| if (!containsKey(String.valueOf(e.getKey()))) { | ||
| keys.add(e.getKey()); | ||
| } | ||
| super.put(e.getKey(), e.getValue()); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public synchronized Object put(Object key, Object value) { | ||
| keys.remove(key); | ||
| keys.add(key); | ||
| return super.put(key, value); | ||
| } | ||
|
|
||
| public synchronized Object putIfAbsent(Object key, Object value) { | ||
| if (!containsKey(String.valueOf(key))) { | ||
| keys.add(key); | ||
| } | ||
| return super.putIfAbsent(key, value); | ||
| } | ||
|
|
||
| @Override | ||
| public Object remove(Object key) { | ||
| keys.remove(key); | ||
| return super.remove(key); | ||
| } | ||
| } | ||
This file contains hidden or 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 hidden or 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
81 changes: 81 additions & 0 deletions
81
hudi-common/src/test/java/org/apache/hudi/common/properties/TestOrderedProperties.java
This file contains hidden or 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,81 @@ | ||
| /* | ||
| * 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.hudi.common.properties; | ||
|
|
||
| import org.apache.hudi.common.config.OrderedProperties; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.Properties; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| public class TestOrderedProperties { | ||
|
|
||
| @Test | ||
| public void testPutPropertiesOrder() { | ||
| Properties properties = new OrderedProperties(); | ||
| properties.put("key0", "true"); | ||
| properties.put("key1", "false"); | ||
| properties.put("key2", "true"); | ||
| properties.put("key3", "false"); | ||
| properties.put("key4", "true"); | ||
| properties.put("key5", "true"); | ||
| properties.put("key6", "false"); | ||
| properties.put("key7", "true"); | ||
| properties.put("key8", "false"); | ||
| properties.put("key9", "true"); | ||
|
|
||
| OrderedProperties typedProperties = new OrderedProperties(properties); | ||
| assertTypeProperties(typedProperties, 0); | ||
| } | ||
|
|
||
| @Test | ||
| void testPutAllPropertiesOrder() { | ||
| Properties firstProp = new OrderedProperties(); | ||
| firstProp.put("key0", "true"); | ||
| firstProp.put("key1", "false"); | ||
| firstProp.put("key2", "true"); | ||
|
|
||
| OrderedProperties firstProperties = new OrderedProperties(firstProp); | ||
| assertTypeProperties(firstProperties, 0); | ||
|
|
||
| OrderedProperties secondProperties = new OrderedProperties(); | ||
| secondProperties.put("key3", "true"); | ||
| secondProperties.put("key4", "false"); | ||
| secondProperties.put("key5", "true"); | ||
| assertTypeProperties(secondProperties, 3); | ||
|
|
||
| OrderedProperties thirdProperties = new OrderedProperties(); | ||
| thirdProperties.putAll(firstProp); | ||
| thirdProperties.putAll(secondProperties); | ||
|
|
||
| assertEquals(3, firstProp.stringPropertyNames().size()); | ||
| assertEquals(3, secondProperties.stringPropertyNames().size()); | ||
| assertEquals(6, thirdProperties.stringPropertyNames().size()); | ||
| } | ||
|
|
||
| private void assertTypeProperties(OrderedProperties typedProperties, int start) { | ||
| String[] props = typedProperties.stringPropertyNames().toArray(new String[0]); | ||
| for (int i = start; i < props.length; i++) { | ||
| assertEquals(String.format("key%d", i), props[i]); | ||
| } | ||
| } | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.