enable memory cache

This commit is contained in:
ThomasV 2011-12-03 23:33:29 +03:00
parent 3409b04d78
commit b144de5b4d

View file

@ -19,6 +19,7 @@
Todo: Todo:
* server should check and return bitcoind status.. * server should check and return bitcoind status..
* improve txpoint sorting * improve txpoint sorting
* command to check cache
""" """
@ -40,6 +41,7 @@ config.set('server', 'host', 'ecdsa.org')
config.set('server', 'port', 50000) config.set('server', 'port', 50000)
config.set('server', 'password', '') config.set('server', 'password', '')
config.set('server', 'irc', 'yes') config.set('server', 'irc', 'yes')
config.set('server', 'cache', 'yes')
config.set('server', 'ircname', 'Electrum server') config.set('server', 'ircname', 'Electrum server')
config.add_section('database') config.add_section('database')
config.set('database', 'type', 'psycopg2') config.set('database', 'type', 'psycopg2')
@ -66,7 +68,7 @@ class MyStore(Datastore_class):
def import_tx(self, tx, is_coinbase): def import_tx(self, tx, is_coinbase):
tx_id = super(MyStore, self).import_tx(tx, is_coinbase) tx_id = super(MyStore, self).import_tx(tx, is_coinbase)
self.update_tx_cache(tx_id) if config.get('server', 'cache') == 'yes': self.update_tx_cache(tx_id)
def update_tx_cache(self, txid): def update_tx_cache(self, txid):
inrows = self.get_tx_inputs(txid, False) inrows = self.get_tx_inputs(txid, False)
@ -74,14 +76,14 @@ class MyStore(Datastore_class):
_hash = store.binout(row[6]) _hash = store.binout(row[6])
address = hash_to_address(chr(0), _hash) address = hash_to_address(chr(0), _hash)
if self.tx_cache.has_key(address): if self.tx_cache.has_key(address):
print "cache: popping", address #print "cache: popping", address, self.ismempool
self.tx_cache.pop(address) self.tx_cache.pop(address)
outrows = self.get_tx_outputs(txid, False) outrows = self.get_tx_outputs(txid, False)
for row in outrows: for row in outrows:
_hash = store.binout(row[6]) _hash = store.binout(row[6])
address = hash_to_address(chr(0), _hash) address = hash_to_address(chr(0), _hash)
if self.tx_cache.has_key(address): if self.tx_cache.has_key(address):
print "cache: popping", address #print "cache: popping", address, self.ismempool
self.tx_cache.pop(address) self.tx_cache.pop(address)
def safe_sql(self,sql, params=(), lock=True): def safe_sql(self,sql, params=(), lock=True):
@ -196,8 +198,11 @@ class MyStore(Datastore_class):
WHERE pubkey.pubkey_hash = ? """, (dbhash,)) WHERE pubkey.pubkey_hash = ? """, (dbhash,))
def get_txpoints(self, addr): def get_txpoints(self, addr):
cached_version = self.tx_cache.get( addr ) if config.get('server','cache') == 'yes':
cached_version = self.tx_cache.get( addr )
if cached_version is not None:
return cached_version
version, binaddr = decode_check_address(addr) version, binaddr = decode_check_address(addr)
if binaddr is None: if binaddr is None:
@ -248,7 +253,7 @@ class MyStore(Datastore_class):
#print "mempool", tx_hash #print "mempool", tx_hash
txpoint = { txpoint = {
"nTime": 0, "nTime": 0,
"chain_id": 1, #"chain_id": 1,
"height": 0, "height": 0,
"is_in": int(is_in), "is_in": int(is_in),
"blk_hash": 'mempool', "blk_hash": 'mempool',
@ -291,15 +296,11 @@ class MyStore(Datastore_class):
if row: if row:
if not row[4]: txpoint['raw_scriptPubKey'] = row[1] if not row[4]: txpoint['raw_scriptPubKey'] = row[1]
# cache result
if cached_version is None: if config.get('server','cache') == 'yes':
#print "cache: adding", addr
self.tx_cache[addr] = txpoints self.tx_cache[addr] = txpoints
return txpoints
else: return txpoints
if cached_version != txpoints:
print "cache error: ", addr
return txpoints
def get_status(self, addr): def get_status(self, addr):
@ -552,6 +553,7 @@ if __name__ == '__main__':
args.connect_args = { 'database' : config.get('database','database') } args.connect_args = { 'database' : config.get('database','database') }
store = MyStore(args) store = MyStore(args)
store.tx_cache = {} store.tx_cache = {}
store.ismempool = False
thread.start_new_thread(listen_thread, (store,)) thread.start_new_thread(listen_thread, (store,))
thread.start_new_thread(clean_session_thread, ()) thread.start_new_thread(clean_session_thread, ())
@ -562,7 +564,9 @@ if __name__ == '__main__':
try: try:
dblock.acquire() dblock.acquire()
store.catch_up() store.catch_up()
store.ismempool = True
memorypool_update(store) memorypool_update(store)
store.ismempool = False
block_number = store.get_block_number(1) block_number = store.get_block_number(1)
dblock.release() dblock.release()
except: except: