RanchiMall/pyflo
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

connector

Browse Source
This commit is contained in:
4tochka 2019-05-13 19:56:05 +04:00
parent 845f8987dd
commit 4298217acb
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pybtc/connector/connector.py
View File

@ -377,6 +377,9 @@ class Connector:
if len(self.utxo.cached) > self.utxo.size_limit and \ if len(self.utxo.cached) > self.utxo.size_limit and \
not self.utxo.save_process and \ not self.utxo.save_process and \
self.utxo.checkpoints: self.utxo.checkpoints:
self.utxo.deleted_last_block = block["height"]
self.utxo.pending_deleted += self.utxo.deleted
self.utxo.deleted = set()
self.loop.create_task(self.utxo.save_utxo()) self.loop.create_task(self.utxo.save_utxo())

21
pybtc/connector/utxo.py
View File

@ -7,7 +7,8 @@ class UTXO():
def __init__(self, db_pool, loop, log, cache_size): def __init__(self, db_pool, loop, log, cache_size):
self.cached = LRU() self.cached = LRU()
self.missed = set() self.missed = set()
self.deleted = LRU() self.deleted = set()
self.pending_deleted = set()
self.checkpoints = list() self.checkpoints = list()
self.log = log self.log = log
self.loaded = LRU() self.loaded = LRU()
@ -27,6 +28,7 @@ class UTXO():
self._hit = 0 self._hit = 0
self.saved_utxo = 0 self.saved_utxo = 0
self.deleted_utxo = 0 self.deleted_utxo = 0
self.deleted_last_block = 0
self.deleted_utxo_saved = 0 self.deleted_utxo_saved = 0
self.loaded_utxo = 0 self.loaded_utxo = 0
self.destroyed_utxo = 0 self.destroyed_utxo = 0
@ -85,7 +87,7 @@ class UTXO():
for i in reversed(self.pending_saved): for i in reversed(self.pending_saved):
self.cached.append({i: self.pending_saved[i]}) self.cached.append({i: self.pending_saved[i]})
self.log.critical("checkpoint not found " +str(lb) +" > "+ str(self.checkpoints)) self.log.critical("checkpoint not found " +str(lb) +" > "+ str(self.checkpoints))
await asyncio.sleep(1) await asyncio.sleep(5)
return return
# self.log.critical("checkpoints " + str(self.checkpoints) + " > " + str(checkpoint)) # self.log.critical("checkpoints " + str(self.checkpoints) + " > " + str(checkpoint))
# self.log.critical("found checkpoint " + str(lb) + " len " + str(len(utxo)) + " cached " + str(len(self.cached)) ) # self.log.critical("found checkpoint " + str(lb) + " len " + str(len(utxo)) + " cached " + str(len(self.cached)) )
@ -119,20 +121,24 @@ class UTXO():
# insert to db # insert to db
# self.log.critical("start " + str(len(utxo))) # self.log.critical("start " + str(len(utxo)))
d = set()
async with self._db_pool.acquire() as conn: async with self._db_pool.acquire() as conn:
async with conn.transaction(): async with conn.transaction():
if d: if self.pending_deleted:
await conn.execute("DELETE FROM connector_utxo WHERE " await conn.execute("DELETE FROM connector_utxo WHERE "
"outpoint = ANY($1);", d) "outpoint = ANY($1);", self.pending_deleted)
if utxo: if utxo:
await conn.copy_records_to_table('connector_utxo', await conn.copy_records_to_table('connector_utxo',
columns=["outpoint", "data"], records=utxo) columns=["outpoint", "data"], records=utxo)
await conn.execute("UPDATE connector_utxo_state SET value = $1 " await conn.execute("UPDATE connector_utxo_state SET value = $1 "
"WHERE name = 'last_block';", lb) "WHERE name = 'last_block';", lb)
await conn.execute("UPDATE connector_utxo_state SET value = $1 "
"WHERE name = 'last_cached_block';", self.deleted_last_block)
self.saved_utxo += len(utxo) self.saved_utxo += len(utxo)
self.deleted_utxo += len(d) self.deleted_utxo += len(self.pending_deleted)
self.log.warning("saved utxo -> " + str(len(utxo))) self.pending_deleted = set()
# # remove from cache # # remove from cache
# for key in a: # for key in a:
# try: # try:
@ -172,6 +178,7 @@ class UTXO():
def get_loaded(self, key): def get_loaded(self, key):
try: try:
self.deleted.add(key)
return self.loaded.delete(key) return self.loaded.delete(key)
except: except:
return None return None