Skip to content

Commit bc44f58

Browse files
authored
refactor(query): merge memory、null、random、result_cache、view into storage_basic (#18547)
1 parent c0f12f9 commit bc44f58

File tree

68 files changed

+146
-294
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+146
-294
lines changed

Cargo.lock

Lines changed: 38 additions & 108 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,12 @@ members = [
6565
"src/query/storages/hive/hive",
6666
"src/query/storages/iceberg",
6767
"src/query/storages/information_schema",
68-
"src/query/storages/memory",
69-
"src/query/storages/null",
68+
"src/query/storages/basic",
7069
"src/query/storages/orc",
71-
"src/query/storages/random",
7270
"src/query/storages/stage",
7371
"src/query/storages/stream",
7472
"src/query/storages/system",
75-
"src/query/storages/view",
7673
"src/query/storages/parquet",
77-
"src/query/storages/result_cache",
7874
"src/query/users",
7975
"src/query/ee_features/attach_table",
8076
"src/query/ee_features/vacuum_handler",
@@ -171,22 +167,18 @@ databend-common-settings = { path = "src/query/settings" }
171167
databend-common-sql = { path = "src/query/sql" }
172168
databend-common-sqlsmith = { path = "src/tests/sqlsmith" }
173169
databend-common-storage = { path = "src/common/storage" }
170+
databend-common-storages-basic = { path = "src/query/storages/basic" }
174171
databend-common-storages-delta = { path = "src/query/storages/delta" }
175172
databend-common-storages-factory = { path = "src/query/storages/factory" }
176173
databend-common-storages-fuse = { path = "src/query/storages/fuse" }
177174
databend-common-storages-hive = { path = "src/query/storages/hive/hive" }
178175
databend-common-storages-iceberg = { path = "src/query/storages/iceberg" }
179176
databend-common-storages-information-schema = { path = "src/query/storages/information_schema" }
180-
databend-common-storages-memory = { path = "src/query/storages/memory" }
181-
databend-common-storages-null = { path = "src/query/storages/null" }
182177
databend-common-storages-orc = { path = "src/query/storages/orc" }
183178
databend-common-storages-parquet = { path = "src/query/storages/parquet" }
184-
databend-common-storages-random = { path = "src/query/storages/random" }
185-
databend-common-storages-result-cache = { path = "src/query/storages/result_cache" }
186179
databend-common-storages-stage = { path = "src/query/storages/stage" }
187180
databend-common-storages-stream = { path = "src/query/storages/stream" }
188181
databend-common-storages-system = { path = "src/query/storages/system" }
189-
databend-common-storages-view = { path = "src/query/storages/view" }
190182
databend-common-telemetry = { path = "src/common/telemetry" }
191183
databend-common-tracing = { path = "src/common/tracing" }
192184
databend-common-users = { path = "src/query/users" }

src/query/service/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,21 +82,18 @@ databend-common-script = { workspace = true }
8282
databend-common-settings = { workspace = true }
8383
databend-common-sql = { workspace = true }
8484
databend-common-storage = { workspace = true }
85+
databend-common-storages-basic = { workspace = true }
8586
databend-common-storages-delta = { workspace = true }
8687
databend-common-storages-factory = { workspace = true }
8788
databend-common-storages-fuse = { workspace = true }
8889
databend-common-storages-hive = { workspace = true }
8990
databend-common-storages-iceberg = { workspace = true }
9091
databend-common-storages-information-schema = { workspace = true }
91-
databend-common-storages-memory = { workspace = true }
92-
databend-common-storages-null = { workspace = true }
9392
databend-common-storages-orc = { workspace = true }
9493
databend-common-storages-parquet = { workspace = true }
95-
databend-common-storages-result-cache = { workspace = true }
9694
databend-common-storages-stage = { workspace = true }
9795
databend-common-storages-stream = { workspace = true }
9896
databend-common-storages-system = { workspace = true }
99-
databend-common-storages-view = { workspace = true }
10097
databend-common-telemetry = { workspace = true }
10198
databend-common-tracing = { workspace = true }
10299
databend-common-users = { workspace = true }

src/query/service/src/interpreters/access/management_mode_access.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ use databend_common_catalog::table_context::TableContext;
1818
use databend_common_config::GlobalConfig;
1919
use databend_common_exception::ErrorCode;
2020
use databend_common_exception::Result;
21+
use databend_common_storages_basic::view_table::VIEW_ENGINE;
2122
use databend_common_storages_stream::stream_table::STREAM_ENGINE;
22-
use databend_common_storages_view::view_table::VIEW_ENGINE;
2323

2424
use crate::interpreters::access::AccessChecker;
2525
use crate::sessions::QueryContext;

src/query/service/src/interpreters/interpreter_explain.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ use databend_common_sql::BindContext;
3939
use databend_common_sql::ColumnSet;
4040
use databend_common_sql::FormatOptions;
4141
use databend_common_sql::MetadataRef;
42+
use databend_common_storages_basic::gen_result_cache_key;
43+
use databend_common_storages_basic::ResultCacheReader;
4244
use databend_common_storages_fuse::FuseLazyPartInfo;
4345
use databend_common_storages_fuse::FuseTable;
44-
use databend_common_storages_result_cache::gen_result_cache_key;
45-
use databend_common_storages_result_cache::ResultCacheReader;
4646
use databend_common_users::UserApiProvider;
4747
use serde::Serialize;
4848
use serde_json;

src/query/service/src/interpreters/interpreter_report_issue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ use databend_common_expression::TableField;
3737
use databend_common_expression::TableSchema;
3838
use databend_common_settings::Settings;
3939
use databend_common_sql::Planner;
40+
use databend_common_storages_basic::view_table::VIEW_ENGINE;
4041
use databend_common_storages_stream::stream_table::STREAM_ENGINE;
41-
use databend_common_storages_view::view_table::VIEW_ENGINE;
4242
use derive_visitor::DriveMut;
4343
use derive_visitor::VisitorMut;
4444
use futures_util::StreamExt;

src/query/service/src/interpreters/interpreter_select.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ use databend_common_sql::executor::physical_plans::FragmentKind;
3636
use databend_common_sql::parse_result_scan_args;
3737
use databend_common_sql::ColumnBinding;
3838
use databend_common_sql::MetadataRef;
39-
use databend_common_storages_result_cache::gen_result_cache_key;
40-
use databend_common_storages_result_cache::ResultCacheReader;
41-
use databend_common_storages_result_cache::WriteResultCacheSink;
39+
use databend_common_storages_basic::gen_result_cache_key;
40+
use databend_common_storages_basic::ResultCacheReader;
41+
use databend_common_storages_basic::WriteResultCacheSink;
4242
use databend_common_users::UserApiProvider;
4343
use log::error;
4444
use log::info;

src/query/service/src/interpreters/interpreter_table_add_column.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ use databend_common_sql::plans::Mutation;
3434
use databend_common_sql::plans::Plan;
3535
use databend_common_sql::DefaultExprBinder;
3636
use databend_common_sql::Planner;
37+
use databend_common_storages_basic::view_table::VIEW_ENGINE;
3738
use databend_common_storages_fuse::FuseTable;
3839
use databend_common_storages_stream::stream_table::STREAM_ENGINE;
39-
use databend_common_storages_view::view_table::VIEW_ENGINE;
4040
use databend_storages_common_table_meta::meta::TableSnapshot;
4141
use databend_storages_common_table_meta::meta::Versioned;
4242
use databend_storages_common_table_meta::readers::snapshot_reader::TableSnapshotAccessor;

src/query/service/src/interpreters/interpreter_table_describe.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ use databend_common_expression::types::StringType;
2121
use databend_common_expression::DataBlock;
2222
use databend_common_expression::FromData;
2323
use databend_common_sql::plans::DescribeTablePlan;
24+
use databend_common_storages_basic::view_table::QUERY;
25+
use databend_common_storages_basic::view_table::VIEW_ENGINE;
2426
use databend_common_storages_fuse::TableContext;
25-
use databend_common_storages_view::view_table::QUERY;
26-
use databend_common_storages_view::view_table::VIEW_ENGINE;
2727

2828
use crate::interpreters::util::generate_desc_schema;
2929
use crate::interpreters::Interpreter;

src/query/service/src/interpreters/interpreter_table_drop.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ use databend_common_meta_app::principal::OwnershipObject;
2222
use databend_common_meta_app::schema::DropTableByIdReq;
2323
use databend_common_sql::plans::DropTablePlan;
2424
use databend_common_sql::plans::TruncateMode;
25+
use databend_common_storages_basic::view_table::VIEW_ENGINE;
2526
use databend_common_storages_fuse::FuseTable;
2627
use databend_common_storages_stream::stream_table::STREAM_ENGINE;
27-
use databend_common_storages_view::view_table::VIEW_ENGINE;
2828
use databend_common_users::RoleCacheManager;
2929
use databend_common_users::UserApiProvider;
3030
use databend_storages_common_table_meta::table::OPT_KEY_TEMP_PREFIX;

0 commit comments

Comments
 (0)