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

refactor: Shorten matches

pull/24376/head
Carol (Nichols || Goulding) 2020-07-15 09:04:59 -04:00
parent c0a823f0d2
commit 582e18a241
1 changed files with 24 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
delorean_tsm/src/reader.rs
View File

@ -306,38 +306,22 @@ impl BlockData {
ts: Vec::with_capacity(other.len()), ts: Vec::with_capacity(other.len()),
values: Vec::with_capacity(other.len()), values: Vec::with_capacity(other.len()),
}, },
Self::Integer { Self::Integer { .. } => Self::Integer {
i: _,
ts: _,
values: _,
} => Self::Integer {
i: 0, i: 0,
ts: Vec::with_capacity(other.len()), ts: Vec::with_capacity(other.len()),
values: Vec::with_capacity(other.len()), values: Vec::with_capacity(other.len()),
}, },
Self::Bool { Self::Bool { .. } => Self::Bool {
i: _,
ts: _,
values: _,
} => Self::Bool {
i: 0, i: 0,
ts: Vec::with_capacity(other.len()), ts: Vec::with_capacity(other.len()),
values: Vec::with_capacity(other.len()), values: Vec::with_capacity(other.len()),
}, },
Self::Str { Self::Str { .. } => Self::Str {
i: _,
ts: _,
values: _,
} => Self::Str {
i: 0, i: 0,
ts: Vec::with_capacity(other.len()), ts: Vec::with_capacity(other.len()),
values: Vec::with_capacity(other.len()), values: Vec::with_capacity(other.len()),
}, },
Self::Unsigned { Self::Unsigned { .. } => Self::Unsigned {
i: _,
ts: _,
values: _,
} => Self::Unsigned {
i: 0, i: 0,
ts: Vec::with_capacity(other.len()), ts: Vec::with_capacity(other.len()),
values: Vec::with_capacity(other.len()), values: Vec::with_capacity(other.len()),
@ -351,19 +335,19 @@ impl BlockData {
ts.reserve_exact(additional); ts.reserve_exact(additional);
values.reserve_exact(additional); values.reserve_exact(additional);
} }
Self::Integer { i: _, ts, values } => { Self::Integer { ts, values, .. } => {
ts.reserve_exact(additional); ts.reserve_exact(additional);
values.reserve_exact(additional); values.reserve_exact(additional);
} }
Self::Bool { i: _, ts, values } => { Self::Bool { ts, values, .. } => {
ts.reserve_exact(additional); ts.reserve_exact(additional);
values.reserve_exact(additional); values.reserve_exact(additional);
} }
Self::Str { i: _, ts, values } => { Self::Str { ts, values, .. } => {
ts.reserve_exact(additional); ts.reserve_exact(additional);
values.reserve_exact(additional); values.reserve_exact(additional);
} }
Self::Unsigned { i: _, ts, values } => { Self::Unsigned { ts, values, .. } => {
ts.reserve_exact(additional); ts.reserve_exact(additional);
values.reserve_exact(additional); values.reserve_exact(additional);
} }
@ -374,7 +358,7 @@ impl BlockData {
pub fn push(&mut self, pair: ValuePair) { pub fn push(&mut self, pair: ValuePair) {
match pair { match pair {
ValuePair::F64((t, v)) => { ValuePair::F64((t, v)) => {
if let Self::Float { i: _, ts, values } = self { if let Self::Float { ts, values, .. } = self {
ts.push(t); ts.push(t);
values.push(v); values.push(v);
} else { } else {
@ -382,7 +366,7 @@ impl BlockData {
} }
} }
ValuePair::I64((t, v)) => { ValuePair::I64((t, v)) => {
if let Self::Integer { i: _, ts, values } = self { if let Self::Integer { ts, values, .. } = self {
ts.push(t); ts.push(t);
values.push(v); values.push(v);
} else { } else {
@ -390,7 +374,7 @@ impl BlockData {
} }
} }
ValuePair::Bool((t, v)) => { ValuePair::Bool((t, v)) => {
if let Self::Bool { i: _, ts, values } = self { if let Self::Bool { ts, values, .. } = self {
ts.push(t); ts.push(t);
values.push(v); values.push(v);
} else { } else {
@ -398,7 +382,7 @@ impl BlockData {
} }
} }
ValuePair::Str((t, v)) => { ValuePair::Str((t, v)) => {
if let Self::Str { i: _, ts, values } = self { if let Self::Str { ts, values, .. } = self {
ts.push(t); ts.push(t);
values.push(v); // TODO(edd): figure out values.push(v); // TODO(edd): figure out
} else { } else {
@ -406,7 +390,7 @@ impl BlockData {
} }
} }
ValuePair::U64((t, v)) => { ValuePair::U64((t, v)) => {
if let Self::Unsigned { i: _, ts, values } = self { if let Self::Unsigned { ts, values, .. } = self {
ts.push(t); ts.push(t);
values.push(v); values.push(v);
} else { } else {
@ -452,37 +436,21 @@ impl BlockData {
pub fn is_empty(&self) -> bool { pub fn is_empty(&self) -> bool {
match &self { match &self {
Self::Float { i, ts, values: _ } => *i == ts.len(), Self::Float { i, ts, .. } => *i == ts.len(),
Self::Integer { i, ts, values: _ } => *i == ts.len(), Self::Integer { i, ts, .. } => *i == ts.len(),
Self::Bool { i, ts, values: _ } => *i == ts.len(), Self::Bool { i, ts, .. } => *i == ts.len(),
Self::Str { i, ts, values: _ } => *i == ts.len(), Self::Str { i, ts, .. } => *i == ts.len(),
Self::Unsigned { i, ts, values: _ } => *i == ts.len(), Self::Unsigned { i, ts, .. } => *i == ts.len(),
} }
} }
pub fn len(&self) -> usize { pub fn len(&self) -> usize {
match &self { match &self {
Self::Float { ts, .. } => ts.len(), Self::Float { ts, .. } => ts.len(),
Self::Integer { Self::Integer { ts, .. } => ts.len(),
i: _, Self::Bool { ts, .. } => ts.len(),
ts, Self::Str { ts, .. } => ts.len(),
values: _, Self::Unsigned { ts, .. } => ts.len(),
} => ts.len(),
Self::Bool {
i: _,
ts,
values: _,
} => ts.len(),
Self::Str {
i: _,
ts,
values: _,
} => ts.len(),
Self::Unsigned {
i: _,
ts,
values: _,
} => ts.len(),
} }
} }
@ -818,11 +786,11 @@ mod tests {
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.
match block { match block {
BlockData::Float { i: _, ts, values } => { BlockData::Float { ts, values, .. } => {
assert_eq!(ts.len(), 507); assert_eq!(ts.len(), 507);
assert_eq!(values.len(), 507); assert_eq!(values.len(), 507);
} }
BlockData::Integer { i: _, ts, values } => { BlockData::Integer { ts, values, .. } => {
assert_eq!(ts.len(), 509); assert_eq!(ts.len(), 509);
assert_eq!(values.len(), 509); assert_eq!(values.len(), 509);
} }