Start using Ver4 dictionary format.

Bug: 11073222

Change-Id: Idd836ee15501e2f8c57c8eebc1fef7f103b01d18
This commit is contained in:
Keisuke Kuroyanagi 2013-11-25 18:51:01 +09:00
parent 24af6ed692
commit 02fd1a78a3

View file

@ -59,7 +59,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
*/ */
protected static final int MAX_WORD_LENGTH = Constants.DICTIONARY_MAX_WORD_LENGTH; protected static final int MAX_WORD_LENGTH = Constants.DICTIONARY_MAX_WORD_LENGTH;
private static final int DICTIONARY_FORMAT_VERSION = 3; private static final int DICTIONARY_FORMAT_VERSION = 4;
private static final String SUPPORTS_DYNAMIC_UPDATE = private static final String SUPPORTS_DYNAMIC_UPDATE =
FormatSpec.FileHeader.ATTRIBUTE_VALUE_TRUE; FormatSpec.FileHeader.ATTRIBUTE_VALUE_TRUE;
@ -237,7 +237,8 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
public void run() { public void run() {
if (mDictionaryWriter == null) { if (mDictionaryWriter == null) {
mBinaryDictionary.close(); mBinaryDictionary.close();
final File file = new File(mContext.getFilesDir(), mFilename); final File file = new File(mContext.getFilesDir(), mFilename + "/"
+ FormatSpec.TRIE_FILE_EXTENSION);
BinaryDictionary.createEmptyDictFile(file.getAbsolutePath(), BinaryDictionary.createEmptyDictFile(file.getAbsolutePath(),
DICTIONARY_FORMAT_VERSION, getHeaderAttributeMap()); DICTIONARY_FORMAT_VERSION, getHeaderAttributeMap());
mBinaryDictionary = new BinaryDictionary( mBinaryDictionary = new BinaryDictionary(
@ -508,7 +509,8 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
+ mFilenameDictionaryUpdateController.mLastUpdateTime); + mFilenameDictionaryUpdateController.mLastUpdateTime);
} }
final File file = new File(mContext.getFilesDir(), mFilename); final File file = new File(mContext.getFilesDir(), mFilename + "/"
+ FormatSpec.TRIE_FILE_EXTENSION);
final String filename = file.getAbsolutePath(); final String filename = file.getAbsolutePath();
final long length = file.length(); final long length = file.length();