Skip to content

Commit bbc6951

Browse files
committed
bounds_from_bsatn: also consider unique indices
1 parent 7ad28dd commit bbc6951

File tree

1 file changed

+24
-45
lines changed
  • crates/table/src/table_index

1 file changed

+24
-45
lines changed

crates/table/src/table_index/mod.rs

Lines changed: 24 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1909,52 +1909,31 @@ impl TableIndex {
19091909
let range_type = &range_type.algebraic_type;
19101910
let suffix_len = suffix_types.len();
19111911

1912+
macro_rules! bounds_from_bsatn_bytes_key {
1913+
($ctor:expr) => {
1914+
Self::bounds_from_bsatn_bytes_key(
1915+
prefix,
1916+
prefix_types,
1917+
start,
1918+
end,
1919+
range_type,
1920+
suffix_len,
1921+
$ctor,
1922+
)
1923+
};
1924+
}
1925+
19121926
match &self.idx {
1913-
BTreeBytesKey8(_) => Self::bounds_from_bsatn_bytes_key(
1914-
prefix,
1915-
prefix_types,
1916-
start,
1917-
end,
1918-
range_type,
1919-
suffix_len,
1920-
TypedIndexKey::BytesKey8B,
1921-
),
1922-
BTreeBytesKey16(_) => Self::bounds_from_bsatn_bytes_key(
1923-
prefix,
1924-
prefix_types,
1925-
start,
1926-
end,
1927-
range_type,
1928-
suffix_len,
1929-
TypedIndexKey::BytesKey16,
1930-
),
1931-
BTreeBytesKey32(_) => Self::bounds_from_bsatn_bytes_key(
1932-
prefix,
1933-
prefix_types,
1934-
start,
1935-
end,
1936-
range_type,
1937-
suffix_len,
1938-
TypedIndexKey::BytesKey32,
1939-
),
1940-
BTreeBytesKey64(_) => Self::bounds_from_bsatn_bytes_key(
1941-
prefix,
1942-
prefix_types,
1943-
start,
1944-
end,
1945-
range_type,
1946-
suffix_len,
1947-
TypedIndexKey::BytesKey64,
1948-
),
1949-
BTreeBytesKey128(_) => Self::bounds_from_bsatn_bytes_key(
1950-
prefix,
1951-
prefix_types,
1952-
start,
1953-
end,
1954-
range_type,
1955-
suffix_len,
1956-
TypedIndexKey::BytesKey128,
1957-
),
1927+
BTreeBytesKey8(_) => bounds_from_bsatn_bytes_key!(TypedIndexKey::BytesKey8B),
1928+
BTreeBytesKey16(_) => bounds_from_bsatn_bytes_key!(TypedIndexKey::BytesKey16),
1929+
BTreeBytesKey32(_) => bounds_from_bsatn_bytes_key!(TypedIndexKey::BytesKey32),
1930+
BTreeBytesKey64(_) => bounds_from_bsatn_bytes_key!(TypedIndexKey::BytesKey64),
1931+
BTreeBytesKey128(_) => bounds_from_bsatn_bytes_key!(TypedIndexKey::BytesKey128),
1932+
UniqueBTreeBytesKey8(_) => bounds_from_bsatn_bytes_key!(TypedIndexKey::BytesKey8B),
1933+
UniqueBTreeBytesKey16(_) => bounds_from_bsatn_bytes_key!(TypedIndexKey::BytesKey16),
1934+
UniqueBTreeBytesKey32(_) => bounds_from_bsatn_bytes_key!(TypedIndexKey::BytesKey32),
1935+
UniqueBTreeBytesKey64(_) => bounds_from_bsatn_bytes_key!(TypedIndexKey::BytesKey64),
1936+
UniqueBTreeBytesKey128(_) => bounds_from_bsatn_bytes_key!(TypedIndexKey::BytesKey128),
19581937
BTreeAV(_) | HashAV(_) | UniqueBTreeAV(_) | UniqueHashAV(_) => {
19591938
// The index is not specialized.
19601939
// We now have the types,

0 commit comments

Comments
 (0)