GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

sort new cards by due not combinedDue; index optimizations

Browse source 
- ensure queue filling selects can be satisfied by index alone
- sort by due instead of combinedDue so we can decouple card order from
  new spacing
This commit is contained in:
Damien Elmes 2010-12-13 02:21:08 +09:00
parent 5de6bb57ed
commit d14761b428
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
anki/deck.py
View file

@ -72,7 +72,7 @@ SEARCH_FIELD = 6
SEARCH_FIELD_EXISTS = 7 SEARCH_FIELD_EXISTS = 7
SEARCH_QA = 8 SEARCH_QA = 8
SEARCH_PHRASE_WB = 9 SEARCH_PHRASE_WB = 9
DECK_VERSION = 61 DECK_VERSION = 62
deckVarsTable = Table( deckVarsTable = Table(
'deckVars', metadata, 'deckVars', metadata,
@ -385,9 +385,9 @@ New type: %s""" % (self.failedSoonCount, self.revCount, self.newCountToday,
"priority desc, factId, ordinal")[self.revCardOrder] "priority desc, factId, ordinal")[self.revCardOrder]
def newOrder(self): def newOrder(self):
return ("priority desc, combinedDue", return ("priority desc, due",
"priority desc, combinedDue", "priority desc, due",
"priority desc, combinedDue desc")[self.newCardOrder] "priority desc, due desc")[self.newCardOrder]
def rebuildTypes(self): def rebuildTypes(self):
"Rebuild the type cache. Only necessary on upgrade." "Rebuild the type cache. Only necessary on upgrade."
@ -3537,15 +3537,15 @@ seq > :s and seq <= :e order by seq desc""", s=start, e=end)
def updateDynamicIndices(self): def updateDynamicIndices(self):
indices = { indices = {
'intervalDesc': 'intervalDesc':
'(type, priority desc, interval desc)', '(type, priority desc, interval desc, factId, combinedDue)',
'intervalAsc': 'intervalAsc':
'(type, priority desc, interval)', '(type, priority desc, interval, factId, combinedDue)',
'randomOrder': 'randomOrder':
'(type, priority desc, factId, ordinal)', '(type, priority desc, factId, ordinal, combinedDue)',
'dueAsc': 'dueAsc':
'(type, priority desc, combinedDue)', '(type, priority desc, due, factId, combinedDue)',
'dueDesc': 'dueDesc':
'(type, priority desc, combinedDue desc)', '(type, priority desc, due desc, factId, combinedDue)',
} }
# determine required # determine required
required = [] required = []
@ -3800,7 +3800,7 @@ update cards set type = type - 3 where type between 0 and 2 and priority = -3"""
# counts, failed cards # counts, failed cards
deck.s.statement(""" deck.s.statement("""
create index if not exists ix_cards_typeCombined on cards create index if not exists ix_cards_typeCombined on cards
(type, combinedDue)""") (type, combinedDue, factId)""")
# scheduler-agnostic type # scheduler-agnostic type
deck.s.statement(""" deck.s.statement("""
create index if not exists ix_cards_relativeDelay on cards create index if not exists ix_cards_relativeDelay on cards
@ -4382,6 +4382,17 @@ where relativeDelay = 2""")
rebuildMediaDir(deck, dirty=False) rebuildMediaDir(deck, dirty=False)
deck.version = 61 deck.version = 61
deck.s.commit() deck.s.commit()
if deck.version < 62:
# updated indices
for d in ("intervalDesc", "intervalAsc", "randomOrder",
"dueAsc", "dueDesc"):
deck.s.statement("drop index if exists ix_cards_%s2" % d)
deck.s.statement("drop index if exists ix_cards_typeCombined")
DeckStorage._addIndices(deck)
deck.updateDynamicIndices()
deck.s.execute("vacuum")
deck.version = 62
deck.s.commit()
# executing a pragma here is very slow on large decks, so we store # executing a pragma here is very slow on large decks, so we store
# our own record # our own record
if not deck.getInt("pageSize") == 4096: if not deck.getInt("pageSize") == 4096: