Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(storages): move fuse&hive to single folder #8621

Merged
merged 5 commits into from
Nov 3, 2022
Merged

refactor(storages): move fuse&hive to single folder #8621

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0f2f358
refactor(storages): move fuse&fuse-meta&fuse-result to fuses folder
BohuTANG Nov 3, 2022
3c12ace
hive&hive-meta-store to hive folder
BohuTANG Nov 3, 2022
55e5926
common-fuse-meta -> common-storages-fuse-meta
BohuTANG Nov 3, 2022
bc7faf7
merge with main branch
BohuTANG Nov 3, 2022
24407ec
Merge branch 'main' into dev-storage-re3
mergify[bot] Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 24 additions & 25 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ members = [
"src/query/sql",
"src/query/storages/cache",
"src/query/storages/constants",
"src/query/storages/fuse",
"src/query/storages/fuse-meta",
"src/query/storages/hive",
"src/query/storages/hive-meta-store",
"src/query/storages/fuse/fuse",
"src/query/storages/fuse/fuse-meta",
"src/query/storages/fuse/fuse-result",
"src/query/storages/hive/hive",
"src/query/storages/hive/hive-meta-store",
"src/query/storages/index",
"src/query/storages/information-schema",
"src/query/storages/memory",
"src/query/storages/factory",
"src/query/storages/fuse-result",
"src/query/storages/null",
"src/query/storages/random",
"src/query/storages/share",
Expand Down
2 changes: 1 addition & 1 deletion src/query/config/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ignored = ["thrift", "common-hive-meta-store", "strum"]
common-base = { path = "../../common/base" }
common-exception = { path = "../../common/exception" }
common-grpc = { path = "../../common/grpc" }
common-hive-meta-store = { path = "../storages/hive-meta-store", optional = true }
common-hive-meta-store = { path = "../storages/hive/hive-meta-store", optional = true }
common-meta-types = { path = "../../meta/types" }
common-storage = { path = "../../common/storage" }
common-tracing = { path = "../../common/tracing" }
Expand Down
10 changes: 5 additions & 5 deletions src/query/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,9 @@ common-datavalues = { path = "../datavalues" }
common-exception = { path = "../../common/exception" }
common-formats = { path = "../formats" }
common-functions = { path = "../functions" }
common-fuse-meta = { path = "../storages/fuse-meta" }
common-grpc = { path = "../../common/grpc" }
common-hashtable = { path = "../../common/hashtable" }
common-hive-meta-store = { path = "../storages/hive-meta-store", optional = true }
common-hive-meta-store = { path = "../storages/hive/hive-meta-store", optional = true }
common-http = { path = "../../common/http" }
common-io = { path = "../../common/io" }
common-management = { path = "../management" }
Expand All @@ -61,9 +60,10 @@ common-storage = { path = "../../common/storage" }
common-storages-cache = { path = "../storages/cache" }
common-storages-constants = { path = "../storages/constants" }
common-storages-factory = { path = "../storages/factory" }
common-storages-fuse = { path = "../storages/fuse" }
common-storages-fuse-result = { path = "../storages/fuse-result" }
common-storages-hive = { path = "../storages/hive", optional = true }
common-storages-fuse = { path = "../storages/fuse/fuse" }
common-storages-fuse-meta = { path = "../storages/fuse/fuse-meta" }
common-storages-fuse-result = { path = "../storages/fuse/fuse-result" }
common-storages-hive = { path = "../storages/hive/hive", optional = true }
common-storages-index = { path = "../storages/index" }
common-storages-information-schema = { path = "../storages/information-schema" }
common-storages-memory = { path = "../storages/memory" }
Expand Down
2 changes: 1 addition & 1 deletion src/query/service/src/global_services.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ use common_base::base::SingletonImpl;
use common_catalog::catalog::CatalogManager;
use common_config::Config;
use common_exception::Result;
use common_fuse_meta::caches::CacheManager;
use common_storage::CacheOperator;
use common_storage::DataOperator;
use common_storage::ShareTableConfig;
use common_storages_fuse_meta::caches::CacheManager;
use common_tracing::QueryLogger;
use common_users::RoleCacheManager;
use common_users::UserApiProvider;
Expand Down
4 changes: 2 additions & 2 deletions src/query/service/tests/it/storages/fuse/io.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
// limitations under the License.

use common_exception::Result;
use common_fuse_meta::meta::TableSnapshot;
use common_fuse_meta::meta::Versioned;
use common_storages_fuse_meta::meta::TableSnapshot;
use common_storages_fuse_meta::meta::Versioned;
use databend_query::storages::fuse::io::TableMetaLocationGenerator;
use uuid::Uuid;

Expand Down
2 changes: 1 addition & 1 deletion src/query/service/tests/it/storages/fuse/meta/snapshot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
use std::ops::Add;

use common_datavalues::DataSchema;
use common_fuse_meta::meta::TableSnapshot;
use common_storages_fuse_meta::meta::TableSnapshot;
use uuid::Uuid;

fn default_snapshot() -> TableSnapshot {
Expand Down
2 changes: 1 addition & 1 deletion src/query/service/tests/it/storages/fuse/misc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

use common_datavalues::DataValue;
use common_fuse_meta::meta::ColumnStatistics;
use common_storages_fuse_meta::meta::ColumnStatistics;
use serde_json::Value;

// A non-backward compatible change has been introduced by [PR#6067](https://github.com/datafuselabs/databend/pull/6067/files#diff-20030750809780d6492d2fe215a8eb80294aa6a8a5af2cf1bebe17eb740cae35)
Expand Down
12 changes: 6 additions & 6 deletions src/query/service/tests/it/storages/fuse/operations/mutation/deletion_mutator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ use common_datablocks::DataBlock;
use common_datavalues::DataSchema;
use common_exception::ErrorCode;
use common_exception::Result;
use common_fuse_meta::caches::CacheManager;
use common_fuse_meta::meta::BlockMeta;
use common_fuse_meta::meta::SegmentInfo;
use common_fuse_meta::meta::Statistics;
use common_fuse_meta::meta::TableSnapshot;
use common_fuse_meta::meta::Versioned;
use common_storages_fuse_meta::caches::CacheManager;
use common_storages_fuse_meta::meta::BlockMeta;
use common_storages_fuse_meta::meta::SegmentInfo;
use common_storages_fuse_meta::meta::Statistics;
use common_storages_fuse_meta::meta::TableSnapshot;
use common_storages_fuse_meta::meta::Versioned;
use databend_query::sessions::TableContext;
use databend_query::storages::fuse::io::SegmentWriter;
use databend_query::storages::fuse::io::TableMetaLocationGenerator;
Expand Down
14 changes: 7 additions & 7 deletions src/query/service/tests/it/storages/fuse/operations/mutation/recluster_mutator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ use common_datavalues::DataSchemaRef;
use common_datavalues::DataValue;
use common_exception::ErrorCode;
use common_exception::Result;
use common_fuse_meta::caches::CacheManager;
use common_fuse_meta::meta::BlockMeta;
use common_fuse_meta::meta::ClusterStatistics;
use common_fuse_meta::meta::SegmentInfo;
use common_fuse_meta::meta::Statistics;
use common_fuse_meta::meta::TableSnapshot;
use common_fuse_meta::meta::Versioned;
use common_storages_fuse_meta::caches::CacheManager;
use common_storages_fuse_meta::meta::BlockMeta;
use common_storages_fuse_meta::meta::ClusterStatistics;
use common_storages_fuse_meta::meta::SegmentInfo;
use common_storages_fuse_meta::meta::Statistics;
use common_storages_fuse_meta::meta::TableSnapshot;
use common_storages_fuse_meta::meta::Versioned;
use databend_query::sessions::TableContext;
use databend_query::storages::fuse::io::BlockCompactor;
use databend_query::storages::fuse::io::SegmentWriter;
Expand Down
6 changes: 3 additions & 3 deletions src/query/service/tests/it/storages/fuse/operations/read_plan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ use common_arrow::arrow::datatypes::Field as ArrowField;
use common_base::base::tokio;
use common_datavalues::DataValue;
use common_exception::Result;
use common_fuse_meta::meta::BlockMeta;
use common_fuse_meta::meta::ColumnMeta;
use common_fuse_meta::meta::ColumnStatistics;
use common_planner::extras::Extras;
use common_planner::plans::Projection;
use common_storages_fuse::ColumnLeaves;
use common_storages_fuse_meta::meta::BlockMeta;
use common_storages_fuse_meta::meta::ColumnMeta;
use common_storages_fuse_meta::meta::ColumnStatistics;
use databend_query::storages::fuse::ColumnLeaf;
use databend_query::storages::fuse::FuseTable;
use futures::TryStreamExt;
Expand Down
4 changes: 2 additions & 2 deletions src/query/service/tests/it/storages/fuse/pruning.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ use common_base::base::tokio;
use common_datablocks::DataBlock;
use common_datavalues::prelude::*;
use common_exception::Result;
use common_fuse_meta::meta::BlockMeta;
use common_fuse_meta::meta::TableSnapshot;
use common_planner::extras::Extras;
use common_sql::executor::add;
use common_sql::executor::col;
use common_sql::executor::lit;
use common_sql::executor::sub;
use common_sql::executor::ExpressionOp;
use common_storages_fuse::FuseTable;
use common_storages_fuse_meta::meta::BlockMeta;
use common_storages_fuse_meta::meta::TableSnapshot;
use databend_query::interpreters::CreateTableInterpreterV2;
use databend_query::interpreters::Interpreter;
use databend_query::sessions::QueryContext;
Expand Down
8 changes: 4 additions & 4 deletions src/query/service/tests/it/storages/fuse/statistics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ use common_datablocks::DataBlock;
use common_datavalues::prelude::*;
use common_functions::aggregates::eval_aggr;
use common_functions::scalars::FunctionContext;
use common_fuse_meta::meta::BlockMeta;
use common_fuse_meta::meta::ClusterStatistics;
use common_fuse_meta::meta::ColumnStatistics;
use common_fuse_meta::meta::Statistics;
use common_sql::evaluator::Evaluator;
use common_sql::executor::add;
use common_sql::executor::col;
Expand All @@ -31,6 +27,10 @@ use common_storages_fuse::statistics::reducers::reduce_block_metas;
use common_storages_fuse::statistics::Trim;
use common_storages_fuse::statistics::STATS_REPLACEMENT_CHAR;
use common_storages_fuse::statistics::STATS_STRING_PREFIX_LEN;
use common_storages_fuse_meta::meta::BlockMeta;
use common_storages_fuse_meta::meta::ClusterStatistics;
use common_storages_fuse_meta::meta::ColumnStatistics;
use common_storages_fuse_meta::meta::Statistics;
use databend_query::storages::fuse::io::BlockCompactor;
use databend_query::storages::fuse::io::BlockWriter;
use databend_query::storages::fuse::io::TableMetaLocationGenerator;
Expand Down
4 changes: 2 additions & 2 deletions src/query/service/tests/it/storages/index/range_filter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ use std::collections::HashMap;
use common_base::base::tokio;
use common_datavalues::prelude::*;
use common_exception::Result;
use common_fuse_meta::meta::ColumnStatistics;
use common_fuse_meta::meta::StatisticsOfColumns;
use common_planner::Expression;
use common_sql::executor::add;
use common_sql::executor::col;
Expand All @@ -28,6 +26,8 @@ use common_sql::executor::lit_null;
use common_sql::executor::neg;
use common_sql::executor::sub;
use common_sql::executor::ExpressionOp;
use common_storages_fuse_meta::meta::ColumnStatistics;
use common_storages_fuse_meta::meta::StatisticsOfColumns;
use databend_query::storages::index::range_filter::build_verifiable_expr;
use databend_query::storages::index::range_filter::left_bound_for_like_pattern;
use databend_query::storages::index::range_filter::right_bound_for_like_pattern;
Expand Down
2 changes: 1 addition & 1 deletion src/query/service/tests/it/tests/sessions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ use common_base::base::SingletonImpl;
use common_catalog::catalog::CatalogManager;
use common_config::Config;
use common_exception::Result;
use common_fuse_meta::caches::CacheManager;
use common_storage::CacheOperator;
use common_storage::DataOperator;
use common_storages_fuse_meta::caches::CacheManager;
use common_tracing::set_panic_hook;
use common_tracing::QueryLogger;
use common_users::RoleCacheManager;
Expand Down
4 changes: 2 additions & 2 deletions src/query/sql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ common-datavalues = { path = "../datavalues" }
common-exception = { path = "../../common/exception" }
common-formats = { path = "../formats" }
common-functions = { path = "../functions" }
common-fuse-meta = { path = "../storages/fuse-meta" }
common-grpc = { path = "../../common/grpc" }
common-hive-meta-store = { path = "../storages/hive-meta-store", optional = true }
common-hive-meta-store = { path = "../storages/hive/hive-meta-store", optional = true }
common-http = { path = "../../common/http" }
common-io = { path = "../../common/io" }
common-management = { path = "../management" }
Expand All @@ -41,6 +40,7 @@ common-planner = { path = "../planner" }
common-settings = { path = "../settings" }
common-storage = { path = "../../common/storage" }
common-storages-constants = { path = "../storages/constants" }
common-storages-fuse-meta = { path = "../storages/fuse/fuse-meta" }
common-storages-view = { path = "../storages/view" }
common-tracing = { path = "../../common/tracing" }
common-users = { path = "../users" }
Expand Down
Loading