empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Make ThreadDatabase ID's autoincrement.

Browse source
This commit is contained in:
Greyson Parrelli 2021-07-14 00:48:06 -04:00
parent 5d6d78a51e
commit b9657208fe
2 changed files with 82 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
View file

@ -89,9 +89,9 @@ public class ThreadDatabase extends Database {
public static final String ID = "_id"; public static final String ID = "_id";
public static final String DATE = "date"; public static final String DATE = "date";
public static final String MESSAGE_COUNT = "message_count"; public static final String MESSAGE_COUNT = "message_count";
public static final String RECIPIENT_ID = "recipient_ids"; public static final String RECIPIENT_ID = "thread_recipient_id";
public static final String SNIPPET = "snippet"; public static final String SNIPPET = "snippet";
private static final String SNIPPET_CHARSET = "snippet_cs"; private static final String SNIPPET_CHARSET = "snippet_charset";
public static final String READ = "read"; public static final String READ = "read";
public static final String UNREAD_COUNT = "unread_count"; public static final String UNREAD_COUNT = "unread_count";
public static final String TYPE = "type"; public static final String TYPE = "type";
@ -110,7 +110,7 @@ public class ThreadDatabase extends Database {
private static final String LAST_SCROLLED = "last_scrolled"; private static final String LAST_SCROLLED = "last_scrolled";
static final String PINNED = "pinned"; static final String PINNED = "pinned";
public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" + ID + " INTEGER PRIMARY KEY, " + public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" + ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
DATE + " INTEGER DEFAULT 0, " + DATE + " INTEGER DEFAULT 0, " +
MESSAGE_COUNT + " INTEGER DEFAULT 0, " + MESSAGE_COUNT + " INTEGER DEFAULT 0, " +
RECIPIENT_ID + " INTEGER, " + RECIPIENT_ID + " INTEGER, " +
@ -135,7 +135,7 @@ public class ThreadDatabase extends Database {
PINNED + " INTEGER DEFAULT 0);"; PINNED + " INTEGER DEFAULT 0);";
public static final String[] CREATE_INDEXS = { public static final String[] CREATE_INDEXS = {
"CREATE INDEX IF NOT EXISTS thread_recipient_ids_index ON " + TABLE_NAME + " (" + RECIPIENT_ID + ");", "CREATE INDEX IF NOT EXISTS thread_recipient_id_index ON " + TABLE_NAME + " (" + RECIPIENT_ID + ");",
"CREATE INDEX IF NOT EXISTS archived_count_index ON " + TABLE_NAME + " (" + ARCHIVED + ", " + MESSAGE_COUNT + ");", "CREATE INDEX IF NOT EXISTS archived_count_index ON " + TABLE_NAME + " (" + ARCHIVED + ", " + MESSAGE_COUNT + ");",
"CREATE INDEX IF NOT EXISTS thread_pinned_index ON " + TABLE_NAME + " (" + PINNED + ");", "CREATE INDEX IF NOT EXISTS thread_pinned_index ON " + TABLE_NAME + " (" + PINNED + ");",
}; };

80
app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
View file

@ -75,6 +75,7 @@ import org.thoughtcrime.securesms.util.FileUtils;
import org.thoughtcrime.securesms.util.Hex; import org.thoughtcrime.securesms.util.Hex;
import org.thoughtcrime.securesms.util.ServiceUtil; import org.thoughtcrime.securesms.util.ServiceUtil;
import org.thoughtcrime.securesms.util.SqlUtil; import org.thoughtcrime.securesms.util.SqlUtil;
import org.thoughtcrime.securesms.util.Stopwatch;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Triple; import org.thoughtcrime.securesms.util.Triple;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
@ -203,8 +204,9 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper implements SignalDatab
private static final int MESSAGE_LOG = 105; private static final int MESSAGE_LOG = 105;
private static final int MESSAGE_LOG_2 = 106; private static final int MESSAGE_LOG_2 = 106;
private static final int ABANDONED_MESSAGE_CLEANUP = 107; private static final int ABANDONED_MESSAGE_CLEANUP = 107;
private static final int THREAD_AUTOINCREMENT = 108;
private static final int DATABASE_VERSION = 107; private static final int DATABASE_VERSION = 108;
private static final String DATABASE_NAME = "signal.db"; private static final String DATABASE_NAME = "signal.db";
private final Context context; private final Context context;
@ -1637,9 +1639,83 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper implements SignalDatab
} }
if (oldVersion < ABANDONED_MESSAGE_CLEANUP) { if (oldVersion < ABANDONED_MESSAGE_CLEANUP) {
long start = System.currentTimeMillis();
int smsDeleteCount = db.delete("sms", "thread_id NOT IN (SELECT _id FROM thread)", null); int smsDeleteCount = db.delete("sms", "thread_id NOT IN (SELECT _id FROM thread)", null);
int mmsDeleteCount = db.delete("mms", "thread_id NOT IN (SELECT _id FROM thread)", null); int mmsDeleteCount = db.delete("mms", "thread_id NOT IN (SELECT _id FROM thread)", null);
Log.i(TAG, "Deleted " + smsDeleteCount + " sms and " + mmsDeleteCount + " mms"); Log.i(TAG, "Deleted " + smsDeleteCount + " sms and " + mmsDeleteCount + " mms in " + (System.currentTimeMillis() - start) + " ms");
}
if (oldVersion < THREAD_AUTOINCREMENT) {
Stopwatch stopwatch = new Stopwatch("thread-autoincrement");
db.execSQL("CREATE TABLE thread_tmp (_id INTEGER PRIMARY KEY AUTOINCREMENT, " +
"date INTEGER DEFAULT 0, " +
"thread_recipient_id INTEGER, " +
"message_count INTEGER DEFAULT 0, " +
"snippet TEXT, " +
"snippet_charset INTEGER DEFAULT 0, " +
"snippet_type INTEGER DEFAULT 0, " +
"snippet_uri TEXT DEFAULT NULL, " +
"snippet_content_type INTEGER DEFAULT NULL, " +
"snippet_extras TEXT DEFAULT NULL, " +
"read INTEGER DEFAULT 1, " +
"type INTEGER DEFAULT 0, " +
"error INTEGER DEFAULT 0, " +
"archived INTEGER DEFAULT 0, " +
"status INTEGER DEFAULT 0, " +
"expires_in INTEGER DEFAULT 0, " +
"last_seen INTEGER DEFAULT 0, " +
"has_sent INTEGER DEFAULT 0, " +
"delivery_receipt_count INTEGER DEFAULT 0, " +
"read_receipt_count INTEGER DEFAULT 0, " +
"unread_count INTEGER DEFAULT 0, " +
"last_scrolled INTEGER DEFAULT 0, " +
"pinned INTEGER DEFAULT 0)");
stopwatch.split("table-create");
db.execSQL("INSERT INTO thread_tmp SELECT _id, " +
"date, " +
"recipient_ids, " +
"message_count, " +
"snippet, " +
"snippet_cs, " +
"snippet_type, " +
"snippet_uri, " +
"snippet_content_type, " +
"snippet_extras, " +
"read, " +
"type, " +
"error, " +
"archived, " +
"status, " +
"expires_in, " +
"last_seen, " +
"has_sent, " +
"delivery_receipt_count, " +
"read_receipt_count, " +
"unread_count, " +
"last_scrolled, " +
"pinned " +
"FROM thread");
stopwatch.split("table-copy");
db.execSQL("DROP TABLE thread");
db.execSQL("ALTER TABLE thread_tmp RENAME TO thread");
stopwatch.split("table-rename");
db.execSQL("CREATE INDEX thread_recipient_id_index ON thread (thread_recipient_id)");
db.execSQL("CREATE INDEX archived_count_index ON thread (archived, message_count)");
db.execSQL("CREATE INDEX thread_pinned_index ON thread (pinned)");
stopwatch.split("indexes");
db.execSQL("DELETE FROM remapped_threads");
stopwatch.split("delete-remap");
stopwatch.stop(TAG);
} }
db.setTransactionSuccessful(); db.setTransactionSuccessful();