Merge "Prepare dictionary saving in native code." (ac7e005e) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/BinaryDictionary.java

+24 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.inputmethod.latin;
		import android.text.TextUtils;
		import android.util.SparseArray;

		import com.android.inputmethod.annotations.UsedForTesting;
		import com.android.inputmethod.keyboard.ProximityInfo;
		import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
		import com.android.inputmethod.latin.settings.NativeSuggestOptions;
		@@ -47,6 +48,7 @@ public final class BinaryDictionary extends Dictionary {
		private long mNativeDict;
		private final Locale mLocale;
		private final long mDictSize;
		private final String mDictFilePath;
		private final int[] mInputCodePoints = new int[MAX_WORD_LENGTH];
		private final int[] mOutputCodePoints = new int[MAX_WORD_LENGTH * MAX_RESULTS];
		private final int[] mSpaceIndices = new int[MAX_RESULTS];
		@@ -91,6 +93,7 @@ public final class BinaryDictionary extends Dictionary {
		super(dictType);
		mLocale = locale;
		mDictSize = length;
		mDictFilePath = filename;
		mNativeSuggestOptions.setUseFullEditDistance(useFullEditDistance);
		loadDictionary(filename, offset, length, isUpdatable);
		}
		@@ -101,6 +104,9 @@ public final class BinaryDictionary extends Dictionary {

		private static native long openNative(String sourceDir, long dictOffset, long dictSize,
		boolean isUpdatable);
		private static native void flushNative(long dict, String filePath);
		private static native boolean needsToRunGCNative(long dict);
		private static native void flushWithGCNative(long dict, String filePath);
		private static native void closeNative(long dict);
		private static native int getProbabilityNative(long dict, int[] word);
		private static native boolean isValidBigramNative(long dict, int[] word0, int[] word1);
		@@ -261,6 +267,24 @@ public final class BinaryDictionary extends Dictionary {
		removeBigramWordsNative(mNativeDict, codePoints0, codePoints1);
		}

		@UsedForTesting
		public void flush() {
		if (!isValidDictionary()) return;
		flushNative(mNativeDict, mDictFilePath);
		}

		@UsedForTesting
		public void flushWithGC() {
		if (!isValidDictionary()) return;
		flushWithGCNative(mNativeDict, mDictFilePath);
		}

		@UsedForTesting
		public boolean needsToRunGC() {
		if (!isValidDictionary()) return false;
		return needsToRunGCNative(mNativeDict);
		}

		@Override
		public boolean shouldAutoCommit(final SuggestedWordInfo candidate) {
		// TODO: actually use the confidence rather than use this completely broken heuristic

native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp

+45 −2

Original line number	Diff line number	Diff line
		@@ -46,8 +46,7 @@ static jlong latinime_BinaryDictionary_open(JNIEnv *env, jclass clazz, jstring s
		sourceDirChars[sourceDirUtf8Length] = '\0';
		DictionaryStructureWithBufferPolicy *const dictionaryStructureWithBufferPolicy =
		DictionaryStructureWithBufferPolicyFactory::newDictionaryStructureWithBufferPolicy(
		sourceDirChars, static_cast<int>(sourceDirUtf8Length),
		static_cast<int>(dictOffset), static_cast<int>(dictSize),
		sourceDirChars, static_cast<int>(dictOffset), static_cast<int>(dictSize),
		isUpdatable == JNI_TRUE);
		if (!dictionaryStructureWithBufferPolicy) {
		return 0;
		@@ -59,6 +58,35 @@ static jlong latinime_BinaryDictionary_open(JNIEnv *env, jclass clazz, jstring s
		return reinterpret_cast<jlong>(dictionary);
		}

		static void latinime_BinaryDictionary_flush(JNIEnv *env, jclass clazz, jlong dict,
		jstring filePath) {
		Dictionary dictionary = reinterpret_cast<Dictionary >(dict);
		if (!dictionary) return;
		const jsize filePathUtf8Length = env->GetStringUTFLength(filePath);
		char filePathChars[filePathUtf8Length + 1];
		env->GetStringUTFRegion(filePath, 0, env->GetStringLength(filePath), filePathChars);
		filePathChars[filePathUtf8Length] = '\0';
		dictionary->flush(filePathChars);
		}

		static bool latinime_BinaryDictionary_needsToRunGC(JNIEnv *env, jclass clazz,
		jlong dict) {
		Dictionary dictionary = reinterpret_cast<Dictionary >(dict);
		if (!dictionary) return false;
		return dictionary->needsToRunGC();
		}

		static void latinime_BinaryDictionary_flushWithGC(JNIEnv *env, jclass clazz, jlong dict,
		jstring filePath) {
		Dictionary dictionary = reinterpret_cast<Dictionary >(dict);
		if (!dictionary) return;
		const jsize filePathUtf8Length = env->GetStringUTFLength(filePath);
		char filePathChars[filePathUtf8Length + 1];
		env->GetStringUTFRegion(filePath, 0, env->GetStringLength(filePath), filePathChars);
		filePathChars[filePathUtf8Length] = '\0';
		dictionary->flushWithGC(filePathChars);
		}

		static void latinime_BinaryDictionary_close(JNIEnv *env, jclass clazz, jlong dict) {
		Dictionary dictionary = reinterpret_cast<Dictionary >(dict);
		if (!dictionary) return;
		@@ -252,6 +280,21 @@ static const JNINativeMethod sMethods[] = {
		const_cast<char *>("(J)V"),
		reinterpret_cast<void *>(latinime_BinaryDictionary_close)
		},
		{
		const_cast<char *>("flushNative"),
		const_cast<char *>("(JLjava/lang/String;)V"),
		reinterpret_cast<void *>(latinime_BinaryDictionary_flush)
		},
		{
		const_cast<char *>("needsToRunGCNative"),
		const_cast<char *>("(J)Z"),
		reinterpret_cast<void *>(latinime_BinaryDictionary_needsToRunGC)
		},
		{
		const_cast<char *>("flushWithGCNative"),
		const_cast<char *>("(JLjava/lang/String;)V"),
		reinterpret_cast<void *>(latinime_BinaryDictionary_flushWithGC)
		},
		{
		const_cast<char *>("getSuggestionsNative"),
		const_cast<char *>("(JJJ[I[I[I[I[III[I[I[I[I[I[I[I)I"),

native/jni/src/suggest/core/dictionary/dictionary.cpp

+12 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,18 @@ void Dictionary::removeBigramWords(const int *const word0, const int length0,
		mDictionaryStructureWithBufferPolicy->removeBigramWords(word0, length0, word1, length1);
		}

		void Dictionary::flush(const char *const filePath) {
		mDictionaryStructureWithBufferPolicy->flush(filePath);
		}

		void Dictionary::flushWithGC(const char *const filePath) {
		mDictionaryStructureWithBufferPolicy->flushWithGC(filePath);
		}

		bool Dictionary::needsToRunGC() {
		return mDictionaryStructureWithBufferPolicy->needsToRunGC();
		}

		void Dictionary::logDictionaryInfo(JNIEnv *const env) const {
		const int BUFFER_SIZE = 16;
		int dictionaryIdCodePointBuffer[BUFFER_SIZE];

native/jni/src/suggest/core/dictionary/dictionary.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,12 @@ class Dictionary {
		void removeBigramWords(const int const word0, const int length0, const int const word1,
		const int length1);

		void flush(const char *const filePath);

		void flushWithGC(const char *const filePath);

		bool needsToRunGC();

		const DictionaryStructureWithBufferPolicy *getDictionaryStructurePolicy() const {
		return mDictionaryStructureWithBufferPolicy;
		}

native/jni/src/suggest/core/policy/dictionary_structure_with_buffer_policy.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,12 @@ class DictionaryStructureWithBufferPolicy {
		virtual bool removeBigramWords(const int *const word0, const int length0,
		const int *const word1, const int length1) = 0;

		virtual void flush(const char *const filePath) = 0;

		virtual void flushWithGC(const char *const filePath) = 0;

		virtual bool needsToRunGC() const = 0;

		protected:
		DictionaryStructureWithBufferPolicy() {}