refactor: remove AdminExpr, make DDL expressions as normal GRPC requests (#808)

* refactor: remove AdminExpr, make DDL expressions as normal GRPC requests

src/api/greptime/v1/common.proto

@@ -6,17 +6,8 @@ message RequestHeader {
   string tenant = 1;
 }
 
-message ExprHeader {
-  uint32 version = 1;
-}
-
 message ResultHeader {
   uint32 version = 1;
   uint32 code = 2;
   string err_msg = 3;
 }
-
-message MutateResult {
-  uint32 success = 1;
-  uint32 failure = 2;
-}

src/api/greptime/v1/database.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 
 package greptime.v1;
 
+import "greptime/v1/ddl.proto";
 import "greptime/v1/column.proto";
 import "greptime/v1/common.proto";
 
@@ -18,6 +19,7 @@ message ObjectExpr {
   oneof request {
     InsertRequest insert = 1;
     QueryRequest query = 2;
+    DdlRequest ddl = 3;
   }
 }
 

src/api/greptime/v1/ddl.proto

@@ -5,29 +5,15 @@ package greptime.v1;
 import "greptime/v1/column.proto";
 import "greptime/v1/common.proto";
 
-message AdminRequest {
-  string name = 1;
-  repeated AdminExpr exprs = 2;
-}
-
-message AdminResponse {
-  repeated AdminResult results = 1;
-}
-
-message AdminExpr {
-  ExprHeader header = 1;
+// "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`.
+// So create a new DDL expr if you need it.
+message DdlRequest {
   oneof expr {
+    CreateDatabaseExpr create_database = 1;
     CreateTableExpr create_table = 2;
     AlterExpr alter = 3;
-    CreateDatabaseExpr create_database = 4;
-    DropTableExpr drop_table = 5;
-  }
-}
-
-message AdminResult {
-  ResultHeader header = 1;
-  oneof result {
-    MutateResult mutate = 2;
+    DropTableExpr drop_table = 4;
   }
 }
 

src/api/greptime/v1/greptime.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package greptime.v1;
 
-import "greptime/v1/admin.proto";
 import "greptime/v1/common.proto";
 import "greptime/v1/database.proto";
 
@@ -12,11 +11,9 @@ service Greptime {
 
 message BatchRequest {
   RequestHeader header = 1;
-  repeated AdminRequest admins = 2;
-  repeated DatabaseRequest databases = 3;
+  repeated DatabaseRequest databases = 2;
 }
 
 message BatchResponse {
-  repeated AdminResponse admins = 1;
-  repeated DatabaseResponse databases = 2;
+  repeated DatabaseResponse databases = 1;
 }

src/api/src/result.rs

@@ -15,13 +15,10 @@
 use arrow_flight::FlightData;
 use prost::Message;
 
-use crate::v1::{admin_result, AdminResult, MutateResult, ObjectResult, ResultHeader};
+use crate::v1::{ObjectResult, ResultHeader};
 
 pub const PROTOCOL_VERSION: u32 = 1;
 
-pub type Success = u32;
-pub type Failure = u32;
-
 #[derive(Default)]
 pub struct ObjectResultBuilder {
     version: u32,
@@ -81,61 +78,6 @@ impl ObjectResultBuilder {
     }
 }
 
-#[derive(Debug)]
-pub struct AdminResultBuilder {
-    version: u32,
-    code: u32,
-    err_msg: Option<String>,
-    mutate: Option<(Success, Failure)>,
-}
-
-impl AdminResultBuilder {
-    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 mutate_result(mut self, success: u32, failure: u32) -> Self {
-        self.mutate = Some((success, failure));
-        self
-    }
-
-    pub fn build(self) -> AdminResult {
-        let header = Some(ResultHeader {
-            version: self.version,
-            code: self.code,
-            err_msg: self.err_msg.unwrap_or_default(),
-        });
-
-        let result = if let Some((success, failure)) = self.mutate {
-            Some(admin_result::Result::Mutate(MutateResult {
-                success,
-                failure,
-            }))
-        } else {
-            None
-        };
-
-        AdminResult { header, result }
-    }
-}
-
-impl Default for AdminResultBuilder {
-    fn default() -> Self {
-        Self {
-            version: PROTOCOL_VERSION,
-            code: 0,
-            err_msg: None,
-            mutate: None,
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;