diff --git a/Cargo.lock b/Cargo.lock index 1c6749579..4c8b337ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4382,34 +4382,6 @@ dependencies = [ "tonic 0.9.2", ] -[[package]] -name = "sparrow-execution" -version = "0.11.0" -dependencies = [ - "arrow-array", - "arrow-schema", - "derive_more", - "error-stack", - "futures", - "hashbrown 0.14.0", - "index_vec", - "itertools 0.11.0", - "parking_lot 0.12.1", - "sparrow-backend", - "sparrow-batch", - "sparrow-interfaces", - "sparrow-logical", - "sparrow-physical", - "sparrow-scheduler", - "sparrow-session", - "sparrow-sources", - "sparrow-testing", - "sparrow-transforms", - "tokio", - "tracing", - "uuid 1.4.1", -] - [[package]] name = "sparrow-expressions" version = "0.11.0" @@ -4620,6 +4592,34 @@ dependencies = [ "uuid 1.4.1", ] +[[package]] +name = "sparrow-plan-execution" +version = "0.11.0" +dependencies = [ + "arrow-array", + "arrow-schema", + "derive_more", + "error-stack", + "futures", + "hashbrown 0.14.0", + "index_vec", + "itertools 0.11.0", + "parking_lot 0.12.1", + "sparrow-backend", + "sparrow-batch", + "sparrow-interfaces", + "sparrow-logical", + "sparrow-physical", + "sparrow-scheduler", + "sparrow-session", + "sparrow-sources", + "sparrow-testing", + "sparrow-transforms", + "tokio", + "tracing", + "uuid 1.4.1", +] + [[package]] name = "sparrow-qfr" version = "0.11.0" @@ -4760,11 +4760,11 @@ dependencies = [ "sparrow-api", "sparrow-backend", "sparrow-compiler", - "sparrow-execution", "sparrow-expressions", "sparrow-instructions", "sparrow-interfaces", "sparrow-logical", + "sparrow-plan-execution", "sparrow-runtime", "sparrow-sources", "sparrow-syntax", diff --git a/crates/sparrow-execution/Cargo.toml b/crates/sparrow-plan-execution/Cargo.toml similarity index 97% rename from crates/sparrow-execution/Cargo.toml rename to crates/sparrow-plan-execution/Cargo.toml index 7987a7d62..72e609713 100644 --- a/crates/sparrow-execution/Cargo.toml +++ b/crates/sparrow-plan-execution/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "sparrow-execution" +name = "sparrow-plan-execution" version.workspace = true authors.workspace = true edition.workspace = true diff --git a/crates/sparrow-execution/src/error.rs b/crates/sparrow-plan-execution/src/error.rs similarity index 100% rename from crates/sparrow-execution/src/error.rs rename to crates/sparrow-plan-execution/src/error.rs diff --git a/crates/sparrow-execution/src/lib.rs b/crates/sparrow-plan-execution/src/lib.rs similarity index 100% rename from crates/sparrow-execution/src/lib.rs rename to crates/sparrow-plan-execution/src/lib.rs diff --git a/crates/sparrow-execution/src/source_tasks.rs b/crates/sparrow-plan-execution/src/source_tasks.rs similarity index 100% rename from crates/sparrow-execution/src/source_tasks.rs rename to crates/sparrow-plan-execution/src/source_tasks.rs diff --git a/crates/sparrow-execution/src/tests.rs b/crates/sparrow-plan-execution/src/tests.rs similarity index 100% rename from crates/sparrow-execution/src/tests.rs rename to crates/sparrow-plan-execution/src/tests.rs diff --git a/crates/sparrow-execution/src/write_channel_pipeline.rs b/crates/sparrow-plan-execution/src/write_channel_pipeline.rs similarity index 100% rename from crates/sparrow-execution/src/write_channel_pipeline.rs rename to crates/sparrow-plan-execution/src/write_channel_pipeline.rs diff --git a/crates/sparrow-session/Cargo.toml b/crates/sparrow-session/Cargo.toml index e4daa2a6f..d6f18778c 100644 --- a/crates/sparrow-session/Cargo.toml +++ b/crates/sparrow-session/Cargo.toml @@ -21,14 +21,14 @@ smallvec.workspace = true sparrow-api = { path = "../sparrow-api" } sparrow-backend = { path = "../sparrow-backend" } sparrow-compiler = { path = "../sparrow-compiler" } -sparrow-execution = { path = "../sparrow-execution" } sparrow-expressions = { path = "../sparrow-expressions" } +sparrow-instructions = { path = "../sparrow-instructions" } sparrow-interfaces = { path = "../sparrow-interfaces" } sparrow-logical = { path = "../sparrow-logical" } +sparrow-plan-execution = { path = "../sparrow-plan-execution" } sparrow-runtime = { path = "../sparrow-runtime" } sparrow-sources = { path = "../sparrow-sources" } sparrow-syntax = { path = "../sparrow-syntax" } -sparrow-instructions = { path = "../sparrow-instructions" } static_init.workspace = true tempfile.workspace = true tokio.workspace = true diff --git a/crates/sparrow-session/src/partitioned/session.rs b/crates/sparrow-session/src/partitioned/session.rs index 129f4de82..139cd5a55 100644 --- a/crates/sparrow-session/src/partitioned/session.rs +++ b/crates/sparrow-session/src/partitioned/session.rs @@ -84,7 +84,7 @@ impl Session { let plan = sparrow_backend::compile(query, None).change_context(Error::Compile)?; let (output_tx, output_rx) = tokio::sync::mpsc::channel(10); - let executor = sparrow_execution::PlanExecutor::try_new( + let executor = sparrow_plan_execution::PlanExecutor::try_new( "query_id".to_owned(), plan, &self.sources, diff --git a/python/Cargo.lock b/python/Cargo.lock index e86bf132d..a3811196d 100644 --- a/python/Cargo.lock +++ b/python/Cargo.lock @@ -3887,28 +3887,6 @@ dependencies = [ "tonic", ] -[[package]] -name = "sparrow-execution" -version = "0.11.0" -dependencies = [ - "arrow-array", - "arrow-schema", - "derive_more", - "error-stack", - "futures", - "hashbrown 0.14.0", - "itertools 0.11.0", - "parking_lot 0.12.1", - "sparrow-batch", - "sparrow-interfaces", - "sparrow-physical", - "sparrow-scheduler", - "sparrow-transforms", - "tokio", - "tracing", - "uuid 1.4.1", -] - [[package]] name = "sparrow-expressions" version = "0.11.0" @@ -4048,6 +4026,28 @@ dependencies = [ "uuid 1.4.1", ] +[[package]] +name = "sparrow-plan-execution" +version = "0.11.0" +dependencies = [ + "arrow-array", + "arrow-schema", + "derive_more", + "error-stack", + "futures", + "hashbrown 0.14.0", + "itertools 0.11.0", + "parking_lot 0.12.1", + "sparrow-batch", + "sparrow-interfaces", + "sparrow-physical", + "sparrow-scheduler", + "sparrow-transforms", + "tokio", + "tracing", + "uuid 1.4.1", +] + [[package]] name = "sparrow-qfr" version = "0.11.0" @@ -4157,11 +4157,11 @@ dependencies = [ "sparrow-api", "sparrow-backend", "sparrow-compiler", - "sparrow-execution", "sparrow-expressions", "sparrow-instructions", "sparrow-interfaces", "sparrow-logical", + "sparrow-plan-execution", "sparrow-runtime", "sparrow-sources", "sparrow-syntax",