Skip to content

Commit e29112e

Browse files
committed
[release/v1.7.0]: Revert "Index a view's metadata columns (#3540)"
This reverts commit 3863f20.
1 parent 3cc59de commit e29112e

File tree

1 file changed

+10
-22
lines changed

1 file changed

+10
-22
lines changed

crates/schema/src/schema.rs

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -603,19 +603,19 @@ impl TableSchema {
603603
/// fn my_anonymous_view(ctx: &AnonymousViewContext, x: u32, y: u32) -> Vec<MyTable> { ... }
604604
/// ```
605605
///
606-
/// The above views are materialized with the following schema:
606+
/// The above views are materialized with the following schemas:
607607
///
608608
/// my_view:
609609
///
610-
/// | sender | arg_id | a | b |
611-
/// |----------------|--------|-----|-----|
612-
/// | (some = 0x...) | u64 | u32 | u32 |
610+
/// | sender | arg_id | a | b |
611+
/// |----------|--------|-----|-----|
612+
/// | Identity | 1 | u32 | u32 |
613613
///
614614
/// my_anonymous_view:
615615
///
616-
/// | sender | arg_id | a | b |
617-
/// |-------------|--------|-----|-----|
618-
/// | (none = ()) | u64 | u32 | u32 |
616+
/// | arg_id | a | b |
617+
/// |--------|-----|-----|
618+
/// | 1 | u32 | u32 |
619619
///
620620
/// Note, `arg_id` is a foreign key into `st_view_arg`.
621621
pub fn from_view_def(module_def: &ModuleDef, view_def: &ViewDef) -> Self {
@@ -631,20 +631,17 @@ impl TableSchema {
631631
let n = return_columns.len() + 2;
632632
let mut columns = Vec::with_capacity(n);
633633

634-
let sender_col_name = "sender";
635-
let arg_id_col_name = "arg_id";
636-
637634
columns.push(ColumnSchema {
638635
table_id: TableId::SENTINEL,
639636
col_pos: ColId(0),
640-
col_name: sender_col_name.into(),
637+
col_name: "sender".into(),
641638
col_type: AlgebraicType::option(AlgebraicType::identity()),
642639
});
643640

644641
columns.push(ColumnSchema {
645642
table_id: TableId::SENTINEL,
646643
col_pos: ColId(1),
647-
col_name: arg_id_col_name.into(),
644+
col_name: "arg_id".into(),
648645
col_type: AlgebraicType::U64,
649646
});
650647

@@ -657,15 +654,6 @@ impl TableSchema {
657654
.map(|(col_pos, schema)| ColumnSchema { col_pos, ..schema }),
658655
);
659656

660-
let index_name = format!("{}_{}_{}_idx_btree", name, sender_col_name, arg_id_col_name);
661-
662-
let indexes = vec![IndexSchema {
663-
index_id: IndexId::SENTINEL,
664-
table_id: TableId::SENTINEL,
665-
index_name: index_name.into_boxed_str(),
666-
index_algorithm: IndexAlgorithm::BTree(col_list![0, 1].into()),
667-
}];
668-
669657
let table_access = if *is_public {
670658
StAccess::Public
671659
} else {
@@ -676,7 +664,7 @@ impl TableSchema {
676664
TableId::SENTINEL,
677665
(*name).clone().into(),
678666
columns,
679-
indexes,
667+
vec![],
680668
vec![],
681669
vec![],
682670
StTableType::User,

0 commit comments

Comments
 (0)