sharpetronics/dragonchain
1
0
Fork 0
mirror of https://github.com/dragonchain/dragonchain.git synced 2025-09-30 00:01:28 -04:00
Code Issues Projects Releases Wiki Activity

Restructured get_unsent_transfer_ids.

Browse Source
This commit is contained in:
micylt 2016-12-24 10:21:58 -08:00
parent 62cc031eea
commit b456c1dc1a
2 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
blockchain/db/postgres/vr_transfers_db.py
View File

@ -48,37 +48,26 @@ SQL_INSERT_QUERY = """INSERT INTO vr_transfers (
) VALUES (%s, %s, %s)"""
def get_unsent_verification_records(node_transmit_id=None, verification_id=None):
def get_unsent_verification_records(node_transmit_id):
""" retrieve validated records that have not already been sent back to node with node_transmit_id or verification_id """
query = GET_VERIFIED_RECORDS
query_ready = False
query += """ WHERE transfer_to = '""" + node_transmit_id
query += """' AND sent = b'0' """
if node_transmit_id and verification_id:
query += """ WHERE transfer_to = '""" + node_transmit_id + """' AND verification_id = '""" + verification_id
query_ready = True
elif node_transmit_id:
query += """ WHERE transfer_to = '""" + node_transmit_id
query_ready = True
elif verification_id:
query += """ WHERE verification_id = '""" + verification_id
query_ready = True
if query_ready:
query += """' AND sent = b'0' """
conn = get_connection_pool().getconn()
try:
cur = conn.cursor(get_cursor_name(), cursor_factory=psycopg2.extras.DictCursor)
cur.execute(query)
'An iterator that uses fetchmany to keep memory usage down'
while True:
results = cur.fetchmany(DEFAULT_PAGE_SIZE)
if not results:
break
for result in results:
yield format_verification_record(result)
cur.close()
finally:
get_connection_pool().putconn(conn)
conn = get_connection_pool().getconn()
try:
cur = conn.cursor(get_cursor_name(), cursor_factory=psycopg2.extras.DictCursor)
cur.execute(query)
'An iterator that uses fetchmany to keep memory usage down'
while True:
results = cur.fetchmany(DEFAULT_PAGE_SIZE)
if not results:
break
for result in results:
yield format_verification_record(result)
cur.close()
finally:
get_connection_pool().putconn(conn)
def insert_transfer(origin_id, transfer_to, verification_id):

4
blockchain/network.py
View File

@ -692,12 +692,12 @@ class BlockchainServiceHandler:
return map(create_node_from_peer, self.connection_manager.connections)
def get_unsent_transfer_ids(self, transfer_to=None, verification_id=None):
def get_unsent_transfer_ids(self, transfer_to):
""" retrieve unsent transfer record info (data used for querying block_verification database) """
unsent_transfer_ids = []
try:
logger().info("Retrieving unsent transfer ids...")
for transfer_record in vr_transfers_db.get_unsent_verification_records(transfer_to, verification_id):
for transfer_record in vr_transfers_db.get_unsent_verification_records(transfer_to):
unsent_transfer_ids.append(transfer_record['verification_id'])
except:
logger().warning("An SQL error has occurred.")