Bitmessage/MiNode
3
0
Fork 1
Code Pull Requests 8 Actions Activity

WIP: Implementing sqlite objects storage #13

Draft
lee.miller wants to merge 12 commits from lee.miller/MiNode:sqlite into v0.3
pull from: lee.miller/MiNode:sqlite
merge into: Bitmessage:v0.3
Conversation 0 Commits 12 Files Changed 9 +5 -7
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6a8d2ddee4 - Show all commits

12
minode/sql.py
View File

@ -39,18 +39,17 @@ class Inventory():
cur.execute('VACUUM')
cur.execute("INSERT INTO status VALUES ('lastvacuumtime', ?)", (now,))
self._db.commit()
self._db.row_factory = self.__object
@staticmethod
def __object(cursor, row):
if len(cursor.description) != 8:
return row
vector, expires, obj_type, version, stream, tag, data, offset = row
return structure.Object(
expires, obj_type, version, stream, data, offset,
tag=tag, vector=vector)
def __objects(self, cur):
cur.row_factory = self.__object
return cur
def cleanup(self):
with shared.objects_lock:
self._db.execute(
@ -73,7 +72,7 @@ class Inventory():
cur = self._db.execute(
'SELECT * FROM objects WHERE ' + ' AND '.join(clauses), params)
return self.__objects(cur)
return cur
def vectors_to_send(self, stream=None):
cur = self._db.execute(
@ -94,8 +93,7 @@ class Inventory():
return (v for v, in cur)
def values(self):
cur = self._db.execute('SELECT * FROM objects')
return self.__objects(cur)
return self._db.execute('SELECT * FROM objects')
def popitem(self):
if not self.rowid: