GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 22:42:25 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

new indices, make sure to set type when reviewing early

Browse source 
- new type, combinedDue for failed cards & count checks
- only reset() on deck load if not already done
- remove isDue from dynamic indices but leave old ones around for now
This commit is contained in:
Damien Elmes 2010-10-26 20:10:05 +09:00
parent ea3bf14019
commit c50b7e61cb
1 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
anki/deck.py
View file

@ -56,7 +56,7 @@ SEARCH_TAG = 0
SEARCH_TYPE = 1 SEARCH_TYPE = 1
SEARCH_PHRASE = 2 SEARCH_PHRASE = 2
SEARCH_FID = 3 SEARCH_FID = 3
DECK_VERSION = 44 DECK_VERSION = 47
deckVarsTable = Table( deckVarsTable = Table(
'deckVars', metadata, 'deckVars', metadata,
@ -752,6 +752,7 @@ where id != :id and factId = :factId""",
if oldSuc and lastDelay < 0: if oldSuc and lastDelay < 0:
if lastDelaySecs > self.delay0: if lastDelaySecs > self.delay0:
card.priority = -1 card.priority = -1
card.type += 3
# card stats # card stats
anki.cards.Card.updateStats(card, ease, oldState) anki.cards.Card.updateStats(card, ease, oldState)
card.toDB(self.s) card.toDB(self.s)
@ -2867,15 +2868,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, isDue, priority desc, interval desc)', '(type, priority desc, interval desc)',
'intervalAsc': 'intervalAsc':
'(type, isDue, priority desc, interval)', '(type, priority desc, interval)',
'randomOrder': 'randomOrder':
'(type, isDue, priority desc, factId, ordinal)', '(type, priority desc, factId, ordinal)',
'dueAsc': 'dueAsc':
'(type, isDue, priority desc, due)', '(type, priority desc, combinedDue)',
'dueDesc': 'dueDesc':
'(type, isDue, priority desc, due desc)', '(type, priority desc, combinedDue desc)',
} }
# determine required # determine required
required = [] required = []
@ -2895,10 +2896,12 @@ seq > :s and seq <= :e order by seq desc""", s=start, e=end)
for (k, v) in indices.items(): for (k, v) in indices.items():
if k in required: if k in required:
self.s.statement( self.s.statement(
"create index if not exists ix_cards_%s on cards %s" % "create index if not exists ix_cards_%s2 on cards %s" %
(k, v)) (k, v))
else: else:
self.s.statement("drop index if exists ix_cards_%s" % k) # leave old indices for older clients
#self.s.statement("drop index if exists ix_cards_%s" % k)
self.s.statement("drop index if exists ix_cards_%s2" % k)
# Shared decks # Shared decks
########################################################################## ##########################################################################
@ -3056,7 +3059,7 @@ update cards set type = type + 3 where type < 3 and priority <= 0""")
deck.hardIntervalMax = max(1.1, deck.hardIntervalMax) deck.hardIntervalMax = max(1.1, deck.hardIntervalMax)
# unsuspend reviewed early & buried # unsuspend reviewed early & buried
ids = deck.s.column0( ids = deck.s.column0(
"select id from cards where type in (3,4,5) and priority in (-1, -2)") "select id from cards where type > 2 and priority in (-1,-2)")
if ids: if ids:
deck.updatePriorities(ids) deck.updatePriorities(ids)
deck.s.commit() deck.s.commit()
@ -3065,7 +3068,8 @@ update cards set type = type + 3 where type < 3 and priority <= 0""")
"select avg(factor) from cards where type = 1") "select avg(factor) from cards where type = 1")
or Deck.initialFactor) or Deck.initialFactor)
deck.averageFactor = max(deck.averageFactor, Deck.minimumAverage) deck.averageFactor = max(deck.averageFactor, Deck.minimumAverage)
# set due cutoff and rebuild queue # rebuild queue if not rebuild already
if not ids:
deck.reset() deck.reset()
return deck return deck
Deck = staticmethod(Deck) Deck = staticmethod(Deck)
@ -3104,6 +3108,10 @@ update cards set type = type + 3 where type < 3 and priority <= 0""")
def _addIndices(deck): def _addIndices(deck):
"Add indices to the DB." "Add indices to the DB."
# counts, failed cards
deck.s.statement("""
create index if not exists ix_cards_typeCombined on cards
(type, combinedDue)""")
# failed cards, review early # failed cards, review early
deck.s.statement(""" deck.s.statement("""
create index if not exists ix_cards_duePriority on cards create index if not exists ix_cards_duePriority on cards
@ -3588,6 +3596,14 @@ nextFactor, reps, thinkingTime, yesCount, noCount from reviewHistory""")
deck.hardIntervalMax = 1.1 deck.hardIntervalMax = 1.1
deck.version = 44 deck.version = 44
deck.s.commit() deck.s.commit()
if deck.version < 47:
# add an index for (type, combinedDue)
DeckStorage._addIndices(deck)
# add new indices that exclude isDue - we'll clean up the old ones later
deck.updateDynamicIndices()
deck.s.execute("analyze")
deck.version = 47
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: