diff --git a/crates/core/src/vm.rs b/crates/core/src/vm.rs index 1ae0b849629..5195a5493c8 100644 --- a/crates/core/src/vm.rs +++ b/crates/core/src/vm.rs @@ -297,7 +297,7 @@ pub struct IndexSemiJoinLeft<'a, 'c, Rhs: RelOps<'a>> { pub tx: &'a TxMode<'a>, } -static_assert_size!(IndexSemiJoinLeft>>, 280); +static_assert_size!(IndexSemiJoinLeft>>, 264); impl<'a, Rhs: RelOps<'a>> IndexSemiJoinLeft<'a, '_, Rhs> { fn filter(&self, index_row: &RelValue<'_>) -> bool { diff --git a/crates/table/src/btree_index.rs b/crates/table/src/btree_index.rs index 96e62bf42bf..98a84fab391 100644 --- a/crates/table/src/btree_index.rs +++ b/crates/table/src/btree_index.rs @@ -84,25 +84,13 @@ impl Iterator for TypedMultiMapRangeIter<'_> { pub struct BTreeIndexRangeIter<'a> { /// The iterator seeking for matching values. iter: TypedMultiMapRangeIter<'a>, - /// The number of pointers yielded thus far. - num_pointers_yielded: u64, } impl Iterator for BTreeIndexRangeIter<'_> { type Item = RowPointer; fn next(&mut self) -> Option { - self.iter.next().map(|ptr| { - self.num_pointers_yielded += 1; - ptr - }) - } -} - -impl BTreeIndexRangeIter<'_> { - /// Returns the current number of pointers the iterator has returned thus far. - pub fn num_pointers_yielded(&self) -> u64 { - self.num_pointers_yielded + self.iter.next() } } @@ -491,7 +479,6 @@ impl BTreeIndex { pub fn seek(&self, range: &impl RangeBounds) -> BTreeIndexRangeIter<'_> { BTreeIndexRangeIter { iter: self.idx.values_in_range(range), - num_pointers_yielded: 0, } } diff --git a/crates/table/src/table.rs b/crates/table/src/table.rs index 5aece1dc8bd..1d95de53967 100644 --- a/crates/table/src/table.rs +++ b/crates/table/src/table.rs @@ -1052,13 +1052,6 @@ impl<'a> Iterator for IndexScanIter<'a> { } } -impl IndexScanIter<'_> { - /// Returns the current number of pointers the iterator has returned thus far. - pub fn num_pointers_yielded(&self) -> u64 { - self.btree_index_iter.num_pointers_yielded() - } -} - #[derive(Error, Debug, PartialEq, Eq)] #[error("Unique constraint violation '{}' in table '{}': column(s): '{:?}' value: {}", constraint_name, table_name, cols, value.to_satn())] pub struct UniqueConstraintViolation {