From 3e07838ccd2d9068e7126f8ce7939b8a93fb76ae Mon Sep 17 00:00:00 2001
From: drdr xp <drdr.xp@gmail.com>
Date: Tue, 9 Nov 2021 01:26:05 +0800
Subject: [PATCH 01/17] [metasrv] refactor: remove unused proto

---
 metasrv/proto/meta.proto | 45 +---------------------------------------
 1 file changed, 1 insertion(+), 44 deletions(-)

diff --git a/metasrv/proto/meta.proto b/metasrv/proto/meta.proto
index 2ed16a08eb15..b8da40f026da 100644
--- a/metasrv/proto/meta.proto
+++ b/metasrv/proto/meta.proto
@@ -14,53 +14,10 @@
 
 syntax = "proto3";
 
-// meta data types for Databend meta server
 package meta;
 
-// TODO(zbr): keep it or remove
-message Db {
-  int64 db_id = 1;
-  // Every modification has a corresponding unique ver.
-  int64 ver = 20;
-  map<string, int64> table_name_to_id = 2;
-  map<int64, Table> tables = 3;
-}
-
-// TODO(zbr): keep it or remove
-message Table {
-  int64 table_id = 1;
-  // Every modification has a corresponding unique ver.
-  int64 ver = 20;
-
-  bytes schema = 5;
-
-  map<string, string> options = 30;
-  // a func(string, Vec<ReplicationGroupId>) mapping PartitionBy expr to
-  // replication group. A DatabendQuery process should consider this to determine
-  // where to send the read or write operations.
-  bytes placement_policy = 10;
-  // repeated ReplicationGroupId ReplicationGroupIds
-}
-
-// A Cmd serves as a raft log entry to commit an atomic operation into meta data
-// storage.
-
-// TODO(zbr): keep it or remove
-message CmdCreateDatabase {
-  string db_name = 20;
-  Db db = 50;
-}
-
-// TODO(zbr): keep it or remove
-message CmdCreateTable {
-  string db_name = 20;
-  string table_name = 30;
-  Table table = 40;
-}
-
-// meta service
-
 message GetReq { string key = 1; }
