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

Jump to bottom

refactor(storages): fuse/fuse-meta --> storages/table-meta #8627

Merged
merged 1 commit into from
Nov 3, 2022
Merged

refactor(storages): fuse/fuse-meta --> storages/table-meta #8627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 24 additions & 24 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.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Expand Up @@ -46,16 +46,16 @@ members = [
"src/query/sql",
"src/query/storages/cache",
"src/query/storages/constants",
"src/query/storages/factory",
"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/null",
"src/query/storages/table-meta",
"src/query/storages/random",
"src/query/storages/share",
"src/query/storages/stage",
Expand Down
2 changes: 1 addition & 1 deletion src/query/service/Cargo.toml
View file
Open in desktop
Expand Up @@ -61,7 +61,6 @@ common-storages-cache = { path = "../storages/cache" }
common-storages-constants = { path = "../storages/constants" }
common-storages-factory = { path = "../storages/factory" }
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" }
Expand All @@ -72,6 +71,7 @@ common-storages-random = { path = "../storages/random" }
common-storages-share = { path = "../storages/share" }
common-storages-stage = { path = "../storages/stage" }
common-storages-system = { path = "../storages/system" }
common-storages-table-meta = { path = "../storages/table-meta" }
common-storages-view = { path = "../storages/view" }
common-streams = { path = "../streams" }
common-tracing = { path = "../../common/tracing" }
Expand Down
2 changes: 1 addition & 1 deletion src/query/service/src/global_services.rs
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ use common_exception::Result;
use common_storage::CacheOperator;
use common_storage::DataOperator;
use common_storage::ShareTableConfig;
use common_storages_fuse_meta::caches::CacheManager;
use common_storages_table_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
Expand Up @@ -13,8 +13,8 @@
// limitations under the License.

use common_exception::Result;
use common_storages_fuse_meta::meta::TableSnapshot;
use common_storages_fuse_meta::meta::Versioned;
use common_storages_table_meta::meta::TableSnapshot;
use common_storages_table_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
Expand Up @@ -15,7 +15,7 @@
use std::ops::Add;

use common_datavalues::DataSchema;
use common_storages_fuse_meta::meta::TableSnapshot;
use common_storages_table_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
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

use common_datavalues::DataValue;
use common_storages_fuse_meta::meta::ColumnStatistics;
use common_storages_table_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
Expand Up @@ -22,12 +22,12 @@ use common_datablocks::DataBlock;
use common_datavalues::DataSchema;
use common_exception::ErrorCode;
use common_exception::Result;
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 common_storages_table_meta::caches::CacheManager;
use common_storages_table_meta::meta::BlockMeta;
use common_storages_table_meta::meta::SegmentInfo;
use common_storages_table_meta::meta::Statistics;
use common_storages_table_meta::meta::TableSnapshot;
use common_storages_table_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
Expand Up @@ -24,13 +24,13 @@ use common_datavalues::DataSchemaRef;
use common_datavalues::DataValue;
use common_exception::ErrorCode;
use common_exception::Result;
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 common_storages_table_meta::caches::CacheManager;
use common_storages_table_meta::meta::BlockMeta;
use common_storages_table_meta::meta::ClusterStatistics;
use common_storages_table_meta::meta::SegmentInfo;
use common_storages_table_meta::meta::Statistics;
use common_storages_table_meta::meta::TableSnapshot;
use common_storages_table_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
Expand Up @@ -24,9 +24,9 @@ use common_exception::Result;
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 common_storages_table_meta::meta::BlockMeta;
use common_storages_table_meta::meta::ColumnMeta;
use common_storages_table_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
Expand Up @@ -26,8 +26,8 @@ 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 common_storages_table_meta::meta::BlockMeta;
use common_storages_table_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
Expand Up @@ -27,10 +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 common_storages_table_meta::meta::BlockMeta;
use common_storages_table_meta::meta::ClusterStatistics;
use common_storages_table_meta::meta::ColumnStatistics;
use common_storages_table_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
Expand Up @@ -26,8 +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 common_storages_table_meta::meta::ColumnStatistics;
use common_storages_table_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
Expand Up @@ -25,7 +25,7 @@ use common_config::Config;
use common_exception::Result;
use common_storage::CacheOperator;
use common_storage::DataOperator;
use common_storages_fuse_meta::caches::CacheManager;
use common_storages_table_meta::caches::CacheManager;
use common_tracing::set_panic_hook;
use common_tracing::QueryLogger;
use common_users::RoleCacheManager;
Expand Down
2 changes: 1 addition & 1 deletion src/query/sql/Cargo.toml
View file
Open in desktop
Expand Up @@ -40,7 +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-table-meta = { path = "../storages/table-meta" }
common-storages-view = { path = "../storages/view" }
common-tracing = { path = "../../common/tracing" }
common-users = { path = "../users" }
Expand Down
2 changes: 1 addition & 1 deletion src/query/storages/cache/Cargo.toml
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ test = false
common-arrow = { path = "../../../common/arrow" }
common-cache = { path = "../../../common/cache" }
common-exception = { path = "../../../common/exception" }
common-storages-fuse-meta = { path = "../fuse/fuse-meta" }
common-storages-table-meta = { path = "../table-meta" }

