feat: flight aboard (#840)

feat: replace old GRPC interface with Arrow Flight

src/api/Cargo.toml

@@ -10,7 +10,7 @@ common-base = { path = "../common/base" }
 common-error = { path = "../common/error" }
 common-time = { path = "../common/time" }
 datatypes = { path = "../datatypes" }
-prost = "0.11"
+prost.workspace = true
 snafu = { version = "0.7", features = ["backtraces"] }
 tonic.workspace = true
 

src/api/build.rs

@@ -12,15 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::path::PathBuf;
-
 fn main() {
-    let default_out_dir = PathBuf::from(std::env::var("OUT_DIR").unwrap());
     tonic_build::configure()
-        .file_descriptor_set_path(default_out_dir.join("greptime_fd.bin"))
         .compile(
             &[
-                "greptime/v1/greptime.proto",
+                "greptime/v1/database.proto",
                 "greptime/v1/meta/common.proto",
                 "greptime/v1/meta/heartbeat.proto",
                 "greptime/v1/meta/route.proto",

src/api/greptime/v1/common.proto

@@ -1,13 +0,0 @@
-syntax = "proto3";
-
-package greptime.v1;
-
-message RequestHeader {
-  string tenant = 1;
-}
-
-message ResultHeader {
-  uint32 version = 1;
-  uint32 code = 2;
-  string err_msg = 3;
-}

src/api/greptime/v1/database.proto

@@ -4,18 +4,8 @@ package greptime.v1;
 
 import "greptime/v1/ddl.proto";
 import "greptime/v1/column.proto";
-import "greptime/v1/common.proto";
 
-message DatabaseRequest {
-  string name = 1;
-  repeated ObjectExpr exprs = 2;
-}
-
-message DatabaseResponse {
-  repeated ObjectResult results = 1;
-}
-
-message ObjectExpr {
+message GreptimeRequest {
   oneof request {
     InsertRequest insert = 1;
     QueryRequest query = 2;
@@ -46,11 +36,6 @@ message InsertRequest {
   uint32 region_number = 5;
 }
 
-message ObjectResult {
-  ResultHeader header = 1;
-  repeated bytes flight_data = 2;
-}
-
 message FlightDataExt {
   uint32 affected_rows = 1;
 }

src/api/greptime/v1/ddl.proto

@@ -3,7 +3,6 @@ syntax = "proto3";
 package greptime.v1;
 
 import "greptime/v1/column.proto";
-import "greptime/v1/common.proto";
 
 // "Data Definition Language" requests, that create, modify or delete the database structures but not the data.
 // `DdlRequest` could carry more information than plain SQL, for example, the "table_id" in `CreateTableExpr`.

src/api/greptime/v1/greptime.proto

@@ -1,19 +0,0 @@
-syntax = "proto3";
-
-package greptime.v1;
-
-import "greptime/v1/common.proto";
-import "greptime/v1/database.proto";
-
-service Greptime {
-  rpc Batch(BatchRequest) returns (BatchResponse) {}
-}
-
-message BatchRequest {
-  RequestHeader header = 1;
-  repeated DatabaseRequest databases = 2;
-}
-
-message BatchResponse {
-  repeated DatabaseResponse databases = 1;
-}

src/api/src/lib.rs

@@ -15,7 +15,6 @@
 pub mod error;
 pub mod helper;
 pub mod prometheus;
-pub mod result;
 pub mod serde;
 pub mod v1;
 

src/api/src/result.rs

@@ -1,97 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use arrow_flight::FlightData;
-use prost::Message;
-
-use crate::v1::{ObjectResult, ResultHeader};
-
-pub const PROTOCOL_VERSION: u32 = 1;
-
-#[derive(Default)]
-pub struct ObjectResultBuilder {
-    version: u32,
-    code: u32,
-    err_msg: Option<String>,
-    flight_data: Option<Vec<FlightData>>,
-}
-
-impl ObjectResultBuilder {
-    pub fn new() -> Self {
-        Self {
-            version: PROTOCOL_VERSION,
-            ..Default::default()
-        }
-    }
-
-    #[allow(dead_code)]
-    pub fn version(mut self, version: u32) -> Self {
-        self.version = version;
-        self
-    }
-
-    pub fn status_code(mut self, code: u32) -> Self {
-        self.code = code;
-        self
-    }
-
-    pub fn err_msg(mut self, err_msg: String) -> Self {
-        self.err_msg = Some(err_msg);
-        self
-    }
-
-    pub fn flight_data(mut self, flight_data: Vec<FlightData>) -> Self {
-        self.flight_data = Some(flight_data);
-        self
-    }
-
-    pub fn build(self) -> ObjectResult {
-        let header = Some(ResultHeader {
-            version: self.version,
-            code: self.code,
-            err_msg: self.err_msg.unwrap_or_default(),
-        });
-
-        let flight_data = if let Some(flight_data) = self.flight_data {
-            flight_data
-                .into_iter()
-                .map(|x| x.encode_to_vec())
-                .collect::<Vec<Vec<u8>>>()
-        } else {
-            vec![]
-        };
-        ObjectResult {
-            header,
-            flight_data,
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_object_result_builder() {
-        let obj_result = ObjectResultBuilder::new()
-            .version(101)
-            .status_code(500)
-            .err_msg("Failed to read this file!".to_string())
-            .build();
-        let header = obj_result.header.unwrap();
-        assert_eq!(101, header.version);
-        assert_eq!(500, header.code);
-        assert_eq!("Failed to read this file!", header.err_msg);
-    }
-}

src/api/src/v1.rs

@@ -15,7 +15,5 @@
 #![allow(clippy::derive_partial_eq_without_eq)]
 tonic::include_proto!("greptime.v1");
 
-pub const GREPTIME_FD_SET: &[u8] = tonic::include_file_descriptor_set!("greptime_fd");
-
 mod column_def;
 pub mod meta;