Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GraphQL][EASY] Remove MovePackage.checkpoint_viewed_at #17691

Merged
merged 3 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions crates/sui-graphql-rpc/src/types/move_package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ pub(crate) struct MovePackage {
/// Move-object-specific data, extracted from the native representation at
/// `graphql_object.native_object.data`.
pub native: NativeMovePackage,

/// The checkpoint sequence number this package was viewed at.
pub checkpoint_viewed_at: u64,
}

/// Information used by a package to link to a specific version of its dependency.
Expand Down Expand Up @@ -276,7 +273,8 @@ impl MovePackage {

let page = Page::from_params(ctx.data_unchecked(), first, after, last, before)?;
let cursor_viewed_at = page.validate_cursor_consistency()?;
let checkpoint_viewed_at = cursor_viewed_at.unwrap_or(self.checkpoint_viewed_at);
let checkpoint_viewed_at =
cursor_viewed_at.unwrap_or_else(|| self.checkpoint_viewed_at_impl());

let parsed = self.parsed_package()?;
let module_range = parsed.modules().range::<String, _>((
Expand Down Expand Up @@ -391,6 +389,12 @@ impl MovePackage {
.map_err(|e| Error::Internal(format!("Error reading package: {e}")))
}

/// This package was viewed at a snapshot of the chain state at this checkpoint (identified by
/// its sequence number).
fn checkpoint_viewed_at_impl(&self) -> u64 {
self.super_.checkpoint_viewed_at
}

pub(crate) fn module_impl(&self, name: &str) -> Result<Option<MoveModule>, Error> {
use PackageCacheError as E;
match (
Expand All @@ -401,7 +405,7 @@ impl MovePackage {
storage_id: self.super_.address,
native: native.clone(),
parsed: parsed.clone(),
checkpoint_viewed_at: self.checkpoint_viewed_at,
checkpoint_viewed_at: self.checkpoint_viewed_at_impl(),
})),

(None, _) | (_, Err(E::ModuleNotFound(_, _))) => Ok(None),
Expand Down Expand Up @@ -438,7 +442,6 @@ impl TryFrom<&Object> for MovePackage {
Ok(Self {
super_: object.clone(),
native: move_package.clone(),
checkpoint_viewed_at: object.checkpoint_viewed_at,
})
} else {
Err(MovePackageDowncastError)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ CREATE TABLE events
) PARTITION BY RANGE (checkpoint_sequence_number) (
PARTITION events_partition_0 VALUES LESS THAN MAXVALUE
);
CREATE INDEX events_package ON events (package(255), tx_sequence_number, event_sequence_number);
CREATE INDEX events_package_module ON events (package(255), module(255), tx_sequence_number, event_sequence_number);
CREATE INDEX events_event_type ON events (event_type(255), tx_sequence_number, event_sequence_number);
CREATE INDEX events_type_package_module_name ON events (event_type_package(128), event_type_module(128), event_type_name(128), tx_sequence_number, event_sequence_number);
CREATE INDEX events_package ON events (package(32), tx_sequence_number, event_sequence_number);
CREATE INDEX events_package_module ON events (package(32), module(128), tx_sequence_number, event_sequence_number);
CREATE INDEX events_event_type ON events (event_type(256), tx_sequence_number, event_sequence_number);
CREATE INDEX events_type_package_module_name ON events (event_type_package(32), event_type_module(128), event_type_name(128), tx_sequence_number, event_sequence_number);
CREATE INDEX events_checkpoint_sequence_number ON events (checkpoint_sequence_number);
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ CREATE TABLE objects (
df_object_type TEXT,
-- object_id in DynamicFieldInfo.
df_object_id BLOB,
CONSTRAINT objects_pk PRIMARY KEY (object_id(128))
CONSTRAINT objects_pk PRIMARY KEY (object_id(32))
);

-- OwnerType: 1: Address, 2: Object, see types.rs
CREATE INDEX objects_owner ON objects (owner_type, owner_id(128));
CREATE INDEX objects_coin ON objects (owner_id(128), coin_type(128));
CREATE INDEX objects_owner ON objects (owner_type, owner_id(32));
CREATE INDEX objects_coin ON objects (owner_id(32), coin_type(256));
CREATE INDEX objects_checkpoint_sequence_number ON objects (checkpoint_sequence_number);
CREATE INDEX objects_package_module_name_full_type ON objects (object_type_package(128), object_type_module(128), object_type_name(128), object_type(128));
CREATE INDEX objects_owner_package_module_name_full_type ON objects (owner_id(128), object_type_package(128), object_type_module(128), object_type_name(128), object_type(128));
CREATE INDEX objects_package_module_name_full_type ON objects (object_type_package(32), object_type_module(128), object_type_name(128), object_type(256));
CREATE INDEX objects_owner_package_module_name_full_type ON objects (owner_id(32), object_type_package(32), object_type_module(128), object_type_name(128), object_type(256));

-- similar to objects table, except that
-- 1. the primary key to store multiple object versions and partitions by checkpoint_sequence_number
Expand All @@ -66,16 +66,16 @@ CREATE TABLE objects_history (
df_name BLOB,
df_object_type TEXT,
df_object_id BLOB,
CONSTRAINT objects_history_pk PRIMARY KEY (checkpoint_sequence_number, object_id(128), object_version)
CONSTRAINT objects_history_pk PRIMARY KEY (checkpoint_sequence_number, object_id(32), object_version)
) PARTITION BY RANGE (checkpoint_sequence_number) (
PARTITION objects_history_partition_0 VALUES LESS THAN MAXVALUE
);
CREATE INDEX objects_history_id_version ON objects_history (object_id(128), object_version, checkpoint_sequence_number);
CREATE INDEX objects_history_owner ON objects_history (checkpoint_sequence_number, owner_type, owner_id(128));
CREATE INDEX objects_history_coin ON objects_history (checkpoint_sequence_number, owner_id(128), coin_type(128));
CREATE INDEX objects_history_type ON objects_history (checkpoint_sequence_number, object_type(128));
CREATE INDEX objects_history_package_module_name_full_type ON objects_history (checkpoint_sequence_number, object_type_package(128), object_type_module(128), object_type_name(128), object_type(128));
CREATE INDEX objects_history_owner_package_module_name_full_type ON objects_history (checkpoint_sequence_number, owner_id(128), object_type_package(128), object_type_module(128), object_type_name(128), object_type(128));
CREATE INDEX objects_history_id_version ON objects_history (object_id(32), object_version, checkpoint_sequence_number);
CREATE INDEX objects_history_owner ON objects_history (checkpoint_sequence_number, owner_type, owner_id(32));
CREATE INDEX objects_history_coin ON objects_history (checkpoint_sequence_number, owner_id(32), coin_type(256));
CREATE INDEX objects_history_type ON objects_history (checkpoint_sequence_number, object_type(256));
CREATE INDEX objects_history_package_module_name_full_type ON objects_history (checkpoint_sequence_number, object_type_package(32), object_type_module(128), object_type_name(128), object_type(256));
CREATE INDEX objects_history_owner_package_module_name_full_type ON objects_history (checkpoint_sequence_number, owner_id(32), object_type_package(32), object_type_module(128), object_type_name(128), object_type(256));

-- snapshot table by folding objects_history table until certain checkpoint,
-- effectively the snapshot of objects at the same checkpoint,
Expand All @@ -99,10 +99,10 @@ CREATE TABLE objects_snapshot (
df_name BLOB,
df_object_type TEXT,
df_object_id BLOB,
CONSTRAINT objects_snapshot_pk PRIMARY KEY (object_id(128))
CONSTRAINT objects_snapshot_pk PRIMARY KEY (object_id(32))
);
CREATE INDEX objects_snapshot_checkpoint_sequence_number ON objects_snapshot (checkpoint_sequence_number);
CREATE INDEX objects_snapshot_owner ON objects_snapshot (owner_type, owner_id(128), object_id(128));
CREATE INDEX objects_snapshot_coin ON objects_snapshot (owner_id(128), coin_type(128), object_id(128));
CREATE INDEX objects_snapshot_package_module_name_full_type ON objects_snapshot (object_type_package(128), object_type_module(128), object_type_name(128), object_type(128));
CREATE INDEX objects_snapshot_owner_package_module_name_full_type ON objects_snapshot (owner_id(128), object_type_package(128), object_type_module(128), object_type_name(128), object_type(128));
CREATE INDEX objects_snapshot_owner ON objects_snapshot (owner_type, owner_id(32), object_id(32));
CREATE INDEX objects_snapshot_coin ON objects_snapshot (owner_id(32), coin_type(256), object_id(32));
CREATE INDEX objects_snapshot_package_module_name_full_type ON objects_snapshot (object_type_package(32), object_type_module(128), object_type_name(128), object_type(256));
CREATE INDEX objects_snapshot_owner_package_module_name_full_type ON objects_snapshot (owner_id(32), object_type_package(32), object_type_module(128), object_type_name(128), object_type(256));
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ CREATE TABLE transactions (
PARTITION transactions_partition_0 VALUES LESS THAN MAXVALUE
);

CREATE INDEX transactions_transaction_digest ON transactions (transaction_digest(255));
CREATE INDEX transactions_transaction_digest ON transactions (transaction_digest(32));
CREATE INDEX transactions_checkpoint_sequence_number ON transactions (checkpoint_sequence_number);
-- only create index for system transactions (0). See types.rs
CREATE INDEX transactions_transaction_kind ON transactions (transaction_kind);
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ CREATE TABLE checkpoints
);

CREATE INDEX checkpoints_epoch ON checkpoints (epoch, sequence_number);
CREATE INDEX checkpoints_digest ON checkpoints (checkpoint_digest(255));
CREATE INDEX checkpoints_digest ON checkpoints (checkpoint_digest(32));
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ CREATE TABLE tx_senders (
tx_sequence_number BIGINT NOT NULL,
-- SuiAddress in bytes.
sender BLOB NOT NULL,
PRIMARY KEY(sender(255), tx_sequence_number, cp_sequence_number)
PRIMARY KEY(sender(32), tx_sequence_number, cp_sequence_number)
);
CREATE INDEX tx_senders_tx_sequence_number_index ON tx_senders (tx_sequence_number, cp_sequence_number);

Expand All @@ -14,7 +14,7 @@ CREATE TABLE tx_recipients (
tx_sequence_number BIGINT NOT NULL,
-- SuiAddress in bytes.
recipient BLOB NOT NULL,
PRIMARY KEY(recipient(255), tx_sequence_number)
PRIMARY KEY(recipient(32), tx_sequence_number)
);
CREATE INDEX tx_recipients_tx_sequence_number_index ON tx_recipients (tx_sequence_number, cp_sequence_number);

Expand All @@ -23,15 +23,15 @@ CREATE TABLE tx_input_objects (
tx_sequence_number BIGINT NOT NULL,
-- Object ID in bytes.
object_id BLOB NOT NULL,
PRIMARY KEY(object_id(255), tx_sequence_number, cp_sequence_number)
PRIMARY KEY(object_id(32), tx_sequence_number, cp_sequence_number)
);

CREATE TABLE tx_changed_objects (
cp_sequence_number BIGINT NOT NULL,
tx_sequence_number BIGINT NOT NULL,
-- Object Id in bytes.
object_id BLOB NOT NULL,
PRIMARY KEY(object_id(255), tx_sequence_number)
PRIMARY KEY(object_id(32), tx_sequence_number)
);

CREATE TABLE tx_calls (
Expand All @@ -42,16 +42,16 @@ CREATE TABLE tx_calls (
func TEXT NOT NULL,
-- 1. Using Primary Key as a unique index.
-- 2. Diesel does not like tables with no primary key.
PRIMARY KEY(package(255), tx_sequence_number, cp_sequence_number)
PRIMARY KEY(package(32), tx_sequence_number, cp_sequence_number)
);

CREATE INDEX tx_calls_module ON tx_calls (package(255), module(255), tx_sequence_number, cp_sequence_number);
CREATE INDEX tx_calls_func ON tx_calls (package(255), module(255), func(255), tx_sequence_number, cp_sequence_number);
CREATE INDEX tx_calls_module ON tx_calls (package(32), module(128), tx_sequence_number, cp_sequence_number);
CREATE INDEX tx_calls_func ON tx_calls (package(32), module(128), func(128), tx_sequence_number, cp_sequence_number);
CREATE INDEX tx_calls_tx_sequence_number ON tx_calls (tx_sequence_number, cp_sequence_number);

CREATE TABLE tx_digests (
tx_digest BLOB NOT NULL,
cp_sequence_number BIGINT NOT NULL,
tx_sequence_number BIGINT NOT NULL,
PRIMARY KEY(tx_digest(255))
PRIMARY KEY(tx_digest(32))
);
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ CREATE TABLE display
id BLOB NOT NULL,
version SMALLINT NOT NULL,
bcs MEDIUMBLOB NOT NULL,
primary key (object_type(255))
primary key (object_type(256))
);

This file was deleted.

This file was deleted.

Loading