LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix ChannelDB.compare_channels: was raising "too many SQL variables"

Browse source 
sqlalchemy.exc.OperationalError: (sqlite3.OperationalError) too many SQL variables
This commit is contained in:
SomberNight 2019-05-26 05:27:29 +02:00 • committed by ThomasV
parent 60cd885f74
commit cffb89002c
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
electrum/lnrouter.py
View file

@ -40,10 +40,10 @@ from sqlalchemy import Column, ForeignKey, Integer, String, Boolean
from sqlalchemy.orm.query import Query from sqlalchemy.orm.query import Query
from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.sql import not_, or_ from sqlalchemy.sql import not_, or_
from .sql_db import SqlDB, sql
from .sql_db import SqlDB, sql, SQLITE_LIMIT_VARIABLE_NUMBER
from . import constants from . import constants
from .util import bh2u, profiler, get_headers_dir, bfh, is_ip_address, list_enabled_bits, print_msg from .util import bh2u, profiler, get_headers_dir, bfh, is_ip_address, list_enabled_bits, print_msg, chunks
from .logging import Logger from .logging import Logger
from .storage import JsonDB from .storage import JsonDB
from .lnverifier import LNChannelVerifier, verify_sig_for_channel_update from .lnverifier import LNChannelVerifier, verify_sig_for_channel_update
@ -231,12 +231,14 @@ class ChannelDB(SqlDB):
@profiler @profiler
def compare_channels(self, channel_ids): def compare_channels(self, channel_ids):
ids = [x.hex() for x in channel_ids] ids = [x.hex() for x in channel_ids]
known = set()
# I need to get the unknown, and also the channels that need refresh # I need to get the unknown, and also the channels that need refresh
known = self.DBSession \ for ids_chunk in chunks(ids, SQLITE_LIMIT_VARIABLE_NUMBER):
known_part = self.DBSession \
.query(ChannelInfo) \ .query(ChannelInfo) \
.filter(ChannelInfo.short_channel_id.in_(ids)) \ .filter(ChannelInfo.short_channel_id.in_(ids_chunk)) \
.all() .all()
known = [bfh(r.short_channel_id) for r in known] known |= set(bfh(r.short_channel_id) for r in known_part)
return known return known
@sql @sql

4
electrum/sql_db.py
View file

@ -10,6 +10,10 @@ from sqlalchemy.orm import sessionmaker
from .logging import Logger from .logging import Logger
# https://stackoverflow.com/questions/26971050/sqlalchemy-sqlite-too-many-sql-variables
SQLITE_LIMIT_VARIABLE_NUMBER = 999
def sql(func): def sql(func):
"""wrapper for sql methods""" """wrapper for sql methods"""
def wrapper(self, *args, **kwargs): def wrapper(self, *args, **kwargs):