rust/tantivy
1
0
Fork 0
mirror of https://github.com/quickwit-oss/tantivy.git synced 2025-12-23 02:29:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

advancing on skip

Browse Source
This commit is contained in:
Paul Masurel
2016-02-13 19:33:28 +09:00
parent c1da85d1f9
commit cdbd772204
3 changed files with 65 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@@ -19,3 +19,6 @@ combine = "1.2.0"
tempdir = "0.3.4"
bincode = "0.4.0"
serde = "0.6.11"
#![feature(step_by)]

49
src/core/skip.rs
View File

@@ -217,12 +217,14 @@ impl<'a, T: BinarySerializable> Iterator for Layer<'a, T> {
}
static EMPTY: [u8; 0] = [];
impl<'a, T: BinarySerializable> Layer<'a, T> {
fn len(&self,) -> usize {
self.num_items
}
fn read(cursor: &mut Cursor<&'a [u8]>) -> Layer<'a, T> {
// TODO error handling?
let num_items = cursor.read_u32::<BigEndian>().unwrap() as u32;
@@ -271,7 +273,6 @@ pub struct SkipList<'a, T: BinarySerializable> {
impl<'a, T: BinarySerializable> Iterator for SkipList<'a, T> {
type Item = (DocId, T);
fn next(&mut self,)-> Option<(DocId, T)> {
@@ -281,6 +282,45 @@ impl<'a, T: BinarySerializable> Iterator for SkipList<'a, T> {
impl<'a, T: BinarySerializable> SkipList<'a, T> {
pub fn seek(&mut self, doc_id: DocId) {
// let mut next_layer_offset: u64 = 0;
// for skip_layer_id in 0..self.skip_layers.len() {
// println!("LAYER {}", skip_layer_id);
// let mut skip_layer: &mut Layer<'a, u32> = &mut self.skip_layers[skip_layer_id];
// println!("seek {}", next_layer_offset);
// if next_layer_offset > 0 {
// skip_layer.cursor.seek(SeekFrom::Start(next_layer_offset));
// next_layer_offset = 0;
// }
// println!("next id {}", skip_layer.next_id);
// while skip_layer.next_id < doc_id {
// match skip_layer.next() {
// Some((_, offset)) => {
// println!("bipoffset {}", offset);
// next_layer_offset = offset as u64;
// },
// None => {
// break;
// }
// }
// }
// }
// for skip_layer in self.skip_layers.iter() {
// println!("{}", skip_layer.len());
// }
// println!("last seek {}", next_layer_offset);
// if next_layer_offset > 0 {
// self.data_layer.cursor.seek(SeekFrom::Start(next_layer_offset));
// }
while self.data_layer.next_id < doc_id {
match self.data_layer.next() {
None => { break; },
_ => {}
}
}
}
pub fn read(data: &'a [u8]) -> SkipList<'a, T> {
let mut cursor = Cursor::new(data);
let num_layers = cursor.read_u8().unwrap();
@@ -290,11 +330,12 @@ impl<'a, T: BinarySerializable> SkipList<'a, T> {
if num_layers == 0 { Layer::empty() }
else { Layer::read(&mut cursor) };
if num_layers > 0 {
for _ in (0..num_layers - 1) {
for _ in 0..(num_layers - 1) {
let skip_layer: Layer<'a, u32> = Layer::read(&mut cursor);
skip_layers.push(skip_layer);
}
}
skip_layers.reverse();
SkipList {
skip_layers: skip_layers,
data_layer: data_layer,

17
tests/skip.rs
View File

@@ -74,4 +74,21 @@ fn test_skip_list_reader() {
assert_eq!(skip_list.next().unwrap(), (9, ()));
assert_eq!(skip_list.next(), None);
}
{
let mut output: Vec<u8> = Vec::new();
let mut skip_list_builder: SkipListBuilder = SkipListBuilder::new(2);
skip_list_builder.insert(2, &());
skip_list_builder.insert(3, &());
skip_list_builder.insert(5, &());
skip_list_builder.insert(7, &());
skip_list_builder.insert(9, &());
skip_list_builder.write::<Vec<u8>>(&mut output);
let mut skip_list: SkipList<()> = SkipList::read(&mut output);
assert_eq!(skip_list.next().unwrap(), (2, ()));
skip_list.seek(5);
assert_eq!(skip_list.next().unwrap(), (5, ()));
assert_eq!(skip_list.next().unwrap(), (7, ()));
assert_eq!(skip_list.next().unwrap(), (9, ()));
assert_eq!(skip_list.next(), None);
}
}