Skip to content

Commit 799cb12

Browse files
authored
refactor: move storage/fuse/io/files.rs to storage/common/io/files.rs (#15428)
1 parent 98873c5 commit 799cb12

File tree

12 files changed

+56
-7
lines changed

12 files changed

+56
-7
lines changed

โ€ŽCargo.lock

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

โ€ŽCargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ members = [
5555
"src/query/storages/common/cache",
5656
"src/query/storages/common/cache_manager",
5757
"src/query/storages/common/index",
58+
"src/query/storages/common/io",
5859
"src/query/storages/common/pruner",
5960
"src/query/storages/common/table_meta",
6061
"src/query/storages/delta",

โ€Žsrc/query/service/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ databend-storages-common-blocks = { path = "../storages/common/blocks" }
9595
databend-storages-common-cache = { path = "../storages/common/cache" }
9696
databend-storages-common-cache-manager = { path = "../storages/common/cache_manager" }
9797
databend-storages-common-index = { path = "../storages/common/index" }
98+
databend-storages-common-io = { path = "../storages/common/io" }
9899
databend-storages-common-table-meta = { path = "../storages/common/table_meta" }
99100
databend-storages-common-txn = { path = "../storages/common/txn" }
100101
jsonb = { workspace = true }

โ€Žsrc/query/service/src/interpreters/interpreter_user_stage_remove.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ use databend_common_exception::Result;
1919
use databend_common_sql::plans::RemoveStagePlan;
2020
use databend_common_storage::StageFileInfo;
2121
use databend_common_storage::StageFilesInfo;
22-
use databend_common_storages_fuse::io::Files;
2322
use databend_common_storages_stage::StageTable;
23+
use databend_storages_common_io::Files;
2424
use futures_util::StreamExt;
2525
use log::debug;
2626
use log::error;

โ€Žsrc/query/service/src/pipelines/builders/builder_on_finished.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ use databend_common_exception::Result;
2121
use databend_common_meta_app::principal::StageInfo;
2222
use databend_common_metrics::storage::*;
2323
use databend_common_pipeline_core::Pipeline;
24-
use databend_common_storages_fuse::io::Files;
2524
use databend_common_storages_stage::StageTable;
25+
use databend_storages_common_io::Files;
2626
use log::error;
2727
use log::info;
2828

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[package]
2+
name = "databend-storages-common-io"
3+
version = { workspace = true }
4+
authors = { workspace = true }
5+
license = { workspace = true }
6+
publish = { workspace = true }
7+
edition = { workspace = true }
8+
9+
[dependencies]
10+
databend-common-base = { path = "../../../../common/base" }
11+
databend-common-catalog = { path = "../../../catalog" }
12+
databend-common-exception = { path = "../../../../common/exception" }
13+
14+
async-backtrace = { workspace = true }
15+
log = { workspace = true }
16+
minitrace = { workspace = true }
17+
opendal = { workspace = true }
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2021 Datafuse Labs
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
mod files;
16+
17+
pub use files::Files;

โ€Žsrc/query/storages/fuse/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ databend-storages-common-blocks = { path = "../common/blocks" }
3737
databend-storages-common-cache = { path = "../common/cache" }
3838
databend-storages-common-cache-manager = { path = "../common/cache_manager" }
3939
databend-storages-common-index = { path = "../common/index" }
40+
databend-storages-common-io = { path = "../common/io" }
4041
databend-storages-common-pruner = { path = "../common/pruner" }
4142
databend-storages-common-table-meta = { path = "../common/table_meta" }
4243

โ€Žsrc/query/storages/fuse/src/io/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
mod files;
1615
mod locations;
1716
pub mod read;
1817
mod segments;
1918
mod snapshots;
2019
mod write;
2120

22-
pub use files::Files;
2321
pub use locations::TableMetaLocationGenerator;
2422
pub use read::AggIndexReader;
2523
pub use read::BlockReader;

0 commit comments

Comments
ย (0)