From 7c077fdb31cf2f683c66607777cc0610deb07376 Mon Sep 17 00:00:00 2001
From: sspanak <doftor.livain@gmail.com>
Date: Thu, 2 Jan 2025 12:25:26 +0200
Subject: [PATCH] fixed extremely slow word filtering caused by v42.0

---
 .../github/sspanak/tt9/db/sqlite/Migration.java  | 16 ++++++++++++++++
 .../sspanak/tt9/db/sqlite/SQLiteOpener.java      |  5 +++++
 .../sspanak/tt9/db/words/DictionaryLoader.java   |  6 +++---
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/github/sspanak/tt9/db/sqlite/Migration.java b/app/src/main/java/io/github/sspanak/tt9/db/sqlite/Migration.java
index 8bf85edc..88a94d76 100644
--- a/app/src/main/java/io/github/sspanak/tt9/db/sqlite/Migration.java
+++ b/app/src/main/java/io/github/sspanak/tt9/db/sqlite/Migration.java
@@ -1,5 +1,7 @@
 package io.github.sspanak.tt9.db.sqlite;
 
+import io.github.sspanak.tt9.preferences.settings.SettingsStore;
+
 class Migration {
 	static final Migration[] LIST = {
 		new Migration(
@@ -13,11 +15,25 @@ class Migration {
 		),
 		new Migration(
 			"ALTER TABLE " + Tables.LANGUAGES_META + " ADD COLUMN maxWordsPerSequence INTEGER NOT NULL DEFAULT -1"
+		),
+		new Migration(
+			"UPDATE " + Tables.LANGUAGES_META +
+				" SET maxWordsPerSequence = " + SettingsStore.SUGGESTIONS_POSITIONS_LIMIT +
+				", fileHash = '0'",
+			832
 		)
 	};
 
 	final String query;
+	final int oldVersion;
+
 	private Migration(String query) {
+		this.oldVersion = Integer.MAX_VALUE;
+		this.query = query;
+	}
+
+	private Migration(String query, int oldVersion) {
+		this.oldVersion = oldVersion;
 		this.query = query;
 	}
 }
diff --git a/app/src/main/java/io/github/sspanak/tt9/db/sqlite/SQLiteOpener.java b/app/src/main/java/io/github/sspanak/tt9/db/sqlite/SQLiteOpener.java
index 9abe9885..3e420c71 100644
--- a/app/src/main/java/io/github/sspanak/tt9/db/sqlite/SQLiteOpener.java
+++ b/app/src/main/java/io/github/sspanak/tt9/db/sqlite/SQLiteOpener.java
@@ -57,6 +57,11 @@ public class SQLiteOpener extends SQLiteOpenHelper {
 	public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
 		onCreate(db);
 		for (Migration migration : Migration.LIST) {
+			if (oldVersion > migration.oldVersion) {
+				Logger.d(LOG_TAG, "Skipping migration: '" + migration.query + "'. Required previous version: " + migration.oldVersion + " but we are at: " + oldVersion);
+				continue;
+			}
+
 			try {
 				db.execSQL(migration.query);
 				Logger.d(LOG_TAG, "Migration succeeded: '" + migration.query);
diff --git a/app/src/main/java/io/github/sspanak/tt9/db/words/DictionaryLoader.java b/app/src/main/java/io/github/sspanak/tt9/db/words/DictionaryLoader.java
index 2a20bf8c..ca82f15e 100644
--- a/app/src/main/java/io/github/sspanak/tt9/db/words/DictionaryLoader.java
+++ b/app/src/main/java/io/github/sspanak/tt9/db/words/DictionaryLoader.java
@@ -263,7 +263,7 @@ public class DictionaryLoader {
 		WordBatch batch = new WordBatch(language, SettingsStore.DICTIONARY_IMPORT_BATCH_SIZE + 1);
 		float progressRatio = (maxProgress - minProgress) / wordFile.getWords();
 		int wordCount = 0;
-		int maxWordCount = 0;
+		int maxWordsPerSequence = 0;
 
 		try (BufferedReader ignored = wordFile.getReader()) {
 			while (wordFile.notEOF()) {
@@ -277,7 +277,7 @@ public class DictionaryLoader {
 					ArrayList<String> words = wordFile.getNextWords(digitSequence);
 					batch.add(words, digitSequence, wordCount + positionShift);
 					wordCount += words.size();
-					maxWordCount = Math.max(maxWordCount, wordCount);
+					maxWordsPerSequence = Math.max(maxWordsPerSequence, words.size());
 
 					if (batch.getWords().size() > SettingsStore.DICTIONARY_IMPORT_BATCH_SIZE) {
 						saveWordBatch(batch);
@@ -292,7 +292,7 @@ public class DictionaryLoader {
 		}
 
 		saveWordBatch(batch);
-		InsertOps.replaceLanguageMeta(sqlite.getDb(), language.getId(), wordFile.getHash(), maxWordCount);
+		InsertOps.replaceLanguageMeta(sqlite.getDb(), language.getId(), wordFile.getHash(), maxWordsPerSequence);
 	}