changes from comment

Author: nischitpra

internal/orchestrator/committer_test.go

@@ -404,6 +404,9 @@ func TestStartCommitter(t *testing.T) {
 	mockRPC.EXPECT().GetChainID().Return(chainID)
 	mockMainStorage.EXPECT().GetMaxBlockNumber(chainID).Return(big.NewInt(100), nil)
 
+	// Add expectation for DeleteOlderThan call during cleanup
+	mockStagingStorage.On("DeleteOlderThan", chainID, big.NewInt(100)).Return(nil)
+
 	blockData := []common.BlockData{
 		{Block: common.Block{Number: big.NewInt(101)}},
 		{Block: common.Block{Number: big.NewInt(102)}},
@@ -438,6 +441,9 @@ func TestCommitterRespectsSIGTERM(t *testing.T) {
 	mockRPC.EXPECT().GetChainID().Return(chainID)
 	mockMainStorage.EXPECT().GetMaxBlockNumber(chainID).Return(big.NewInt(100), nil)
 
+	// Add expectation for DeleteOlderThan call during cleanup
+	mockStagingStorage.On("DeleteOlderThan", chainID, big.NewInt(100)).Return(nil)
+
 	blockData := []common.BlockData{
 		{Block: common.Block{Number: big.NewInt(101)}},
 		{Block: common.Block{Number: big.NewInt(102)}},

internal/storage/clickhouse.go

@@ -2115,50 +2115,14 @@ func (c *ClickHouseConnector) GetFullBlockData(chainId *big.Int, blockNumbers []
 }
 
 func (c *ClickHouseConnector) DeleteOlderThan(chainId *big.Int, blockNumber *big.Int) error {
-	// First, get all the block numbers that need to be deleted
 	query := fmt.Sprintf(`
-		SELECT DISTINCT chain_id, block_number
-		FROM %s.block_data 
+		INSERT INTO %s.block_data (chain_id, block_number, is_deleted)
+		SELECT chain_id, block_number, 1
+		FROM %s.block_data
 		WHERE chain_id = ? AND block_number <= ? AND is_deleted = 0
-	`, c.cfg.Database)
-
-	rows, err := c.conn.Query(context.Background(), query, chainId, blockNumber)
-	if err != nil {
-		return err
-	}
-	defer rows.Close()
-
-	// Prepare batch for deletion
-	deleteQuery := fmt.Sprintf(`
-		INSERT INTO %s.block_data (
-			chain_id, block_number, is_deleted
-		) VALUES (?, ?, ?)
-	`, c.cfg.Database)
-
-	batch, err := c.conn.PrepareBatch(context.Background(), deleteQuery)
-	if err != nil {
-		return err
-	}
-	defer batch.Close()
-
-	// Add each block to the deletion batch
-	for rows.Next() {
-		var chainIdVal, blockNumberVal *big.Int
-		if err := rows.Scan(&chainIdVal, &blockNumberVal); err != nil {
-			return err
-		}
-
-		err := batch.Append(
-			chainIdVal,
-			blockNumberVal,
-			1, // is_deleted = 1
-		)
-		if err != nil {
-			return err
-		}
-	}
-
-	return batch.Send()
+		GROUP BY chain_id, block_number
+	`, c.cfg.Database, c.cfg.Database)
+	return c.conn.Exec(context.Background(), query, chainId, blockNumber)
 }
 
 // Helper function to test query generation