From c9319cdbebe65e1ce7033cce8abba4ef0c4684e7 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 6 Jun 2024 13:17:35 +0300 Subject: [PATCH] Fix duplicates. --- ...2c90ea67bb_logs_address_selector_index.py} | 46 +++++++++++-------- .../moonstreamdbv3/models_indexes.py | 40 ++++++++++++---- 2 files changed, 58 insertions(+), 28 deletions(-) rename moonstreamdb-v3/moonstreamdbv3/alembic_indexes/versions/{f0169529a544_logs_address_selector_index.py => e02c90ea67bb_logs_address_selector_index.py} (60%) diff --git a/moonstreamdb-v3/moonstreamdbv3/alembic_indexes/versions/f0169529a544_logs_address_selector_index.py b/moonstreamdb-v3/moonstreamdbv3/alembic_indexes/versions/e02c90ea67bb_logs_address_selector_index.py similarity index 60% rename from moonstreamdb-v3/moonstreamdbv3/alembic_indexes/versions/f0169529a544_logs_address_selector_index.py rename to moonstreamdb-v3/moonstreamdbv3/alembic_indexes/versions/e02c90ea67bb_logs_address_selector_index.py index e6710195..5e4928bf 100644 --- a/moonstreamdb-v3/moonstreamdbv3/alembic_indexes/versions/f0169529a544_logs_address_selector_index.py +++ b/moonstreamdb-v3/moonstreamdbv3/alembic_indexes/versions/e02c90ea67bb_logs_address_selector_index.py @@ -1,8 +1,8 @@ """Logs address selector index -Revision ID: f0169529a544 +Revision ID: e02c90ea67bb Revises: a4ef4f9031e4 -Create Date: 2024-06-06 13:01:56.457667 +Create Date: 2024-06-06 13:12:14.594600 """ @@ -13,7 +13,7 @@ import sqlalchemy as sa # revision identifiers, used by Alembic. -revision: str = "f0169529a544" +revision: str = "e02c90ea67bb" down_revision: Union[str, None] = "a4ef4f9031e4" branch_labels: Union[str, Sequence[str], None] = None depends_on: Union[str, Sequence[str], None] = None @@ -22,37 +22,37 @@ depends_on: Union[str, Sequence[str], None] = None def upgrade() -> None: # ### commands auto generated by Alembic - please adjust! ### op.create_index( - "idx_polygon_logs_address_selector", + "idx_arbitrum_one_logs_address_selector", "arbitrum_one_logs", ["address", "selector"], unique=False, ) op.create_index( - "idx_polygon_logs_address_selector", + "idx_arbitrum_sepolia_logs_address_selector", "arbitrum_sepolia_logs", ["address", "selector"], unique=False, ) op.create_index( - "idx_polygon_logs_address_selector", + "idx_ethereum_logs_address_selector", "ethereum_logs", ["address", "selector"], unique=False, ) op.create_index( - "idx_polygon_logs_address_selector", + "idx_game7_orbit_arbitrum_sepolia_logs_address_selector", "game7_orbit_arbitrum_sepolia_logs", ["address", "selector"], unique=False, ) op.create_index( - "idx_polygon_logs_address_selector", + "idx_mantle_logs_address_selector", "mantle_logs", ["address", "selector"], unique=False, ) op.create_index( - "idx_polygon_logs_address_selector", + "idx_mantle_sepolia_logs_address_selector", "mantle_sepolia_logs", ["address", "selector"], unique=False, @@ -64,13 +64,13 @@ def upgrade() -> None: unique=False, ) op.create_index( - "idx_polygon_logs_address_selector", + "idx_xai_logs_address_selector", "xai_logs", ["address", "selector"], unique=False, ) op.create_index( - "idx_polygon_logs_address_selector", + "idx_xai_sepolia_logs_address_selector", "xai_sepolia_logs", ["address", "selector"], unique=False, @@ -80,18 +80,24 @@ def upgrade() -> None: def downgrade() -> None: # ### commands auto generated by Alembic - please adjust! ### - op.drop_index("idx_polygon_logs_address_selector", table_name="xai_sepolia_logs") - op.drop_index("idx_polygon_logs_address_selector", table_name="xai_logs") - op.drop_index("idx_polygon_logs_address_selector", table_name="polygon_logs") - op.drop_index("idx_polygon_logs_address_selector", table_name="mantle_sepolia_logs") - op.drop_index("idx_polygon_logs_address_selector", table_name="mantle_logs") op.drop_index( - "idx_polygon_logs_address_selector", + "idx_xai_sepolia_logs_address_selector", table_name="xai_sepolia_logs" + ) + op.drop_index("idx_xai_logs_address_selector", table_name="xai_logs") + op.drop_index("idx_polygon_logs_address_selector", table_name="polygon_logs") + op.drop_index( + "idx_mantle_sepolia_logs_address_selector", table_name="mantle_sepolia_logs" + ) + op.drop_index("idx_mantle_logs_address_selector", table_name="mantle_logs") + op.drop_index( + "idx_game7_orbit_arbitrum_sepolia_logs_address_selector", table_name="game7_orbit_arbitrum_sepolia_logs", ) - op.drop_index("idx_polygon_logs_address_selector", table_name="ethereum_logs") + op.drop_index("idx_ethereum_logs_address_selector", table_name="ethereum_logs") op.drop_index( - "idx_polygon_logs_address_selector", table_name="arbitrum_sepolia_logs" + "idx_arbitrum_sepolia_logs_address_selector", table_name="arbitrum_sepolia_logs" + ) + op.drop_index( + "idx_arbitrum_one_logs_address_selector", table_name="arbitrum_one_logs" ) - op.drop_index("idx_polygon_logs_address_selector", table_name="arbitrum_one_logs") # ### end Alembic commands ### diff --git a/moonstreamdb-v3/moonstreamdbv3/models_indexes.py b/moonstreamdb-v3/moonstreamdbv3/models_indexes.py index d531bac7..3ac1bcfe 100644 --- a/moonstreamdb-v3/moonstreamdbv3/models_indexes.py +++ b/moonstreamdb-v3/moonstreamdbv3/models_indexes.py @@ -122,7 +122,9 @@ class EthereumLogIndex(EvmBasedLogs): __tablename__ = "ethereum_logs" __table_args__ = ( - Index("idx_polygon_logs_address_selector", "address", "selector", unique=False), + Index( + "idx_ethereum_logs_address_selector", "address", "selector", unique=False + ), Index( "idx_ethereum_logs_block_hash_log_index", "block_hash", @@ -220,7 +222,7 @@ class XaiLogIndex(EvmBasedLogs): __tablename__ = "xai_logs" __table_args__ = ( - Index("idx_polygon_logs_address_selector", "address", "selector", unique=False), + Index("idx_xai_logs_address_selector", "address", "selector", unique=False), UniqueConstraint( "transaction_hash", "log_index", @@ -265,7 +267,9 @@ class XaiSepoliaLogIndex(EvmBasedLogs): __tablename__ = "xai_sepolia_logs" __table_args__ = ( - Index("idx_polygon_logs_address_selector", "address", "selector", unique=False), + Index( + "idx_xai_sepolia_logs_address_selector", "address", "selector", unique=False + ), UniqueConstraint( "transaction_hash", "log_index", @@ -312,7 +316,12 @@ class ArbitrumOneLogIndex(EvmBasedLogs): __tablename__ = "arbitrum_one_logs" __table_args__ = ( - Index("idx_polygon_logs_address_selector", "address", "selector", unique=False), + Index( + "idx_arbitrum_one_logs_address_selector", + "address", + "selector", + unique=False, + ), UniqueConstraint( "transaction_hash", "log_index", @@ -359,7 +368,12 @@ class ArbitrumSepoliaLogIndex(EvmBasedLogs): __tablename__ = "arbitrum_sepolia_logs" __table_args__ = ( - Index("idx_polygon_logs_address_selector", "address", "selector", unique=False), + Index( + "idx_arbitrum_sepolia_logs_address_selector", + "address", + "selector", + unique=False, + ), UniqueConstraint( "transaction_hash", "log_index", @@ -408,7 +422,12 @@ class Game7OrbitArbitrumSepoliaLogIndex(EvmBasedLogs): __tablename__ = "game7_orbit_arbitrum_sepolia_logs" __table_args__ = ( - Index("idx_polygon_logs_address_selector", "address", "selector", unique=False), + Index( + "idx_game7_orbit_arbitrum_sepolia_logs_address_selector", + "address", + "selector", + unique=False, + ), UniqueConstraint( "transaction_hash", "log_index", @@ -456,7 +475,7 @@ class MantleLogIndex(EvmBasedLogs): __tablename__ = "mantle_logs" __table_args__ = ( - Index("idx_polygon_logs_address_selector", "address", "selector", unique=False), + Index("idx_mantle_logs_address_selector", "address", "selector", unique=False), Index( "idx_mantle_logs_block_hash_log_index", "block_hash", @@ -506,7 +525,12 @@ class MantleSepoliaLogIndex(EvmBasedLogs): __tablename__ = "mantle_sepolia_logs" __table_args__ = ( - Index("idx_polygon_logs_address_selector", "address", "selector", unique=False), + Index( + "idx_mantle_sepolia_logs_address_selector", + "address", + "selector", + unique=False, + ), Index( "idx_mantle_sepolia_logs_block_hash_log_index", "block_hash",