Skip to content

Commit 9fc458e

Browse files
authored
Remove FINAL keyword from ClickHouse queries (#99)
2 parents df13321 + ae7ede1 commit 9fc458e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

internal/storage/clickhouse.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ func (c *ClickHouseConnector) StoreBlockFailures(failures []common.BlockFailure)
230230

231231
func (c *ClickHouseConnector) GetBlocks(qf QueryFilter) (blocks []common.Block, err error) {
232232
columns := "chain_id, number, hash, parent_hash, timestamp, nonce, sha3_uncles, logs_bloom, receipts_root, difficulty, total_difficulty, size, extra_data, gas_limit, gas_used, transaction_count, base_fee_per_gas, withdrawals_root"
233-
query := fmt.Sprintf("SELECT %s FROM %s.blocks FINAL WHERE number IN (%s) AND is_deleted = 0",
233+
query := fmt.Sprintf("SELECT %s FROM %s.blocks WHERE number IN (%s) AND is_deleted = 0",
234234
columns, c.cfg.Database, getBlockNumbersStringArray(qf.BlockNumbers))
235235

236236
if qf.ChainId.Sign() > 0 {
@@ -320,7 +320,7 @@ func executeQuery[T any](c *ClickHouseConnector, table, columns string, qf Query
320320
}
321321

322322
func (c *ClickHouseConnector) buildQuery(table, columns string, qf QueryFilter) string {
323-
query := fmt.Sprintf("SELECT %s FROM %s.%s FINAL WHERE is_deleted = 0", columns, c.cfg.Database, table)
323+
query := fmt.Sprintf("SELECT %s FROM %s.%s WHERE is_deleted = 0", columns, c.cfg.Database, table)
324324

325325
if qf.ChainId.Sign() > 0 {
326326
query = addFilterParams("chain_id", qf.ChainId.String(), query)
@@ -403,7 +403,7 @@ func getTopicValueFormat(topic string) string {
403403

404404
func (c *ClickHouseConnector) executeAggregateQuery(table string, qf QueryFilter) (map[string]string, error) {
405405
aggregateQuery := "SELECT " + strings.Join(qf.Aggregates, ", ") +
406-
fmt.Sprintf(" FROM %s.%s FINAL WHERE is_deleted = 0", c.cfg.Database, table)
406+
fmt.Sprintf(" FROM %s.%s WHERE is_deleted = 0", c.cfg.Database, table)
407407

408408
if qf.ContractAddress != "" {
409409
aggregateQuery += fmt.Sprintf(" AND address = '%s'", qf.ContractAddress)
@@ -490,7 +490,7 @@ func scanLog(rows driver.Rows) (common.Log, error) {
490490
}
491491

492492
func (c *ClickHouseConnector) GetMaxBlockNumber(chainId *big.Int) (maxBlockNumber *big.Int, err error) {
493-
query := fmt.Sprintf("SELECT max(number) FROM %s.blocks FINAL WHERE is_deleted = 0", c.cfg.Database)
493+
query := fmt.Sprintf("SELECT max(number) FROM %s.blocks WHERE is_deleted = 0", c.cfg.Database)
494494
if chainId.Sign() > 0 {
495495
query += fmt.Sprintf(" AND chain_id = %s", chainId.String())
496496
}
@@ -503,7 +503,7 @@ func (c *ClickHouseConnector) GetMaxBlockNumber(chainId *big.Int) (maxBlockNumbe
503503
}
504504

505505
func (c *ClickHouseConnector) GetLastStagedBlockNumber(chainId *big.Int, rangeEnd *big.Int) (maxBlockNumber *big.Int, err error) {
506-
query := fmt.Sprintf("SELECT max(block_number) FROM %s.block_data FINAL WHERE is_deleted = 0", c.cfg.Database)
506+
query := fmt.Sprintf("SELECT max(block_number) FROM %s.block_data WHERE is_deleted = 0", c.cfg.Database)
507507
if chainId.Sign() > 0 {
508508
query += fmt.Sprintf(" AND chain_id = %s", chainId.String())
509509
}
@@ -715,7 +715,7 @@ func (c *ClickHouseConnector) insertTraces(traces *[]common.Trace) error {
715715

716716
func (c *ClickHouseConnector) GetTraces(qf QueryFilter) (traces []common.Trace, err error) {
717717
columns := "chain_id, block_number, block_hash, block_timestamp, transaction_hash, transaction_index, subtraces, trace_address, type, call_type, error, from_address, to_address, gas, gas_used, input, output, value, author, reward_type, refund_address"
718-
query := fmt.Sprintf("SELECT %s FROM %s.traces FINAL WHERE block_number IN (%s) AND is_deleted = 0",
718+
query := fmt.Sprintf("SELECT %s FROM %s.traces WHERE block_number IN (%s) AND is_deleted = 0",
719719
columns, c.cfg.Database, getBlockNumbersStringArray(qf.BlockNumbers))
720720

721721
if qf.ChainId.Sign() > 0 {

0 commit comments

Comments
 (0)