From 49081d818c7b0fc1c9580f274eb4501aa42ae81f Mon Sep 17 00:00:00 2001 From: evenyag Date: Mon, 25 Apr 2022 11:50:04 +0800 Subject: [PATCH] refactor: Divide common crate into small crates --- Cargo.lock | 10 +++++----- Cargo.toml | 2 +- src/common/{ => base}/Cargo.toml | 2 +- src/common/{ => base}/src/bytes.rs | 0 src/common/{ => base}/src/lib.rs | 0 src/datatypes/Cargo.toml | 2 +- src/datatypes/src/types/binary_type.rs | 2 +- src/datatypes/src/value.rs | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) rename src/common/{ => base}/Cargo.toml (90%) rename src/common/{ => base}/src/bytes.rs (100%) rename src/common/{ => base}/src/lib.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 4a4d27f706a..0d0aa96d366 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,6 +33,10 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "base" +version = "0.1.0" + [[package]] name = "bytemuck" version = "1.9.1" @@ -69,10 +73,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "common" -version = "0.1.0" - [[package]] name = "datanode" version = "0.1.0" @@ -85,7 +85,7 @@ name = "datatypes" version = "0.1.0" dependencies = [ "arrow2", - "common", + "base", "paste", ] diff --git a/Cargo.toml b/Cargo.toml index b63440d6e3f..deff6444b86 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] members = [ - "src/common", + "src/common/base", "src/datanode", "src/datatypes", "src/log-store", diff --git a/src/common/Cargo.toml b/src/common/base/Cargo.toml similarity index 90% rename from src/common/Cargo.toml rename to src/common/base/Cargo.toml index b7723d9c7fa..6916ddc11bd 100644 --- a/src/common/Cargo.toml +++ b/src/common/base/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "common" +name = "base" version = "0.1.0" edition = "2021" diff --git a/src/common/src/bytes.rs b/src/common/base/src/bytes.rs similarity index 100% rename from src/common/src/bytes.rs rename to src/common/base/src/bytes.rs diff --git a/src/common/src/lib.rs b/src/common/base/src/lib.rs similarity index 100% rename from src/common/src/lib.rs rename to src/common/base/src/lib.rs diff --git a/src/datatypes/Cargo.toml b/src/datatypes/Cargo.toml index 00fe1222728..5b17af98370 100644 --- a/src/datatypes/Cargo.toml +++ b/src/datatypes/Cargo.toml @@ -6,6 +6,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -common = { path = "../common" } +base = { path = "../common/base" } arrow2 = "0.10" paste = "1.0" diff --git a/src/datatypes/src/types/binary_type.rs b/src/datatypes/src/types/binary_type.rs index 18c2a0fa1b3..34f729e617d 100644 --- a/src/datatypes/src/types/binary_type.rs +++ b/src/datatypes/src/types/binary_type.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use arrow2::datatypes::DataType as ArrowDataType; -use common::bytes::StringBytes; +use base::bytes::StringBytes; use crate::data_type::{DataType, DataTypeRef}; use crate::type_id::LogicalTypeId; diff --git a/src/datatypes/src/value.rs b/src/datatypes/src/value.rs index 3a7f597eaf7..41b43f54ce1 100644 --- a/src/datatypes/src/value.rs +++ b/src/datatypes/src/value.rs @@ -1,4 +1,4 @@ -use common::bytes::{Bytes, StringBytes}; +use base::bytes::{Bytes, StringBytes}; /// Value holds a single arbitrary value of any [DataType](crate::data_type::DataType). #[derive(Debug)]