async-trait = { version = "0.1.57", package = "async-trait-fn" }
opendal = { version = "0.19", features = ["layers-retry"] }
4 changes: 2 additions & 2 deletions src/query/storages/cache/src/cached_reader.rs
View file
Open in desktop
Expand Up @@ -16,8 +16,8 @@ use std::sync::Arc;

use common_cache::Cache;
use common_exception::Result;
use common_storages_fuse_meta::caches::CacheDeferMetrics;
use common_storages_fuse_meta::caches::LabeledItemCache;
use common_storages_table_meta::caches::CacheDeferMetrics;
use common_storages_table_meta::caches::LabeledItemCache;

/// Loads an object from a source
#[async_trait::async_trait]
Expand Down
2 changes: 1 addition & 1 deletion src/query/storages/cache/src/file_meta_data_reader.rs
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@ use common_arrow::arrow::io::parquet::read::read_metadata_async;
use common_arrow::parquet::metadata::FileMetaData;
use common_exception::ErrorCode;
use common_exception::Result;
use common_storages_fuse_meta::caches::CacheManager;
use common_storages_table_meta::caches::CacheManager;
use opendal::Operator;

use super::cached_reader::CachedReader;
Expand Down
23 changes: 0 additions & 23 deletions src/query/storages/fuse/fuse-meta/Cargo.toml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/query/storages/fuse/fuse-result/Cargo.toml
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ common-pipeline-transforms = { path = "../../../pipeline/transforms" }
common-planner = { path = "../../../planner" }
common-storage = { path = "../../../../common/storage" }
common-storages-fuse = { path = "../../fuse/fuse" }
common-storages-fuse-meta = { path = "../../fuse/fuse-meta" }
common-storages-table-meta = { path = "../../table-meta" }
common-storages-view = { path = "../../view" }
common-streams = { path = "../../../streams" }
common-users = { path = "../../../users" }
Expand Down
4 changes: 2 additions & 2 deletions src/query/storages/fuse/fuse-result/src/result_locations.rs
View file
Open in desktop
Expand Up @@ -13,8 +13,8 @@
// limitations under the License.

use common_datablocks::DataBlock;
use common_storages_fuse_meta::meta::SegmentInfo;
use common_storages_fuse_meta::meta::Versioned;
use common_storages_table_meta::meta::SegmentInfo;
use common_storages_table_meta::meta::Versioned;
use uuid::Uuid;

pub const RESULT_CACHE_PREFIX: &str = "_res";
Expand Down
2 changes: 1 addition & 1 deletion src/query/storages/fuse/fuse-result/src/result_table.rs
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ use common_planner::Partitions;
use common_planner::ReadDataSourcePlan;
use common_storages_fuse::io::BlockReader;
use common_storages_fuse::FuseTable;
use common_storages_fuse_meta::meta::SegmentInfo;
use common_storages_table_meta::meta::SegmentInfo;
use serde::Deserialize;
use serde::Serialize;

Expand Down
4 changes: 2 additions & 2 deletions src/query/storages/fuse/fuse-result/src/result_table_sink.rs
View file
Open in desktop
Expand Up @@ -31,8 +31,8 @@ use common_storages_fuse::io::BlockReader;
use common_storages_fuse::statistics::BlockStatistics;
use common_storages_fuse::statistics::StatisticsAccumulator;
use common_storages_fuse::FuseTable;
use common_storages_fuse_meta::meta::SegmentInfo;
use common_storages_fuse_meta::meta::Statistics as FuseMetaStatistics;
use common_storages_table_meta::meta::SegmentInfo;
use common_storages_table_meta::meta::Statistics as FuseMetaStatistics;
use opendal::Operator;

use crate::block_buffer::BlockBuffer;
Expand Down