X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FIndex.java;h=fd69bb857e4bd53c08152211c91bccf4115e3d10;hb=60b71b3a5c6fbcd12fbff3d814e8199aec7fba92;hp=b58384d1d4981849cb7966c9ca923e507c8d6bae;hpb=e79165503392ed6a7cb7a8eadc15eaae0cda9443;p=Dictionary.git diff --git a/src/com/hughes/android/dictionary/engine/Index.java b/src/com/hughes/android/dictionary/engine/Index.java index b58384d..fd69bb8 100644 --- a/src/com/hughes/android/dictionary/engine/Index.java +++ b/src/com/hughes/android/dictionary/engine/Index.java @@ -14,40 +14,38 @@ package com.hughes.android.dictionary.engine; -import com.hughes.android.dictionary.DictionaryInfo; -import com.hughes.android.dictionary.DictionaryInfo.IndexInfo; -import com.hughes.android.dictionary.engine.RowBase.RowKey; -import com.hughes.util.CachingList; -import com.hughes.util.StringUtil; -import com.hughes.util.TransformingList; -import com.hughes.util.raf.RAFList; -import com.hughes.util.raf.RAFSerializable; -import com.hughes.util.raf.RAFSerializer; -import com.hughes.util.raf.SerializableSerializer; -import com.hughes.util.raf.UniformRAFList; -import com.ibm.icu.text.Transliterator; - import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.io.PrintStream; import java.io.RandomAccessFile; -import java.nio.channels.FileChannel; import java.util.AbstractList; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.EnumMap; -import java.util.HashSet; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Pattern; -public final class Index implements RAFSerializable { +import com.hughes.android.dictionary.DictionaryInfo; +import com.hughes.android.dictionary.DictionaryInfo.IndexInfo; +import com.hughes.android.dictionary.engine.RowBase.RowKey; +import com.hughes.util.CachingList; +import com.hughes.util.DataInputBuffer; +import com.hughes.util.StringUtil; +import com.hughes.util.TransformingList; +import com.hughes.util.raf.RAFList; +import com.hughes.util.raf.RAFSerializer; +import com.hughes.util.raf.UniformRAFList; +import com.ibm.icu.text.Transliterator; + +public final class Index { private static final int CACHE_SIZE = 5000; @@ -117,7 +115,7 @@ public final class Index implements RAFSerializable { return new NormalizeComparator(normalizer(), sortLanguage.getCollator(), dict.dictFileVersion); } - public Index(final Dictionary dict, final FileChannel inp, final DataInput raf) throws IOException { + public Index(final Dictionary dict, final DataInputBuffer raf) throws IOException { this.dict = dict; shortName = raf.readUTF(); longName = raf.readUTF(); @@ -129,7 +127,7 @@ public final class Index implements RAFSerializable { mainTokenCount = raf.readInt(); } sortedIndexEntries = CachingList.create( - RAFList.create(inp, new IndexEntrySerializer(dict.dictFileVersion == 6 ? inp : null), inp.position(), + RAFList.create(raf, new IndexEntrySerializer(), dict.dictFileVersion, dict.dictInfo + " idx " + languageCode + ": "), CACHE_SIZE, true); if (dict.dictFileVersion >= 7) { int count = StringUtil.readVarInt(raf); @@ -138,16 +136,22 @@ public final class Index implements RAFSerializable { stoplist.add(raf.readUTF()); } } else if (dict.dictFileVersion >= 4) { - stoplist = new SerializableSerializer>().read(raf); + raf.readInt(); // length + raf.skipBytes(52); + stoplist = new HashSet<>(); + byte b; + while ((b = raf.readByte()) == 0x74) { + stoplist.add(raf.readUTF()); + } + if (b != 0x78) throw new IOException("Invalid data in dictionary stoplist!"); } else { stoplist = Collections.emptySet(); } rows = CachingList.create( - UniformRAFList.create(inp, new RowBase.Serializer(this), inp.position()), + UniformRAFList.create(raf, new RowBase.Serializer(this)), CACHE_SIZE, true); } - @Override public void write(final DataOutput out) throws IOException { RandomAccessFile raf = (RandomAccessFile)out; raf.writeUTF(shortName); @@ -156,7 +160,7 @@ public final class Index implements RAFSerializable { raf.writeUTF(normalizerRules); raf.writeBoolean(swapPairEntries); raf.writeInt(mainTokenCount); - RAFList.write(raf, sortedIndexEntries, new IndexEntrySerializer(null), 32, true); + RAFList.write(raf, sortedIndexEntries, new IndexEntrySerializer(), 32, true); StringUtil.writeVarInt(raf, stoplist.size()); for (String i : stoplist) { raf.writeUTF(i); @@ -171,15 +175,9 @@ public final class Index implements RAFSerializable { } private final class IndexEntrySerializer implements RAFSerializer { - private final FileChannel ch; - - IndexEntrySerializer(FileChannel ch) { - this.ch = ch; - } - @Override public IndexEntry read(DataInput raf) throws IOException { - return new IndexEntry(Index.this, ch, raf); + return new IndexEntry(Index.this, raf); } @Override @@ -188,7 +186,7 @@ public final class Index implements RAFSerializable { } } - public static final class IndexEntry implements RAFSerializable { + public static final class IndexEntry { public final String token; private final String normalizedToken; public final int startRow; @@ -206,7 +204,7 @@ public final class Index implements RAFSerializable { this.htmlEntries = new ArrayList<>(); } - IndexEntry(final Index index, final FileChannel ch, final DataInput raf) throws IOException { + IndexEntry(final Index index, final DataInput raf) throws IOException { token = raf.readUTF(); if (index.dict.dictFileVersion >= 7) { startRow = StringUtil.readVarInt(raf); @@ -231,6 +229,7 @@ public final class Index implements RAFSerializable { public HtmlEntry get(int i) { return index.dict.htmlEntries.get(htmlEntryIndices[i]); } + @Override public int size() { return htmlEntryIndices.length; @@ -239,8 +238,8 @@ public final class Index implements RAFSerializable { } } else if (index.dict.dictFileVersion >= 6) { this.htmlEntries = CachingList.create( - RAFList.create(ch, index.dict.htmlEntryIndexSerializer, - ch.position(), index.dict.dictFileVersion, + RAFList.create((DataInputBuffer)raf, index.dict.htmlEntryIndexSerializer, + index.dict.dictFileVersion, index.dict.dictInfo + " htmlEntries: "), 1, false); } else { this.htmlEntries = Collections.emptyList(); @@ -373,7 +372,7 @@ public final class Index implements RAFSerializable { return result; } - private final int windBackCase(final String token, int result, final AtomicBoolean interrupted) { + private int windBackCase(final String token, int result, final AtomicBoolean interrupted) { while (result > 0 && sortedIndexEntries.get(result - 1).normalizedToken().equals(token)) { --result; if (interrupted.get()) { @@ -391,8 +390,8 @@ public final class Index implements RAFSerializable { private final Map prefixToNumRows = new HashMap<>(); - private synchronized final int getUpperBoundOnRowsStartingWith(final String normalizedPrefix, - final int maxRows, final AtomicBoolean interrupted) { + private synchronized int getUpperBoundOnRowsStartingWith(final String normalizedPrefix, + final int maxRows, final AtomicBoolean interrupted) { final Integer numRows = prefixToNumRows.get(normalizedPrefix); if (numRows != null) { return numRows;