From b0d90bd24a5ce8db8ade50219c94067b20de06c8 Mon Sep 17 00:00:00 2001 From: NGA TRAN Date: Fri, 26 Feb 2021 14:55:16 -0500 Subject: [PATCH] feat: fmt auto fix --- mutable_buffer/src/chunk.rs | 8 +++++--- query/src/frontend/influxrpc.rs | 2 +- query/src/test.rs | 18 ++++++------------ server/src/db/chunk.rs | 8 +------- 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/mutable_buffer/src/chunk.rs b/mutable_buffer/src/chunk.rs index 477cb774b9..e2b2aaeaa7 100644 --- a/mutable_buffer/src/chunk.rs +++ b/mutable_buffer/src/chunk.rs @@ -338,7 +338,7 @@ impl Chunk { // Only return subset of these selection_cols if not all_cols let mut all_cols = true; let selection_cols = match selection { - Selection::All => &[""], + Selection::All => &[""], Selection::Some(cols) => { all_cols = false; cols @@ -355,8 +355,10 @@ impl Chunk { chunk: self.id, })?; - if !column_names.contains(column_name) && - (all_cols || selection_cols.contains(&column_name)) { // only use columns in selection_cols + if !column_names.contains(column_name) + && (all_cols || selection_cols.contains(&column_name)) + { + // only use columns in selection_cols column_names.insert(column_name.to_string()); } } diff --git a/query/src/frontend/influxrpc.rs b/query/src/frontend/influxrpc.rs index d776c593c1..71e76e22c4 100644 --- a/query/src/frontend/influxrpc.rs +++ b/query/src/frontend/influxrpc.rs @@ -222,7 +222,7 @@ impl InfluxRPCPlanner { .await .map_err(|e| Box::new(e) as _) .context(FindingColumnNames)?; - + match maybe_names { Some(mut names) => { debug!(names=?names, chunk_id = chunk.id(), "column names found from metadata"); diff --git a/query/src/test.rs b/query/src/test.rs index 97c6691635..a039741e0a 100644 --- a/query/src/test.rs +++ b/query/src/test.rs @@ -497,30 +497,24 @@ impl TestChunk { self } - /// Returns all columns of the table - pub fn all_column_names( - &self, - table_name: &str, - ) -> Option { - + pub fn all_column_names(&self, table_name: &str) -> Option { let column_names = self.table_schemas.get(table_name).map(|schema| { schema .iter() - .map(|(_, field)| field.name().to_string()) + .map(|(_, field)| field.name().to_string()) .collect::() }); column_names } - /// Returns just the specified columns + /// Returns just the specified columns pub fn specific_column_names_selection( &self, table_name: &str, columns: &[&str], ) -> Option { - let column_names = self.table_schemas.get(table_name).map(|schema| { schema .iter() @@ -615,11 +609,11 @@ impl PartitionChunk for TestChunk { // save the predicate self.predicate.lock().replace(predicate.clone()); - + // only return columns specified in selection let column_names = match selection { - Selection::All => self.all_column_names(table_name), - Selection::Some(cols) => self.specific_column_names_selection(table_name, cols) + Selection::All => self.all_column_names(table_name), + Selection::Some(cols) => self.specific_column_names_selection(table_name, cols), }; Ok(column_names) diff --git a/server/src/db/chunk.rs b/server/src/db/chunk.rs index 2c5673011e..e758553dc6 100644 --- a/server/src/db/chunk.rs +++ b/server/src/db/chunk.rs @@ -340,13 +340,7 @@ impl PartitionChunk for DBChunk { let chunk_ids = &[chunk_id]; let names = db - .column_names( - partition_key, - table_name, - chunk_ids, - rb_predicate, - columns, - ) + .column_names(partition_key, table_name, chunk_ids, rb_predicate, columns) .context(ReadBufferChunk { chunk_id })?; Ok(names)