From 691d35a5dfb5bd64328bfbc4cffe5b68da45c9b6 Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Thu, 15 Jun 2023 18:23:48 -0500 Subject: [PATCH] Rewrite query for speed and simplicity. --- pkg/eth/sql.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/eth/sql.go b/pkg/eth/sql.go index 9d4c9e42..cac9f833 100644 --- a/pkg/eth/sql.go +++ b/pkg/eth/sql.go @@ -122,8 +122,8 @@ const ( RetrieveFilteredLogs = `SELECT CAST(eth.log_cids.block_number as TEXT), eth.log_cids.cid, eth.log_cids.index, eth.log_cids.rct_id, eth.log_cids.address, eth.log_cids.topic0, eth.log_cids.topic1, eth.log_cids.topic2, eth.log_cids.topic3, eth.transaction_cids.tx_hash, eth.transaction_cids.index as txn_index, - blocks.data, eth.receipt_cids.cid AS rct_cid, eth.receipt_cids.post_status, eth.log_cids.header_id AS block_hash - FROM eth.log_cids, eth.receipt_cids, eth.transaction_cids, ipld.blocks + blocks.data, eth.receipt_cids.cid AS rct_cid, eth.receipt_cids.post_status, header_cids.block_hash + FROM eth.log_cids, eth.receipt_cids, eth.transaction_cids, eth.header_cids, ipld.blocks WHERE eth.log_cids.rct_id = receipt_cids.tx_id AND eth.log_cids.header_id = eth.receipt_cids.header_id AND eth.log_cids.block_number = eth.receipt_cids.block_number @@ -132,9 +132,8 @@ const ( AND receipt_cids.tx_id = transaction_cids.tx_hash AND receipt_cids.header_id = transaction_cids.header_id AND receipt_cids.block_number = transaction_cids.block_number - AND transaction_cids.header_id = log_cids.header_id - AND transaction_cids.header_id = (SELECT canonical_header_hash(transaction_cids.block_number)) - AND transaction_cids.block_number = log_cids.block_number` + AND transaction_cids.header_id = header_cids.block_hash + AND transaction_cids.block_number = header_cids.block_number` RetrieveStorageLeafByAddressHashAndLeafKeyAndBlockHashPgStr = `SELECT cid, val, block_number, removed, state_leaf_removed FROM get_storage_at_by_hash($1, $2, $3)` RetrieveStorageAndRLPByAddressHashAndLeafKeyAndBlockHashPgStr = ` SELECT cid, val, storage.block_number, removed, state_leaf_removed, data