Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

fixed conflict with two cursors when one is reading and another is commiting

Browse source
This commit is contained in:
Lex Berezhny 2020-07-06 09:18:22 -04:00
parent 7d9bf03574
commit 34a9dff141
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lbry/blockchain/sync/steps.py
View file

@ -341,19 +341,18 @@ def process_claims(starting_height: int, blocks_added: Optional[Tuple[int, int]]
).order_by(TXO.c.claim_hash) ).order_by(TXO.c.claim_hash)
) )
streaming_connection = p.ctx.connection.execution_options(stream_results=True) with p.ctx.engine.connect().execution_options(stream_results=True) as c:
# all channels need to be inserted first because channel short_url will needed to
# all channels need to be inserted first because channel short_url will needed to # set the contained claims canonical_urls when those are inserted next
# set the contained claims canonical_urls when those are inserted next done = insert_claims_with_lbrycrd(
done = insert_claims_with_lbrycrd( done, chain, p, c.execute(
done, chain, p, streaming_connection.execute( select_claims.select_from(TXO.join(TX)).where(
select_claims.select_from(TXO.join(TX)).where( (TXO.c.txo_type == TXO_TYPES['channel']) &
(TXO.c.txo_type == TXO_TYPES['channel']) & (TXO.c.spent_height == 0) &
(TXO.c.spent_height == 0) & (TXO.c.claim_hash.notin_(select(Claim.c.claim_hash)))
(TXO.c.claim_hash.notin_(select(Claim.c.claim_hash))) )
) )
) )
)
channel_txo = TXO.alias('channel_txo') channel_txo = TXO.alias('channel_txo')
channel_claim = Claim.alias('channel_claim') channel_claim = Claim.alias('channel_claim')
@ -376,15 +375,16 @@ def process_claims(starting_height: int, blocks_added: Optional[Tuple[int, int]]
) )
) )
done = insert_claims_with_lbrycrd( with p.ctx.engine.connect().execution_options(stream_results=True) as c:
done, chain, p, streaming_connection.execute( done = insert_claims_with_lbrycrd(
select_claims.where( done, chain, p, c.execute(
(TXO.c.txo_type.in_(list(set(CLAIM_TYPE_CODES) - {TXO_TYPES['channel']}))) & select_claims.where(
(TXO.c.spent_height == 0) & (TXO.c.txo_type.in_(list(set(CLAIM_TYPE_CODES) - {TXO_TYPES['channel']}))) &
(TXO.c.claim_hash.notin_(select(Claim.c.claim_hash))) (TXO.c.spent_height == 0) &
(TXO.c.claim_hash.notin_(select(Claim.c.claim_hash)))
)
) )
) )
)
if initial_sync: if initial_sync:
channel_update_member_count_sql = ( channel_update_member_count_sql = (