From 5737c9d96224f08e6840b6d0ec682173a85ece45 Mon Sep 17 00:00:00 2001
From: Edd Robinson <me@edd.io>
Date: Wed, 30 Jun 2021 09:43:41 +0100
Subject: [PATCH] refactor: remove table name from column_names

---
 read_buffer/src/chunk.rs | 11 +----------
 server/src/db/chunk.rs   |  3 +--
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/read_buffer/src/chunk.rs b/read_buffer/src/chunk.rs
index 5c65276dc3..6974c60d44 100644
--- a/read_buffer/src/chunk.rs
+++ b/read_buffer/src/chunk.rs
@@ -280,11 +280,8 @@ impl Chunk {
     /// determines that all the columns in the row group are already contained
     /// in the results buffer. Callers can skip this behaviour by passing in
     /// an empty `BTreeSet`.
-    ///
-    /// TODO(edd): remove `table_name`
     pub fn column_names(
         &self,
-        _table_name: &str,
         predicate: Predicate,
         only_columns: Selection<'_>,
         dst: BTreeSet<String>,
@@ -1078,12 +1075,7 @@ mod test {
         chunk.upsert_table("Utopia", rb);
 
         let result = chunk
-            .column_names(
-                "Utopia",
-                Predicate::default(),
-                Selection::All,
-                BTreeSet::new(),
-            )
+            .column_names(Predicate::default(), Selection::All, BTreeSet::new())
             .unwrap();
 
         assert_eq!(
@@ -1094,7 +1086,6 @@ mod test {
         // Testing predicates
         let result = chunk
             .column_names(
-                "Utopia",
                 Predicate::new(vec![BinaryExpr::from(("time", "=", 222222_i64))]),
                 Selection::All,
                 BTreeSet::new(),
diff --git a/server/src/db/chunk.rs b/server/src/db/chunk.rs
index d7825ee9ee..18bc8b4097 100644
--- a/server/src/db/chunk.rs
+++ b/server/src/db/chunk.rs
@@ -342,7 +342,6 @@ impl QueryChunk for DbChunk {
         predicate: &Predicate,
         columns: Selection<'_>,
     ) -> Result<Option<StringSet>, Self::Error> {
-        let table_name = self.table_name.as_ref();
         match &self.state {
             State::MutableBuffer { chunk, .. } => {
                 if !predicate.is_empty() {
@@ -362,7 +361,7 @@ impl QueryChunk for DbChunk {
 
                 Ok(Some(
                     chunk
-                        .column_names(table_name, rb_predicate, columns, BTreeSet::new())
+                        .column_names(rb_predicate, columns, BTreeSet::new())
                         .context(ReadBufferChunkError {
                             chunk_id: self.id(),
                         })?,