Skip to content

[HUDI-3528] Fix String convert issue and overwrite putAll method in Typed… #4920

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.

Sign up for GitHub

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
nsivabalan merged 1 commit into from
Feb 28, 2022
Merged

[HUDI-3528] Fix String convert issue and overwrite putAll method in Typed… #4920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion hudi-common/src/main/java/org/apache/hudi/common/config/TypedProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
import java.util.Set;
Expand Down Expand Up @@ -63,11 +64,22 @@ public synchronized Enumeration<Object> keys() {
public Set<String> stringPropertyNames() {
Set<String> set = new LinkedHashSet<>();
for (Object key : this.keys) {
set.add((String) key);
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);
Expand Down
31 changes: 30 additions & 1 deletion hudi-common/src/test/java/org/apache/hudi/common/properties/TestTypedProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,37 @@ public void testPropertiesOrder() throws IOException {
properties.put("key9", "true");

TypedProperties typedProperties = new TypedProperties(properties);
assertTypeProperties(typedProperties, 0);
}

@Test
void testPutAllProperties() {
Properties firstProp = new TypedProperties();
firstProp.put("key0", "true");
firstProp.put("key1", "false");
firstProp.put("key2", "true");

TypedProperties firstProperties = new TypedProperties(firstProp);
assertTypeProperties(firstProperties, 0);

TypedProperties secondProperties = new TypedProperties();
secondProperties.put("key3", "true");
secondProperties.put("key4", "false");
secondProperties.put("key5", "true");
assertTypeProperties(secondProperties, 3);

TypedProperties thirdProperties = new TypedProperties();
thirdProperties.putAll(firstProp);
thirdProperties.putAll(secondProperties);

assertEquals(3, firstProp.stringPropertyNames().size());
assertEquals(3, secondProperties.stringPropertyNames().size());
assertEquals(6, thirdProperties.stringPropertyNames().size());
}

private void assertTypeProperties(TypedProperties typedProperties, int start) {
String[] props = typedProperties.stringPropertyNames().toArray(new String[0]);
for (int i = 0; i < props.length; i++) {
for (int i = start; i < props.length; i++) {
assertEquals(String.format("key%d", i), props[i]);
}
}
Expand Down