Skip to content

Commit 33102cc

Browse files
authored
refactor(query): merge pipeline core, sources and sinks crate (#18939)
* refactor(query): merge pipeline core, sources and sinks crate * refactor(query): merge pipeline core, sources and sinks crate
1 parent 82c03f1 commit 33102cc

File tree

341 files changed

+2142
-2340
lines changed

Some content is hidden

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

341 files changed

+2142
-2340
lines changed

Cargo.lock

Lines changed: 17 additions & 58 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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ members = [
4545
"src/query/functions/src/scalars/arithmetic",
4646
"src/query/functions/src/scalars/integer_arithmetic",
4747
"src/query/management",
48-
"src/query/pipeline/core",
49-
"src/query/pipeline/sinks",
50-
"src/query/pipeline/sources",
48+
"src/query/pipeline",
5149
"src/query/pipeline/transforms",
5250
"src/query/script",
5351
"src/query/settings",
@@ -155,9 +153,7 @@ databend-common-meta-store = { path = "src/meta/store" }
155153
databend-common-meta-types = { path = "src/meta/types" }
156154
databend-common-metrics = { path = "src/common/metrics" }
157155
databend-common-native = { path = "src/common/native" }
158-
databend-common-pipeline-core = { path = "src/query/pipeline/core" }
159-
databend-common-pipeline-sinks = { path = "src/query/pipeline/sinks" }
160-
databend-common-pipeline-sources = { path = "src/query/pipeline/sources" }
156+
databend-common-pipeline = { path = "src/query/pipeline" }
161157
databend-common-pipeline-transforms = { path = "src/query/pipeline/transforms" }
162158
databend-common-proto-conv = { path = "src/meta/proto-conv" }
163159
databend-common-protos = { path = "src/meta/protos" }

src/query/catalog/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ databend-common-meta-api = { workspace = true }
2323
databend-common-meta-app = { workspace = true }
2424
databend-common-meta-store = { workspace = true }
2525
databend-common-meta-types = { workspace = true }
26-
databend-common-pipeline-core = { workspace = true }
26+
databend-common-pipeline = { workspace = true }
2727
databend-common-settings = { workspace = true }
2828
databend-common-storage = { workspace = true }
2929
databend-common-users = { workspace = true }

src/query/catalog/src/lock.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use std::sync::Arc;
1616

1717
use databend_common_exception::Result;
1818
use databend_common_meta_app::schema::LockType;
19-
use databend_common_pipeline_core::LockGuard;
19+
use databend_common_pipeline::core::LockGuard;
2020

2121
use crate::table_context::TableContext;
2222

src/query/catalog/src/table.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ use databend_common_meta_app::schema::TableMeta;
3636
use databend_common_meta_app::schema::UpdateStreamMetaReq;
3737
use databend_common_meta_app::schema::UpsertTableCopiedFileReq;
3838
use databend_common_meta_types::MetaId;
39-
use databend_common_pipeline_core::Pipeline;
39+
use databend_common_pipeline::core::Pipeline;
4040
use databend_common_storage::Histogram;
4141
use databend_common_storage::StorageMetrics;
4242
use databend_storages_common_table_meta::meta::ClusterKey;

src/query/catalog/src/table_context.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ use databend_common_meta_app::principal::UserInfo;
4646
use databend_common_meta_app::principal::UserPrivilegeType;
4747
use databend_common_meta_app::storage::StorageParams;
4848
use databend_common_meta_app::tenant::Tenant;
49-
use databend_common_pipeline_core::processors::PlanProfile;
50-
use databend_common_pipeline_core::InputError;
51-
use databend_common_pipeline_core::LockGuard;
49+
use databend_common_pipeline::core::InputError;
50+
use databend_common_pipeline::core::LockGuard;
51+
use databend_common_pipeline::core::PlanProfile;
5252
use databend_common_settings::Settings;
5353
use databend_common_storage::CopyStatus;
5454
use databend_common_storage::DataOperator;

src/query/ee/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ databend-common-meta-app = { workspace = true }
2626
databend-common-meta-store = { workspace = true }
2727
databend-common-meta-types = { workspace = true }
2828
databend-common-metrics = { workspace = true }
29-
databend-common-pipeline-core = { workspace = true }
30-
databend-common-pipeline-sources = { workspace = true }
29+
databend-common-pipeline = { workspace = true }
3130
databend-common-pipeline-transforms = { workspace = true }
3231
databend-common-sql = { workspace = true }
3332
databend-common-storage = { workspace = true }

src/query/ee/src/storages/fuse/operations/virtual_columns.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ use databend_common_expression::TableSchema;
3333
use databend_common_metrics::storage::metrics_inc_block_virtual_column_write_bytes;
3434
use databend_common_metrics::storage::metrics_inc_block_virtual_column_write_milliseconds;
3535
use databend_common_metrics::storage::metrics_inc_block_virtual_column_write_nums;
36-
use databend_common_pipeline_core::Pipeline;
37-
use databend_common_pipeline_sources::AsyncSource;
38-
use databend_common_pipeline_sources::AsyncSourcer;
36+
use databend_common_pipeline::core::Pipeline;
37+
use databend_common_pipeline::sources::AsyncSource;
38+
use databend_common_pipeline::sources::AsyncSourcer;
3939
use databend_common_pipeline_transforms::processors::AsyncTransform;
4040
use databend_common_pipeline_transforms::processors::TransformPipelineHelper;
4141
use databend_common_sql::executor::physical_plans::MutationKind;
@@ -173,7 +173,7 @@ pub async fn do_refresh_virtual_column(
173173
block_reader.clone(),
174174
virtual_column_metas.clone(),
175175
);
176-
AsyncSourcer::create(ctx.clone(), output, inner)
176+
AsyncSourcer::create(ctx.get_scan_progress(), output, inner)
177177
},
178178
1,
179179
)?;

src/query/ee/src/virtual_column/virtual_column_handler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use std::sync::Arc;
1717
use databend_common_base::base::GlobalInstance;
1818
use databend_common_catalog::table_context::TableContext;
1919
use databend_common_exception::Result;
20-
use databend_common_pipeline_core::Pipeline;
20+
use databend_common_pipeline::core::Pipeline;
2121
use databend_common_storages_fuse::FuseTable;
2222
use databend_enterprise_virtual_column::VirtualColumnHandler;
2323
use databend_enterprise_virtual_column::VirtualColumnHandlerWrapper;

src/query/ee_features/virtual_column/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ async-trait = { workspace = true }
1414
databend-common-base = { workspace = true }
1515
databend-common-catalog = { workspace = true }
1616
databend-common-exception = { workspace = true }
17-
databend-common-pipeline-core = { workspace = true }
17+
databend-common-pipeline = { workspace = true }
1818
databend-common-storages-fuse = { workspace = true }
1919

2020
[build-dependencies]

0 commit comments

Comments
 (0)