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 +13 -14
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 868fe296fb - Show all commits

25
minode/sql.py
View File

@ -40,14 +40,16 @@ class Inventory():
cur.execute("INSERT INTO status VALUES ('lastvacuumtime', ?)", (now,)) cur.execute("INSERT INTO status VALUES ('lastvacuumtime', ?)", (now,))
self._db.commit() self._db.commit()
def __objects(self, cur): @staticmethod
return ( def __object(cursor, row):
structure.Object( vector, expires, obj_type, version, stream, tag, data, offset = row
return structure.Object(
expires, obj_type, version, stream, data, offset, expires, obj_type, version, stream, data, offset,
tag=tag, vector=vector) tag=tag, vector=vector)
for (vector, expires, obj_type, version, stream, tag, data, offset)
in cur.fetchall() def __objects(self, cur):
) cur.row_factory = self.__object
return cur
def cleanup(self): def cleanup(self):
with shared.objects_lock: with shared.objects_lock:
@ -79,7 +81,7 @@ class Inventory():
' ORDER BY random()', ' ORDER BY random()',
(int(time.time()), stream or shared.stream) (int(time.time()), stream or shared.stream)
) )
return [v for v, in cur.fetchall()] return [v for v, in cur]
def get(self, vector, default=None): def get(self, vector, default=None):
try: try:
@ -89,7 +91,7 @@ class Inventory():
def keys(self): def keys(self):
cur = self._db.execute('SELECT vector FROM objects') cur = self._db.execute('SELECT vector FROM objects')
return (v for v, in cur.fetchall()) return (v for v, in cur)
def values(self): def values(self):
cur = self._db.execute('SELECT * FROM objects') cur = self._db.execute('SELECT * FROM objects')
@ -113,14 +115,11 @@ class Inventory():
def __getitem__(self, vector): def __getitem__(self, vector):
cur = self._db.execute( cur = self._db.execute(
'SELECT * FROM objects WHERE vector = ?', (vector,)) 'SELECT * FROM objects WHERE vector = ?', (vector,))
cur.row_factory = self.__object
item = cur.fetchone() item = cur.fetchone()
if item is None: if item is None:
raise KeyError(vector) raise KeyError(vector)
vector, expires, obj_type, version, stream, tag, data, offset = item return item
return structure.Object(
expires, obj_type, version, stream, data, offset,
tag=tag, vector=vector
)
def __delitem__(self, vector): def __delitem__(self, vector):
with shared.objects_lock: # KeyError with shared.objects_lock: # KeyError