Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: remove lifetime to make index re-usable

pull/24376/head
Edd Robinson 2020-06-02 16:59:24 +01:00
parent 481ce5f136
commit 887ffd5977
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -411,6 +411,7 @@ dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
"predicates 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"prost 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "prost 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"prost-types 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "prost-types 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",

9
src/storage/tsm.rs
View File

@ -409,11 +409,11 @@ fn parse_tsm_key(
/// BlockData describes the various types of block data that can be held within /// BlockData describes the various types of block data that can be held within
/// a TSM file. /// a TSM file.
pub enum BlockData<'a> { pub enum BlockData {
Float { ts: Vec<i64>, values: Vec<f64> }, Float { ts: Vec<i64>, values: Vec<f64> },
Integer { ts: Vec<i64>, values: Vec<i64> }, Integer { ts: Vec<i64>, values: Vec<i64> },
Bool { ts: Vec<i64>, values: Vec<bool> }, Bool { ts: Vec<i64>, values: Vec<bool> },
Str { ts: Vec<i64>, values: Vec<&'a str> }, Str { ts: Vec<i64>, values: Vec<String> },
Unsigned { ts: Vec<i64>, values: Vec<u64> }, Unsigned { ts: Vec<i64>, values: Vec<u64> },
} }
@ -574,12 +574,13 @@ mod tests {
let f64_block = &index.decode_block(&f64_entry.block).unwrap(); let f64_block = &index.decode_block(&f64_entry.block).unwrap();
blocks.push(f64_block); blocks.push(f64_block);
// // Find the first integer block index entry in the file. // Find the first integer block index entry in the file.
let i64_entry = index let i64_entry = index
.find(|e| e.as_ref().unwrap().block_type == 1_u8) .find(|e| e.as_ref().unwrap().block_type == 1_u8)
.unwrap() .unwrap()
.unwrap(); .unwrap();
blocks.push(&index.decode_block(&i64_entry.block).unwrap()); let i64_block = &index.decode_block(&i64_entry.block).unwrap();
blocks.push(i64_block);
for block in blocks { for block in blocks {
// The first integer block in the value should have 509 values in it. // The first integer block in the value should have 509 values in it.