From fcbaf23762c21dc95f0ef4a65b3de23204a2bd92 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Mon, 15 Jan 2018 17:01:21 +0100 Subject: [PATCH] better index for Keys table --- .../keychain/provider/KeychainDatabase.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java index 40955479c..f3b140fe1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java @@ -231,7 +231,7 @@ public class KeychainDatabase extends SQLiteOpenHelper { db.execSQL(CREATE_OVERRIDDEN_WARNINGS); db.execSQL(CREATE_API_AUTOCRYPT_PEERS); - db.execSQL("CREATE INDEX keys_by_rank ON keys (" + KeysColumns.RANK + ");"); + db.execSQL("CREATE INDEX keys_by_rank ON keys (" + KeysColumns.RANK + ", " + KeysColumns.MASTER_KEY_ID + ");"); db.execSQL("CREATE INDEX uids_by_rank ON user_packets (" + UserPacketsColumns.RANK + ", " + UserPacketsColumns.USER_ID + ", " + UserPacketsColumns.MASTER_KEY_ID + ");"); db.execSQL("CREATE INDEX verified_certs ON certs (" @@ -415,6 +415,8 @@ public class KeychainDatabase extends SQLiteOpenHelper { db.execSQL("DROP TABLE api_autocrypt_peers"); db.execSQL(CREATE_API_AUTOCRYPT_PEERS); db.execSQL("CREATE INDEX uids_by_email ON user_packets (email);"); + db.execSQL("DROP INDEX keys_by_rank"); + db.execSQL("CREATE INDEX keys_by_rank ON keys(rank, master_key_id);"); } }