organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 14:05:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 8

ICU-22390 Speed-up ICU4J Transliterator.<clinit>

Browse source 
It reduces the method runtime by approx. 60%.
This commit is contained in:
Victor Chang 2023-05-12 16:01:56 +01:00 • committed by Mark Davis
parent 5435007e6a
commit a18c8f83e3
3 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
icu4j/main/classes/core/src/com/ibm/icu/impl/ICUResourceBundleReader.java
View file

@ -14,6 +14,7 @@ import java.lang.ref.SoftReference;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.IntBuffer;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import com.ibm.icu.util.ICUException;
@ -444,13 +445,12 @@ public final class ICUResourceBundleReader {
}
private static String makeKeyStringFromBytes(byte[] keyBytes, int keyOffset) {
StringBuilder sb = new StringBuilder();
byte b;
while((b = keyBytes[keyOffset]) != 0) {
++keyOffset;
sb.append((char)b);
int end = keyOffset;
while(keyBytes[end] != 0) {
++end;
}
return sb.toString();
int len = end - keyOffset;
return new String(keyBytes, keyOffset, len, StandardCharsets.ISO_8859_1);
}
private String getKey16String(int keyOffset) {
if(keyOffset < localKeyLimit) {

19
icu4j/main/classes/translit/src/com/ibm/icu/text/AnyTransliterator.java
View file

@ -52,6 +52,12 @@ class AnyTransliterator extends Transliterator {
static final String NULL_ID = "Null";
static final String LATIN_PIVOT = "-Latin;Latin-";
/**
* Special code for handling width characters
*/
private static final Transliterator WIDTH_FIX =
Transliterator.getInstance("[[:dt=Nar:][:dt=Wide:]] nfkd");
/**
* Cache mapping UScriptCode values to Transliterator*.
*/
@ -67,11 +73,6 @@ class AnyTransliterator extends Transliterator {
*/
private int targetScript;
/**
* Special code for handling width characters
*/
private Transliterator widthFix = Transliterator.getInstance("[[:dt=Nar:][:dt=Wide:]] nfkd");
/**
* Implements {@link Transliterator#handleTransliterate}.
*/
@ -176,7 +177,7 @@ class AnyTransliterator extends Transliterator {
if (isWide(targetScript)) {
return null;
} else {
return widthFix;
return WIDTH_FIX;
}
}
@ -201,7 +202,7 @@ class AnyTransliterator extends Transliterator {
if (t != null) {
if (!isWide(targetScript)) {
List<Transliterator> v = new ArrayList<Transliterator>();
v.add(widthFix);
v.add(WIDTH_FIX);
v.add(t);
t = new CompoundTransliterator(v);
}
@ -210,7 +211,7 @@ class AnyTransliterator extends Transliterator {
t = prevCachedT;
}
} else if (!isWide(targetScript)) {
return widthFix;
return WIDTH_FIX;
}
}
@ -408,7 +409,7 @@ class AnyTransliterator extends Transliterator {
if (filter != null && filter instanceof UnicodeSet) {
filter = new UnicodeSet((UnicodeSet)filter);
}
return new AnyTransliterator(getID(), filter, target, targetScript, widthFix, cache);
return new AnyTransliterator(getID(), filter, target, targetScript, WIDTH_FIX, cache);
}
/* (non-Javadoc)

10
icu4j/main/classes/translit/src/com/ibm/icu/text/TransliteratorRegistry.java
View file

@ -16,11 +16,13 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import java.util.Set;
import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
@ -69,7 +71,7 @@ class TransliteratorRegistry {
/**
* Vector of public full IDs (CaseInsensitiveString objects).
*/
private List<CaseInsensitiveString> availableIDs;
private final Set<CaseInsensitiveString> availableIDs;
//----------------------------------------------------------------------
// class Spec
@ -293,7 +295,7 @@ class TransliteratorRegistry {
public TransliteratorRegistry() {
registry = Collections.synchronizedMap(new HashMap<CaseInsensitiveString, Object[]>());
specDAG = Collections.synchronizedMap(new HashMap<CaseInsensitiveString, Map<CaseInsensitiveString, List<CaseInsensitiveString>>>());
availableIDs = new ArrayList<CaseInsensitiveString>();
availableIDs = new LinkedHashSet<>();
}
/**
@ -520,9 +522,7 @@ class TransliteratorRegistry {
registry.put(ciID, arrayOfObj);
if (visible) {
registerSTV(source, target, variant);
if (!availableIDs.contains(ciID)) {
availableIDs.add(ciID);
}
availableIDs.add(ciID);
} else {
removeSTV(source, target, variant);
availableIDs.remove(ciID);