mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-17 17:12:13 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

remind sqlite we have indexes

Browse source
This commit is contained in:
ed 2023-03-30 21:45:58 +00:00
parent 949baae539
commit 209b49d771
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
copyparty/up2k.py
View file

@ -1032,7 +1032,7 @@ class Up2k(object):
zh.update(cv.encode("utf-8", "replace")) zh.update(cv.encode("utf-8", "replace"))
zh.update(spack(b"<d", cst.st_mtime)) zh.update(spack(b"<d", cst.st_mtime))
dhash = base64.urlsafe_b64encode(zh.digest()[:12]).decode("ascii") dhash = base64.urlsafe_b64encode(zh.digest()[:12]).decode("ascii")
sql = "select d from dh where d = ? and h = ?" sql = "select d from dh where d=? and +h=?"
try: try:
c = db.c.execute(sql, (rd, dhash)) c = db.c.execute(sql, (rd, dhash))
drd = rd drd = rd
@ -1316,9 +1316,9 @@ class Up2k(object):
w, drd, dfn = zb[:-1].decode("utf-8").split("\x00") w, drd, dfn = zb[:-1].decode("utf-8").split("\x00")
with self.mutex: with self.mutex:
q = "select mt, sz from up where w = ? and rd = ? and fn = ?" q = "select mt, sz from up where rd=? and fn=? and +w=?"
try: try:
mt, sz = cur.execute(q, (w, drd, dfn)).fetchone() mt, sz = cur.execute(q, (drd, dfn, w)).fetchone()
except: except:
# file moved/deleted since spooling # file moved/deleted since spooling
continue continue
@ -2223,7 +2223,7 @@ class Up2k(object):
q = r"select * from up where w = ?" q = r"select * from up where w = ?"
argv = [wark] argv = [wark]
else: else:
q = r"select * from up where substr(w,1,16) = ? and w = ?" q = r"select * from up where substr(w,1,16)=? and +w=?"
argv = [wark[:16], wark] argv = [wark[:16], wark]
c2 = cur.execute(q, tuple(argv)) c2 = cur.execute(q, tuple(argv))
@ -3300,9 +3300,16 @@ class Up2k(object):
""" """
dupes = [] dupes = []
sabs = djoin(sptop, srem) sabs = djoin(sptop, srem)
q = "select rd, fn from up where substr(w,1,16)=? and w=?"
if self.no_expr_idx:
q = r"select rd, fn from up where w = ?"
argv = (wark,)
else:
q = r"select rd, fn from up where substr(w,1,16)=? and +w=?"
argv = (wark[:16], wark)
for ptop, cur in self.cur.items(): for ptop, cur in self.cur.items():
for rd, fn in cur.execute(q, (wark[:16], wark)): for rd, fn in cur.execute(q, argv):
if rd.startswith("//") or fn.startswith("//"): if rd.startswith("//") or fn.startswith("//"):
rd, fn = s3dec(rd, fn) rd, fn = s3dec(rd, fn)