+
 message GetReply {
   bool ok = 1;
   string key = 2;

From b8b42e855b4272baa0febe1a0f9431ded4af2f95 Mon Sep 17 00:00:00 2001
From: drdr xp <drdr.xp@gmail.com>
Date: Tue, 9 Nov 2021 14:56:04 +0800
Subject: [PATCH 02/17] [metasrv] refactor: impl KVApi for MetaNode, as it
 already provides the methods in KVApi

---
 metasrv/src/executor/kv_handlers.rs           | 34 ++-----
 .../src/meta_service/meta_node_kv_api_impl.rs | 89 +++++++++++++++++++
 metasrv/src/meta_service/mod.rs               |  1 +
 metasrv/src/meta_service/raftmeta.rs          | 29 ------
 metasrv/src/meta_service/raftmeta_test.rs     |  1 +
 5 files changed, 97 insertions(+), 57 deletions(-)
 create mode 100644 metasrv/src/meta_service/meta_node_kv_api_impl.rs

diff --git a/metasrv/src/executor/kv_handlers.rs b/metasrv/src/executor/kv_handlers.rs
index 84e511b6dc90..5faa87febf23 100644
--- a/metasrv/src/executor/kv_handlers.rs
+++ b/metasrv/src/executor/kv_handlers.rs
@@ -13,15 +13,12 @@
 // limitations under the License.
 //
 
-use common_exception::ErrorCode;
+use common_meta_api::KVApi;
 use common_meta_flight::GetKVAction;
 use common_meta_flight::MGetKVAction;
 use common_meta_flight::PrefixListReq;
 use common_meta_flight::UpsertKVAction;
-use common_meta_raft_store::state_machine::AppliedState;
-use common_meta_types::Cmd;
 use common_meta_types::GetKVActionReply;
-use common_meta_types::LogEntry;
 use common_meta_types::MGetKVActionReply;
 use common_meta_types::PrefixListReply;
 use common_meta_types::UpsertKVActionReply;
@@ -32,48 +29,29 @@ use crate::executor::ActionHandler;
 #[async_trait::async_trait]
 impl RequestHandler<UpsertKVAction> for ActionHandler {
     async fn handle(&self, act: UpsertKVAction) -> common_exception::Result<UpsertKVActionReply> {
-        let cr = LogEntry {
-            txid: None,
-            cmd: Cmd::UpsertKV {
-                key: act.key,
-                seq: act.seq,
-                value: act.value,
-                value_meta: act.value_meta,
-            },
-        };
-        let rst = self
-            .meta_node
-            .write(cr)
+        self.meta_node
+            .upsert_kv(&act.key, act.seq, act.value, act.value_meta)
             .await
-            .map_err(|e| ErrorCode::MetaNodeInternalError(e.to_string()))?;
-
-        match rst {
-            AppliedState::KV(x) => Ok(x),
-            _ => Err(ErrorCode::MetaNodeInternalError("not a KV result")),
-        }
     }
 }
 
 #[async_trait::async_trait]
 impl RequestHandler<GetKVAction> for ActionHandler {
     async fn handle(&self, act: GetKVAction) -> common_exception::Result<GetKVActionReply> {
-        let result = self.meta_node.get_kv(&act.key).await?;
-        Ok(result)
+        self.meta_node.get_kv(&act.key).await
     }
 }
 
 #[async_trait::async_trait]
 impl RequestHandler<MGetKVAction> for ActionHandler {
     async fn handle(&self, act: MGetKVAction) -> common_exception::Result<MGetKVActionReply> {
-        let result = self.meta_node.mget_kv(&act.keys).await?;
-        Ok(result)
+        self.meta_node.mget_kv(&act.keys).await
     }
 }
 
 #[async_trait::async_trait]
 impl RequestHandler<PrefixListReq> for ActionHandler {
     async fn handle(&self, act: PrefixListReq) -> common_exception::Result<PrefixListReply> {
-        let result = self.meta_node.prefix_list_kv(&(act.0)).await?;
-        Ok(result)
+        self.meta_node.prefix_list_kv(&(act.0)).await
     }
 }
diff --git a/metasrv/src/meta_service/meta_node_kv_api_impl.rs b/metasrv/src/meta_service/meta_node_kv_api_impl.rs
new file mode 100644
index 000000000000..35dc91e509ef
--- /dev/null
+++ b/metasrv/src/meta_service/meta_node_kv_api_impl.rs
@@ -0,0 +1,89 @@
+// Copyright 2020 Datafuse Labs.
+//
+// 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 async_trait::async_trait;
+use common_exception::ErrorCode;
+use common_meta_api::KVApi;
+use common_meta_raft_store::state_machine::AppliedState;
+use common_meta_types::Cmd;
+use common_meta_types::GetKVActionReply;
+use common_meta_types::KVMeta;
+use common_meta_types::LogEntry;
+use common_meta_types::MGetKVActionReply;
+use common_meta_types::MatchSeq;
+use common_meta_types::Operation;
+use common_meta_types::PrefixListReply;
+use common_meta_types::UpsertKVActionReply;
+use common_tracing::tracing;
+
+use crate::meta_service::MetaNode;
+
+/// Impl KVApi for MetaNode.
+///
+/// Write through raft-log.
+/// Read through local state machine, which may not be consistent.
+/// E.g. Read is not guaranteed to see a write.
+#[async_trait]
+impl KVApi for MetaNode {
+    async fn upsert_kv(
+        &self,
+        key: &str,
+        seq: MatchSeq,
+        value: Operation<Vec<u8>>,
+        value_meta: Option<KVMeta>,
+    ) -> common_exception::Result<UpsertKVActionReply> {
+        let ent = LogEntry {
+            txid: None,
+            cmd: Cmd::UpsertKV {
+                key: key.to_string(),
+                seq,
+                value,
+                value_meta,
+            },
+        };
+        let rst = self
+            .write(ent)
+            .await
+            .map_err(|e| ErrorCode::MetaNodeInternalError(e.to_string()))?;
+
+        match rst {
+            AppliedState::KV(x) => Ok(x),
+            _ => Err(ErrorCode::MetaNodeInternalError("not a KV result")),
+        }
+    }
+
+    #[tracing::instrument(level = "debug", skip(self))]
+    async fn get_kv(&self, key: &str) -> common_exception::Result<GetKVActionReply> {
+        // inconsistent get: from local state machine
+
+        let sm = self.sto.state_machine.read().await;
+        sm.get_kv(key).await
+    }
+
+    #[tracing::instrument(level = "debug", skip(self))]
+    async fn mget_kv(&self, keys: &[String]) -> common_exception::Result<MGetKVActionReply> {
+        // inconsistent get: from local state machine
+
+        let sm = self.sto.state_machine.read().await;
+        sm.mget_kv(keys).await
+    }
+
+    #[tracing::instrument(level = "debug", skip(self))]
+    async fn prefix_list_kv(&self, prefix: &str) -> common_exception::Result<PrefixListReply> {
+        // inconsistent get: from local state machine
+
+        let sm = self.sto.state_machine.read().await;
+        sm.prefix_list_kv(prefix).await
+    }
+}
diff --git a/metasrv/src/meta_service/mod.rs b/metasrv/src/meta_service/mod.rs
index 2f33a25ee6cf..33dd94c8b096 100644
--- a/metasrv/src/meta_service/mod.rs
+++ b/metasrv/src/meta_service/mod.rs
@@ -21,6 +21,7 @@ pub use raftmeta::MetaNode;
 
 mod message;
 mod meta_leader;
+mod meta_node_kv_api_impl;
 pub mod meta_service_impl;
 pub mod network;
 pub mod raftmeta;
diff --git a/metasrv/src/meta_service/raftmeta.rs b/metasrv/src/meta_service/raftmeta.rs
index a05a673d6862..8dccdb8b8f9e 100644
--- a/metasrv/src/meta_service/raftmeta.rs
+++ b/metasrv/src/meta_service/raftmeta.rs
@@ -28,7 +28,6 @@ use common_base::tokio::sync::RwLockReadGuard;
 use common_base::tokio::task::JoinHandle;
 use common_exception::prelude::ErrorCode;
 use common_exception::prelude::ToErrorCode;
-use common_meta_api::KVApi;
 use common_meta_raft_store::config::RaftConfig;
 use common_meta_raft_store::state_machine::AppliedState;
 use common_meta_raft_store::state_machine::StateMachine;
@@ -530,34 +529,6 @@ impl MetaNode {
         sm.get_table_by_id(tid)
     }
 
-    #[tracing::instrument(level = "debug", skip(self))]
-    pub async fn get_kv(&self, key: &str) -> common_exception::Result<Option<SeqV<Vec<u8>>>> {
-        // inconsistent get: from local state machine
-
-        let sm = self.sto.state_machine.read().await;
-        sm.get_kv(key).await
-    }
-
-    #[tracing::instrument(level = "debug", skip(self))]
-    pub async fn mget_kv(
-        &self,
-        keys: &[String],
-    ) -> common_exception::Result<Vec<Option<SeqV<Vec<u8>>>>> {
-        // inconsistent get: from local state machine
-        let sm = self.sto.state_machine.read().await;
-        sm.mget_kv(keys).await
-    }
-
-    #[tracing::instrument(level = "debug", skip(self))]
-    pub async fn prefix_list_kv(
-        &self,
-        prefix: &str,
-    ) -> common_exception::Result<Vec<(String, SeqV<Vec<u8>>)>> {
-        // inconsistent get: from local state machine
-        let sm = self.sto.state_machine.read().await;
-        sm.prefix_list_kv(prefix).await
-    }
-
     /// Submit a write request to the known leader. Returns the response after applying the request.
     #[tracing::instrument(level = "info", skip(self))]
     pub async fn write(&self, req: LogEntry) -> common_exception::Result<AppliedState> {
diff --git a/metasrv/src/meta_service/raftmeta_test.rs b/metasrv/src/meta_service/raftmeta_test.rs
index 8eae85c3bf52..ce1faf9fae3a 100644
--- a/metasrv/src/meta_service/raftmeta_test.rs
+++ b/metasrv/src/meta_service/raftmeta_test.rs
@@ -19,6 +19,7 @@ use async_raft::RaftMetrics;
 use async_raft::State;
 use common_base::tokio;
 use common_base::tokio::time::Duration;
+use common_meta_api::KVApi;
 use common_meta_raft_store::state_machine::AppliedState;
 use common_meta_types::Cmd;
 use common_meta_types::LogEntry;

From d75584be3225fbf5a8c3145881f9c23de09a62d4 Mon Sep 17 00:00:00 2001
From: drdr xp <drdr.xp@gmail.com>
Date: Tue, 9 Nov 2021 15:20:13 +0800
Subject: [PATCH 03/17] [common/meta] refactor: move UpsertKVAction to
 meta/types

---
 common/meta/api/src/kv_api.rs                       |  1 +
 common/meta/flight/src/flight_action.rs             | 13 +------------
 common/meta/flight/src/impls/kv_api_impl.rs         |  2 +-
 .../meta/types/src/{kv_reply.rs => kv_message.rs}   | 11 +++++++++++
 common/meta/types/src/lib.rs                        | 11 ++++++-----
 metasrv/src/executor/action_handler.rs              |  1 +
 metasrv/src/executor/kv_handlers.rs                 |  2 +-
 7 files changed, 22 insertions(+), 19 deletions(-)
 rename common/meta/types/src/{kv_reply.rs => kv_message.rs} (75%)

diff --git a/common/meta/api/src/kv_api.rs b/common/meta/api/src/kv_api.rs
index c03a9ef974c4..534be8277f67 100644
--- a/common/meta/api/src/kv_api.rs
+++ b/common/meta/api/src/kv_api.rs
@@ -22,6 +22,7 @@ use common_meta_types::MGetKVActionReply;
 use common_meta_types::MatchSeq;
 use common_meta_types::Operation;
 use common_meta_types::PrefixListReply;
+use common_meta_types::UpsertKVAction;
 use common_meta_types::UpsertKVActionReply;
 
 #[async_trait]
diff --git a/common/meta/flight/src/flight_action.rs b/common/meta/flight/src/flight_action.rs
index f191cde8dce2..d03177b13bfb 100644
--- a/common/meta/flight/src/flight_action.rs
+++ b/common/meta/flight/src/flight_action.rs
@@ -22,14 +22,12 @@ use common_meta_types::CreateDatabaseReply;
 use common_meta_types::CreateTableReply;
 use common_meta_types::DatabaseInfo;
 use common_meta_types::GetKVActionReply;
-use common_meta_types::KVMeta;
 use common_meta_types::MGetKVActionReply;
-use common_meta_types::MatchSeq;
 use common_meta_types::MetaId;
 use common_meta_types::MetaVersion;
-use common_meta_types::Operation;
 use common_meta_types::PrefixListReply;
 use common_meta_types::TableInfo;
+use common_meta_types::UpsertKVAction;
 use common_meta_types::UpsertKVActionReply;
 use common_meta_types::UpsertTableOptionReply;
 use common_planners::CreateDatabasePlan;
@@ -160,15 +158,6 @@ action_declare!(
     MetaFlightAction::PrefixListKV
 );
 
-// === general-kv: upsert ===
-#[derive(serde::Serialize, serde::Deserialize, Clone, Debug)]
-pub struct UpsertKVAction {
-    pub key: String,
-    pub seq: MatchSeq,
-    pub value: Operation<Vec<u8>>,
-    pub value_meta: Option<KVMeta>,
-}
-
 action_declare!(
     UpsertKVAction,
     UpsertKVActionReply,
diff --git a/common/meta/flight/src/impls/kv_api_impl.rs b/common/meta/flight/src/impls/kv_api_impl.rs
index e35a78505f66..dc69e71d7429 100644
--- a/common/meta/flight/src/impls/kv_api_impl.rs
+++ b/common/meta/flight/src/impls/kv_api_impl.rs
@@ -20,6 +20,7 @@ use common_meta_types::MGetKVActionReply;
 use common_meta_types::MatchSeq;
 use common_meta_types::Operation;
 use common_meta_types::PrefixListReply;
+use common_meta_types::UpsertKVAction;
 use common_meta_types::UpsertKVActionReply;
 use common_tracing::tracing;
 
@@ -27,7 +28,6 @@ use crate::GetKVAction;
 use crate::MGetKVAction;
 use crate::MetaFlightClient;
 use crate::PrefixListReq;
-use crate::UpsertKVAction;
 
 #[async_trait::async_trait]
 impl KVApi for MetaFlightClient {
diff --git a/common/meta/types/src/kv_reply.rs b/common/meta/types/src/kv_message.rs
similarity index 75%
rename from common/meta/types/src/kv_reply.rs
rename to common/meta/types/src/kv_message.rs
index fb6763200645..61dd2deb03cf 100644
--- a/common/meta/types/src/kv_reply.rs
+++ b/common/meta/types/src/kv_message.rs
@@ -13,9 +13,20 @@
 // limitations under the License.
 
 use crate::Change;
+use crate::KVMeta;
+use crate::MatchSeq;
+use crate::Operation;
 use crate::SeqV;
 
 pub type UpsertKVActionReply = Change<Vec<u8>>;
 pub type GetKVActionReply = Option<SeqV<Vec<u8>>>;
 pub type MGetKVActionReply = Vec<Option<SeqV<Vec<u8>>>>;
 pub type PrefixListReply = Vec<(String, SeqV<Vec<u8>>)>;
+
+#[derive(serde::Serialize, serde::Deserialize, Clone, Debug)]
+pub struct UpsertKVAction {
+    pub key: String,
+    pub seq: MatchSeq,
+    pub value: Operation<Vec<u8>>,
+    pub value_meta: Option<KVMeta>,
+}
diff --git a/common/meta/types/src/lib.rs b/common/meta/types/src/lib.rs
index 5a2bbc54d357..e2918acbb40a 100644
--- a/common/meta/types/src/lib.rs
+++ b/common/meta/types/src/lib.rs
@@ -33,10 +33,11 @@ pub use commit_table_reply::UpsertTableOptionReply;
 pub use database_info::DatabaseInfo;
 pub use database_reply::CreateDatabaseReply;
 pub use errors::ConflictSeq;
-pub use kv_reply::GetKVActionReply;
-pub use kv_reply::MGetKVActionReply;
-pub use kv_reply::PrefixListReply;
-pub use kv_reply::UpsertKVActionReply;
+pub use kv_message::GetKVActionReply;
+pub use kv_message::MGetKVActionReply;
+pub use kv_message::PrefixListReply;
+pub use kv_message::UpsertKVAction;
+pub use kv_message::UpsertKVActionReply;
 pub use log_entry::LogEntry;
 pub use match_seq::MatchSeq;
 pub use match_seq::MatchSeqExt;
@@ -68,7 +69,7 @@ mod commit_table_reply;
 mod database_info;
 mod database_reply;
 mod errors;
-mod kv_reply;
+mod kv_message;
 mod log_entry;
 mod match_seq;
 mod operation;
diff --git a/metasrv/src/executor/action_handler.rs b/metasrv/src/executor/action_handler.rs
index 20d4f2b69641..351a71468c8b 100644
--- a/metasrv/src/executor/action_handler.rs
+++ b/metasrv/src/executor/action_handler.rs
@@ -15,6 +15,7 @@
 use std::sync::Arc;
 
 use common_exception::ErrorCode;
+use common_meta_api::KVApi;
 use common_meta_flight::MetaFlightAction;
 use common_meta_flight::RequestFor;
 use serde::Serialize;
diff --git a/metasrv/src/executor/kv_handlers.rs b/metasrv/src/executor/kv_handlers.rs
index 5faa87febf23..800f63472ebc 100644
--- a/metasrv/src/executor/kv_handlers.rs
+++ b/metasrv/src/executor/kv_handlers.rs
@@ -17,10 +17,10 @@ use common_meta_api::KVApi;
 use common_meta_flight::GetKVAction;
 use common_meta_flight::MGetKVAction;
 use common_meta_flight::PrefixListReq;
-use common_meta_flight::UpsertKVAction;
 use common_meta_types::GetKVActionReply;
 use common_meta_types::MGetKVActionReply;
 use common_meta_types::PrefixListReply;
+use common_meta_types::UpsertKVAction;
 use common_meta_types::UpsertKVActionReply;
 
 use crate::executor::action_handler::RequestHandler;

From 65929fd252fcda1b470eb88f2a307424d79000d7 Mon Sep 17 00:00:00 2001
From: drdr xp <drdr.xp@gmail.com>
Date: Tue, 9 Nov 2021 16:17:16 +0800
Subject: [PATCH 04/17] [common/meta/api] refactor: upsert_kv use UpsertAction
 as a arg container

---
 .../management/src/namespace/namespace_mgr.rs |  18 ++-
 common/management/src/user/user_mgr.rs        |  22 ++-
 common/management/src/user/user_mgr_test.rs   | 122 ++++++++---------
 common/meta/api/src/kv_api.rs                 |  19 +--
 common/meta/api/src/kv_api_test_suite.rs      | 126 +++++++++++-------
 common/meta/embedded/src/kv_api_impl.rs       |  11 +-
 common/meta/flight/src/impls/kv_api_impl.rs   |  19 +--
 .../src/state_machine/sm_kv_api_impl.rs       |  17 +--
 common/meta/types/src/kv_message.rs           |  18 ++-
 metasrv/src/executor/action_handler.rs        |   1 -
 metasrv/src/executor/kv_handlers.rs           |   4 +-
 .../src/meta_service/meta_node_kv_api_impl.rs |  17 +--
 metasrv/tests/flight/metasrv_flight_api.rs    |   9 +-
 13 files changed, 213 insertions(+), 190 deletions(-)

diff --git a/common/management/src/namespace/namespace_mgr.rs b/common/management/src/namespace/namespace_mgr.rs
index c63cd39ad62c..24c37d788cce 100644
--- a/common/management/src/namespace/namespace_mgr.rs
+++ b/common/management/src/namespace/namespace_mgr.rs
@@ -27,6 +27,7 @@ use common_meta_types::MatchSeq;
 use common_meta_types::NodeInfo;
 use common_meta_types::Operation;
 use common_meta_types::SeqV;
+use common_meta_types::UpsertKVAction;
 use common_meta_types::UpsertKVActionReply;
 
 use crate::namespace::NamespaceApi;
@@ -143,7 +144,9 @@ impl NamespaceApi for NamespaceMgr {
             self.namespace_prefix,
             Self::escape_for_key(&node.id)?
         );
-        let upsert_node = self.kv_api.upsert_kv(&node_key, seq, value, meta);
+        let upsert_node = self
+            .kv_api
+            .upsert_kv(UpsertKVAction::new(&node_key, seq, value, meta));
 
         let res = upsert_node.await?.into_add_result()?;
 
@@ -177,9 +180,12 @@ impl NamespaceApi for NamespaceMgr {
             self.namespace_prefix,
             Self::escape_for_key(&node_id)?
         );
-        let upsert_node = self
-            .kv_api
-            .upsert_kv(&node_key, seq.into(), Operation::Delete, None);
+        let upsert_node = self.kv_api.upsert_kv(UpsertKVAction::new(
+            &node_key,
+            seq.into(),
+            Operation::Delete,
+            None,
+        ));
 
         match upsert_node.await? {
             UpsertKVActionReply {
@@ -205,7 +211,9 @@ impl NamespaceApi for NamespaceMgr {
             Some(exact) => MatchSeq::Exact(exact),
         };
 
-        let upsert_meta = self.kv_api.upsert_kv(&node_key, seq, Operation::AsIs, meta);
+        let upsert_meta =
+            self.kv_api
+                .upsert_kv(UpsertKVAction::new(&node_key, seq, Operation::AsIs, meta));
 
         match upsert_meta.await? {
             UpsertKVActionReply {
diff --git a/common/management/src/user/user_mgr.rs b/common/management/src/user/user_mgr.rs
index 371a02378393..36cee7703c27 100644
--- a/common/management/src/user/user_mgr.rs
+++ b/common/management/src/user/user_mgr.rs
@@ -26,6 +26,7 @@ use common_meta_types::MatchSeq;
 use common_meta_types::MatchSeqExt;
 use common_meta_types::Operation;
 use common_meta_types::SeqV;
+use common_meta_types::UpsertKVAction;
 
 use crate::user::user_api::UserInfo;
 use crate::user::user_api::UserMgrApi;
@@ -54,7 +55,12 @@ impl UserMgrApi for UserMgr {
         let value = serde_json::to_vec(&user_info)?;
 
         let kv_api = self.kv_api.clone();
-        let upsert_kv = kv_api.upsert_kv(&key, match_seq, Operation::Update(value), None);
+        let upsert_kv = kv_api.upsert_kv(UpsertKVAction::new(
+            &key,
+            match_seq,
+            Operation::Update(value),
+            None,
+        ));
         let res = upsert_kv.await?.into_add_result()?;
         match res {
             AddResult::Ok(v) => Ok(v.seq),
@@ -138,7 +144,12 @@ impl UserMgrApi for UserMgr {
         let kv_api = self.kv_api.clone();
         let upsert_kv = async move {
             kv_api
-                .upsert_kv(&key, match_seq, Operation::Update(value), None)
+                .upsert_kv(UpsertKVAction::new(
+                    &key,
+                    match_seq,
+                    Operation::Update(value),
+                    None,
+                ))
                 .await
         };
         let res = upsert_kv.await?;
@@ -156,7 +167,12 @@ impl UserMgrApi for UserMgr {
         let kv_api = self.kv_api.clone();
         let upsert_kv = async move {
             kv_api
-                .upsert_kv(&key, seq.into(), Operation::Delete, None)
+                .upsert_kv(UpsertKVAction::new(
+                    &key,
+                    seq.into(),
+                    Operation::Delete,
+                    None,
+                ))
                 .await
         };
         let res = upsert_kv.await?;
diff --git a/common/management/src/user/user_mgr_test.rs b/common/management/src/user/user_mgr_test.rs
index 398ffe61797d..a07a660f1758 100644
--- a/common/management/src/user/user_mgr_test.rs
+++ b/common/management/src/user/user_mgr_test.rs
@@ -20,12 +20,12 @@ use common_base::tokio;
 use common_exception::ErrorCode;
 use common_meta_api::KVApi;
 use common_meta_types::GetKVActionReply;
-use common_meta_types::KVMeta;
 use common_meta_types::MGetKVActionReply;
 use common_meta_types::MatchSeq;
 use common_meta_types::Operation;
 use common_meta_types::PrefixListReply;
 use common_meta_types::SeqV;
+use common_meta_types::UpsertKVAction;
 use common_meta_types::UpsertKVActionReply;
 use mockall::predicate::*;
 use mockall::*;
@@ -41,10 +41,7 @@ mock! {
     impl KVApi for KV {
         async fn upsert_kv(
             &self,
-            key: &str,
-            seq: MatchSeq,
-            value: Operation<Vec<u8>>,
-            value_meta: Option<KVMeta>
+            act: UpsertKVAction,
         ) -> common_exception::Result<UpsertKVActionReply>;
 
         async fn get_kv(&self, key: &str) -> common_exception::Result<GetKVActionReply>;
@@ -86,14 +83,14 @@ mod add {
             let test_key = test_key.clone();
             let mut api = MockKV::new();
             api.expect_upsert_kv()
-                .with(
-                    predicate::function(move |v| v == test_key.as_str()),
-                    predicate::eq(test_seq),
-                    predicate::eq(value.clone()),
-                    predicate::eq(None),
-                )
+                .with(predicate::eq(UpsertKVAction::new(
+                    &test_key,
+                    test_seq,
+                    value.clone(),
+                    None,
+                )))
                 .times(1)
-                .return_once(|_u, _s, _salt, _meta| Ok(UpsertKVActionReply::new(None, None)));
+                .return_once(|_u| Ok(UpsertKVActionReply::new(None, None)));
             let api = Arc::new(api);
             let user_mgr = UserMgr::new(api, "tenant1");
             let res = user_mgr.add_user(user_info);
@@ -109,14 +106,14 @@ mod add {
             let test_key = test_key.clone();
             let mut api = MockKV::new();
             api.expect_upsert_kv()
-                .with(
-                    predicate::function(move |v| v == test_key.as_str()),
-                    predicate::eq(test_seq),
-                    predicate::eq(value.clone()),
-                    predicate::eq(None),
-                )
+                .with(predicate::eq(UpsertKVAction::new(
+                    &test_key,
+                    test_seq,
+                    value.clone(),
+                    None,
+                )))
                 .times(1)
-                .returning(|_u, _s, _salt, _meta| {
+                .returning(|_u| {
                     Ok(UpsertKVActionReply::new(
                         Some(SeqV::new(1, vec![])),
                         Some(SeqV::new(1, vec![])),
@@ -145,14 +142,14 @@ mod add {
         {
             let mut api = MockKV::new();
             api.expect_upsert_kv()
-                .with(
-                    predicate::function(move |v| v == test_key.as_str()),
-                    predicate::eq(test_seq),
-                    predicate::eq(value),
-                    predicate::eq(None),
-                )
+                .with(predicate::eq(UpsertKVAction::new(
+                    &test_key,
+                    test_seq,
+                    value.clone(),
+                    None,
+                )))
                 .times(1)
-                .returning(|_u, _s, _salt, _meta| Ok(UpsertKVActionReply::new(None, None)));
+                .returning(|_u| Ok(UpsertKVActionReply::new(None, None)));
 
             let kv = Arc::new(api);
 
@@ -387,16 +384,14 @@ mod drop {
         let mut kv = MockKV::new();
         let test_key = "__fd_users/tenant1/test";
         kv.expect_upsert_kv()
-            .with(
-                predicate::function(move |v| v == test_key),
-                predicate::eq(MatchSeq::Any),
-                predicate::eq(Operation::Delete),
-                predicate::eq(None),
-            )
+            .with(predicate::eq(UpsertKVAction::new(
+                test_key,
+                MatchSeq::Any,
+                Operation::Delete,
+                None,
+            )))
             .times(1)
-            .returning(|_k, _seq, _none, _meta| {
-                Ok(UpsertKVActionReply::new(Some(SeqV::new(1, vec![])), None))
-            });
+            .returning(|_k| Ok(UpsertKVActionReply::new(Some(SeqV::new(1, vec![])), None)));
         let kv = Arc::new(kv);
         let user_mgr = UserMgr::new(kv, "tenant1");
         let res = user_mgr.drop_user("test".to_string(), None);
@@ -410,14 +405,14 @@ mod drop {
         let mut kv = MockKV::new();
         let test_key = "__fd_users/tenant1/test";
         kv.expect_upsert_kv()
-            .with(
-                predicate::function(move |v| v == test_key),
-                predicate::eq(MatchSeq::Any),
-                predicate::eq(Operation::Delete),
-                predicate::eq(None),
-            )
+            .with(predicate::eq(UpsertKVAction::new(
+                test_key,
+                MatchSeq::Any,
+                Operation::Delete,
+                None,
+            )))
             .times(1)
-            .returning(|_k, _seq, _none, _meta| Ok(UpsertKVActionReply::new(None, None)));
+            .returning(|_k| Ok(UpsertKVActionReply::new(None, None)));
         let kv = Arc::new(kv);
         let user_mgr = UserMgr::new(kv, "tenant1");
         let res = user_mgr.drop_user("test".to_string(), None);
@@ -474,16 +469,14 @@ mod update {
         let new_value_with_old_salt = serde_json::to_vec(&new_user_info)?;
 
         kv.expect_upsert_kv()
-            .with(
-                predicate::function(move |v| v == test_key.as_str()),
-                predicate::eq(MatchSeq::GE(1)),
-                predicate::eq(Operation::Update(new_value_with_old_salt)),
-                predicate::eq(None),
-            )
+            .with(predicate::eq(UpsertKVAction::new(
+                &test_key,
+                MatchSeq::GE(1),
+                Operation::Update(new_value_with_old_salt.clone()),
+                None,
+            )))
             .times(1)
-            .return_once(|_, _, _, _meta| {
-                Ok(UpsertKVActionReply::new(None, Some(SeqV::new(0, vec![]))))
-            });
+            .return_once(|_| Ok(UpsertKVActionReply::new(None, Some(SeqV::new(0, vec![])))));
 
         let kv = Arc::new(kv);
         let user_mgr = UserMgr::new(kv, "tenant1");
@@ -523,16 +516,14 @@ mod update {
 
         let mut kv = MockKV::new();
         kv.expect_upsert_kv()
-            .with(
-                predicate::function(move |v| v == test_key.as_str()),
-                predicate::eq(MatchSeq::GE(1)),
-                predicate::eq(Operation::Update(new_value)),
-                predicate::eq(None),
-            )
+            .with(predicate::eq(UpsertKVAction::new(
+                &test_key,
+                MatchSeq::GE(1),
+                Operation::Update(new_value),
+                None,
+            )))
             .times(1)
-            .return_once(|_, _, _, _meta| {
-                Ok(UpsertKVActionReply::new(None, Some(SeqV::new(0, vec![]))))
-            });
+            .return_once(|_| Ok(UpsertKVActionReply::new(None, Some(SeqV::new(0, vec![])))));
 
         let kv = Arc::new(kv);
         let user_mgr = UserMgr::new(kv, "tenant1");
@@ -605,14 +596,11 @@ mod update {
 
         // upsert should be called
         kv.expect_upsert_kv()
-            .with(
-                predicate::function(move |v| v == test_key.as_str()),
-                predicate::eq(MatchSeq::GE(1)),
-                predicate::always(), // a little bit relax here, as we've covered it before
-                predicate::eq(None),
-            )
+            .with(predicate::function(move |act: &UpsertKVAction| {
+                act.key == test_key.as_str() && act.seq == MatchSeq::GE(1)
+            }))
             .times(1)
-            .returning(|_u, _s, _salt, _meta| Ok(UpsertKVActionReply::new(None, None)));
+            .returning(|_| Ok(UpsertKVActionReply::new(None, None)));
 
         let kv = Arc::new(kv);
         let user_mgr = UserMgr::new(kv, "tenant1");
diff --git a/common/meta/api/src/kv_api.rs b/common/meta/api/src/kv_api.rs
index 534be8277f67..2a5649e50db5 100644
--- a/common/meta/api/src/kv_api.rs
+++ b/common/meta/api/src/kv_api.rs
@@ -17,23 +17,15 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 use common_meta_types::GetKVActionReply;
-use common_meta_types::KVMeta;
 use common_meta_types::MGetKVActionReply;
-use common_meta_types::MatchSeq;
-use common_meta_types::Operation;
 use common_meta_types::PrefixListReply;
 use common_meta_types::UpsertKVAction;
 use common_meta_types::UpsertKVActionReply;
 
 #[async_trait]
 pub trait KVApi: Send + Sync {
-    async fn upsert_kv(
-        &self,
-        key: &str,
-        seq: MatchSeq,
-        value: Operation<Vec<u8>>,
-        value_meta: Option<KVMeta>,
-    ) -> common_exception::Result<UpsertKVActionReply>;
+    async fn upsert_kv(&self, act: UpsertKVAction)
+        -> common_exception::Result<UpsertKVActionReply>;
 
     async fn get_kv(&self, key: &str) -> common_exception::Result<GetKVActionReply>;
 
@@ -47,12 +39,9 @@ pub trait KVApi: Send + Sync {
 impl KVApi for Arc<dyn KVApi> {
     async fn upsert_kv(
         &self,
-        key: &str,
-        seq: MatchSeq,
-        value: Operation<Vec<u8>>,
-        value_meta: Option<KVMeta>,
+        act: UpsertKVAction,
     ) -> common_exception::Result<UpsertKVActionReply> {
-        self.as_ref().upsert_kv(key, seq, value, value_meta).await
+        self.as_ref().upsert_kv(act).await
     }
 
     async fn get_kv(&self, key: &str) -> common_exception::Result<GetKVActionReply> {
diff --git a/common/meta/api/src/kv_api_test_suite.rs b/common/meta/api/src/kv_api_test_suite.rs
index 2a6f3f1d0530..e68aaa102478 100644
--- a/common/meta/api/src/kv_api_test_suite.rs
+++ b/common/meta/api/src/kv_api_test_suite.rs
@@ -20,6 +20,7 @@ use common_meta_types::KVMeta;
 use common_meta_types::MatchSeq;
 use common_meta_types::Operation;
 use common_meta_types::SeqV;
+use common_meta_types::UpsertKVAction;
 use common_tracing::tracing;
 
 use crate::KVApi;
@@ -30,12 +31,12 @@ impl KVApiTestSuite {
         {
             // write
             let res = kv
-                .upsert_kv(
+                .upsert_kv(UpsertKVAction::new(
                     "foo",
                     MatchSeq::Any,
                     Operation::Update(b"bar".to_vec()),
                     None,
-                )
+                ))
                 .await?;
             assert_eq!(None, res.prev);
             assert_eq!(Some(SeqV::with_meta(1, None, b"bar".to_vec())), res.result);
@@ -44,12 +45,12 @@ impl KVApiTestSuite {
         {
             // write fails with unmatched seq
             let res = kv
-                .upsert_kv(
+                .upsert_kv(UpsertKVAction::new(
                     "foo",
                     MatchSeq::Exact(2),
                     Operation::Update(b"bar".to_vec()),
                     None,
-                )
+                ))
                 .await?;
             assert_eq!(
                 (
@@ -64,12 +65,12 @@ impl KVApiTestSuite {
         {
             // write done with matching seq
             let res = kv
-                .upsert_kv(
+                .upsert_kv(UpsertKVAction::new(
                     "foo",
                     MatchSeq::Exact(1),
                     Operation::Update(b"wow".to_vec()),
                     None,
-                )
+                ))
                 .await?;
             assert_eq!(
                 Some(SeqV::with_meta(1, None, b"bar".to_vec())),
@@ -89,12 +90,12 @@ impl KVApiTestSuite {
     pub async fn kv_delete<KV: KVApi>(&self, client: &KV) -> anyhow::Result<()> {
         let test_key = "test_key";
         client
-            .upsert_kv(
+            .upsert_kv(UpsertKVAction::new(
                 test_key,
                 MatchSeq::Any,
                 Operation::Update(b"v1".to_vec()),
                 None,
-            )
+            ))
             .await?;
 
         let current = client.get_kv(test_key).await?;
@@ -102,14 +103,24 @@ impl KVApiTestSuite {
             // seq mismatch
             let wrong_seq = Some(seq + 1);
             let res = client
-                .upsert_kv(test_key, wrong_seq.into(), Operation::Delete, None)
+                .upsert_kv(UpsertKVAction::new(
+                    test_key,
+                    wrong_seq.into(),
+                    Operation::Delete,
+                    None,
+                ))
                 .await?;
 
             assert_eq!(res.prev, res.result);
 
             // seq match
             let res = client
-                .upsert_kv(test_key, MatchSeq::Exact(seq), Operation::Delete, None)
+                .upsert_kv(UpsertKVAction::new(
+                    test_key,
+                    MatchSeq::Exact(seq),
+                    Operation::Delete,
+                    None,
+                ))
                 .await?;
             assert!(res.result.is_none());
 
@@ -122,23 +133,33 @@ impl KVApiTestSuite {
 
         // key not exist
         let res = client
-            .upsert_kv("not exists", MatchSeq::Any, Operation::Delete, None)
+            .upsert_kv(UpsertKVAction::new(
+                "not exists",
+                MatchSeq::Any,
+                Operation::Delete,
+                None,
+            ))
             .await?;
         assert_eq!(None, res.prev);
         assert_eq!(None, res.result);
 
         // do not care seq
         client
-            .upsert_kv(
+            .upsert_kv(UpsertKVAction::new(
                 test_key,
                 MatchSeq::Any,
                 Operation::Update(b"v2".to_vec()),
                 None,
-            )
+            ))
             .await?;
 
         let res = client
-            .upsert_kv(test_key, MatchSeq::Any, Operation::Delete, None)
+            .upsert_kv(UpsertKVAction::new(
+                test_key,
+                MatchSeq::Any,
+                Operation::Delete,
+                None,
+            ))
             .await?;
         assert_eq!(
             (Some(SeqV::with_meta(2, None, b"v2".to_vec())), None),
@@ -152,58 +173,58 @@ impl KVApiTestSuite {
         let test_key = "test_key_for_update";
 
         let r = client
-            .upsert_kv(
+            .upsert_kv(UpsertKVAction::new(
                 test_key,
                 MatchSeq::GE(1),
                 Operation::Update(b"v1".to_vec()),
                 None,
-            )
+            ))
             .await?;
         assert_eq!((None, None), (r.prev, r.result), "not changed");
 
         let r = client
-            .upsert_kv(
+            .upsert_kv(UpsertKVAction::new(
                 test_key,
                 MatchSeq::Any,
                 Operation::Update(b"v1".to_vec()),
                 None,
-            )
+            ))
             .await?;
         assert_eq!(Some(SeqV::with_meta(1, None, b"v1".to_vec())), r.result);
         let seq = r.result.unwrap().seq;
 
         // unmatched seq
         let r = client
-            .upsert_kv(
+            .upsert_kv(UpsertKVAction::new(
                 test_key,
                 MatchSeq::Exact(seq + 1),
                 Operation::Update(b"v2".to_vec()),
                 None,
-            )
+            ))
             .await?;
         assert_eq!(Some(SeqV::with_meta(1, None, b"v1".to_vec())), r.prev);
         assert_eq!(Some(SeqV::with_meta(1, None, b"v1".to_vec())), r.result);
 
         // matched seq
         let r = client
-            .upsert_kv(
+            .upsert_kv(UpsertKVAction::new(
                 test_key,
                 MatchSeq::Exact(seq),
                 Operation::Update(b"v2".to_vec()),
                 None,
-            )
+            ))
             .await?;
         assert_eq!(Some(SeqV::with_meta(1, None, b"v1".to_vec())), r.prev);
         assert_eq!(Some(SeqV::with_meta(2, None, b"v2".to_vec())), r.result);
 
         // blind update
         let r = client
-            .upsert_kv(
+            .upsert_kv(UpsertKVAction::new(
                 test_key,
                 MatchSeq::GE(1),
                 Operation::Update(b"v3".to_vec()),
                 None,
-            )
+            ))
             .await?;
         assert_eq!(Some(SeqV::with_meta(2, None, b"v2".to_vec())), r.prev);
         assert_eq!(Some(SeqV::with_meta(3, None, b"v3".to_vec())), r.result);
@@ -228,14 +249,14 @@ impl KVApiTestSuite {
             .as_secs();
 
         client
-            .upsert_kv(
+            .upsert_kv(UpsertKVAction::new(
                 "k1",
                 MatchSeq::Any,
                 Operation::Update(b"v1".to_vec()),
                 Some(KVMeta {
                     expire_at: Some(now + 1),
                 }),
-            )
+            ))
             .await?;
 
         tracing::info!("---get unexpired");
@@ -260,24 +281,24 @@ impl KVApiTestSuite {
         tracing::info!("--- expired entry act as if it does not exist, an ADD op should apply");
         {
             client
-                .upsert_kv(
+                .upsert_kv(UpsertKVAction::new(
                     "k1",
                     MatchSeq::Exact(0),
                     Operation::Update(b"v1".to_vec()),
                     Some(KVMeta {
                         expire_at: Some(now - 1),
                     }),
-                )
+                ))
                 .await?;
             client
-                .upsert_kv(
+                .upsert_kv(UpsertKVAction::new(
                     "k2",
                     MatchSeq::Exact(0),
                     Operation::Update(b"v2".to_vec()),
                     Some(KVMeta {
                         expire_at: Some(now + 2),
                     }),
-                )
+                ))
                 .await?;
 
             tracing::info!("--- mget should not return expired");
@@ -307,14 +328,14 @@ impl KVApiTestSuite {
         tracing::info!("--- update expire");
         {
             client
-                .upsert_kv(
+                .upsert_kv(UpsertKVAction::new(
                     "k2",
                     MatchSeq::Exact(3),
                     Operation::Update(b"v2".to_vec()),
                     Some(KVMeta {
                         expire_at: Some(now - 1),
                     }),
-                )
+                ))
                 .await?;
 
             let res = client.get_kv(&"k2".to_string()).await?;
@@ -333,12 +354,12 @@ impl KVApiTestSuite {
             .as_secs();
 
         let r = client
-            .upsert_kv(
+            .upsert_kv(UpsertKVAction::new(
                 test_key,
                 MatchSeq::Any,
                 Operation::Update(b"v1".to_vec()),
                 None,
-            )
+            ))
             .await?;
         assert_eq!(Some(SeqV::with_meta(1, None, b"v1".to_vec())), r.result);
         let seq = r.result.unwrap().seq;
@@ -346,14 +367,14 @@ impl KVApiTestSuite {
         tracing::info!("--- mismatching seq does nothing");
 
         let r = client
-            .upsert_kv(
+            .upsert_kv(UpsertKVAction::new(
                 test_key,
                 MatchSeq::Exact(seq + 1),
                 Operation::AsIs,
                 Some(KVMeta {
                     expire_at: Some(now + 20),
                 }),
-            )
+            ))
             .await?;
         assert_eq!(Some(SeqV::with_meta(1, None, b"v1".to_vec())), r.prev);
         assert_eq!(Some(SeqV::with_meta(1, None, b"v1".to_vec())), r.result);
@@ -361,14 +382,14 @@ impl KVApiTestSuite {
         tracing::info!("--- matching seq only update meta");
 
         let r = client
-            .upsert_kv(
+            .upsert_kv(UpsertKVAction::new(
                 test_key,
                 MatchSeq::Exact(seq),
                 Operation::AsIs,
                 Some(KVMeta {
                     expire_at: Some(now + 20),
                 }),
-            )
+            ))
             .await?;
         assert_eq!(Some(SeqV::with_meta(1, None, b"v1".to_vec())), r.prev);
         assert_eq!(
@@ -403,12 +424,12 @@ impl KVApiTestSuite {
         let mut values = vec![];
         {
             client
-                .upsert_kv(
+                .upsert_kv(UpsertKVAction::new(
                     "t",
                     MatchSeq::Any,
                     Operation::Update("".as_bytes().to_vec()),
                     None,
-                )
+                ))
                 .await?;
 
             for i in 0..9 {
@@ -416,16 +437,21 @@ impl KVApiTestSuite {
                 let val = format!("val_{}", i);
                 values.push(val.clone());
                 client
-                    .upsert_kv(
+                    .upsert_kv(UpsertKVAction::new(
                         &key,
                         MatchSeq::Any,
                         Operation::Update(val.as_bytes().to_vec()),
                         None,
-                    )
+                    ))
                     .await?;
             }
             client
-                .upsert_kv("v", MatchSeq::Any, Operation::Update(b"".to_vec()), None)
+                .upsert_kv(UpsertKVAction::new(
+                    "v",
+                    MatchSeq::Any,
+                    Operation::Update(b"".to_vec()),
+                    None,
+                ))
                 .await?;
         }
 
@@ -444,10 +470,20 @@ impl KVApiTestSuite {
 
     pub async fn kv_mget<KV: KVApi>(&self, client: &KV) -> anyhow::Result<()> {
         client
-            .upsert_kv("k1", MatchSeq::Any, Operation::Update(b"v1".to_vec()), None)
+            .upsert_kv(UpsertKVAction::new(
+                "k1",
+                MatchSeq::Any,
+                Operation::Update(b"v1".to_vec()),
+                None,
+            ))
             .await?;
         client
-            .upsert_kv("k2", MatchSeq::Any, Operation::Update(b"v2".to_vec()), None)
+            .upsert_kv(UpsertKVAction::new(
+                "k2",
+                MatchSeq::Any,
+                Operation::Update(b"v2".to_vec()),
+                None,
+            ))
             .await?;
 
         let res = client
diff --git a/common/meta/embedded/src/kv_api_impl.rs b/common/meta/embedded/src/kv_api_impl.rs
index f584c1beab91..a09477596173 100644
--- a/common/meta/embedded/src/kv_api_impl.rs
+++ b/common/meta/embedded/src/kv_api_impl.rs
@@ -17,11 +17,9 @@ use common_exception::Result;
 use common_meta_api::KVApi;
 pub use common_meta_sled_store::init_temp_sled_db;
 use common_meta_types::GetKVActionReply;
-use common_meta_types::KVMeta;
 use common_meta_types::MGetKVActionReply;
-use common_meta_types::MatchSeq;
-use common_meta_types::Operation;
 use common_meta_types::PrefixListReply;
+use common_meta_types::UpsertKVAction;
 use common_meta_types::UpsertKVActionReply;
 
 use crate::MetaEmbedded;
@@ -30,13 +28,10 @@ use crate::MetaEmbedded;
 impl KVApi for MetaEmbedded {
     async fn upsert_kv(
         &self,
-        key: &str,
-        seq: MatchSeq,
-        value: Operation<Vec<u8>>,
-        value_meta: Option<KVMeta>,
+        act: UpsertKVAction,
     ) -> common_exception::Result<UpsertKVActionReply> {
         let sm = self.inner.lock().await;
-        sm.upsert_kv(key, seq, value, value_meta).await
+        sm.upsert_kv(act).await
     }
 
     async fn get_kv(&self, key: &str) -> Result<GetKVActionReply> {
diff --git a/common/meta/flight/src/impls/kv_api_impl.rs b/common/meta/flight/src/impls/kv_api_impl.rs
index dc69e71d7429..a0054d53082d 100644
--- a/common/meta/flight/src/impls/kv_api_impl.rs
+++ b/common/meta/flight/src/impls/kv_api_impl.rs
@@ -15,10 +15,7 @@
 use common_exception::Result;
 use common_meta_api::KVApi;
 use common_meta_types::GetKVActionReply;
-use common_meta_types::KVMeta;
 use common_meta_types::MGetKVActionReply;
-use common_meta_types::MatchSeq;
-use common_meta_types::Operation;
 use common_meta_types::PrefixListReply;
 use common_meta_types::UpsertKVAction;
 use common_meta_types::UpsertKVActionReply;
@@ -31,21 +28,12 @@ use crate::PrefixListReq;
 
 #[async_trait::async_trait]
 impl KVApi for MetaFlightClient {
-    #[tracing::instrument(level = "debug", skip(self, value))]
+    #[tracing::instrument(level = "debug", skip(self, act))]
     async fn upsert_kv(
         &self,
-        key: &str,
-        seq: MatchSeq,
-        value: Operation<Vec<u8>>,
-        value_meta: Option<KVMeta>,
+        act: UpsertKVAction,
     ) -> common_exception::Result<UpsertKVActionReply> {
-        self.do_action(UpsertKVAction {
-            key: key.to_string(),
-            seq,
-            value,
-            value_meta,
-        })
-        .await
+        self.do_action(act).await
     }
 
     #[tracing::instrument(level = "debug", skip(self))]
@@ -59,7 +47,6 @@ impl KVApi for MetaFlightClient {
     #[tracing::instrument(level = "debug", skip(self, keys))]
     async fn mget_kv(&self, keys: &[String]) -> common_exception::Result<MGetKVActionReply> {
         let keys = keys.to_vec();
-        //keys.iter().map(|k| k.to_string()).collect();
         self.do_action(MGetKVAction { keys }).await
     }
 
diff --git a/common/meta/raft-store/src/state_machine/sm_kv_api_impl.rs b/common/meta/raft-store/src/state_machine/sm_kv_api_impl.rs
index bfba800612b8..b6d376a9e82d 100644
--- a/common/meta/raft-store/src/state_machine/sm_kv_api_impl.rs
+++ b/common/meta/raft-store/src/state_machine/sm_kv_api_impl.rs
@@ -15,11 +15,9 @@
 use common_meta_api::KVApi;
 use common_meta_types::Cmd;
 use common_meta_types::GetKVActionReply;
-use common_meta_types::KVMeta;
 use common_meta_types::MGetKVActionReply;
-use common_meta_types::MatchSeq;
-use common_meta_types::Operation;
 use common_meta_types::SeqV;
+use common_meta_types::UpsertKVAction;
 use common_meta_types::UpsertKVActionReply;
 use common_tracing::tracing;
 
@@ -30,16 +28,13 @@ use crate::state_machine::StateMachine;
 impl KVApi for StateMachine {
     async fn upsert_kv(
         &self,
-        key: &str,
-        seq: MatchSeq,
-        value: Operation<Vec<u8>>,
-        value_meta: Option<KVMeta>,
+        act: UpsertKVAction,
     ) -> common_exception::Result<UpsertKVActionReply> {
         let cmd = Cmd::UpsertKV {
-            key: key.to_string(),
-            seq,
-            value,
-            value_meta,
+            key: act.key,
+            seq: act.seq,
+            value: act.value,
+            value_meta: act.value_meta,
         };
 
         let res = self.apply_cmd(&cmd).await?;
diff --git a/common/meta/types/src/kv_message.rs b/common/meta/types/src/kv_message.rs
index 61dd2deb03cf..35d2534e240d 100644
--- a/common/meta/types/src/kv_message.rs
+++ b/common/meta/types/src/kv_message.rs
@@ -23,10 +23,26 @@ pub type GetKVActionReply = Option<SeqV<Vec<u8>>>;
 pub type MGetKVActionReply = Vec<Option<SeqV<Vec<u8>>>>;
 pub type PrefixListReply = Vec<(String, SeqV<Vec<u8>>)>;
 
-#[derive(serde::Serialize, serde::Deserialize, Clone, Debug)]
+#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq)]
 pub struct UpsertKVAction {
     pub key: String,
     pub seq: MatchSeq,
     pub value: Operation<Vec<u8>>,
     pub value_meta: Option<KVMeta>,
 }
+
+impl UpsertKVAction {
+    pub fn new(
+        key: &str,
+        seq: MatchSeq,
+        value: Operation<Vec<u8>>,
+        value_meta: Option<KVMeta>,
+    ) -> Self {
+        Self {
+            key: key.to_string(),
+            seq,
+            value,
+            value_meta,
+        }
+    }
+}
diff --git a/metasrv/src/executor/action_handler.rs b/metasrv/src/executor/action_handler.rs
index 351a71468c8b..20d4f2b69641 100644
--- a/metasrv/src/executor/action_handler.rs
+++ b/metasrv/src/executor/action_handler.rs
@@ -15,7 +15,6 @@
 use std::sync::Arc;
 
 use common_exception::ErrorCode;
-use common_meta_api::KVApi;
 use common_meta_flight::MetaFlightAction;
 use common_meta_flight::RequestFor;
 use serde::Serialize;
diff --git a/metasrv/src/executor/kv_handlers.rs b/metasrv/src/executor/kv_handlers.rs
index 800f63472ebc..47114a66286d 100644
--- a/metasrv/src/executor/kv_handlers.rs
+++ b/metasrv/src/executor/kv_handlers.rs
@@ -29,9 +29,7 @@ use crate::executor::ActionHandler;
 #[async_trait::async_trait]
 impl RequestHandler<UpsertKVAction> for ActionHandler {
     async fn handle(&self, act: UpsertKVAction) -> common_exception::Result<UpsertKVActionReply> {
-        self.meta_node
-            .upsert_kv(&act.key, act.seq, act.value, act.value_meta)
-            .await
+        self.meta_node.upsert_kv(act).await
     }
 }
 
diff --git a/metasrv/src/meta_service/meta_node_kv_api_impl.rs b/metasrv/src/meta_service/meta_node_kv_api_impl.rs
index 35dc91e509ef..6f4a9d5f68ed 100644
--- a/metasrv/src/meta_service/meta_node_kv_api_impl.rs
+++ b/metasrv/src/meta_service/meta_node_kv_api_impl.rs
@@ -18,12 +18,10 @@ use common_meta_api::KVApi;
 use common_meta_raft_store::state_machine::AppliedState;
 use common_meta_types::Cmd;
 use common_meta_types::GetKVActionReply;
-use common_meta_types::KVMeta;
 use common_meta_types::LogEntry;
 use common_meta_types::MGetKVActionReply;
-use common_meta_types::MatchSeq;
-use common_meta_types::Operation;
 use common_meta_types::PrefixListReply;
+use common_meta_types::UpsertKVAction;
 use common_meta_types::UpsertKVActionReply;
 use common_tracing::tracing;
 
@@ -38,18 +36,15 @@ use crate::meta_service::MetaNode;
 impl KVApi for MetaNode {
     async fn upsert_kv(
         &self,
-        key: &str,
-        seq: MatchSeq,
-        value: Operation<Vec<u8>>,
-        value_meta: Option<KVMeta>,
+        act: UpsertKVAction,
     ) -> common_exception::Result<UpsertKVActionReply> {
         let ent = LogEntry {
             txid: None,
             cmd: Cmd::UpsertKV {
-                key: key.to_string(),
-                seq,
-                value,
-                value_meta,
+                key: act.key,
+                seq: act.seq,
+                value: act.value,
+                value_meta: act.value_meta,
             },
         };
         let rst = self
diff --git a/metasrv/tests/flight/metasrv_flight_api.rs b/metasrv/tests/flight/metasrv_flight_api.rs
index 49971b39d006..c19a7ffaaeac 100644
--- a/metasrv/tests/flight/metasrv_flight_api.rs
+++ b/metasrv/tests/flight/metasrv_flight_api.rs
@@ -20,6 +20,7 @@ use common_meta_flight::MetaFlightClient;
 use common_meta_types::MatchSeq;
 use common_meta_types::Operation;
 use common_meta_types::SeqV;
+use common_meta_types::UpsertKVAction;
 use common_meta_types::UpsertKVActionReply;
 use common_tracing::tracing;
 use databend_meta::init_meta_ut;
@@ -46,12 +47,12 @@ async fn test_restart() -> anyhow::Result<()> {
     tracing::info!("--- upsert kv");
     {
         let res = client
-            .upsert_kv(
+            .upsert_kv(UpsertKVAction::new(
                 "foo",
                 MatchSeq::Any,
                 Operation::Update(b"bar".to_vec()),
                 None,
-            )
+            ))
             .await;
 
         tracing::debug!("set kv res: {:?}", res);
@@ -163,12 +164,12 @@ async fn test_join() -> anyhow::Result<()> {
             let k = format!("join-{}", i);
 
             let res = cli
-                .upsert_kv(
+                .upsert_kv(UpsertKVAction::new(
                     k.as_str(),
                     MatchSeq::Any,
                     Operation::Update(k.clone().into_bytes()),
                     None,
-                )
+                ))
                 .await;
 
             tracing::debug!("set kv res: {:?}", res);

From e20c97bd0faa4289b31cd70068a2da696217be64 Mon Sep 17 00:00:00 2001
From: zhihanz <zzh243402448@gmail.com>
Date: Wed, 10 Nov 2021 09:23:49 +0800
Subject: [PATCH 05/17] release *** issue fix

---
 .github/workflows/databend-release.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/databend-release.yml b/.github/workflows/databend-release.yml
index f3e29e883373..6b9e9f3a435a 100644
--- a/.github/workflows/databend-release.yml
+++ b/.github/workflows/databend-release.yml
@@ -142,4 +142,5 @@ jobs:
           mkdir -p ./target/aarch64-unknown-linux-gnu/release
           tar xC ./target/x86_64-unknown-linux-gnu/release -f ./databend-${{ steps.get_version.outputs.VERSION }}-x86_64-unknown-linux-gnu.tar.gz
           tar xC ./target/aarch64-unknown-linux-gnu/release -f ./databend-${{ steps.get_version.outputs.VERSION }}-aarch64-unknown-linux-gnu.tar.gz
-          HUB= ${{ secrets.DOCKERHUB_NAMESPACE }} TAG=${{ steps.get_version.outputs.VERSION }}  make k8s-docker
\ No newline at end of file
+          export TAG=${{ steps.get_version.outputs.VERSION }}
+          make k8s-docker
\ No newline at end of file

From d0d41e022ece64000f55e69f8abb970ad8e37147 Mon Sep 17 00:00:00 2001
From: sundyli <543950155@qq.com>
Date: Wed, 10 Nov 2021 09:56:52 +0800
Subject: [PATCH 06/17] disable flaky test temporary

---
 query/src/servers/clickhouse/clickhouse_handler_test.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/query/src/servers/clickhouse/clickhouse_handler_test.rs b/query/src/servers/clickhouse/clickhouse_handler_test.rs
index c218f3989779..03a3f4976057 100644
--- a/query/src/servers/clickhouse/clickhouse_handler_test.rs
+++ b/query/src/servers/clickhouse/clickhouse_handler_test.rs
@@ -68,7 +68,7 @@ async fn test_clickhouse_insert_data() -> Result<()> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+// (todo winter)#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
 async fn test_clickhouse_insert_to_fuse_table() -> Result<()> {
     let tmp_dir = TempDir::new()?;
     let data_path = tmp_dir.path().to_str().unwrap().to_string();

From cffe76690e24ddaf89be600acf858ef64a99e547 Mon Sep 17 00:00:00 2001
From: sundyli <543950155@qq.com>
Date: Wed, 10 Nov 2021 10:07:28 +0800
Subject: [PATCH 07/17] Update
 query/src/servers/clickhouse/clickhouse_handler_test.rs

Co-authored-by: Chojan Shang <PsiACE@Outlook.com>
---
 query/src/servers/clickhouse/clickhouse_handler_test.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/query/src/servers/clickhouse/clickhouse_handler_test.rs b/query/src/servers/clickhouse/clickhouse_handler_test.rs
index 03a3f4976057..4725f5cddb3f 100644
--- a/query/src/servers/clickhouse/clickhouse_handler_test.rs
+++ b/query/src/servers/clickhouse/clickhouse_handler_test.rs
@@ -68,7 +68,9 @@ async fn test_clickhouse_insert_data() -> Result<()> {
     Ok(())
 }
 
-// (todo winter)#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+// (todo winter)
+#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+#[ignore]
 async fn test_clickhouse_insert_to_fuse_table() -> Result<()> {
     let tmp_dir = TempDir::new()?;
     let data_path = tmp_dir.path().to_str().unwrap().to_string();

From cd721e72b85a01105d8af14dba591b947540ea6e Mon Sep 17 00:00:00 2001
From: Li Yazhou <me.ssword@gmail.com>
Date: Wed, 10 Nov 2021 11:29:21 +0800
Subject: [PATCH 08/17] rename LogFunction to GenericLogFunction, with derived
 LogFunction and LnFunction

---
 common/functions/src/scalars/maths/log.rs  | 69 +++++++++++++++++-----
 common/functions/src/scalars/maths/math.rs |  2 +
 common/functions/src/scalars/maths/mod.rs  |  1 +
 3 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/common/functions/src/scalars/maths/log.rs b/common/functions/src/scalars/maths/log.rs
index 39e0fc2c4b97..325b023c7693 100644
--- a/common/functions/src/scalars/maths/log.rs
+++ b/common/functions/src/scalars/maths/log.rs
@@ -27,32 +27,45 @@ use crate::scalars::function_factory::FunctionFeatures;
 use crate::scalars::Function;
 
 #[derive(Clone)]
-pub struct LogFunction {
-    _display_name: String,
+pub struct GenericLogFunction {
+    display_name: String,
     default_base: f64,
+    unary: bool,
 }
 
-impl LogFunction {
-    pub fn try_create(_display_name: &str) -> Result<Box<dyn Function>> {
+impl GenericLogFunction {
+    pub fn try_create(
+        display_name: &str,
+        default_base: f64,
+        unary: bool,
+    ) -> Result<Box<dyn Function>> {
         Ok(Box::new(Self {
-            _display_name: _display_name.to_string(),
-            default_base: E,
+            display_name: display_name.to_string(),
+            default_base,
+            unary,
         }))
     }
-
-    pub fn desc() -> FunctionDescription {
-        FunctionDescription::creator(Box::new(Self::try_create))
-            .features(FunctionFeatures::default().deterministic())
-    }
 }
 
-impl Function for LogFunction {
+impl Function for GenericLogFunction {
     fn name(&self) -> &str {
-        &*self._display_name
+        &*self.display_name
+    }
+
+    fn num_arguments(&self) -> usize {
+        if self.unary {
+            1
+        } else {
+            0
+        }
     }
 
     fn variadic_arguments(&self) -> Option<(usize, usize)> {
-        Some((1, 2))
+        if self.unary {
+            None
+        } else {
+            Some((1, 2))
+        }
     }
 
     fn return_type(&self, _args: &[DataType]) -> Result<DataType> {
@@ -113,8 +126,34 @@ impl Function for LogFunction {
     }
 }
 
-impl fmt::Display for LogFunction {
+impl fmt::Display for GenericLogFunction {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "LOG")
     }
 }
+
+pub struct LogFunction {}
+
+impl LogFunction {
+    pub fn try_create(display_name: &str) -> Result<Box<dyn Function>> {
+        GenericLogFunction::try_create(display_name, E, false)
+    }
+
+    pub fn desc() -> FunctionDescription {
+        FunctionDescription::creator(Box::new(Self::try_create))
+            .features(FunctionFeatures::default().deterministic())
+    }
+}
+
+pub struct LnFunction {}
+
+impl LnFunction {
+    pub fn try_create(display_name: &str) -> Result<Box<dyn Function>> {
+        GenericLogFunction::try_create(display_name, E, true)
+    }
+
+    pub fn desc() -> FunctionDescription {
+        FunctionDescription::creator(Box::new(Self::try_create))
+            .features(FunctionFeatures::default().deterministic())
+    }
+}
diff --git a/common/functions/src/scalars/maths/math.rs b/common/functions/src/scalars/maths/math.rs
index 88264882c78d..78628fce4bcc 100644
--- a/common/functions/src/scalars/maths/math.rs
+++ b/common/functions/src/scalars/maths/math.rs
@@ -16,6 +16,7 @@ use crate::scalars::function_factory::FunctionFactory;
 use crate::scalars::AbsFunction;
 use crate::scalars::CRC32Function;
 use crate::scalars::DegressFunction;
+use crate::scalars::LnFunction;
 use crate::scalars::LogFunction;
 use crate::scalars::PiFunction;
 use crate::scalars::RadiansFunction;
@@ -38,5 +39,6 @@ impl MathsFunction {
         factory.register("degrees", DegressFunction::desc());
         factory.register("radians", RadiansFunction::desc());
         factory.register("log", LogFunction::desc());
+        factory.register("ln", LnFunction::desc());
     }
 }
diff --git a/common/functions/src/scalars/maths/mod.rs b/common/functions/src/scalars/maths/mod.rs
index 141f327d456b..db04da8a0415 100644
--- a/common/functions/src/scalars/maths/mod.rs
+++ b/common/functions/src/scalars/maths/mod.rs
@@ -24,6 +24,7 @@ pub use abs::AbsFunction;
 pub use angle::DegressFunction;
 pub use angle::RadiansFunction;
 pub use crc32::CRC32Function;
+pub use log::LnFunction;
 pub use log::LogFunction;
 pub use math::MathsFunction;
 pub use pi::PiFunction;

From 76f1ee51da273e9d9a7b0a313d49d25b0f1068c3 Mon Sep 17 00:00:00 2001
From: Chojan Shang <psiace@outlook.com>
Date: Wed, 10 Nov 2021 11:40:29 +0800
Subject: [PATCH 09/17] [ci] ignore some paths

Signed-off-by: Chojan Shang <psiace@outlook.com>
---
 .github/workflows/cargo.yml                      | 10 +++++++++-
 .github/workflows/databend-build.yml             | 10 +++++++++-
 .github/workflows/databend-docker.yml            |  3 +++
 .github/workflows/embedded-meta-test.yml         | 10 +++++++++-
 .github/workflows/pr-audit.yml                   |  4 ++--
 .github/workflows/stateless-tests-cluster.yml    | 10 +++++++++-
 .github/workflows/stateless-tests-standalone.yml | 10 +++++++++-
 .github/workflows/unit-tests.yml                 | 10 +++++++++-
 8 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml
index aa2580483ef4..4ff770139b46 100644
--- a/.github/workflows/cargo.yml
+++ b/.github/workflows/cargo.yml
@@ -1,5 +1,13 @@
 name: Cargo
-on: [push, pull_request]
+on:
+  push:
+    paths-ignore:
+      - 'website/'
+      - '*.md'
+  pull_request:
+    paths-ignore:
+      - 'website/'
+      - '*.md'
 
 env:
   CARGO_TERM_COLOR: always
diff --git a/.github/workflows/databend-build.yml b/.github/workflows/databend-build.yml
index 9a3572f05ee0..9e226a04c573 100644
--- a/.github/workflows/databend-build.yml
+++ b/.github/workflows/databend-build.yml
@@ -1,5 +1,13 @@
 name: Build
-on: [push, pull_request]
+on:
+  push:
+    paths-ignore:
+      - 'website/'
+      - '*.md'
+  pull_request:
+    paths-ignore:
+      - 'website/'
+      - '*.md'
 
 env:
   CARGO_TERM_COLOR: always
diff --git a/.github/workflows/databend-docker.yml b/.github/workflows/databend-docker.yml
index acf487cb64b7..24cd008f9f31 100644
--- a/.github/workflows/databend-docker.yml
+++ b/.github/workflows/databend-docker.yml
@@ -2,6 +2,9 @@ name: Push to Dockerhub
 on:
   push:
     branches: main
+    paths-ignore:
+      - 'website/'
+      - '*.md'
 
 jobs:
   build:
diff --git a/.github/workflows/embedded-meta-test.yml b/.github/workflows/embedded-meta-test.yml
index bed69ec84e4f..df6335156c21 100644
--- a/.github/workflows/embedded-meta-test.yml
+++ b/.github/workflows/embedded-meta-test.yml
@@ -1,5 +1,13 @@
 name: Stateless(Standalone, using embedded meta-store)
-on: [push, pull_request]
+on:
+  push:
+    paths-ignore:
+      - 'website/'
+      - '*.md'
+  pull_request:
+    paths-ignore:
+      - 'website/'
+      - '*.md'
 
 env:
   CARGO_TERM_COLOR: always
diff --git a/.github/workflows/pr-audit.yml b/.github/workflows/pr-audit.yml
index 91804a418103..5b06aacc5624 100644
--- a/.github/workflows/pr-audit.yml
+++ b/.github/workflows/pr-audit.yml
@@ -3,10 +3,10 @@ name: Pull Request Security Audit
 on:
   push:
     paths:
-      - '**/**/Cargo.toml'
+      - '**/Cargo.lock'
   pull_request:
     paths:
-      - '**/**/Cargo.toml'
+      - '**/Cargo.lock'
 
 jobs:
   security-audit:
diff --git a/.github/workflows/stateless-tests-cluster.yml b/.github/workflows/stateless-tests-cluster.yml
index 6fe8906bf4b3..2cb062f67c00 100644
--- a/.github/workflows/stateless-tests-cluster.yml
+++ b/.github/workflows/stateless-tests-cluster.yml
@@ -1,5 +1,13 @@
 name: Stateless(Cluster)
-on: [push, pull_request]
+on:
+  push:
+    paths-ignore:
+      - 'website/'
+      - '*.md'
+  pull_request:
+    paths-ignore:
+      - 'website/'
+      - '*.md'
 
 env:
   CARGO_TERM_COLOR: always
diff --git a/.github/workflows/stateless-tests-standalone.yml b/.github/workflows/stateless-tests-standalone.yml
index 4978edf3a77e..c453382602dc 100644
--- a/.github/workflows/stateless-tests-standalone.yml
+++ b/.github/workflows/stateless-tests-standalone.yml
@@ -1,5 +1,13 @@
 name: Stateless(Standalone)
-on: [push, pull_request]
+on:
+  push:
+    paths-ignore:
+      - 'website/'
+      - '*.md'
+  pull_request:
+    paths-ignore:
+      - 'website/'
+      - '*.md'
 
 env:
   CARGO_TERM_COLOR: always
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 0f516d0f0d47..d0996f4efdb5 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -1,5 +1,13 @@
 name: Unit Tests
-on: [push, pull_request]
+on:
+  push:
+    paths-ignore:
+      - 'website/'
+      - '*.md'
+  pull_request:
+    paths-ignore:
+      - 'website/'
+      - '*.md'
 
 env:
   CARGO_TERM_COLOR: always

From bd54f89b4c968a9eea2c978349d75fde31e419e1 Mon Sep 17 00:00:00 2001
From: BohuTANG <overred.shuttler@gmail.com>
Date: Wed, 10 Nov 2021 09:39:42 +0800
Subject: [PATCH 10/17] README: Add logo

---
 README.md                                     |   2 +-
 website/databend/docs/assets/favicon.png      | Bin 32988 -> 5593 bytes
 .../databend/docs/images/databend-logo.png    | Bin 0 -> 5593 bytes
 website/databend/src/.icons/logo.svg          |   4 +---
 .../databend/src/assets/images/favicon.png    | Bin 32988 -> 5593 bytes
 5 files changed, 2 insertions(+), 4 deletions(-)
 create mode 100644 website/databend/docs/images/databend-logo.png

diff --git a/README.md b/README.md
index d7bb2792d411..9c42fdd75c04 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-<h1>Databend</h1>
+<p align="center"><img alt="Databend Logo" src="website/databend/docs/images/databend-logo.png" width="15%"/></p>
 <p align="center">The Open Source Serverless Data Warehouse for Everyone</p>
  
 <h4 align="center">
diff --git a/website/databend/docs/assets/favicon.png b/website/databend/docs/assets/favicon.png
index 5c882f31b4129bc1850061fad4165fdfdd4f350d..ff09aeed8fe7bd54ac4ca6c0958289b7771fe80c 100644
GIT binary patch
literal 5593
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

literal 32988
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

diff --git a/website/databend/docs/images/databend-logo.png b/website/databend/docs/images/databend-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff09aeed8fe7bd54ac4ca6c0958289b7771fe80c
GIT binary patch
literal 5593
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

literal 0
HcmV?d00001

diff --git a/website/databend/src/.icons/logo.svg b/website/databend/src/.icons/logo.svg
index 5e1af8706d1f..cfb90237b4ee 100644
--- a/website/databend/src/.icons/logo.svg
+++ b/website/databend/src/.icons/logo.svg
@@ -1,3 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="493px" height="140px" viewBox="-0.5 -0.5 493 140" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2021-05-13T07:51:58.546Z&quot; agent=&quot;5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36&quot; etag=&quot;VX0OhVPp9Cqep5aYSbF8&quot; version=&quot;14.5.8&quot; type=&quot;google&quot;&gt;&lt;diagram id=&quot;SEU0eixfUz9YEUQ2ynjH&quot; name=&quot;Page-1&quot;&gt;3ZjbctsgEIafRpfuSKCDfelT4mmbphMn7UzusIQlNUi4CNdOnr5gIDpYSZTWaiexLwzfclj+BVaWBafZ/pyhTXJBI0wsYEd7C84sABwbDsWPJPeKeNBTIGZppJBdgmX6gE1PTbdphAvNFOKUEp5u6jCkeY5DXmOIMbqrN1tTEtXABsX4CCxDRI7p9zTiiaJDEJR8gdM4MTM7/khZVii8ixnd5no+C8Czw0eZM2TG0gstEhTRXQXBuQWnjFKuStl+ionUti7b2RPWR78ZznmXDlcfl+THrRN/ui28s/HXxeXqGg30KL8Q2WKzjIOz/N4IdFgiloPYFpzskpTj5QaF0roTW0KwhGdE1BxRLDijd3hKCWWC5DQXzSbrlBCDpEpgBB3h4uR4BcYdzDjeV5Be0TmmGebsXjQxVl9vP737IPBVfVfG0gQgqYQx0Azp3RM/jlwqKApaxFcI6r51QUcNQe1ugo76EtR744KKu6QmKBh2E9Rx+lLUb1HUJ1zKJEsxPyxckRVrEjFltVkjFEIU/kq9NUIkjXNRDYXUWPCJlDgV9/RYG7I0iuQ0rQGub4FThK3LOfD6ClHwZIjWVCypKrn/c0uNYVAc0utYNHBse7MvrTKBElQUtS7hwyCUQRjY1Yb1cOv5nukMbBuOPLc215+493j8SgjX9jCwvWPvIsRRZUMqJ9sdbxvWjeT3Lz1uHBQD1tsCV1xbtZyfNneP8Ls9WP7L9yEM/JaU7fV02MxF+09TjDuT354egoJuKQb0dX05/+Ox8qSKNm9/v5uisDdFwRtXtPkYBL1uirq9KQpfyrFdU8daaVyyb5hFKEf1/GL++BrmPJtLXs5HIGhLR9eLuSiiTEY7XxUbNfnF5Wx+9aXFMBtfj1vw9PPlzexVSezdZiu3ebWCo23rOs4H7yR3gaiW7wMOtspLFzj/DQ==&lt;/diagram&gt;&lt;/mxfile&gt;"><defs/><g><rect x="0" y="62" width="20" height="70" fill="#f2931e" stroke="none" pointer-events="all"/><rect x="30" y="42" width="20" height="90" fill="#f2931e" stroke="none" pointer-events="all"/><rect x="60" y="22" width="20" height="110" fill="#f2931e" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 248px; height: 1px; padding-top: 43px; margin-left: 131px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><h2><br /></h2></div></div></div></foreignObject><text x="255" y="46" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle"></text></switch></g><rect x="100" y="22" width="376" height="75" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 374px; height: 1px; padding-top: 60px; margin-left: 101px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 100px" class="cz-color-0"><font class="cz-color-2003954" style="font-size: 100px" color="#f08705">data</font><font color="#4d4d4d" style="font-size: 100px"><b>fuse</b></font></font></div></div></div></foreignObject><text x="288" y="63" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">datafuse</text></switch></g><rect x="0" y="112" width="20" height="20" fill="#4d4d4d" stroke="none" pointer-events="all"/><rect x="30" y="102" width="20" height="30" fill="#4d4d4d" stroke="none" pointer-events="all"/><rect x="60" y="92" width="20" height="40" fill="#4d4d4d" stroke="none" pointer-events="all"/><rect x="80" y="108" width="411.5" height="30" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 410px; height: 1px; padding-top: 123px; margin-left: 81px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font color="#4d4d4d" face="Verdana" size="1"><b style="font-size: 27px">THE  MODERN  DATA  CLOUD</b></font></div></div></div></foreignObject><text x="286" y="127" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">THE  MODERN  DATA  CLOUD</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200"><defs><style>.cls-1{fill:#1b83f6;}.cls-2{fill:#7ab4f5;}.cls-3{fill:#2983f4;}.cls-4{fill:#b3d7f8;}.cls-5{fill:#0d6bd4;}.cls-6{fill:#0e6dd4;}.cls-7{fill:#0f6ed4;}.cls-8{fill:#0d6dd4;}</style></defs><title>画板 2</title><path class="cls-1" d="M26.33,156.92a.68.68,0,0,1,.68-.68h7.85c6.5,0,10.92,4.1,10.92,10.11s-4.42,10.12-10.92,10.12H27a.69.69,0,0,1-.68-.68Zm8.36,17c5,0,8.2-3.06,8.2-7.6s-3.2-7.6-8.2-7.6H29.9a.69.69,0,0,0-.68.68V174Z"/><path class="cls-1" d="M64.25,161.83v14a.68.68,0,0,1-.68.68h-1.3a.69.69,0,0,1-.68-.68V174a6.44,6.44,0,0,1-5.46,2.6,7.82,7.82,0,0,1,0-15.63,6.53,6.53,0,0,1,5.35,2.45v-1.63a.68.68,0,0,1,.68-.68h1.41A.68.68,0,0,1,64.25,161.83Zm-2.74,7a5.17,5.17,0,1,0-5.15,5.4A5,5,0,0,0,61.51,168.81Z"/><path class="cls-1" d="M79.12,174.69a1.13,1.13,0,0,1-.58,1.48,6,6,0,0,1-2.39.47c-3.09,0-4.85-1.7-4.85-4.8v-8.41H68.52a1.2,1.2,0,0,1-1-1.16,1.12,1.12,0,0,1,1-1.12h1.84a1,1,0,0,0,1-1v-1.26a1.12,1.12,0,0,1,1.12-1.12H73a1.12,1.12,0,0,1,1.12,1.12v2.23h3.27a1.12,1.12,0,0,1,1.12,1.12v0a1.12,1.12,0,0,1-1.12,1.12H75.19a1.13,1.13,0,0,0-1.12,1.13v7.17c0,1.65.84,2.57,2.4,2.57a3.65,3.65,0,0,0,1.23-.21,1.12,1.12,0,0,1,1.42.6Z"/><path class="cls-1" d="M96.79,161.83v14a.69.69,0,0,1-.68.68h-1.3a.68.68,0,0,1-.68-.68V174a6.47,6.47,0,0,1-5.46,2.6,7.82,7.82,0,0,1,0-15.63A6.53,6.53,0,0,1,94,163.46v-1.63a.69.69,0,0,1,.68-.68h1.42A.69.69,0,0,1,96.79,161.83Zm-2.75,7a5.17,5.17,0,1,0-5.14,5.4A5,5,0,0,0,94,168.81Z"/><path class="cls-1" d="M117.91,168.81a7.45,7.45,0,0,1-7.74,7.83,6.8,6.8,0,0,1-4.33-1.4.69.69,0,0,0-1.13.53h0a.7.7,0,0,1-.7.7h-1.27a.69.69,0,0,1-.69-.7V155.72a.7.7,0,0,1,.69-.7h1.39a.7.7,0,0,1,.69.7v7.74h0a6.53,6.53,0,0,1,5.35-2.45A7.43,7.43,0,0,1,117.91,168.81Zm-2.8,0a5.17,5.17,0,1,0-5.17,5.4A5,5,0,0,0,115.11,168.81Z"/><path class="cls-1" d="M154.63,167.71v8.14a.68.68,0,0,1-.67.68h-1.43a.68.68,0,0,1-.67-.68V168c0-3-1.5-4.48-4.13-4.48-2.95,0-4.86,1.76-4.86,5.09v7.21a.68.68,0,0,1-.67.68h-1.43a.68.68,0,0,1-.67-.68v-14a.67.67,0,0,1,.67-.67h1.31a.68.68,0,0,1,.68.67h0a.68.68,0,0,0,1.09.53,7.17,7.17,0,0,1,4.43-1.35C152,161.06,154.63,163.2,154.63,167.71Z"/><path class="cls-1" d="M135.32,173.31h0a1.2,1.2,0,0,1-.15,1.69,8,8,0,0,1-5.15,1.64c-5,0-8.24-3.26-8.24-7.83a7.48,7.48,0,0,1,7.69-7.8,7.25,7.25,0,0,1,7.45,6.36,1.21,1.21,0,0,1-1,1.36l-11.12,2.16a5.21,5.21,0,0,0,5.26,3.32,5.91,5.91,0,0,0,3.58-1.08A1.2,1.2,0,0,1,135.32,173.31Zm-10-4.52,7.49-1.42a1.2,1.2,0,0,0,.81-1.8,5,5,0,0,0-9,1.51,3.57,3.57,0,0,0-.08,1.3C124.66,168.88,125.35,168.79,125.35,168.79Z"/><path class="cls-1" d="M173.67,155.64v20.21a.62.62,0,0,1-.62.62h-1.43a.61.61,0,0,1-.61-.62v-.25a.62.62,0,0,0-1-.47,6.77,6.77,0,0,1-4.46,1.51,7.82,7.82,0,0,1,0-15.63,6.53,6.53,0,0,1,5.35,2.45v-7.82a.62.62,0,0,1,.62-.62h1.54A.62.62,0,0,1,173.67,155.64Zm-2.75,13.17a5.17,5.17,0,1,0-5.14,5.4A5,5,0,0,0,170.92,168.81Z"/><path class="cls-2" d="M172.05,86.38h0c-1.54,0-3.33-3.65-4.63-4.21-5.15-2.25-9.93-2.22-15.42-2.89a97.38,97.38,0,0,0-15.89-1c-8.48.39-17.16-.53-25.53,1-13.38,2.39-27.07,5-40.47,7.22C62.07,87.87,55.17,89,47,88.44c-12.08-.87-23.77-.94-33.51-8.5A6,6,0,0,1,11.64,78c-1.5,1.19-2.94,2.3-3.17,4.54a70.79,70.79,0,0,0,.1,17.15c.56,4,1.09,8.08,3.11,11.73,5.14,3.89,10.19,11.1,16.55,12.17s12.71.45,19.26,0a166,166,0,0,0,34.21-5.78c.13,0,1-3.85,1.18-3.91,1.11-4.24,4.15-5.21,7.9-2.52,8.25-2.8,15.88-2.41,24.15-5.13,8.55-2.8,16.54-3.54,25.53-4.33,3.86-.34,9.2-2,13-1.93,8.69,0,17.27-2.08,25.55,1a15.2,15.2,0,0,0,1.8.42l-8.56-14.91"/><path class="cls-3" d="M159.63,72.24c-2.78-.33-5.94-4.19-8.57-5A138.6,138.6,0,0,0,124.57,62a121.69,121.69,0,0,0-21.68,0c-6.33.43-12-.76-18.3,0a111.39,111.39,0,0,1-18.79.48c-7.9-.44-16.2,2.23-22.91-2.36A96.14,96.14,0,0,0,11.64,78a6,6,0,0,0,1.86,1.93c9.74,7.56,21,10.94,33.11,11.81A102.36,102.36,0,0,0,71,90.48c13.4-2.26,26.76-4.78,40.13-7.17a193.78,193.78,0,0,1,25.31-2.67A93,93,0,0,1,152,81c5.49.67,10.94,1.5,16.09,3.75,1.3.56,3.3,2,4,1.62C166,76.88,159.63,72.24,159.63,72.24Z"/><path class="cls-4" d="M90.78,111.39c8.25-2.8,16.47-5.67,24.75-8.39a116.31,116.31,0,0,1,26.28-5.45c3.86-.34,7.75-.6,11.57-.57,8.69,0,17.36.94,25.64,4a15.2,15.2,0,0,0,1.8.42c.78,1.7,1.61,3.37,2.32,5.1a8.42,8.42,0,0,0,2.65,3.57A16.39,16.39,0,0,1,192,121.66c.19,1.83-.53,2.34-2.27,1.81a11,11,0,0,1-4.63-3.4c-.27-.28-.52-.75-1-.57s-.32.7-.37,1.09a16.21,16.21,0,0,1-2.11,6.67c-.77,1.22-1.48,1.68-2.64.18a13.24,13.24,0,0,1-2.75-7.67c0-1,0-2.08,0-3.12,0-4.35-.94-5.8-5.16-7.32a36.36,36.36,0,0,0-15.89-1.83,112.87,112.87,0,0,0-18,3.36c2.2.75,3.85,1.27,5.47,1.88.83.31,1.81.66,1.91,1.7s-.85,1.33-1.53,1.77c-3.93,2.5-8.4,3.06-12.87,3.48a56.16,56.16,0,0,1-13.65.06,4.73,4.73,0,0,0-3,.55,136.27,136.27,0,0,1-40.12,14.17c-14,2.54-27.93,2.52-41.36-3.1-8.26-3.46-15.28-8.39-19.22-16.81a8.68,8.68,0,0,1-1-3.13,39.2,39.2,0,0,0,17.19,7.75,81.65,81.65,0,0,0,19.34,1.08,167.41,167.41,0,0,0,34.29-6.18,3.17,3.17,0,0,0,.38-.17c.43,2.94,1.67,4.3,3.9,4.61C89.92,119,93.29,115.49,90.78,111.39Z"/><path class="cls-5" d="M159.63,72.24c-2.78-.33-5.3-1.52-7.93-2.32A140.06,140.06,0,0,0,125,64.43a131.72,131.72,0,0,0-22.56-.19c-6.32.43-12.62,1.1-18.9,1.85a105.05,105.05,0,0,1-18.41.67c-7.9-.43-15.56-2.1-22.27-6.69a106.54,106.54,0,0,1,23.56-6.44,154.25,154.25,0,0,1,58.87,1.15A75,75,0,0,1,157,69.69,8.86,8.86,0,0,1,159.63,72.24Z"/><path class="cls-6" d="M68,43.4c-.22-5-.24-9.35,1.17-13.58A9.25,9.25,0,0,1,74,23.91a4.8,4.8,0,0,1,6.26,1.54c1.33,2,1,3.93-1.12,5.86-1.84,1.68-3.7,3.35-5.59,5A26.22,26.22,0,0,0,68,43.4Z"/><path class="cls-7" d="M63.9,49.63c-2.72-3.33-6.13-4.69-9.44-6.24-1.92-.91-3.31-2.38-3.09-4.69a4.47,4.47,0,0,1,3.54-4.12c2.49-.67,4.82-.2,6.36,1.87C64.08,40.25,64.38,44.64,63.9,49.63Z"/><path class="cls-8" d="M90.78,111.39c2.51,4.1-.86,7.56-4,7.13-2.23-.31-3.47-1.67-3.9-4.61C84,109.67,87,108.7,90.78,111.39Z"/></svg>
\ No newline at end of file
diff --git a/website/databend/src/assets/images/favicon.png b/website/databend/src/assets/images/favicon.png
index 5c882f31b4129bc1850061fad4165fdfdd4f350d..ff09aeed8fe7bd54ac4ca6c0958289b7771fe80c 100644
GIT binary patch
literal 5593
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

literal 32988
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


From 932944936e2041ba57256d255d661acd121f6d9c Mon Sep 17 00:00:00 2001
From: Li Yazhou <me.ssword@gmail.com>
Date: Wed, 10 Nov 2021 11:55:52 +0800
Subject: [PATCH 11/17] add tests for ln

---
 common/functions/src/scalars/maths/log.rs     |  2 +-
 .../functions/tests/it/scalars/maths/log.rs   | 24 +++++++++++++++++++
 .../0_stateless/02_0014_function_maths.result |  1 +
 .../0_stateless/02_0014_function_maths.sql    |  2 ++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/common/functions/src/scalars/maths/log.rs b/common/functions/src/scalars/maths/log.rs
index 325b023c7693..3d4913454722 100644
--- a/common/functions/src/scalars/maths/log.rs
+++ b/common/functions/src/scalars/maths/log.rs
@@ -128,7 +128,7 @@ impl Function for GenericLogFunction {
 
 impl fmt::Display for GenericLogFunction {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "LOG")
+        write!(f, "{}", self.display_name.to_uppercase())
     }
 }
 
diff --git a/common/functions/tests/it/scalars/maths/log.rs b/common/functions/tests/it/scalars/maths/log.rs
index c7cf46cf1858..f80575024519 100644
--- a/common/functions/tests/it/scalars/maths/log.rs
+++ b/common/functions/tests/it/scalars/maths/log.rs
@@ -96,6 +96,30 @@ fn test_log_function() -> Result<()> {
             expect: Series::new([None, None, Some(1_f64)]).into(),
             error: "",
         },
+        Test {
+            name: "ln on series",
+            display: "LN",
+            args: vec![DataColumnWithField::new(
+                Series::new([Some(E), None]).into(),
+                DataField::new("num", DataType::Int32, false),
+            )],
+            input_rows: 1,
+            func: LnFunction::try_create("ln")?,
+            expect: Series::new([Some(1_f64), None]).into(),
+            error: "",
+        },
+        Test {
+            name: "ln on literal",
+            display: "LN",
+            args: vec![DataColumnWithField::new(
+                Series::new([E]).into(),
+                DataField::new("num", DataType::Int32, false),
+            )],
+            input_rows: 1,
+            func: LnFunction::try_create("ln")?,
+            expect: DataColumn::Constant(1_f64.into(), 1),
+            error: "",
+        },
     ];
     for t in tests {
         let func = t.func;
diff --git a/tests/suites/0_stateless/02_0014_function_maths.result b/tests/suites/0_stateless/02_0014_function_maths.result
index 98a08cfc867f..56b03b0aa017 100644
--- a/tests/suites/0_stateless/02_0014_function_maths.result
+++ b/tests/suites/0_stateless/02_0014_function_maths.result
@@ -12,3 +12,4 @@ NULL
 NULL
 NULL
 2
+NULL
\ No newline at end of file
diff --git a/tests/suites/0_stateless/02_0014_function_maths.sql b/tests/suites/0_stateless/02_0014_function_maths.sql
index d0ed77bbb83c..e28bd3511a5c 100644
--- a/tests/suites/0_stateless/02_0014_function_maths.sql
+++ b/tests/suites/0_stateless/02_0014_function_maths.sql
@@ -16,5 +16,7 @@ SELECT log(NULL, NULL); -- {ErrorCode 10}
 SELECT log(1, NULL);
 SELECT log(NULL, 1); -- {ErrorCode 10}
 SELECT log('10', 100);
+SELECT ln(NULL);
+SELECT ln(1, 2); -- {ErrorCode 28}
 
 DROP TABLE math_sample_numbers;

From b19352fc9876872d66aacdea4e7917ca85a5a6ea Mon Sep 17 00:00:00 2001
From: Li Yazhou <me.ssword@gmail.com>
Date: Wed, 10 Nov 2021 12:01:58 +0800
Subject: [PATCH 12/17] add log10(), log2() with tests

---
 common/functions/src/scalars/maths/log.rs     | 26 +++++++++++++++++
 common/functions/src/scalars/maths/math.rs    |  4 +++
 common/functions/src/scalars/maths/mod.rs     |  2 ++
 .../functions/tests/it/scalars/maths/log.rs   | 28 +++++++++++++++++--
 .../0_stateless/02_0014_function_maths.result |  5 +++-
 .../0_stateless/02_0014_function_maths.sql    |  3 ++
 6 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/common/functions/src/scalars/maths/log.rs b/common/functions/src/scalars/maths/log.rs
index 3d4913454722..8bb13c8abd08 100644
--- a/common/functions/src/scalars/maths/log.rs
+++ b/common/functions/src/scalars/maths/log.rs
@@ -157,3 +157,29 @@ impl LnFunction {
             .features(FunctionFeatures::default().deterministic())
     }
 }
+
+pub struct Log10Function {}
+
+impl Log10Function {
+    pub fn try_create(display_name: &str) -> Result<Box<dyn Function>> {
+        GenericLogFunction::try_create(display_name, 10_f64, true)
+    }
+
+    pub fn desc() -> FunctionDescription {
+        FunctionDescription::creator(Box::new(Self::try_create))
+            .features(FunctionFeatures::default().deterministic())
+    }
+}
+
+pub struct Log2Function {}
+
+impl Log2Function {
+    pub fn try_create(display_name: &str) -> Result<Box<dyn Function>> {
+        GenericLogFunction::try_create(display_name, 2_f64, true)
+    }
+
+    pub fn desc() -> FunctionDescription {
+        FunctionDescription::creator(Box::new(Self::try_create))
+            .features(FunctionFeatures::default().deterministic())
+    }
+}
diff --git a/common/functions/src/scalars/maths/math.rs b/common/functions/src/scalars/maths/math.rs
index 78628fce4bcc..0933a93a99ea 100644
--- a/common/functions/src/scalars/maths/math.rs
+++ b/common/functions/src/scalars/maths/math.rs
@@ -17,6 +17,8 @@ use crate::scalars::AbsFunction;
 use crate::scalars::CRC32Function;
 use crate::scalars::DegressFunction;
 use crate::scalars::LnFunction;
+use crate::scalars::Log10Function;
+use crate::scalars::Log2Function;
 use crate::scalars::LogFunction;
 use crate::scalars::PiFunction;
 use crate::scalars::RadiansFunction;
@@ -39,6 +41,8 @@ impl MathsFunction {
         factory.register("degrees", DegressFunction::desc());
         factory.register("radians", RadiansFunction::desc());
         factory.register("log", LogFunction::desc());
+        factory.register("log10", Log10Function::desc());
+        factory.register("log2", Log2Function::desc());
         factory.register("ln", LnFunction::desc());
     }
 }
diff --git a/common/functions/src/scalars/maths/mod.rs b/common/functions/src/scalars/maths/mod.rs
index db04da8a0415..beaf82839249 100644
--- a/common/functions/src/scalars/maths/mod.rs
+++ b/common/functions/src/scalars/maths/mod.rs
@@ -25,6 +25,8 @@ pub use angle::DegressFunction;
 pub use angle::RadiansFunction;
 pub use crc32::CRC32Function;
 pub use log::LnFunction;
+pub use log::Log10Function;
+pub use log::Log2Function;
 pub use log::LogFunction;
 pub use math::MathsFunction;
 pub use pi::PiFunction;
diff --git a/common/functions/tests/it/scalars/maths/log.rs b/common/functions/tests/it/scalars/maths/log.rs
index f80575024519..2b90ebca5337 100644
--- a/common/functions/tests/it/scalars/maths/log.rs
+++ b/common/functions/tests/it/scalars/maths/log.rs
@@ -101,7 +101,7 @@ fn test_log_function() -> Result<()> {
             display: "LN",
             args: vec![DataColumnWithField::new(
                 Series::new([Some(E), None]).into(),
-                DataField::new("num", DataType::Int32, false),
+                DataField::new("num", DataType::Float64, false),
             )],
             input_rows: 1,
             func: LnFunction::try_create("ln")?,
@@ -113,13 +113,37 @@ fn test_log_function() -> Result<()> {
             display: "LN",
             args: vec![DataColumnWithField::new(
                 Series::new([E]).into(),
-                DataField::new("num", DataType::Int32, false),
+                DataField::new("num", DataType::Float64, false),
             )],
             input_rows: 1,
             func: LnFunction::try_create("ln")?,
             expect: DataColumn::Constant(1_f64.into(), 1),
             error: "",
         },
+        Test {
+            name: "log2 on literal",
+            display: "LOG2",
+            args: vec![DataColumnWithField::new(
+                Series::new([2_f64]).into(),
+                DataField::new("num", DataType::Float64, false),
+            )],
+            input_rows: 1,
+            func: Log2Function::try_create("log2")?,
+            expect: DataColumn::Constant(1_f64.into(), 1),
+            error: "",
+        },
+        Test {
+            name: "log10 on literal",
+            display: "LOG10",
+            args: vec![DataColumnWithField::new(
+                Series::new([10_f64]).into(),
+                DataField::new("num", DataType::Float64, false),
+            )],
+            input_rows: 1,
+            func: Log10Function::try_create("log10")?,
+            expect: DataColumn::Constant(1_f64.into(), 1),
+            error: "",
+        },
     ];
     for t in tests {
         let func = t.func;
diff --git a/tests/suites/0_stateless/02_0014_function_maths.result b/tests/suites/0_stateless/02_0014_function_maths.result
index 56b03b0aa017..4c4c47cdbb3b 100644
--- a/tests/suites/0_stateless/02_0014_function_maths.result
+++ b/tests/suites/0_stateless/02_0014_function_maths.result
@@ -12,4 +12,7 @@ NULL
 NULL
 NULL
 2
-NULL
\ No newline at end of file
+NULL
+NULL
+2
+1
diff --git a/tests/suites/0_stateless/02_0014_function_maths.sql b/tests/suites/0_stateless/02_0014_function_maths.sql
index e28bd3511a5c..77f031db3686 100644
--- a/tests/suites/0_stateless/02_0014_function_maths.sql
+++ b/tests/suites/0_stateless/02_0014_function_maths.sql
@@ -18,5 +18,8 @@ SELECT log(NULL, 1); -- {ErrorCode 10}
 SELECT log('10', 100);
 SELECT ln(NULL);
 SELECT ln(1, 2); -- {ErrorCode 28}
+SELECT log10(NULL);
+SELECT log10(100);
+SELECT log2(2);
 
 DROP TABLE math_sample_numbers;

From 2530cbf951bcdfc5837e708634ef4e3fbe668430 Mon Sep 17 00:00:00 2001
From: BohuTANG <overred.shuttler@gmail.com>
Date: Wed, 10 Nov 2021 12:05:30 +0800
Subject: [PATCH 13/17] Update logo.svg

---
 website/databend/src/.icons/logo.svg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/databend/src/.icons/logo.svg b/website/databend/src/.icons/logo.svg
index cfb90237b4ee..c70768b5f6f9 100644
--- a/website/databend/src/.icons/logo.svg
+++ b/website/databend/src/.icons/logo.svg
@@ -1 +1 @@
-<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200"><defs><style>.cls-1{fill:#1b83f6;}.cls-2{fill:#7ab4f5;}.cls-3{fill:#2983f4;}.cls-4{fill:#b3d7f8;}.cls-5{fill:#0d6bd4;}.cls-6{fill:#0e6dd4;}.cls-7{fill:#0f6ed4;}.cls-8{fill:#0d6dd4;}</style></defs><title>画板 2</title><path class="cls-1" d="M26.33,156.92a.68.68,0,0,1,.68-.68h7.85c6.5,0,10.92,4.1,10.92,10.11s-4.42,10.12-10.92,10.12H27a.69.69,0,0,1-.68-.68Zm8.36,17c5,0,8.2-3.06,8.2-7.6s-3.2-7.6-8.2-7.6H29.9a.69.69,0,0,0-.68.68V174Z"/><path class="cls-1" d="M64.25,161.83v14a.68.68,0,0,1-.68.68h-1.3a.69.69,0,0,1-.68-.68V174a6.44,6.44,0,0,1-5.46,2.6,7.82,7.82,0,0,1,0-15.63,6.53,6.53,0,0,1,5.35,2.45v-1.63a.68.68,0,0,1,.68-.68h1.41A.68.68,0,0,1,64.25,161.83Zm-2.74,7a5.17,5.17,0,1,0-5.15,5.4A5,5,0,0,0,61.51,168.81Z"/><path class="cls-1" d="M79.12,174.69a1.13,1.13,0,0,1-.58,1.48,6,6,0,0,1-2.39.47c-3.09,0-4.85-1.7-4.85-4.8v-8.41H68.52a1.2,1.2,0,0,1-1-1.16,1.12,1.12,0,0,1,1-1.12h1.84a1,1,0,0,0,1-1v-1.26a1.12,1.12,0,0,1,1.12-1.12H73a1.12,1.12,0,0,1,1.12,1.12v2.23h3.27a1.12,1.12,0,0,1,1.12,1.12v0a1.12,1.12,0,0,1-1.12,1.12H75.19a1.13,1.13,0,0,0-1.12,1.13v7.17c0,1.65.84,2.57,2.4,2.57a3.65,3.65,0,0,0,1.23-.21,1.12,1.12,0,0,1,1.42.6Z"/><path class="cls-1" d="M96.79,161.83v14a.69.69,0,0,1-.68.68h-1.3a.68.68,0,0,1-.68-.68V174a6.47,6.47,0,0,1-5.46,2.6,7.82,7.82,0,0,1,0-15.63A6.53,6.53,0,0,1,94,163.46v-1.63a.69.69,0,0,1,.68-.68h1.42A.69.69,0,0,1,96.79,161.83Zm-2.75,7a5.17,5.17,0,1,0-5.14,5.4A5,5,0,0,0,94,168.81Z"/><path class="cls-1" d="M117.91,168.81a7.45,7.45,0,0,1-7.74,7.83,6.8,6.8,0,0,1-4.33-1.4.69.69,0,0,0-1.13.53h0a.7.7,0,0,1-.7.7h-1.27a.69.69,0,0,1-.69-.7V155.72a.7.7,0,0,1,.69-.7h1.39a.7.7,0,0,1,.69.7v7.74h0a6.53,6.53,0,0,1,5.35-2.45A7.43,7.43,0,0,1,117.91,168.81Zm-2.8,0a5.17,5.17,0,1,0-5.17,5.4A5,5,0,0,0,115.11,168.81Z"/><path class="cls-1" d="M154.63,167.71v8.14a.68.68,0,0,1-.67.68h-1.43a.68.68,0,0,1-.67-.68V168c0-3-1.5-4.48-4.13-4.48-2.95,0-4.86,1.76-4.86,5.09v7.21a.68.68,0,0,1-.67.68h-1.43a.68.68,0,0,1-.67-.68v-14a.67.67,0,0,1,.67-.67h1.31a.68.68,0,0,1,.68.67h0a.68.68,0,0,0,1.09.53,7.17,7.17,0,0,1,4.43-1.35C152,161.06,154.63,163.2,154.63,167.71Z"/><path class="cls-1" d="M135.32,173.31h0a1.2,1.2,0,0,1-.15,1.69,8,8,0,0,1-5.15,1.64c-5,0-8.24-3.26-8.24-7.83a7.48,7.48,0,0,1,7.69-7.8,7.25,7.25,0,0,1,7.45,6.36,1.21,1.21,0,0,1-1,1.36l-11.12,2.16a5.21,5.21,0,0,0,5.26,3.32,5.91,5.91,0,0,0,3.58-1.08A1.2,1.2,0,0,1,135.32,173.31Zm-10-4.52,7.49-1.42a1.2,1.2,0,0,0,.81-1.8,5,5,0,0,0-9,1.51,3.57,3.57,0,0,0-.08,1.3C124.66,168.88,125.35,168.79,125.35,168.79Z"/><path class="cls-1" d="M173.67,155.64v20.21a.62.62,0,0,1-.62.62h-1.43a.61.61,0,0,1-.61-.62v-.25a.62.62,0,0,0-1-.47,6.77,6.77,0,0,1-4.46,1.51,7.82,7.82,0,0,1,0-15.63,6.53,6.53,0,0,1,5.35,2.45v-7.82a.62.62,0,0,1,.62-.62h1.54A.62.62,0,0,1,173.67,155.64Zm-2.75,13.17a5.17,5.17,0,1,0-5.14,5.4A5,5,0,0,0,170.92,168.81Z"/><path class="cls-2" d="M172.05,86.38h0c-1.54,0-3.33-3.65-4.63-4.21-5.15-2.25-9.93-2.22-15.42-2.89a97.38,97.38,0,0,0-15.89-1c-8.48.39-17.16-.53-25.53,1-13.38,2.39-27.07,5-40.47,7.22C62.07,87.87,55.17,89,47,88.44c-12.08-.87-23.77-.94-33.51-8.5A6,6,0,0,1,11.64,78c-1.5,1.19-2.94,2.3-3.17,4.54a70.79,70.79,0,0,0,.1,17.15c.56,4,1.09,8.08,3.11,11.73,5.14,3.89,10.19,11.1,16.55,12.17s12.71.45,19.26,0a166,166,0,0,0,34.21-5.78c.13,0,1-3.85,1.18-3.91,1.11-4.24,4.15-5.21,7.9-2.52,8.25-2.8,15.88-2.41,24.15-5.13,8.55-2.8,16.54-3.54,25.53-4.33,3.86-.34,9.2-2,13-1.93,8.69,0,17.27-2.08,25.55,1a15.2,15.2,0,0,0,1.8.42l-8.56-14.91"/><path class="cls-3" d="M159.63,72.24c-2.78-.33-5.94-4.19-8.57-5A138.6,138.6,0,0,0,124.57,62a121.69,121.69,0,0,0-21.68,0c-6.33.43-12-.76-18.3,0a111.39,111.39,0,0,1-18.79.48c-7.9-.44-16.2,2.23-22.91-2.36A96.14,96.14,0,0,0,11.64,78a6,6,0,0,0,1.86,1.93c9.74,7.56,21,10.94,33.11,11.81A102.36,102.36,0,0,0,71,90.48c13.4-2.26,26.76-4.78,40.13-7.17a193.78,193.78,0,0,1,25.31-2.67A93,93,0,0,1,152,81c5.49.67,10.94,1.5,16.09,3.75,1.3.56,3.3,2,4,1.62C166,76.88,159.63,72.24,159.63,72.24Z"/><path class="cls-4" d="M90.78,111.39c8.25-2.8,16.47-5.67,24.75-8.39a116.31,116.31,0,0,1,26.28-5.45c3.86-.34,7.75-.6,11.57-.57,8.69,0,17.36.94,25.64,4a15.2,15.2,0,0,0,1.8.42c.78,1.7,1.61,3.37,2.32,5.1a8.42,8.42,0,0,0,2.65,3.57A16.39,16.39,0,0,1,192,121.66c.19,1.83-.53,2.34-2.27,1.81a11,11,0,0,1-4.63-3.4c-.27-.28-.52-.75-1-.57s-.32.7-.37,1.09a16.21,16.21,0,0,1-2.11,6.67c-.77,1.22-1.48,1.68-2.64.18a13.24,13.24,0,0,1-2.75-7.67c0-1,0-2.08,0-3.12,0-4.35-.94-5.8-5.16-7.32a36.36,36.36,0,0,0-15.89-1.83,112.87,112.87,0,0,0-18,3.36c2.2.75,3.85,1.27,5.47,1.88.83.31,1.81.66,1.91,1.7s-.85,1.33-1.53,1.77c-3.93,2.5-8.4,3.06-12.87,3.48a56.16,56.16,0,0,1-13.65.06,4.73,4.73,0,0,0-3,.55,136.27,136.27,0,0,1-40.12,14.17c-14,2.54-27.93,2.52-41.36-3.1-8.26-3.46-15.28-8.39-19.22-16.81a8.68,8.68,0,0,1-1-3.13,39.2,39.2,0,0,0,17.19,7.75,81.65,81.65,0,0,0,19.34,1.08,167.41,167.41,0,0,0,34.29-6.18,3.17,3.17,0,0,0,.38-.17c.43,2.94,1.67,4.3,3.9,4.61C89.92,119,93.29,115.49,90.78,111.39Z"/><path class="cls-5" d="M159.63,72.24c-2.78-.33-5.3-1.52-7.93-2.32A140.06,140.06,0,0,0,125,64.43a131.72,131.72,0,0,0-22.56-.19c-6.32.43-12.62,1.1-18.9,1.85a105.05,105.05,0,0,1-18.41.67c-7.9-.43-15.56-2.1-22.27-6.69a106.54,106.54,0,0,1,23.56-6.44,154.25,154.25,0,0,1,58.87,1.15A75,75,0,0,1,157,69.69,8.86,8.86,0,0,1,159.63,72.24Z"/><path class="cls-6" d="M68,43.4c-.22-5-.24-9.35,1.17-13.58A9.25,9.25,0,0,1,74,23.91a4.8,4.8,0,0,1,6.26,1.54c1.33,2,1,3.93-1.12,5.86-1.84,1.68-3.7,3.35-5.59,5A26.22,26.22,0,0,0,68,43.4Z"/><path class="cls-7" d="M63.9,49.63c-2.72-3.33-6.13-4.69-9.44-6.24-1.92-.91-3.31-2.38-3.09-4.69a4.47,4.47,0,0,1,3.54-4.12c2.49-.67,4.82-.2,6.36,1.87C64.08,40.25,64.38,44.64,63.9,49.63Z"/><path class="cls-8" d="M90.78,111.39c2.51,4.1-.86,7.56-4,7.13-2.23-.31-3.47-1.67-3.9-4.61C84,109.67,87,108.7,90.78,111.39Z"/></svg>
\ No newline at end of file
+<svg id="layer_1" data-name="layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200"><defs><style>.cls-1{fill:#1b83f6;}.cls-2{fill:#7ab4f5;}.cls-3{fill:#2983f4;}.cls-4{fill:#b3d7f8;}.cls-5{fill:#0d6bd4;}.cls-6{fill:#0e6dd4;}.cls-7{fill:#0f6ed4;}.cls-8{fill:#0d6dd4;}</style></defs><title>Databend Logo</title><path class="cls-1" d="M26.33,156.92a.68.68,0,0,1,.68-.68h7.85c6.5,0,10.92,4.1,10.92,10.11s-4.42,10.12-10.92,10.12H27a.69.69,0,0,1-.68-.68Zm8.36,17c5,0,8.2-3.06,8.2-7.6s-3.2-7.6-8.2-7.6H29.9a.69.69,0,0,0-.68.68V174Z"/><path class="cls-1" d="M64.25,161.83v14a.68.68,0,0,1-.68.68h-1.3a.69.69,0,0,1-.68-.68V174a6.44,6.44,0,0,1-5.46,2.6,7.82,7.82,0,0,1,0-15.63,6.53,6.53,0,0,1,5.35,2.45v-1.63a.68.68,0,0,1,.68-.68h1.41A.68.68,0,0,1,64.25,161.83Zm-2.74,7a5.17,5.17,0,1,0-5.15,5.4A5,5,0,0,0,61.51,168.81Z"/><path class="cls-1" d="M79.12,174.69a1.13,1.13,0,0,1-.58,1.48,6,6,0,0,1-2.39.47c-3.09,0-4.85-1.7-4.85-4.8v-8.41H68.52a1.2,1.2,0,0,1-1-1.16,1.12,1.12,0,0,1,1-1.12h1.84a1,1,0,0,0,1-1v-1.26a1.12,1.12,0,0,1,1.12-1.12H73a1.12,1.12,0,0,1,1.12,1.12v2.23h3.27a1.12,1.12,0,0,1,1.12,1.12v0a1.12,1.12,0,0,1-1.12,1.12H75.19a1.13,1.13,0,0,0-1.12,1.13v7.17c0,1.65.84,2.57,2.4,2.57a3.65,3.65,0,0,0,1.23-.21,1.12,1.12,0,0,1,1.42.6Z"/><path class="cls-1" d="M96.79,161.83v14a.69.69,0,0,1-.68.68h-1.3a.68.68,0,0,1-.68-.68V174a6.47,6.47,0,0,1-5.46,2.6,7.82,7.82,0,0,1,0-15.63A6.53,6.53,0,0,1,94,163.46v-1.63a.69.69,0,0,1,.68-.68h1.42A.69.69,0,0,1,96.79,161.83Zm-2.75,7a5.17,5.17,0,1,0-5.14,5.4A5,5,0,0,0,94,168.81Z"/><path class="cls-1" d="M117.91,168.81a7.45,7.45,0,0,1-7.74,7.83,6.8,6.8,0,0,1-4.33-1.4.69.69,0,0,0-1.13.53h0a.7.7,0,0,1-.7.7h-1.27a.69.69,0,0,1-.69-.7V155.72a.7.7,0,0,1,.69-.7h1.39a.7.7,0,0,1,.69.7v7.74h0a6.53,6.53,0,0,1,5.35-2.45A7.43,7.43,0,0,1,117.91,168.81Zm-2.8,0a5.17,5.17,0,1,0-5.17,5.4A5,5,0,0,0,115.11,168.81Z"/><path class="cls-1" d="M154.63,167.71v8.14a.68.68,0,0,1-.67.68h-1.43a.68.68,0,0,1-.67-.68V168c0-3-1.5-4.48-4.13-4.48-2.95,0-4.86,1.76-4.86,5.09v7.21a.68.68,0,0,1-.67.68h-1.43a.68.68,0,0,1-.67-.68v-14a.67.67,0,0,1,.67-.67h1.31a.68.68,0,0,1,.68.67h0a.68.68,0,0,0,1.09.53,7.17,7.17,0,0,1,4.43-1.35C152,161.06,154.63,163.2,154.63,167.71Z"/><path class="cls-1" d="M135.32,173.31h0a1.2,1.2,0,0,1-.15,1.69,8,8,0,0,1-5.15,1.64c-5,0-8.24-3.26-8.24-7.83a7.48,7.48,0,0,1,7.69-7.8,7.25,7.25,0,0,1,7.45,6.36,1.21,1.21,0,0,1-1,1.36l-11.12,2.16a5.21,5.21,0,0,0,5.26,3.32,5.91,5.91,0,0,0,3.58-1.08A1.2,1.2,0,0,1,135.32,173.31Zm-10-4.52,7.49-1.42a1.2,1.2,0,0,0,.81-1.8,5,5,0,0,0-9,1.51,3.57,3.57,0,0,0-.08,1.3C124.66,168.88,125.35,168.79,125.35,168.79Z"/><path class="cls-1" d="M173.67,155.64v20.21a.62.62,0,0,1-.62.62h-1.43a.61.61,0,0,1-.61-.62v-.25a.62.62,0,0,0-1-.47,6.77,6.77,0,0,1-4.46,1.51,7.82,7.82,0,0,1,0-15.63,6.53,6.53,0,0,1,5.35,2.45v-7.82a.62.62,0,0,1,.62-.62h1.54A.62.62,0,0,1,173.67,155.64Zm-2.75,13.17a5.17,5.17,0,1,0-5.14,5.4A5,5,0,0,0,170.92,168.81Z"/><path class="cls-2" d="M172.05,86.38h0c-1.54,0-3.33-3.65-4.63-4.21-5.15-2.25-9.93-2.22-15.42-2.89a97.38,97.38,0,0,0-15.89-1c-8.48.39-17.16-.53-25.53,1-13.38,2.39-27.07,5-40.47,7.22C62.07,87.87,55.17,89,47,88.44c-12.08-.87-23.77-.94-33.51-8.5A6,6,0,0,1,11.64,78c-1.5,1.19-2.94,2.3-3.17,4.54a70.79,70.79,0,0,0,.1,17.15c.56,4,1.09,8.08,3.11,11.73,5.14,3.89,10.19,11.1,16.55,12.17s12.71.45,19.26,0a166,166,0,0,0,34.21-5.78c.13,0,1-3.85,1.18-3.91,1.11-4.24,4.15-5.21,7.9-2.52,8.25-2.8,15.88-2.41,24.15-5.13,8.55-2.8,16.54-3.54,25.53-4.33,3.86-.34,9.2-2,13-1.93,8.69,0,17.27-2.08,25.55,1a15.2,15.2,0,0,0,1.8.42l-8.56-14.91"/><path class="cls-3" d="M159.63,72.24c-2.78-.33-5.94-4.19-8.57-5A138.6,138.6,0,0,0,124.57,62a121.69,121.69,0,0,0-21.68,0c-6.33.43-12-.76-18.3,0a111.39,111.39,0,0,1-18.79.48c-7.9-.44-16.2,2.23-22.91-2.36A96.14,96.14,0,0,0,11.64,78a6,6,0,0,0,1.86,1.93c9.74,7.56,21,10.94,33.11,11.81A102.36,102.36,0,0,0,71,90.48c13.4-2.26,26.76-4.78,40.13-7.17a193.78,193.78,0,0,1,25.31-2.67A93,93,0,0,1,152,81c5.49.67,10.94,1.5,16.09,3.75,1.3.56,3.3,2,4,1.62C166,76.88,159.63,72.24,159.63,72.24Z"/><path class="cls-4" d="M90.78,111.39c8.25-2.8,16.47-5.67,24.75-8.39a116.31,116.31,0,0,1,26.28-5.45c3.86-.34,7.75-.6,11.57-.57,8.69,0,17.36.94,25.64,4a15.2,15.2,0,0,0,1.8.42c.78,1.7,1.61,3.37,2.32,5.1a8.42,8.42,0,0,0,2.65,3.57A16.39,16.39,0,0,1,192,121.66c.19,1.83-.53,2.34-2.27,1.81a11,11,0,0,1-4.63-3.4c-.27-.28-.52-.75-1-.57s-.32.7-.37,1.09a16.21,16.21,0,0,1-2.11,6.67c-.77,1.22-1.48,1.68-2.64.18a13.24,13.24,0,0,1-2.75-7.67c0-1,0-2.08,0-3.12,0-4.35-.94-5.8-5.16-7.32a36.36,36.36,0,0,0-15.89-1.83,112.87,112.87,0,0,0-18,3.36c2.2.75,3.85,1.27,5.47,1.88.83.31,1.81.66,1.91,1.7s-.85,1.33-1.53,1.77c-3.93,2.5-8.4,3.06-12.87,3.48a56.16,56.16,0,0,1-13.65.06,4.73,4.73,0,0,0-3,.55,136.27,136.27,0,0,1-40.12,14.17c-14,2.54-27.93,2.52-41.36-3.1-8.26-3.46-15.28-8.39-19.22-16.81a8.68,8.68,0,0,1-1-3.13,39.2,39.2,0,0,0,17.19,7.75,81.65,81.65,0,0,0,19.34,1.08,167.41,167.41,0,0,0,34.29-6.18,3.17,3.17,0,0,0,.38-.17c.43,2.94,1.67,4.3,3.9,4.61C89.92,119,93.29,115.49,90.78,111.39Z"/><path class="cls-5" d="M159.63,72.24c-2.78-.33-5.3-1.52-7.93-2.32A140.06,140.06,0,0,0,125,64.43a131.72,131.72,0,0,0-22.56-.19c-6.32.43-12.62,1.1-18.9,1.85a105.05,105.05,0,0,1-18.41.67c-7.9-.43-15.56-2.1-22.27-6.69a106.54,106.54,0,0,1,23.56-6.44,154.25,154.25,0,0,1,58.87,1.15A75,75,0,0,1,157,69.69,8.86,8.86,0,0,1,159.63,72.24Z"/><path class="cls-6" d="M68,43.4c-.22-5-.24-9.35,1.17-13.58A9.25,9.25,0,0,1,74,23.91a4.8,4.8,0,0,1,6.26,1.54c1.33,2,1,3.93-1.12,5.86-1.84,1.68-3.7,3.35-5.59,5A26.22,26.22,0,0,0,68,43.4Z"/><path class="cls-7" d="M63.9,49.63c-2.72-3.33-6.13-4.69-9.44-6.24-1.92-.91-3.31-2.38-3.09-4.69a4.47,4.47,0,0,1,3.54-4.12c2.49-.67,4.82-.2,6.36,1.87C64.08,40.25,64.38,44.64,63.9,49.63Z"/><path class="cls-8" d="M90.78,111.39c2.51,4.1-.86,7.56-4,7.13-2.23-.31-3.47-1.67-3.9-4.61C84,109.67,87,108.7,90.78,111.39Z"/></svg>

From 2691a2da7912a1bea6173c12e19f9e4336054a49 Mon Sep 17 00:00:00 2001
From: drdr xp <drdr.xp@gmail.com>
Date: Tue, 9 Nov 2021 20:46:49 +0800
Subject: [PATCH 14/17] [metasrv] refactor: remove kv handler. ActionHandler
 calls <meta_node as KVApi> directly

---
 metasrv/src/executor/action_handler.rs | 11 ++++--
 metasrv/src/executor/kv_handlers.rs    | 55 --------------------------
 metasrv/src/executor/mod.rs            |  1 -
 3 files changed, 7 insertions(+), 60 deletions(-)
 delete mode 100644 metasrv/src/executor/kv_handlers.rs

diff --git a/metasrv/src/executor/action_handler.rs b/metasrv/src/executor/action_handler.rs
index 20d4f2b69641..c718ee3f9cbd 100644
--- a/metasrv/src/executor/action_handler.rs
+++ b/metasrv/src/executor/action_handler.rs
@@ -15,6 +15,7 @@
 use std::sync::Arc;
 
 use common_exception::ErrorCode;
+use common_meta_api::KVApi;
 use common_meta_flight::MetaFlightAction;
 use common_meta_flight::RequestFor;
 use serde::Serialize;
@@ -55,10 +56,12 @@ impl ActionHandler {
         // To keep the code IDE-friendly, we manually expand the enum variants and dispatch them one by one
 
         match action {
-            MetaFlightAction::UpsertKV(a) => s.serialize(self.handle(a).await?),
-            MetaFlightAction::GetKV(a) => s.serialize(self.handle(a).await?),
-            MetaFlightAction::MGetKV(a) => s.serialize(self.handle(a).await?),
-            MetaFlightAction::PrefixListKV(a) => s.serialize(self.handle(a).await?),
+            MetaFlightAction::UpsertKV(a) => s.serialize(self.meta_node.upsert_kv(a).await?),
+            MetaFlightAction::GetKV(a) => s.serialize(self.meta_node.get_kv(&a.key).await?),
+            MetaFlightAction::MGetKV(a) => s.serialize(self.meta_node.mget_kv(&a.keys).await?),
+            MetaFlightAction::PrefixListKV(a) => {
+                s.serialize(self.meta_node.prefix_list_kv(&a.0).await?)
+            }
 
             // database
             MetaFlightAction::CreateDatabase(a) => s.serialize(self.handle(a).await?),
diff --git a/metasrv/src/executor/kv_handlers.rs b/metasrv/src/executor/kv_handlers.rs
deleted file mode 100644
index 47114a66286d..000000000000
--- a/metasrv/src/executor/kv_handlers.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2020 Datafuse Labs.
-//
-// 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 common_meta_api::KVApi;
-use common_meta_flight::GetKVAction;
-use common_meta_flight::MGetKVAction;
-use common_meta_flight::PrefixListReq;
-use common_meta_types::GetKVActionReply;
-use common_meta_types::MGetKVActionReply;
-use common_meta_types::PrefixListReply;
-use common_meta_types::UpsertKVAction;
-use common_meta_types::UpsertKVActionReply;
-
-use crate::executor::action_handler::RequestHandler;
-use crate::executor::ActionHandler;
-
-#[async_trait::async_trait]
-impl RequestHandler<UpsertKVAction> for ActionHandler {
-    async fn handle(&self, act: UpsertKVAction) -> common_exception::Result<UpsertKVActionReply> {
-        self.meta_node.upsert_kv(act).await
-    }
-}
-
-#[async_trait::async_trait]
-impl RequestHandler<GetKVAction> for ActionHandler {
-    async fn handle(&self, act: GetKVAction) -> common_exception::Result<GetKVActionReply> {
-        self.meta_node.get_kv(&act.key).await
-    }
-}
-
-#[async_trait::async_trait]
-impl RequestHandler<MGetKVAction> for ActionHandler {
-    async fn handle(&self, act: MGetKVAction) -> common_exception::Result<MGetKVActionReply> {
-        self.meta_node.mget_kv(&act.keys).await
-    }
-}
-
-#[async_trait::async_trait]
-impl RequestHandler<PrefixListReq> for ActionHandler {
-    async fn handle(&self, act: PrefixListReq) -> common_exception::Result<PrefixListReply> {
-        self.meta_node.prefix_list_kv(&(act.0)).await
-    }
-}
diff --git a/metasrv/src/executor/mod.rs b/metasrv/src/executor/mod.rs
index 218dacd73a79..7a624182cbda 100644
--- a/metasrv/src/executor/mod.rs
+++ b/metasrv/src/executor/mod.rs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 mod action_handler;
-mod kv_handlers;
 mod meta_handlers;
 
 pub use action_handler::ActionHandler;

From 0f13a37e45c9e05cb4507644def07d80e60e7e56 Mon Sep 17 00:00:00 2001
From: drdr xp <drdr.xp@gmail.com>
Date: Tue, 9 Nov 2021 21:16:10 +0800
Subject: [PATCH 15/17] [metasrv] refactor: use derive_more to impl Into<T> for
 actions

---
 Cargo.lock                              |   1 +
 common/meta/flight/Cargo.toml           |   1 +
 common/meta/flight/src/flight_action.rs | 112 +++++++++---------------
 3 files changed, 43 insertions(+), 71 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 30f78b1e70c1..22c15ea4154d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1423,6 +1423,7 @@ dependencies = [
  "common-meta-types",
  "common-planners",
  "common-tracing",
+ "derive_more",
  "futures",
  "hyper",
  "jwt-simple",
diff --git a/common/meta/flight/Cargo.toml b/common/meta/flight/Cargo.toml
index 12072f111486..251ddfd111ae 100644
--- a/common/meta/flight/Cargo.toml
+++ b/common/meta/flight/Cargo.toml
@@ -24,6 +24,7 @@ common-tracing = {path = "../../tracing"}
 
 # Crates.io dependencies
 async-trait = "0.1"
+derive_more = "0.99.16"
 futures = "0.3"
 jwt-simple = "0.10.7"
 log = "0.4"
diff --git a/common/meta/flight/src/flight_action.rs b/common/meta/flight/src/flight_action.rs
index d03177b13bfb..c877fd9c971c 100644
--- a/common/meta/flight/src/flight_action.rs
+++ b/common/meta/flight/src/flight_action.rs
@@ -43,23 +43,8 @@ pub trait RequestFor {
     type Reply;
 }
 
-#[macro_export]
-macro_rules! action_declare {
-    ($req:ident, $reply:ty, $enum_ctor:expr) => {
-        impl RequestFor for $req {
-            type Reply = $reply;
-        }
-
-        impl From<$req> for MetaFlightAction {
-            fn from(act: $req) -> Self {
-                $enum_ctor(act)
-            }
-        }
-    };
-}
-
 // Action wrapper for do_action.
-#[derive(serde::Serialize, serde::Deserialize, Clone, Debug)]
+#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, derive_more::From)]
 pub enum MetaFlightAction {
     // database meta
     CreateDatabase(CreateDatabaseAction),
@@ -129,15 +114,6 @@ impl RequestFor for GetKVAction {
     type Reply = GetKVActionReply;
 }
 
-// Explicitly defined the converter for MetaDoAction
-// It's implementations' choice, that they gonna using enum MetaDoAction as wrapper.
-// This can be simplified by using macro (see code below)
-impl From<GetKVAction> for MetaFlightAction {
-    fn from(act: GetKVAction) -> Self {
-        MetaFlightAction::GetKV(act)
-    }
-}
-
 // - MGetKV
 
 // Again, impl chooses to wrap it up
@@ -147,22 +123,20 @@ pub struct MGetKVAction {
 }
 
 // here we use a macro to simplify the declarations
-action_declare!(MGetKVAction, MGetKVActionReply, MetaFlightAction::MGetKV);
+impl RequestFor for MGetKVAction {
+    type Reply = MGetKVActionReply;
+}
 
 // - prefix list
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug)]
 pub struct PrefixListReq(pub String);
-action_declare!(
-    PrefixListReq,
-    PrefixListReply,
-    MetaFlightAction::PrefixListKV
-);
-
-action_declare!(
-    UpsertKVAction,
-    UpsertKVActionReply,
-    MetaFlightAction::UpsertKV
-);
+impl RequestFor for PrefixListReq {
+    type Reply = PrefixListReply;
+}
+
+impl RequestFor for UpsertKVAction {
+    type Reply = UpsertKVActionReply;
+}
 
 // == database actions ==
 // - create database
@@ -170,28 +144,26 @@ action_declare!(
 pub struct CreateDatabaseAction {
     pub plan: CreateDatabasePlan,
 }
-action_declare!(
-    CreateDatabaseAction,
-    CreateDatabaseReply,
-    MetaFlightAction::CreateDatabase
-);
+impl RequestFor for CreateDatabaseAction {
+    type Reply = CreateDatabaseReply;
+}
 
 // - get database
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug)]
 pub struct GetDatabaseAction {
     pub db: String,
 }
-action_declare!(
-    GetDatabaseAction,
-    DatabaseInfo,
-    MetaFlightAction::GetDatabase
-);
+impl RequestFor for GetDatabaseAction {
+    type Reply = DatabaseInfo;
+}
 
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug)]
 pub struct DropDatabaseAction {
     pub plan: DropDatabasePlan,
 }
-action_declare!(DropDatabaseAction, (), MetaFlightAction::DropDatabase);
+impl RequestFor for DropDatabaseAction {
+    type Reply = ();
+}
 
 // == table actions ==
 // - create table
@@ -199,18 +171,18 @@ action_declare!(DropDatabaseAction, (), MetaFlightAction::DropDatabase);
 pub struct CreateTableAction {
     pub plan: CreateTablePlan,
 }
-action_declare!(
-    CreateTableAction,
-    CreateTableReply,
-    MetaFlightAction::CreateTable
-);
+impl RequestFor for CreateTableAction {
+    type Reply = CreateTableReply;
+}
 
 // - drop table
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug)]
 pub struct DropTableAction {
     pub plan: DropTablePlan,
 }
-action_declare!(DropTableAction, (), MetaFlightAction::DropTable);
+impl RequestFor for DropTableAction {
+    type Reply = ();
+}
 
 // - get table
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug, Eq, PartialEq)]
@@ -219,13 +191,17 @@ pub struct GetTableAction {
     pub table: String,
 }
 
-action_declare!(GetTableAction, TableInfo, MetaFlightAction::GetTable);
+impl RequestFor for GetTableAction {
+    type Reply = TableInfo;
+}
 
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug, Eq, PartialEq)]
 pub struct GetTableExtReq {
     pub tbl_id: MetaId,
 }
-action_declare!(GetTableExtReq, TableInfo, MetaFlightAction::GetTableExt);
+impl RequestFor for GetTableExtReq {
+    type Reply = TableInfo;
+}
 
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug, Eq, PartialEq)]
 pub struct UpsertTableOptionReq {
@@ -234,11 +210,9 @@ pub struct UpsertTableOptionReq {
     pub option_key: String,
     pub option_value: String,
 }
-action_declare!(
-    UpsertTableOptionReq,
-    UpsertTableOptionReply,
-    MetaFlightAction::CommitTable
-);
+impl RequestFor for UpsertTableOptionReq {
+    type Reply = UpsertTableOptionReply;
+}
 
 // - get tables
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug, Eq, PartialEq)]
@@ -246,19 +220,15 @@ pub struct GetTablesAction {
     pub db: String,
 }
 
-action_declare!(
-    GetTablesAction,
-    Vec<Arc<TableInfo>>,
-    MetaFlightAction::GetTables
-);
+impl RequestFor for GetTablesAction {
+    type Reply = Vec<Arc<TableInfo>>;
+}
 
 // -get databases
 
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq)]
 pub struct GetDatabasesAction;
 
-action_declare!(
-    GetDatabasesAction,
-    Vec<Arc<DatabaseInfo>>,
-    MetaFlightAction::GetDatabases
-);
+impl RequestFor for GetDatabasesAction {
+    type Reply = Vec<Arc<DatabaseInfo>>;
+}

From d7407fc2a6277ff474338877b5a0bb7a2e68b318 Mon Sep 17 00:00:00 2001
From: drdr xp <drdr.xp@gmail.com>
Date: Wed, 10 Nov 2021 13:28:16 +0800
Subject: [PATCH 16/17] [metasrv] refactor: move write_to_local_leader() to
 MetaLeader

---
 metasrv/src/meta_service/message.rs           |  3 +
 metasrv/src/meta_service/meta_leader.rs       | 56 ++++++++++-----
 metasrv/src/meta_service/meta_service_impl.rs | 22 ++++--
 .../meta_service/meta_service_impl_test.rs    | 13 +++-
 metasrv/src/meta_service/raftmeta.rs          | 69 +++----------------
 metasrv/src/meta_service/raftmeta_test.rs     | 30 +++++---
 6 files changed, 96 insertions(+), 97 deletions(-)

diff --git a/metasrv/src/meta_service/message.rs b/metasrv/src/meta_service/message.rs
index 8f7f48bce023..02d4a31412b3 100644
--- a/metasrv/src/meta_service/message.rs
+++ b/metasrv/src/meta_service/message.rs
@@ -35,6 +35,7 @@ pub struct JoinRequest {
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, derive_more::TryInto)]
 pub enum AdminRequestInner {
     Join(JoinRequest),
+    Write(LogEntry),
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
@@ -52,8 +53,10 @@ impl AdminRequest {
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, derive_more::TryInto)]
+#[allow(clippy::large_enum_variant)]
 pub enum AdminResponse {
     Join(()),
+    AppliedState(AppliedState),
 }
 
 impl tonic::IntoRequest<RaftRequest> for AdminRequest {
diff --git a/metasrv/src/meta_service/meta_leader.rs b/metasrv/src/meta_service/meta_leader.rs
index 494dce70c907..eb15a0eaffbc 100644
--- a/metasrv/src/meta_service/meta_leader.rs
+++ b/metasrv/src/meta_service/meta_leader.rs
@@ -15,7 +15,10 @@
 use std::collections::BTreeSet;
 
 use async_raft::error::ResponseError;
+use async_raft::raft::ClientWriteRequest;
 use async_raft::ChangeConfigError;
+use async_raft::ClientWriteError;
+use common_meta_raft_store::state_machine::AppliedState;
 use common_meta_types::Cmd;
 use common_meta_types::LogEntry;
 use common_meta_types::Node;
@@ -25,7 +28,6 @@ use common_tracing::tracing;
 use crate::errors::ForwardToLeader;
 use crate::errors::InvalidMembership;
 use crate::errors::MetaError;
-use crate::errors::RetryableError;
 use crate::meta_service::message::AdminRequest;
 use crate::meta_service::message::AdminResponse;
 use crate::meta_service::AdminRequestInner;
@@ -52,6 +54,10 @@ impl<'a> MetaLeader<'a> {
                 self.join(join_req).await?;
                 Ok(AdminResponse::Join(()))
             }
+            AdminRequestInner::Write(entry) => {
+                let res = self.write(entry).await?;
+                Ok(AdminResponse::AppliedState(res))
+            }
         }
     }
 
@@ -85,23 +91,7 @@ impl<'a> MetaLeader<'a> {
             },
         };
 
-        let res = self
-            .meta_node
-            .write_to_local_leader(ent.clone())
-            .await
-            .map_err(|e| MetaError::UnknownError(e.to_string()))?;
-        match res {
-            Ok(_applied_state) => {}
-            Err(retryable_error) => {
-                // TODO(xp): remove retryable error.
-                let leader_id = match retryable_error {
-                    RetryableError::ForwardToLeader { leader } => leader,
-                };
-                return Err(MetaError::ForwardToLeader(ForwardToLeader {
-                    leader: Some(leader_id),
-                }));
-            }
-        }
+        self.write(ent.clone()).await?;
 
         self.change_membership(membership).await
     }
@@ -138,4 +128,34 @@ impl<'a> MetaLeader<'a> {
             _ => Err(MetaError::UnknownError("uncovered error".to_string())),
         }
     }
+
+    /// Write a log through local raft node and return the states before and after applying the log.
+    ///
+    /// If the raft node is not a leader, it returns MetaError::ForwardToLeader.
+    /// If the leadership is lost during writing the log, it returns an UnknownError.
+    /// TODO(xp): elaborate the UnknownError, e.g. LeaderLostError
+    #[tracing::instrument(level = "debug", skip(self))]
+    pub async fn write(&self, entry: LogEntry) -> Result<AppliedState, MetaError> {
+        let write_rst = self
+            .meta_node
+            .raft
+            .client_write(ClientWriteRequest::new(entry))
+            .await;
+
+        tracing::debug!("raft.client_write rst: {:?}", write_rst);
+
+        match write_rst {
+            Ok(resp) => Ok(resp.data),
+            Err(cli_write_err) => match cli_write_err {
+                // fatal error
+                ClientWriteError::RaftError(raft_err) => {
+                    Err(MetaError::UnknownError(raft_err.to_string()))
+                }
+                // retryable error
+                ClientWriteError::ForwardToLeader(_, leader) => {
+                    Err(MetaError::ForwardToLeader(ForwardToLeader { leader }))
+                }
+            },
+        }
+    }
 }
diff --git a/metasrv/src/meta_service/meta_service_impl.rs b/metasrv/src/meta_service/meta_service_impl.rs
index dde9cf912e79..1a4a41614f59 100644
--- a/metasrv/src/meta_service/meta_service_impl.rs
+++ b/metasrv/src/meta_service/meta_service_impl.rs
@@ -21,6 +21,7 @@ use std::sync::Arc;
 use common_meta_types::LogEntry;
 use common_tracing::tracing;
 
+use crate::errors::MetaError;
 use crate::meta_service::message::AdminRequest;
 use crate::meta_service::MetaNode;
 use crate::proto::meta_service_server::MetaService;
@@ -53,14 +54,21 @@ impl MetaService for MetaServiceImpl {
         let mes = request.into_inner();
         let req: LogEntry = mes.try_into()?;
 
-        let rst = self
-            .meta_node
-            .write_to_local_leader(req)
-            .await
-            .map_err(|e| tonic::Status::internal(e.to_string()))?;
+        let leader = self.meta_node.as_leader().await;
 
-        let raft_mes = rst.into();
-        Ok(tonic::Response::new(raft_mes))
+        let leader = match leader {
+            Ok(x) => x,
+            Err(err) => {
+                let err: MetaError = err.into();
+                let raft_reply = Err::<(), _>(err).into();
+                return Ok(tonic::Response::new(raft_reply));
+            }
+        };
+
+        let rst = leader.write(req).await;
+
+        let raft_reply = rst.into();
+        Ok(tonic::Response::new(raft_reply))
     }
 
     #[tracing::instrument(level = "info", skip(self))]
diff --git a/metasrv/src/meta_service/meta_service_impl_test.rs b/metasrv/src/meta_service/meta_service_impl_test.rs
index 2be6170159d3..203f5bcf2f8b 100644
--- a/metasrv/src/meta_service/meta_service_impl_test.rs
+++ b/metasrv/src/meta_service/meta_service_impl_test.rs
@@ -25,6 +25,8 @@ use common_tracing::tracing;
 use log::info;
 use pretty_assertions::assert_eq;
 
+use crate::errors::ForwardToLeader;
+use crate::errors::MetaError;
 use crate::errors::RetryableError;
 use crate::meta_service::MetaNode;
 use crate::proto::meta_service_client::MetaServiceClient;
@@ -165,12 +167,17 @@ async fn test_meta_cluster_write_on_non_leader() -> anyhow::Result<()> {
     };
     let raft_mes = client.write(req).await?.into_inner();
 
-    let rst: Result<AppliedState, RetryableError> = raft_mes.into();
+    let rst: Result<AppliedState, MetaError> = raft_mes.into();
+    println!("{:?}", rst);
+
     assert!(rst.is_err());
     let err = rst.unwrap_err();
     match err {
-        RetryableError::ForwardToLeader { leader } => {
-            assert_eq!(leader, 0);
+        MetaError::ForwardToLeader(ForwardToLeader { leader }) => {
+            assert_eq!(leader, Some(0));
+        }
+        _ => {
+            panic!("expect ForwardToLeader")
         }
     }
 
diff --git a/metasrv/src/meta_service/raftmeta.rs b/metasrv/src/meta_service/raftmeta.rs
index 8dccdb8b8f9e..506e7cf13907 100644
--- a/metasrv/src/meta_service/raftmeta.rs
+++ b/metasrv/src/meta_service/raftmeta.rs
@@ -16,8 +16,6 @@ use std::collections::BTreeSet;
 use std::sync::Arc;
 
 use async_raft::config::Config;
-use async_raft::raft::ClientWriteRequest;
-use async_raft::ClientWriteError;
 use async_raft::Raft;
 use async_raft::RaftMetrics;
 use async_raft::SnapshotPolicy;
@@ -46,10 +44,10 @@ use common_tracing::tracing::Instrument;
 use crate::errors::ConnectionError;
 use crate::errors::ForwardToLeader;
 use crate::errors::MetaError;
-use crate::errors::RetryableError;
 use crate::meta_service::message::AdminRequest;
 use crate::meta_service::message::AdminResponse;
 use crate::meta_service::meta_leader::MetaLeader;
+use crate::meta_service::AdminRequestInner;
 use crate::meta_service::MetaServiceImpl;
 use crate::meta_service::Network;
 use crate::proto::meta_service_client::MetaServiceClient;
@@ -532,31 +530,16 @@ impl MetaNode {
     /// Submit a write request to the known leader. Returns the response after applying the request.
     #[tracing::instrument(level = "info", skip(self))]
     pub async fn write(&self, req: LogEntry) -> common_exception::Result<AppliedState> {
-        let mut curr_leader = self.get_leader().await;
-        loop {
-            let rst = if curr_leader == self.sto.id {
-                self.write_to_local_leader(req.clone()).await?
-            } else {
-                // forward to leader
-
-                let addr = self.sto.get_node_addr(&curr_leader).await?;
-
-                // TODO: retry
-                let mut client = MetaServiceClient::connect(format!("http://{}", addr))
-                    .await
-                    .map_err(|e| ErrorCode::CannotConnectNode(e.to_string()))?;
-                let resp = client.write(req.clone()).await?;
-                let rst: Result<AppliedState, RetryableError> = resp.into_inner().into();
-                rst
-            };
-
-            match rst {
-                Ok(resp) => return Ok(resp),
-                Err(write_err) => match write_err {
-                    RetryableError::ForwardToLeader { leader } => curr_leader = leader,
-                },
-            }
-        }
+        let res = self
+            .handle_admin_req(AdminRequest {
+                forward_to_leader: true,
+                req: AdminRequestInner::Write(req.clone()),
+            })
+            .await?;
+
+        let res: AppliedState = res.try_into().expect("expect AppliedState");
+
+        Ok(res)
     }
 
     /// Try to get the leader from the latest metrics of the local raft node.
@@ -616,34 +599,4 @@ impl MetaNode {
         let res: Result<AdminResponse, MetaError> = raft_mes.into();
         res
     }
-
-    /// Write a meta log through local raft node.
-    /// It works only when this node is the leader,
-    /// otherwise it returns ClientWriteError::ForwardToLeader error indicating the latest leader.
-    #[tracing::instrument(level = "info", skip(self))]
-    pub async fn write_to_local_leader(
-        &self,
-        req: LogEntry,
-    ) -> common_exception::Result<Result<AppliedState, RetryableError>> {
-        let write_rst = self.raft.client_write(ClientWriteRequest::new(req)).await;
-
-        tracing::debug!("raft.client_write rst: {:?}", write_rst);
-
-        match write_rst {
-            Ok(resp) => Ok(Ok(resp.data)),
-            Err(cli_write_err) => match cli_write_err {
-                // fatal error
-                ClientWriteError::RaftError(raft_err) => {
-                    Err(ErrorCode::MetaServiceError(raft_err.to_string()))
-                }
-                // retryable error
-                ClientWriteError::ForwardToLeader(_, leader) => match leader {
-                    Some(id) => Ok(Err(RetryableError::ForwardToLeader { leader: id })),
-                    None => Err(ErrorCode::MetaServiceUnavailable(
-                        "no leader to write".to_string(),
-                    )),
-                },
-            },
-        }
-    }
 }
diff --git a/metasrv/src/meta_service/raftmeta_test.rs b/metasrv/src/meta_service/raftmeta_test.rs
index ce1faf9fae3a..7cccb6b4f5c9 100644
--- a/metasrv/src/meta_service/raftmeta_test.rs
+++ b/metasrv/src/meta_service/raftmeta_test.rs
@@ -32,8 +32,10 @@ use maplit::btreeset;
 use pretty_assertions::assert_eq;
 
 use crate::configs;
-use crate::errors::RetryableError;
+use crate::errors::ForwardToLeader;
+use crate::errors::MetaError;
 use crate::meta_service::message::AdminRequest;
+use crate::meta_service::meta_leader::MetaLeader;
 use crate::meta_service::AdminRequestInner;
 use crate::meta_service::JoinRequest;
 use crate::meta_service::MetaNode;
@@ -136,8 +138,9 @@ async fn test_meta_node_write_to_local_leader() -> anyhow::Result<()> {
         let key = "t-non-leader-write";
         for id in 0u64..4 {
             let mn = &all[id as usize];
-            let rst = mn
-                .write_to_local_leader(LogEntry {
+            let maybe_leader = MetaLeader::new(mn);
+            let rst = maybe_leader
+                .write(LogEntry {
                     txid: None,
                     cmd: Cmd::UpsertKV {
                         key: key.to_string(),
@@ -148,16 +151,17 @@ async fn test_meta_node_write_to_local_leader() -> anyhow::Result<()> {
                 })
                 .await;
 
-            let rst = rst?;
-
             if id == leader_id {
                 assert!(rst.is_ok());
             } else {
                 assert!(rst.is_err());
                 let e = rst.unwrap_err();
                 match e {
-                    RetryableError::ForwardToLeader { leader } => {
-                        assert_eq!(leader_id, leader);
+                    MetaError::ForwardToLeader(ForwardToLeader { leader }) => {
+                        assert_eq!(Some(leader_id), leader);
+                    }
+                    _ => {
+                        panic!("expect ForwardToLeader")
                     }
                 }
             }
@@ -559,7 +563,9 @@ async fn test_meta_node_restart_single_node() -> anyhow::Result<()> {
         let leader = tc.meta_nodes.pop().unwrap();
 
         leader
-            .write_to_local_leader(LogEntry {
+            .as_leader()
+            .await?
+            .write(LogEntry {
                 txid: None,
                 cmd: Cmd::UpsertKV {
                     key: "foo".to_string(),
@@ -568,7 +574,7 @@ async fn test_meta_node_restart_single_node() -> anyhow::Result<()> {
                     value_meta: None,
                 },
             })
-            .await??;
+            .await?;
         log_cnt += 1;
 
         want_hs = leader.sto.raft_state.read_hard_state()?;
@@ -752,7 +758,9 @@ async fn assert_upsert_kv_synced(meta_nodes: Vec<Arc<MetaNode>>, key: &str) -> a
     tracing::info!("leader: last_applied={}", last_applied);
     {
         leader
-            .write_to_local_leader(LogEntry {
+            .as_leader()
+            .await?
+            .write(LogEntry {
                 txid: None,
                 cmd: Cmd::UpsertKV {
                     key: key.to_string(),
@@ -761,7 +769,7 @@ async fn assert_upsert_kv_synced(meta_nodes: Vec<Arc<MetaNode>>, key: &str) -> a
                     value_meta: None,
                 },
             })
-            .await??;
+            .await?;
     }
 
     assert_applied_index(meta_nodes.clone(), last_applied + 1).await?;

From d8c307c2ded9c99648c46aa5cd013eb8e5e6bb37 Mon Sep 17 00:00:00 2001
From: Sunli <scott_s829@163.com>
Date: Wed, 10 Nov 2021 17:00:45 +0800
Subject: [PATCH 17/17] Bump poem from `1.0.21` to `1.0.23`.

---
 Cargo.lock                                        |  4 ++--
 common/base/Cargo.toml                            |  2 +-
 common/base/src/http_shutdown_handlers.rs         | 10 +++++-----
 metasrv/Cargo.toml                                |  2 +-
 metasrv/src/api/http_service.rs                   |  6 +++---
 query/Cargo.toml                                  |  2 +-
 query/src/api/http_service.rs                     |  6 +++---
 query/src/common/service/http_shutdown_handles.rs | 10 +++++-----
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 22c15ea4154d..cae12bff8554 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4847,9 +4847,9 @@ dependencies = [
 
 [[package]]
 name = "poem"
-version = "1.0.21"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a70978aaae37dc18bbd43e5ed31cfd665a79a07bba612477eb808520eb5b1dde"
+checksum = "ab3fde11180e1e5c1585b90776c410b200dd9a157300c9e7dd16b25a6b1ea1dd"
 dependencies = [
  "async-trait",
  "base64 0.13.0",
diff --git a/common/base/Cargo.toml b/common/base/Cargo.toml
index 456f1fd730ce..5c5ace452eec 100644
--- a/common/base/Cargo.toml
+++ b/common/base/Cargo.toml
@@ -25,7 +25,7 @@ pprof = { version = "0.5", features = ["flamegraph", "protobuf"] }
 tokio = { version = "1.13.0", features = ["macros", "rt", "rt-multi-thread", "sync", "fs", "signal"] }
 uuid = { version = "0.8", features = ["serde", "v4"] }
 serde = { version = "1.0", features = ["derive"] }
-poem = { version = "1.0.21", features = ["tls"] }
+poem = { version = "1.0.23", features = ["rustls"] }
 
 
 [dev-dependencies]
diff --git a/common/base/src/http_shutdown_handlers.rs b/common/base/src/http_shutdown_handlers.rs
index 5624e08f221e..626fc0873bbc 100644
--- a/common/base/src/http_shutdown_handlers.rs
+++ b/common/base/src/http_shutdown_handlers.rs
@@ -20,9 +20,10 @@ use common_tracing::tracing;
 use futures::FutureExt;
 use poem::listener::Acceptor;
 use poem::listener::AcceptorExt;
+use poem::listener::IntoTlsConfigStream;
 use poem::listener::Listener;
+use poem::listener::RustlsConfig;
 use poem::listener::TcpListener;
-use poem::listener::TlsConfig;
 use poem::Endpoint;
 use tokio::sync::oneshot;
 use tokio::task::JoinHandle;
@@ -45,7 +46,7 @@ impl HttpShutdownHandler {
     pub async fn start_service(
         &mut self,
         listening: String,
-        tls_config: Option<TlsConfig>,
+        tls_config: Option<RustlsConfig>,
         ep: impl Endpoint + 'static,
     ) -> Result<SocketAddr> {
         assert!(self.join_handle.is_none());
@@ -65,13 +66,12 @@ impl HttpShutdownHandler {
 
         if let Some(tls_config) = tls_config {
             acceptor = acceptor
-                .tls(tls_config)
-                .map_err(|err| {
+                .rustls(tls_config.into_stream().map_err(|err| {
                     ErrorCode::TLSConfigurationFailure(format!(
                         "Cannot build TLS config for http service, cause {}",
                         err
                     ))
-                })?
+                })?)
                 .boxed();
         }
 
diff --git a/metasrv/Cargo.toml b/metasrv/Cargo.toml
index ceac5495191f..15dade74291a 100644
--- a/metasrv/Cargo.toml
+++ b/metasrv/Cargo.toml
@@ -69,7 +69,7 @@ tonic = { version = "0.6.0", features = ["tls"]}
 
 sha2 = "0.9.8"
 uuid = { version = "0.8", features = ["serde", "v4"] }
-poem = { version = "1.0.21", features = ["tls"] }
+poem = { version = "1.0.23", features = ["rustls"] }
 
 [dev-dependencies]
 common-meta-api = {path = "../common/meta/api" }
diff --git a/metasrv/src/api/http_service.rs b/metasrv/src/api/http_service.rs
index 03ad29c36c7e..fb083bb18045 100644
--- a/metasrv/src/api/http_service.rs
+++ b/metasrv/src/api/http_service.rs
@@ -17,7 +17,7 @@ use common_base::HttpShutdownHandler;
 use common_base::Stoppable;
 use common_exception::Result;
 use poem::get;
-use poem::listener::TlsConfig;
+use poem::listener::RustlsConfig;
 use poem::Endpoint;
 use poem::EndpointExt;
 use poem::Route;
@@ -52,12 +52,12 @@ impl HttpService {
             .data(self.cfg.clone())
     }
 
-    fn build_tls(config: &Config) -> Result<TlsConfig> {
+    fn build_tls(config: &Config) -> Result<RustlsConfig> {
         let conf = config.clone();
         let tls_cert = conf.admin_tls_server_cert;
         let tls_key = conf.admin_tls_server_key;
 
-        let cfg = TlsConfig::new()
+        let cfg = RustlsConfig::new()
             .cert(std::fs::read(tls_cert.as_str())?)
             .key(std::fs::read(tls_key.as_str())?);
         Ok(cfg)
diff --git a/query/Cargo.toml b/query/Cargo.toml
index a81dc41f2497..0233c67ac760 100644
--- a/query/Cargo.toml
+++ b/query/Cargo.toml
@@ -56,7 +56,7 @@ sqlparser = { git = "https://github.com/datafuse-extras/sqlparser-rs", rev = "ec
 ahash = "0.7.6"
 async-compat = "0.2.1"
 async-trait = "0.1"
-poem = { version = "1.0.21", features = ["tls"] }
+poem = { version = "1.0.23", features = ["rustls"] }
 bumpalo = "3.8.0"
 byteorder = "1"
 bytes = "1"
diff --git a/query/src/api/http_service.rs b/query/src/api/http_service.rs
index f79501681c5b..b8d091b42150 100644
--- a/query/src/api/http_service.rs
+++ b/query/src/api/http_service.rs
@@ -17,7 +17,7 @@ use std::path::Path;
 
 use common_exception::Result;
 use poem::get;
-use poem::listener::TlsConfig;
+use poem::listener::RustlsConfig;
 use poem::Endpoint;
 use poem::EndpointExt;
 use poem::Route;
@@ -61,8 +61,8 @@ impl HttpService {
             .data(self.sessions.get_conf().clone())
     }
 
-    fn build_tls(config: &Config) -> Result<TlsConfig> {
-        let mut cfg = TlsConfig::new()
+    fn build_tls(config: &Config) -> Result<RustlsConfig> {
+        let mut cfg = RustlsConfig::new()
             .cert(std::fs::read(&config.query.api_tls_server_cert.as_str())?)
             .key(std::fs::read(&config.query.api_tls_server_key.as_str())?);
         if Path::new(&config.query.api_tls_server_root_ca_cert).exists() {
diff --git a/query/src/common/service/http_shutdown_handles.rs b/query/src/common/service/http_shutdown_handles.rs
index d42c65e97063..f3c1c2ec1be8 100644
--- a/query/src/common/service/http_shutdown_handles.rs
+++ b/query/src/common/service/http_shutdown_handles.rs
@@ -21,9 +21,10 @@ use common_exception::Result;
 use futures::FutureExt;
 use poem::listener::Acceptor;
 use poem::listener::AcceptorExt;
+use poem::listener::IntoTlsConfigStream;
 use poem::listener::Listener;
+use poem::listener::RustlsConfig;
 use poem::listener::TcpListener;
-use poem::listener::TlsConfig;
 use poem::Endpoint;
 
 pub struct HttpShutdownHandler {
@@ -44,7 +45,7 @@ impl HttpShutdownHandler {
     pub async fn start_service(
         &mut self,
         listening: SocketAddr,
-        tls_config: Option<TlsConfig>,
+        tls_config: Option<RustlsConfig>,
         ep: impl Endpoint + 'static,
     ) -> Result<SocketAddr> {
         assert!(self.join_handle.is_none());
@@ -64,13 +65,12 @@ impl HttpShutdownHandler {
 
         if let Some(tls_config) = tls_config {
             acceptor = acceptor
-                .tls(tls_config)
-                .map_err(|err| {
+                .rustls(tls_config.into_stream().map_err(|err| {
                     ErrorCode::TLSConfigurationFailure(format!(
                         "Cannot build TLS config for http service, cause {}",
                         err
                     ))
-                })?
+                })?)
                 .boxed();
         }