From 9d89f9b834dc14f31e8537493af67532807c4de9 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Thu, 14 Feb 2019 15:57:24 -0500 Subject: [PATCH] use executemany instead of batched_operation --- lbrynet/extras/daemon/storage.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/lbrynet/extras/daemon/storage.py b/lbrynet/extras/daemon/storage.py index 1b4f9e167..68e93145c 100644 --- a/lbrynet/extras/daemon/storage.py +++ b/lbrynet/extras/daemon/storage.py @@ -105,13 +105,6 @@ def get_content_claim_from_outpoint(transaction: sqlite3.Connection, return StoredStreamClaim(*claim_fields) -def batched_operation(transaction, query, parameters, batch_size=900): - for start_index in range(0, len(parameters), batch_size): - current_batch = parameters[start_index:start_index+batch_size] - bind = "({})".format(','.join(['?'] * len(current_batch))) - transaction.execute(query.format(bind), current_batch) - - def _batched_select(transaction, query, parameters, batch_size=900): for start_index in range(0, len(parameters), batch_size): current_batch = parameters[start_index:start_index+batch_size] @@ -162,13 +155,13 @@ def get_all_lbry_files(transaction: sqlite3.Connection) -> typing.List[typing.Di def delete_stream(transaction: sqlite3.Connection, descriptor: 'StreamDescriptor'): - blob_hashes = [blob.blob_hash for blob in descriptor.blobs[:-1]] - blob_hashes.append(descriptor.sd_hash) + blob_hashes = [(blob.blob_hash, ) for blob in descriptor.blobs[:-1]] + blob_hashes.append((descriptor.sd_hash, )) transaction.execute("delete from content_claim where stream_hash=? ", (descriptor.stream_hash,)) transaction.execute("delete from file where stream_hash=? ", (descriptor.stream_hash,)) transaction.execute("delete from stream_blob where stream_hash=?", (descriptor.stream_hash,)) transaction.execute("delete from stream where stream_hash=? ", (descriptor.stream_hash,)) - batched_operation(transaction, "delete from blob where blob_hash in {}", blob_hashes) + transaction.executemany("delete from blob where blob_hash=?", blob_hashes) class SQLiteStorage(SQLiteMixin):