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

WIP: Implementing sqlite objects storage #13

Draft
lee.miller wants to merge 11 commits from lee.miller/MiNode:sqlite into v0.3
pull from: lee.miller/MiNode:sqlite
merge into: Bitmessage:v0.3
Conversation 0 Commits 11 Files Changed 10 +5 -4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0059b77b58 - Show all commits

1
minode/shared.py
View File

@ -63,4 +63,3 @@ outgoing_connections = 8
connection_limit = 250 connection_limit = 250
objects = {} objects = {}
objects_lock = threading.Lock()

8
minode/sql.py
View File

@ -2,6 +2,7 @@
import os import os
import sqlite3 import sqlite3
import threading
import time import time
from . import shared, structure from . import shared, structure
@ -12,6 +13,7 @@ sqlite3.threadsafety = 3
class Inventory(): class Inventory():
"""sqlite inventory""" """sqlite inventory"""
def __init__(self): def __init__(self):
self._lock = threading.Lock()
self._db = sqlite3.connect( self._db = sqlite3.connect(
os.path.join(shared.data_directory, 'objects.dat'), os.path.join(shared.data_directory, 'objects.dat'),
check_same_thread=False check_same_thread=False
@ -52,7 +54,7 @@ class Inventory():
def cleanup(self): def cleanup(self):
"""Remove expired objects""" """Remove expired objects"""
with shared.objects_lock: with self._lock:
self._db.execute( self._db.execute(
'DELETE FROM objects WHERE expires < ?', 'DELETE FROM objects WHERE expires < ?',
(int(time.time()) - 3 * 3600,) (int(time.time()) - 3 * 3600,)
@ -121,13 +123,13 @@ class Inventory():
return item return item
def __delitem__(self, vector): def __delitem__(self, vector):
with shared.objects_lock: # KeyError with self._lock: # KeyError
self._db.execute('DELETE FROM objects WHERE vector = ?', (vector,)) self._db.execute('DELETE FROM objects WHERE vector = ?', (vector,))
self._db.commit() self._db.commit()
self.rowid = len(self) self.rowid = len(self)
def __setitem__(self, vector, obj): def __setitem__(self, vector, obj):
with shared.objects_lock: with self._lock:
cur = self._db.execute( cur = self._db.execute(
'INSERT INTO objects VALUES (?,?,?,?,?,?,?,?)', ( 'INSERT INTO objects VALUES (?,?,?,?,?,?,?,?)', (
vector, obj.expires_time, obj.object_type, obj.version, vector, obj.expires_time, obj.object_type, obj.version,