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

closes 2281 - fix too many sql variables + tests

Browse source
This commit is contained in:
Victor Shyba 2019-07-05 18:25:53 -03:00 committed by Lex Berezhny
parent 71de4d769d
commit 28ae7f81e9
2 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
torba/tests/client_tests/unit/test_database.py
View file

@ -1,5 +1,6 @@
import unittest import unittest
import sqlite3 import sqlite3
from functools import wraps
from torba.client.wallet import Wallet from torba.client.wallet import Wallet
from torba.client.constants import COIN from torba.client.constants import COIN
@ -224,6 +225,21 @@ class TestQueries(AsyncioTestCase):
def txi(self, txo): def txi(self, txo):
return ledger_class.transaction_class.input_class.spend(txo) return ledger_class.transaction_class.input_class.spend(txo)
async def test_large_tx_doesnt_hit_variable_limits(self):
# SQLite is usually compiled with 999 variables limit: https://www.sqlite.org/limits.html
# This can be removed when there is a better way. See: https://github.com/lbryio/lbry-sdk/issues/2281
fetchall = self.ledger.db.db.execute_fetchall
def check_parameters_length(sql, parameters):
self.assertLess(len(parameters or []), 999)
return fetchall(sql, parameters)
self.ledger.db.db.execute_fetchall = check_parameters_length
account = await self.create_account()
tx = await self.create_tx_from_nothing(account, 1)
for _ in range(1200):
tx = await self.create_tx_from_txo(tx.outputs[0], account, 1)
await self.ledger.db.get_transactions()
async def test_queries(self): async def test_queries(self):
self.assertEqual(0, await self.ledger.db.get_address_count()) self.assertEqual(0, await self.ledger.db.get_address_count())
account1 = await self.create_account() account1 = await self.create_account()

32
torba/torba/client/basedatabase.py
View file

@ -412,21 +412,25 @@ class BaseDatabase(SQLiteMixin):
for txi in txs[-1].inputs: for txi in txs[-1].inputs:
txi_txoids.append(txi.txo_ref.id) txi_txoids.append(txi.txo_ref.id)
annotated_txos = { annotated_txos = {}
txo.id: txo for txo in for offset in range(0, len(txids), 900):
(await self.get_txos( annotated_txos.update({
my_account=my_account, txo.id: txo for txo in
txid__in=txids (await self.get_txos(
)) my_account=my_account,
} txid__in=txids[offset:offset+900],
))
})
referenced_txos = { referenced_txos = {}
txo.id: txo for txo in for offset in range(0, len(txi_txoids), 900):
(await self.get_txos( referenced_txos.update({
my_account=my_account, txo.id: txo for txo in
txoid__in=txi_txoids (await self.get_txos(
)) my_account=my_account,
} txoid__in=txi_txoids[offset:offset+900],
))
})
for tx in txs: for tx in txs:
for txi in tx.inputs: for txi in tx.inputs: