refactor code

analytic_engine/src/payload.rs

@@ -2,7 +2,7 @@
 
 //! Payloads to write to wal
 
-use ceresdbproto::{manifest, table_requests};
+use ceresdbproto::{manifest as manifest_pb, table_requests};
 use common_types::{
     bytes::{Buf, BufMut, SafeBuf, SafeBufMut},
     row::{RowGroup, RowGroupBuilder},
@@ -105,8 +105,8 @@ const HEADER_SIZE: usize = 1;
 #[derive(Debug)]
 pub enum WritePayload<'a> {
     Write(&'a table_requests::WriteRequest),
-    AlterSchema(&'a manifest::AlterSchemaMeta),
-    AlterOption(&'a manifest::AlterOptionsMeta),
+    AlterSchema(&'a manifest_pb::AlterSchemaMeta),
+    AlterOption(&'a manifest_pb::AlterOptionsMeta),
 }
 
 impl<'a> Payload for WritePayload<'a> {
@@ -184,7 +184,7 @@ impl ReadPayload {
     }
 
     fn decode_alter_schema_from_pb(buf: &[u8]) -> Result<Self> {
-        let alter_schema_meta_pb: manifest::AlterSchemaMeta =
+        let alter_schema_meta_pb: manifest_pb::AlterSchemaMeta =
             Message::decode(buf).context(DecodeBody)?;
 
         // Consume and convert schema in pb
@@ -198,7 +198,7 @@ impl ReadPayload {
     }
 
     fn decode_alter_option_from_pb(buf: &[u8]) -> Result<Self> {
-        let alter_option_meta_pb: manifest::AlterOptionsMeta =
+        let alter_option_meta_pb: manifest_pb::AlterOptionsMeta =
             Message::decode(buf).context(DecodeBody)?;
 
         // Consume and convert options in pb

common_util/src/config.rs

@@ -4,7 +4,7 @@
 
 //! Configure utils
 
-//This module is forked from tikv and remove unnessary code.
+//This module is forked from tikv and remove unnecessary code.
 //https://github.com/tikv/tikv/blob/HEAD/src/util/config.rs
 use std::{
     fmt::{self, Write},
@@ -13,7 +13,7 @@ use std::{
     time::Duration,
 };
 
-use ceresdbproto::manifest;
+use ceresdbproto::manifest as manifest_pb;
 use serde::{
     de::{self, Unexpected, Visitor},
     Deserialize, Deserializer, Serialize, Serializer,
@@ -61,30 +61,30 @@ pub enum TimeUnit {
     Days,
 }
 
-impl From<TimeUnit> for manifest::TimeUnit {
+impl From<TimeUnit> for manifest_pb::TimeUnit {
     fn from(unit: TimeUnit) -> Self {
         match unit {
-            TimeUnit::Nanoseconds => manifest::TimeUnit::Nanoseconds,
-            TimeUnit::Microseconds => manifest::TimeUnit::Microseconds,
-            TimeUnit::Milliseconds => manifest::TimeUnit::Milliseconds,
-            TimeUnit::Seconds => manifest::TimeUnit::Seconds,
-            TimeUnit::Minutes => manifest::TimeUnit::Minutes,
-            TimeUnit::Hours => manifest::TimeUnit::Hours,
-            TimeUnit::Days => manifest::TimeUnit::Days,
+            TimeUnit::Nanoseconds => manifest_pb::TimeUnit::Nanoseconds,
+            TimeUnit::Microseconds => manifest_pb::TimeUnit::Microseconds,
+            TimeUnit::Milliseconds => manifest_pb::TimeUnit::Milliseconds,
+            TimeUnit::Seconds => manifest_pb::TimeUnit::Seconds,
+            TimeUnit::Minutes => manifest_pb::TimeUnit::Minutes,
+            TimeUnit::Hours => manifest_pb::TimeUnit::Hours,
+            TimeUnit::Days => manifest_pb::TimeUnit::Days,
         }
     }
 }
 
-impl From<manifest::TimeUnit> for TimeUnit {
-    fn from(unit: manifest::TimeUnit) -> Self {
+impl From<manifest_pb::TimeUnit> for TimeUnit {
+    fn from(unit: manifest_pb::TimeUnit) -> Self {
         match unit {
-            manifest::TimeUnit::Nanoseconds => TimeUnit::Nanoseconds,
-            manifest::TimeUnit::Microseconds => TimeUnit::Microseconds,
-            manifest::TimeUnit::Milliseconds => TimeUnit::Milliseconds,
-            manifest::TimeUnit::Seconds => TimeUnit::Seconds,
-            manifest::TimeUnit::Minutes => TimeUnit::Minutes,
-            manifest::TimeUnit::Hours => TimeUnit::Hours,
-            manifest::TimeUnit::Days => TimeUnit::Days,
+            manifest_pb::TimeUnit::Nanoseconds => TimeUnit::Nanoseconds,
+            manifest_pb::TimeUnit::Microseconds => TimeUnit::Microseconds,
+            manifest_pb::TimeUnit::Milliseconds => TimeUnit::Milliseconds,
+            manifest_pb::TimeUnit::Seconds => TimeUnit::Seconds,
+            manifest_pb::TimeUnit::Minutes => TimeUnit::Minutes,
+            manifest_pb::TimeUnit::Hours => TimeUnit::Hours,
+            manifest_pb::TimeUnit::Days => TimeUnit::Days,
         }
     }
 }

wal/Cargo.toml

@@ -19,14 +19,14 @@ features = ["portable"]
 
 [dependencies]
 async-trait = { workspace = true }
+ceresdbproto = { workspace = true }
 chrono = { workspace = true }
 common_types = { workspace = true }
 common_util = { workspace = true }
 futures = { workspace = true, features = ["async-await"], optional = true }
 log = { workspace = true }
 message_queue = { workspace = true }
 prost = { workspace = true }
-ceresdbproto = { workspace = true }
 serde = { workspace = true }
 serde_derive = { workspace = true }
 serde_json = { workspace = true }