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

introduce tableset and impl for tables enum #12617

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
19 changes: 19 additions & 0 deletions crates/storage/db/src/tables/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,13 @@ pub trait TableViewer<R> {
}
}

/// General trait for defining the set of tables
/// Used to initialize database
trait TableSet {
fn table_names(&self) -> Vec<&'static str>;
fn is_dupsort(&self, idx: usize) -> bool;
}

/// Defines all the tables in the database.
#[macro_export]
macro_rules! tables {
Expand Down Expand Up @@ -242,6 +249,18 @@ macro_rules! tables {
}
}

impl TableSet for Tables {
fn table_names(&self) -> Vec<&'static str> {
//vec![$(table_names::$name,)*]
Self::ALL.iter().map(|t| t.name()).collect()
}

fn is_dupsort(&self, idx: usize) -> bool {
let table: Self = self.table_names()[idx].parse().expect("should be valid table name");
table.is_dupsort()
}
}

// Need constants to match on in the `FromStr` implementation.
#[allow(non_upper_case_globals)]
mod table_names {
Expand Down
Loading