Skip to content

Commit d614f70

Browse files
yanghuayanghua
committed
refactor: rename RowIdTreeMap to RowAddrTreeMap
1 parent 3891204 commit d614f70

File tree

12 files changed

+28
-29
lines changed

12 files changed

+28
-29
lines changed

‎rust/lance-index/src/frag_reuse.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use arrow_array::{Array, ArrayRef, PrimitiveArray, RecordBatch, UInt64Array};
88
use async_trait::async_trait;
99
use deepsize::{Context, DeepSizeOf};
1010
use itertools::Itertools;
11-
use lance_core::utils::mask::RowAddrTreeMap;
11+
use lance_core::utils::mask::{RowAddrTreeMap, RowIdTreeMap};
1212
use lance_core::{Error, Result};
1313
use lance_table::format::pb::fragment_reuse_index_details::InlineContent;
1414
use lance_table::format::{pb, ExternalFile, Fragment};
@@ -246,7 +246,7 @@ impl FragReuseIndex {
246246
}
247247

248248
pub fn remap_row_ids_tree_map(&self, row_ids: &RowIdTreeMap) -> RowIdTreeMap {
249-
RowIdTreeMap::from_iter(row_ids.row_ids().unwrap().filter_map(|addr| {
249+
RowAddrTreeMap::from_iter(row_ids.row_ids().unwrap().filter_map(|addr| {
250250
let addr_as_u64 = u64::from(addr);
251251
self.remap_row_id(addr_as_u64)
252252
}))

‎rust/lance-index/src/scalar/bitmap.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use futures::TryStreamExt;
2121
use lance_core::{
2222
cache::{CacheKey, LanceCache, WeakLanceCache},
2323
error::LanceOptionExt,
24-
utils::mask::RowIdTreeMap,
24+
utils::mask::{RowIdTreeMap, RowAddrTreeMap},
2525
Error, Result, ROW_ID,
2626
};
2727
use roaring::RoaringBitmap;
@@ -169,7 +169,7 @@ impl BitmapIndex {
169169
}
170170

171171
let mut index_map: BTreeMap<OrderableScalarValue, usize> = BTreeMap::new();
172-
let mut null_map = Arc::new(RowIdTreeMap::default());
172+
let mut null_map = Arc::new(RowAddrTreeMap::default());
173173
let mut value_type: Option<DataType> = None;
174174
let mut null_location: Option<usize> = None;
175175
let mut row_offset = 0;
@@ -261,7 +261,7 @@ impl BitmapIndex {
261261

262262
let row_offset = match self.index_map.get(key) {
263263
Some(loc) => *loc,
264-
None => return Ok(Arc::new(RowIdTreeMap::default())),
264+
None => return Ok(Arc::new(RowAddrTreeMap::default())),
265265
};
266266

267267
let page_lookup_file = self.lazy_reader.get().await?;
@@ -509,7 +509,7 @@ impl ScalarIndex for BitmapIndex {
509509
for key in self.index_map.keys() {
510510
let bitmap = self.load_bitmap(key, None).await?;
511511
let remapped_bitmap =
512-
RowIdTreeMap::from_iter(bitmap.row_ids().unwrap().filter_map(|addr| {
512+
RowAddrTreeMap::from_iter(bitmap.row_ids().unwrap().filter_map(|addr| {
513513
let addr_as_u64 = u64::from(addr);
514514
mapping
515515
.get(&addr_as_u64)
@@ -521,7 +521,7 @@ impl ScalarIndex for BitmapIndex {
521521

522522
if !self.null_map.is_empty() {
523523
let remapped_null =
524-
RowIdTreeMap::from_iter(self.null_map.row_ids().unwrap().filter_map(|addr| {
524+
RowAddrTreeMap::from_iter(self.null_map.row_ids().unwrap().filter_map(|addr| {
525525
let addr_as_u64 = u64::from(addr);
526526
mapping
527527
.get(&addr_as_u64)
@@ -902,7 +902,7 @@ pub mod tests {
902902
let mut state = HashMap::new();
903903
for i in 0..m {
904904
// Create a bitmap that contains, say, 1000 row IDs.
905-
let bitmap = RowIdTreeMap::from_iter(0..per_bitmap_size);
905+
let bitmap = RowAddrTreeMap::from_iter(0..per_bitmap_size);
906906

907907
let key = ScalarValue::UInt32(Some(i));
908908
state.insert(key, bitmap);

‎rust/lance-index/src/scalar/btree.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2161,7 +2161,7 @@ mod tests {
21612161
let result = index.search(&query, &NoOpMetricsCollector).await.unwrap();
21622162
assert_eq!(
21632163
result,
2164-
SearchResult::Exact(RowIdTreeMap::from_iter(((idx as u64)..1000).step_by(7)))
2164+
SearchResult::Exact(RowAddrTreeMap::from_iter(((idx as u64)..1000).step_by(7)))
21652165
);
21662166
}
21672167
}

‎rust/lance-index/src/scalar/flat.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ impl ScalarIndex for FlatIndex {
304304
.as_any()
305305
.downcast_ref::<UInt64Array>()
306306
.expect("Result of arrow_select::filter::filter did not match input type");
307-
Ok(SearchResult::Exact(RowIdTreeMap::from_iter(
307+
Ok(SearchResult::Exact(RowAddrTreeMap::from_iter(
308308
matching_ids.values(),
309309
)))
310310
}
@@ -372,7 +372,7 @@ mod tests {
372372
let SearchResult::Exact(actual_row_ids) = actual else {
373373
panic! {"Expected exact search result"}
374374
};
375-
let expected = RowIdTreeMap::from_iter(expected);
375+
let expected = RowAddrTreeMap::from_iter(expected);
376376
assert_eq!(actual_row_ids, expected);
377377
}
378378

‎rust/lance-index/src/scalar/inverted/index.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ impl ScalarIndex for InvertedIndex {
533533
.downcast_ref::<UInt64Array>()
534534
.unwrap();
535535
let row_ids = row_ids.iter().flatten().collect_vec();
536-
Ok(SearchResult::AtMost(RowIdTreeMap::from_iter(row_ids)))
536+
Ok(SearchResult::AtMost(RowAddrTreeMap::from_iter(row_ids)))
537537
}
538538
}
539539
}

‎rust/lance-index/src/scalar/ngram.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use lance_core::utils::address::RowAddress;
3838
use lance_core::utils::tempfile::TempDir;
3939
use lance_core::utils::tokio::get_num_compute_intensive_cpus;
4040
use lance_core::utils::tracing::{IO_TYPE_LOAD_SCALAR_PART, TRACE_IO_EVENTS};
41-
use lance_core::{utils::mask::RowIdTreeMap, Error};
41+
use lance_core::{utils::mask::RowAddrTreeMap, Error};
4242
use lance_core::{Result, ROW_ID};
4343
use lance_io::object_store::ObjectStore;
4444
use log::info;
@@ -451,7 +451,7 @@ impl ScalarIndex for NGramIndex {
451451
TextQuery::StringContains(substr) => {
452452
if substr.len() < NGRAM_N {
453453
// We know nothing on short searches, need to recheck all
454-
return Ok(SearchResult::AtLeast(RowIdTreeMap::new()));
454+
return Ok(SearchResult::AtLeast(RowAddrTreeMap::new()));
455455
}
456456

457457
let mut row_offsets = Vec::with_capacity(substr.len() * 3);
@@ -466,7 +466,7 @@ impl ScalarIndex for NGramIndex {
466466
});
467467
// At least one token was missing, so we know there are zero results
468468
if missing {
469-
return Ok(SearchResult::Exact(RowIdTreeMap::new()));
469+
return Ok(SearchResult::Exact(RowAddrTreeMap::new()));
470470
}
471471
let posting_lists = futures::stream::iter(
472472
row_offsets
@@ -479,7 +479,7 @@ impl ScalarIndex for NGramIndex {
479479
metrics.record_comparisons(posting_lists.len());
480480
let list_refs = posting_lists.iter().map(|list| list.as_ref());
481481
let row_ids = NGramPostingList::intersect(list_refs);
482-
Ok(SearchResult::AtMost(RowIdTreeMap::from(row_ids)))
482+
Ok(SearchResult::AtMost(RowAddrTreeMap::from(row_ids)))
483483
}
484484
}
485485
}
@@ -1483,7 +1483,7 @@ mod tests {
14831483
.await
14841484
.unwrap();
14851485

1486-
let expected = SearchResult::AtMost(RowIdTreeMap::from_iter([0, 2, 3]));
1486+
let expected = SearchResult::AtMost(RowAddrTreeMap::from_iter([0, 2, 3]));
14871487

14881488
assert_eq!(expected, res);
14891489

@@ -1506,7 +1506,7 @@ mod tests {
15061506
)
15071507
.await
15081508
.unwrap();
1509-
let expected = SearchResult::Exact(RowIdTreeMap::new());
1509+
let expected = SearchResult::Exact(RowAddrTreeMap::new());
15101510
assert_eq!(expected, res);
15111511

15121512
// False positive
@@ -1528,7 +1528,7 @@ mod tests {
15281528
)
15291529
.await
15301530
.unwrap();
1531-
let expected = SearchResult::AtLeast(RowIdTreeMap::new());
1531+
let expected = SearchResult::AtLeast(RowAddrTreeMap::new());
15321532
assert_eq!(expected, res);
15331533

15341534
// One short string but we still get at least one trigram, this is ok
@@ -1578,7 +1578,7 @@ mod tests {
15781578
)
15791579
.await
15801580
.unwrap();
1581-
let expected = SearchResult::AtMost(RowIdTreeMap::from_iter([0, 4]));
1581+
let expected = SearchResult::AtMost(RowAddrTreeMap::from_iter([0, 4]));
15821582
assert_eq!(expected, res);
15831583

15841584
let null_posting_list = get_null_posting_list(&index).await;

‎rust/lance-index/src/scalar/zonemap.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ use crate::{Index, IndexType};
4343
use async_trait::async_trait;
4444
use deepsize::DeepSizeOf;
4545
use lance_core::Result;
46-
use lance_core::{utils::mask::RowIdTreeMap, Error};
46+
use lance_core::{utils::mask::{RowIdTreeMap, RowAddrTreeMap}, Error};
4747
use roaring::RoaringBitmap;
4848
use snafu::location;
4949
const ROWS_PER_ZONE_DEFAULT: u64 = 8192; // 1 zone every two batches

‎rust/lance/src/dataset/write/commit.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use std::collections::HashMap;
55
use std::sync::Arc;
66

7-
use lance_core::utils::mask::RowAddrTreeMap;
7+
use lance_core::utils::mask::{RowAddrTreeMap, RowIdTreeMap};
88
use lance_file::version::LanceFileVersion;
99
use lance_io::object_store::{ObjectStore, ObjectStoreParams};
1010
use lance_table::{

‎rust/lance/src/dataset/write/delete.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::{
1010
use datafusion::logical_expr::Expr;
1111
use datafusion::scalar::ScalarValue;
1212
use futures::{StreamExt, TryStreamExt};
13-
use lance_core::utils::mask::RowAddrTreeMap;
13+
use lance_core::utils::mask::{RowAddrTreeMap, RowIdTreeMap};
1414
use lance_core::{Error, Result, ROW_ID};
1515
use lance_table::format::Fragment;
1616
use roaring::RoaringTreemap;

‎rust/lance/src/dataset/write/update.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use datafusion::scalar::ScalarValue;
2525
use futures::StreamExt;
2626
use lance_arrow::RecordBatchExt;
2727
use lance_core::error::{box_error, InvalidInputSnafu};
28-
use lance_core::utils::mask::RowAddrTreeMap;
28+
use lance_core::utils::mask::{RowAddrTreeMap, RowIdTreeMap};
2929
use lance_core::utils::tokio::get_num_compute_intensive_cpus;
3030
use lance_datafusion::expr::safe_coerce_scalar;
3131
use lance_table::format::{Fragment, RowIdMeta};

0 commit comments

Comments
 (0)