remove type and cp columns from events

crates/sui-graphql-rpc/src/types/event.rs

@@ -164,13 +164,6 @@ impl Event {
                 page.paginate_query::<StoredEvent, _, _, _>(conn, checkpoint_viewed_at, move || {
                     let mut query = events::dsl::events.into_boxed();
 
-                    // Bound events by the provided `checkpoint_viewed_at`. From EXPLAIN
-                    // ANALYZE, using the checkpoint sequence number directly instead of
-                    // translating into a transaction sequence number bound is more efficient.
-                    query = query.filter(
-                        events::dsl::checkpoint_sequence_number.le(checkpoint_viewed_at as i64),
-                    );
-
                     // The transactions table doesn't have an index on the senders column, so use
                     // `tx_senders`.
                     if let Some(sender) = &filter.sender {
@@ -205,16 +198,6 @@ impl Event {
                         query = module.apply(query, events::dsl::package, events::dsl::module);
                     }
 
-                    if let Some(type_) = &filter.event_type {
-                        query = type_.apply(
-                            query,
-                            events::dsl::event_type,
-                            events::dsl::event_type_package,
-                            events::dsl::event_type_module,
-                            events::dsl::event_type_name,
-                        );
-                    }
-
                     query
                 })
             })
@@ -257,7 +240,6 @@ impl Event {
             tx_sequence_number: stored_tx.tx_sequence_number,
             event_sequence_number: idx as i64,
             transaction_digest: stored_tx.transaction_digest.clone(),
-            checkpoint_sequence_number: stored_tx.checkpoint_sequence_number,
             #[cfg(feature = "postgres-feature")]
             senders: vec![Some(native_event.sender.to_vec())],
             #[cfg(feature = "mysql-feature")]
@@ -268,9 +250,6 @@ impl Event {
             event_type: native_event
                 .type_
                 .to_canonical_string(/* with_prefix */ true),
-            event_type_package: native_event.type_.address.to_vec(),
-            event_type_module: native_event.type_.module.to_string(),
-            event_type_name: native_event.type_.name.to_string(),
             bcs: native_event.contents.clone(),
             timestamp_ms: stored_tx.timestamp_ms,
         };

crates/sui-indexer/migrations/pg/2023-08-19-044020_events/up.sql

@@ -4,7 +4,6 @@ CREATE TABLE events
     tx_sequence_number          BIGINT       NOT NULL,
     event_sequence_number       BIGINT       NOT NULL,
     transaction_digest          bytea        NOT NULL,
-    checkpoint_sequence_number  bigint       NOT NULL,
     -- array of SuiAddress in bytes. All signers of the transaction.
     senders                     bytea[]      NOT NULL,
     -- bytes of the entry package ID. Notice that the package and module here
@@ -15,11 +14,7 @@ CREATE TABLE events
     module                      text         NOT NULL,
     -- StructTag in Display format, fully qualified including type parameters
     event_type                  text         NOT NULL,
-    -- Components of the StructTag of the event type: package, module,
-    -- name (name of the struct, without type parameters)
-    event_type_package          bytea        NOT NULL,
-    event_type_module           text         NOT NULL,
-    event_type_name             text         NOT NULL,
+
     -- timestamp of the checkpoint when the event was emitted
     timestamp_ms                BIGINT       NOT NULL,
     -- bcs of the Event contents (Event.contents)
@@ -30,5 +25,3 @@ CREATE TABLE events_partition_0 PARTITION OF events FOR VALUES FROM (0) TO (MAXV
 CREATE INDEX events_package ON events (package, tx_sequence_number, event_sequence_number);
 CREATE INDEX events_package_module ON events (package, module, tx_sequence_number, event_sequence_number);
 CREATE INDEX events_event_type ON events (event_type text_pattern_ops, tx_sequence_number, event_sequence_number);
-CREATE INDEX events_type_package_module_name ON events (event_type_package, event_type_module, event_type_name, tx_sequence_number, event_sequence_number);
-CREATE INDEX events_checkpoint_sequence_number ON events (checkpoint_sequence_number);

crates/sui-indexer/src/models/events.rs

@@ -31,9 +31,6 @@ pub struct StoredEvent {
     #[diesel(sql_type = diesel::sql_types::Binary)]
     pub transaction_digest: Vec<u8>,
 
-    #[diesel(sql_type = diesel::sql_types::BigInt)]
-    pub checkpoint_sequence_number: i64,
-
     #[cfg(feature = "postgres-feature")]
     #[diesel(sql_type = diesel::sql_types::Array<diesel::sql_types::Nullable<diesel::pg::sql_types::Bytea>>)]
     pub senders: Vec<Option<Vec<u8>>>,
@@ -52,15 +49,6 @@ pub struct StoredEvent {
     #[diesel(sql_type = diesel::sql_types::Text)]
     pub event_type: String,
 
-    #[diesel(sql_type = diesel::sql_types::Binary)]
-    pub event_type_package: Vec<u8>,
-
-    #[diesel(sql_type = diesel::sql_types::Text)]
-    pub event_type_module: String,
-
-    #[diesel(sql_type = diesel::sql_types::Text)]
-    pub event_type_name: String,
-
     #[diesel(sql_type = diesel::sql_types::BigInt)]
     pub timestamp_ms: i64,
 
@@ -81,7 +69,6 @@ impl From<IndexedEvent> for StoredEvent {
             tx_sequence_number: event.tx_sequence_number as i64,
             event_sequence_number: event.event_sequence_number as i64,
             transaction_digest: event.transaction_digest.into_inner().to_vec(),
-            checkpoint_sequence_number: event.checkpoint_sequence_number as i64,
             #[cfg(feature = "postgres-feature")]
             senders: event
                 .senders
@@ -94,9 +81,6 @@ impl From<IndexedEvent> for StoredEvent {
             package: event.package.to_vec(),
             module: event.module.clone(),
             event_type: event.event_type.clone(),
-            event_type_package: event.event_type_package.to_vec(),
-            event_type_module: event.event_type_module.clone(),
-            event_type_name: event.event_type_name.clone(),
             bcs: event.bcs.clone(),
             timestamp_ms: event.timestamp_ms as i64,
         }

crates/sui-indexer/src/schema/pg.rs

@@ -131,14 +131,10 @@ diesel::table! {
         tx_sequence_number -> Int8,
         event_sequence_number -> Int8,
         transaction_digest -> Bytea,
-        checkpoint_sequence_number -> Int8,
         senders -> Array<Nullable<Bytea>>,
         package -> Bytea,
         module -> Text,
         event_type -> Text,
-        event_type_package -> Bytea,
-        event_type_module -> Text,
-        event_type_name -> Text,
         timestamp_ms -> Int8,
         bcs -> Bytea,
     }
@@ -149,14 +145,10 @@ diesel::table! {
         tx_sequence_number -> Int8,
         event_sequence_number -> Int8,
         transaction_digest -> Bytea,
-        checkpoint_sequence_number -> Int8,
         senders -> Array<Nullable<Bytea>>,
         package -> Bytea,
         module -> Text,
         event_type -> Text,
-        event_type_package -> Bytea,
-        event_type_module -> Text,
-        event_type_name -> Text,
         timestamp_ms -> Int8,
         bcs -> Bytea,
     }

crates/sui-indexer/tests/ingestion_tests.rs

@@ -190,9 +190,6 @@ mod ingestion_tests {
             db_event.event_type,
             event_type_tag.to_canonical_string(true)
         );
-        assert_eq!(db_event.event_type_package, SUI_SYSTEM_PACKAGE_ID.to_vec());
-        assert_eq!(db_event.event_type_module, "sui_system_state_inner");
-        assert_eq!(db_event.event_type_name, "SystemEpochInfoEvent");
         Ok(())
     }