import java.util.Comparator;
import java.util.EnumMap;
import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
*/
public synchronized Transliterator normalizer() {
if (normalizer == null) {
- normalizer = Transliterator
- .createFromRules("", normalizerRules, Transliterator.FORWARD);
+ normalizer = TransliteratorManager.get(normalizerRules);
}
return normalizer;
}
};
public static final class IndexEntry implements RAFSerializable<Index.IndexEntry> {
- private final Index index;
public final String token;
private final String normalizedToken;
public final int startRow;
public final int numRows; // doesn't count the token row!
public List<HtmlEntry> htmlEntries;
- private int[] htmlEntryIndices;
public IndexEntry(final Index index, final String token, final String normalizedToken,
final int startRow, final int numRows) {
- this.index = index;
assert token.equals(token.trim());
assert token.length() > 0;
this.token = token;
}
public IndexEntry(final Index index, final DataInput raf) throws IOException {
- this.index = index;
token = raf.readUTF();
if (index.dict.dictFileVersion >= 7) {
startRow = StringUtil.readVarInt(raf);
}
final boolean hasNormalizedForm = raf.readBoolean();
normalizedToken = hasNormalizedForm ? raf.readUTF() : token;
- htmlEntryIndices = null;
if (index.dict.dictFileVersion >= 7) {
int size = StringUtil.readVarInt(raf);
- htmlEntryIndices = new int[size];
- for (int i = 0; i < size; ++i) {
- htmlEntryIndices[i] = StringUtil.readVarInt(raf);
- }
- this.htmlEntries = CachingList.create(new AbstractList<HtmlEntry>() {
- @Override
- public HtmlEntry get(int i) {
- return index.dict.htmlEntries.get(htmlEntryIndices[i]);
- }
- @Override
- public int size() {
- return htmlEntryIndices.length;
+ if (size == 0) {
+ this.htmlEntries = Collections.emptyList();
+ } else {
+ final int[] htmlEntryIndices = new int[size];
+ for (int i = 0; i < size; ++i) {
+ htmlEntryIndices[i] = StringUtil.readVarInt(raf);
}
- }, 1);
+ this.htmlEntries = CachingList.create(new AbstractList<HtmlEntry>() {
+ @Override
+ public HtmlEntry get(int i) {
+ return index.dict.htmlEntries.get(htmlEntryIndices[i]);
+ }
+ @Override
+ public int size() {
+ return htmlEntryIndices.length;
+ }
+ }, 1);
+ }
} else if (index.dict.dictFileVersion >= 6) {
this.htmlEntries = CachingList.create(
RAFList.create((RandomAccessFile)raf, index.dict.htmlEntryIndexSerializer,
}
final IndexEntry midEntry = sortedIndexEntries.get(mid);
- int comp = NormalizeComparator.compareWithoutLeadingDash(token, midEntry.normalizedToken(), sortCollator, dict.dictFileVersion);
+ int comp = NormalizeComparator.compareWithoutDash(token, midEntry.normalizedToken(), sortCollator, dict.dictFileVersion);
if (comp == 0)
comp = sortCollator.compare(token, midEntry.normalizedToken());
if (comp == 0) {
private static final int MAX_SEARCH_ROWS = 1000;
- private final Map<String, Integer> prefixToNumRows = new LinkedHashMap<String, Integer>();
+ private final Map<String, Integer> prefixToNumRows = new HashMap<String, Integer>();
private synchronized final int getUpperBoundOnRowsStartingWith(final String normalizedPrefix,
final int maxRows, final AtomicBoolean interrupted) {
final long startMills = System.currentTimeMillis();
final List<RowBase> result = new ArrayList<RowBase>();
- final Set<String> normalizedNonStoplist = new LinkedHashSet<String>();
+ final Set<String> normalizedNonStoplist = new HashSet<String>();
String bestPrefix = null;
int leastRows = Integer.MAX_VALUE;