From 4edbe7652c9535c53819cb27cebdc494bf9722a2 Mon Sep 17 00:00:00 2001 From: Ben Gotow Date: Thu, 28 Jan 2016 10:03:21 -0800 Subject: [PATCH] Remove indexes which used accountId as the first param... not faster --- src/flux/models/message.coffee | 3 +-- src/flux/models/thread.coffee | 2 +- src/flux/stores/message-store.coffee | 2 +- src/mailbox-perspective.coffee | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/flux/models/message.coffee b/src/flux/models/message.coffee index c60560e35..8d4819d8c 100644 --- a/src/flux/models/message.coffee +++ b/src/flux/models/message.coffee @@ -158,8 +158,7 @@ class Message extends Model @additionalSQLiteConfig: setup: -> - ['CREATE INDEX IF NOT EXISTS MessageListIndex ON Message(account_id, thread_id, date ASC)', - 'CREATE INDEX IF NOT EXISTS MessageListThreadIndex ON Message(thread_id, date ASC)', + ['CREATE INDEX IF NOT EXISTS MessageListThreadIndex ON Message(thread_id, date ASC)', 'CREATE INDEX IF NOT EXISTS MessageListDraftIndex ON Message(account_id, draft)', 'CREATE UNIQUE INDEX IF NOT EXISTS MessageDraftIndex ON Message(client_id)', 'CREATE UNIQUE INDEX IF NOT EXISTS MessageBodyIndex ON MessageBody(id)'] diff --git a/src/flux/models/thread.coffee b/src/flux/models/thread.coffee index 10c9e7c4b..b6354108a 100644 --- a/src/flux/models/thread.coffee +++ b/src/flux/models/thread.coffee @@ -100,7 +100,7 @@ class Thread extends Model @additionalSQLiteConfig: setup: -> - ['CREATE INDEX IF NOT EXISTS ThreadListIndex ON Thread(account_id, last_message_received_timestamp DESC, id)'] + ['CREATE INDEX IF NOT EXISTS ThreadListIndex ON Thread(last_message_received_timestamp DESC, id)'] fromJSON: (json) -> super(json) diff --git a/src/flux/stores/message-store.coffee b/src/flux/stores/message-store.coffee index 6199426f4..7031025be 100644 --- a/src/flux/stores/message-store.coffee +++ b/src/flux/stores/message-store.coffee @@ -211,7 +211,7 @@ class MessageStore extends NylasStore loadedThreadId = @_thread.id query = DatabaseStore.findAll(Message) - query.where(threadId: loadedThreadId, accountId: @_thread.accountId) + query.where(threadId: loadedThreadId) query.include(Message.attributes.body) query.then (items) => # Check to make sure that our thread is still the thread we were diff --git a/src/mailbox-perspective.coffee b/src/mailbox-perspective.coffee index add7693ab..34b4a9c3b 100644 --- a/src/mailbox-perspective.coffee +++ b/src/mailbox-perspective.coffee @@ -198,8 +198,7 @@ class CategoryMailboxPerspective extends MailboxPerspective super(other) and _.isEqual(@categories(), other.categories()) threads: => - query = DatabaseStore - .findAll(Thread) + query = DatabaseStore.findAll(Thread) .where([Thread.attributes.categories.containsAny(_.pluck(@categories(), 'id'))]) .limit(0)