From 1639b6e7cec0b078627a4d2ab3eb5d92b2144e2f Mon Sep 17 00:00:00 2001
From: Ning Sun <sunng@protonmail.com>
Date: Fri, 16 Sep 2022 14:04:04 +0800
Subject: [PATCH] refactor: rename to_vec to take for RecordBatches (#264)

---
 src/common/recordbatch/src/lib.rs      | 5 ++---
 src/datanode/src/server/grpc/select.rs | 2 +-
 src/frontend/src/instance.rs           | 4 ++--
 src/servers/src/http.rs                | 2 +-
 src/servers/src/mysql/writer.rs        | 2 +-
 src/servers/src/postgres/handler.rs    | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/common/recordbatch/src/lib.rs b/src/common/recordbatch/src/lib.rs
index dafacf7506..988431e8a0 100644
--- a/src/common/recordbatch/src/lib.rs
+++ b/src/common/recordbatch/src/lib.rs
@@ -71,8 +71,7 @@ impl RecordBatches {
         self.schema.clone()
     }
 
-    // TODO: a new name that to avoid misunderstanding it as an allocation operation
-    pub fn to_vec(self) -> Vec<RecordBatch> {
+    pub fn take(self) -> Vec<RecordBatch> {
         self.batches
     }
 }
@@ -115,6 +114,6 @@ mod tests {
 
         let batches = RecordBatches::try_new(schema1.clone(), vec![batch1.clone()]).unwrap();
         assert_eq!(schema1, batches.schema());
-        assert_eq!(vec![batch1], batches.to_vec());
+        assert_eq!(vec![batch1], batches.take());
     }
 }
diff --git a/src/datanode/src/server/grpc/select.rs b/src/datanode/src/server/grpc/select.rs
index 194b0eb03f..354355cfde 100644
--- a/src/datanode/src/server/grpc/select.rs
+++ b/src/datanode/src/server/grpc/select.rs
@@ -21,7 +21,7 @@ pub async fn to_object_result(result: Result<Output>) -> ObjectResult {
             .mutate_result(rows as u32, 0)
             .build(),
         Ok(Output::Stream(stream)) => record_batchs(stream).await,
-        Ok(Output::RecordBatches(recordbatches)) => build_result(recordbatches.to_vec()).await,
+        Ok(Output::RecordBatches(recordbatches)) => build_result(recordbatches.take()).await,
         Err(err) => ObjectResultBuilder::new()
             .status_code(err.status_code() as u32)
             .err_msg(err.to_string())
diff --git a/src/frontend/src/instance.rs b/src/frontend/src/instance.rs
index 9d9b6598dc..802972eb84 100644
--- a/src/frontend/src/instance.rs
+++ b/src/frontend/src/instance.rs
@@ -287,7 +287,7 @@ mod tests {
             _ => unreachable!(),
         }
 
-        let sql = r#"insert into demo(host, cpu, memory, ts) values 
+        let sql = r#"insert into demo(host, cpu, memory, ts) values
                                 ('frontend.host1', 1.1, 100, 1000),
                                 ('frontend.host2', null, null, 2000),
                                 ('frontend.host3', 3.3, 300, 3000)
@@ -307,7 +307,7 @@ mod tests {
         match output {
             Output::RecordBatches(recordbatches) => {
                 let recordbatches = recordbatches
-                    .to_vec()
+                    .take()
                     .into_iter()
                     .map(|r| r.df_recordbatch)
                     .collect::<Vec<DfRecordBatch>>();
diff --git a/src/servers/src/http.rs b/src/servers/src/http.rs
index e0b17902b0..56f3fdb96e 100644
--- a/src/servers/src/http.rs
+++ b/src/servers/src/http.rs
@@ -86,7 +86,7 @@ impl JsonResponse {
                 Err(e) => Self::with_error(Some(format!("Recordbatch error: {}", e))),
             },
             Ok(Output::RecordBatches(recordbatches)) => {
-                Self::with_output(Some(JsonOutput::Rows(recordbatches.to_vec())))
+                Self::with_output(Some(JsonOutput::Rows(recordbatches.take())))
             }
             Err(e) => Self::with_error(Some(format!("Query engine output error: {}", e))),
         }
diff --git a/src/servers/src/mysql/writer.rs b/src/servers/src/mysql/writer.rs
index 1f1bedda38..e409d2db19 100644
--- a/src/servers/src/mysql/writer.rs
+++ b/src/servers/src/mysql/writer.rs
@@ -48,7 +48,7 @@ impl<'a, W: io::Write> MysqlResultWriter<'a, W> {
                 Output::RecordBatches(recordbatches) => {
                     let query_result = QueryResult {
                         schema: recordbatches.schema(),
-                        recordbatches: recordbatches.to_vec(),
+                        recordbatches: recordbatches.take(),
                     };
                     Self::write_query_result(query_result, writer)?
                 }
diff --git a/src/servers/src/postgres/handler.rs b/src/servers/src/postgres/handler.rs
index 1fd8f32d31..c0ff2e2a87 100644
--- a/src/servers/src/postgres/handler.rs
+++ b/src/servers/src/postgres/handler.rs
@@ -51,7 +51,7 @@ impl SimpleQueryHandler for PostgresServerHandler {
             }
             Output::RecordBatches(recordbatches) => {
                 let schema = recordbatches.schema();
-                recordbatches_to_query_response(recordbatches.to_vec().iter(), schema)
+                recordbatches_to_query_response(recordbatches.take().iter(), schema)
             }
         }
     }