Skip to content

Commit

Permalink
8288979: Improve CLDRConverter run time
Browse files Browse the repository at this point in the history 
Reviewed-by: naoto, rriggs
  • Loading branch information
@djelinski
djelinski committed Jun 23, 2022
1 parent 740169c commit c8cc94a
Showing 1 changed file with 73 additions and 45 deletions.
118 changes: 73 additions & 45 deletions make/jdk/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java
View file
Expand Up @@ -33,7 +33,6 @@
import java.util.HashSet;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Locale;
import java.util.Objects;
Expand Down Expand Up @@ -70,7 +69,6 @@ class ResourceBundleGenerator implements BundleGenerator {
private static final String META_VALUE_PREFIX = "metaValue_";

@Override
@SuppressWarnings("unchecked")
public void generateBundle(String packageName, String baseName, String localeID, boolean useJava,
Map<String, ?> map, BundleType type) throws IOException {
String suffix = useJava ? ".java" : ".properties";
Expand Down Expand Up @@ -144,56 +142,34 @@ public void generateBundle(String packageName, String baseName, String localeID,
map = newMap;
} else {
// generic reduction of duplicated values
Map<String, Object> newMap = null;
for (String key : map.keySet()) {
Object val = map.get(key);
String metaVal = null;

for (Map.Entry<String, ?> entry : map.entrySet()) {
String k = entry.getKey();
if (!k.equals(key) &&
Objects.deepEquals(val, entry.getValue()) &&
!(Objects.nonNull(newMap) && newMap.containsKey(k))) {
if (Objects.isNull(newMap)) {
newMap = new HashMap<>();
Map<String, Object> newMap = new LinkedHashMap<>(map);
Map<BundleEntryValue, BundleEntryValue> dedup = new HashMap<>(map.size());
for (Map.Entry<String, ?> entry : map.entrySet()) {
String key = entry.getKey();
Object val = entry.getValue();
BundleEntryValue newEntry = new BundleEntryValue(key, val);
BundleEntryValue oldEntry = dedup.putIfAbsent(newEntry, newEntry);
if (oldEntry != null) {
if (oldEntry.meta()) {
if (fmt == null) {
fmt = new Formatter();
}

if (Objects.isNull(metaVal)) {
metaVal = META_VALUE_PREFIX + key.replaceAll("[\\.-]", "_");

if (val instanceof String[]) {
fmt.format(" final String[] %s = new String[] {\n", metaVal);
for (String s : (String[]) val) {
fmt.format(" \"%s\",\n", CLDRConverter.saveConvert(s, useJava));
}
fmt.format(" };\n");
} else if (val instanceof List) {
fmt.format(" final String[] %s = new String[] {\n", metaVal);
for (String s : (List<String>) val) {
fmt.format(" \"%s\",\n", CLDRConverter.saveConvert(s, useJava));
}
fmt.format(" };\n");
} else {
fmt.format(" final String %s = \"%s\";\n", metaVal, CLDRConverter.saveConvert((String)val, useJava));
String metaVal = oldEntry.metaKey();
if (val instanceof String[] values) {
fmt.format(" final String[] %s = new String[] {\n", metaVal);
for (String s : values) {
fmt.format(" \"%s\",\n", CLDRConverter.saveConvert(s, useJava));
}
fmt.format(" };\n");
} else {
fmt.format(" final String %s = \"%s\";\n", metaVal, CLDRConverter.saveConvert((String)val, useJava));
}

newMap.put(k, metaVal);
newMap.put(oldEntry.key, oldEntry.metaKey());
}
}

if (Objects.nonNull(metaVal)) {
newMap.put(key, metaVal);
newMap.put(key, oldEntry.metaKey());
}
}

if (Objects.nonNull(newMap)) {
for (String key : map.keySet()) {
newMap.putIfAbsent(key, map.get(key));
}
map = newMap;
}
map = newMap;
}

try (PrintWriter out = new PrintWriter(file, encoding)) {
Expand Down Expand Up @@ -247,6 +223,58 @@ public void generateBundle(String packageName, String baseName, String localeID,
}
}

private static class BundleEntryValue {
private final String key;
private final Object value;
private final int hashCode;
private String metaKey;

BundleEntryValue(String key, Object value) {
this.key = Objects.requireNonNull(key);
this.value = Objects.requireNonNull(value);
if (value instanceof String) {
hashCode = value.hashCode();
} else if (value instanceof String[] arr) {
hashCode = Arrays.hashCode(arr);
} else {
throw new InternalError("Expected a string or a string array");
}
}

/**
* mark the entry as meta
* @return true if the entry was not meta before, false otherwise
*/
public boolean meta() {
if (metaKey == null) {
metaKey = META_VALUE_PREFIX + key.replaceAll("[\\.-]", "_");
return true;
}
return false;
}

public String metaKey() {
return metaKey;
}

@Override
public int hashCode() {
return hashCode;
}

@Override
public boolean equals(Object obj) {
if (obj instanceof BundleEntryValue entry) {
if (value instanceof String s) {
return s.equals(entry.value);
} else if (entry.value instanceof String[] otherVal) {
return Arrays.equals((String[]) value, otherVal);
}
}
return false;
}
}

@Override
public void generateMetaInfo(Map<String, SortedSet<String>> metaInfo) throws IOException {
String dirName = CLDRConverter.DESTINATION_DIR + File.separator + "sun" + File.separator + "util" +
Expand Down

1 comment on commit c8cc94a

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

Please sign in to comment.