Skip to content

fix(cubestore): Allowing window functions in cluster send planning #9940

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

Merged
merged 3 commits into from
Sep 2, 2025
Merged

fix(cubestore): Allowing window functions in cluster send planning #9940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c78013
fix(cubestore): Allowing window functions in cluster send planning
waralexrom Sep 1, 2025
172cf2f
lint
waralexrom Sep 1, 2025
e43d526
update toolchain in ci
waralexrom Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ jobs:
- name: Setup Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2024-01-29
toolchain: nightly-2024-10-30
target: ${{ matrix.target }}
# override: true # this is by default on
rustflags: ""
Expand Down Expand Up @@ -705,7 +705,7 @@ jobs:
- name: Setup Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2024-01-29
toolchain: nightly-2024-10-30
target: ${{ matrix.target }}
# override: true # this is by default on
rustflags: ""
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2024-01-29
toolchain: nightly-2024-10-30
# override: true # this is by default on
rustflags: ""
components: rustfmt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust-cubestore-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
rust: [nightly-2024-01-29]
rust: [nightly-2024-10-30]
env:
RUST: ${{ matrix.rust }}
steps:
Expand Down Expand Up @@ -304,7 +304,7 @@ jobs:
- name: Setup Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2024-01-29
toolchain: nightly-2024-10-30
target: ${{ matrix.target }}
# override: true # this is by default on
rustflags: ""
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust-cubestore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
strategy:
fail-fast: false
matrix:
rust: [nightly-2024-01-29]
rust: [nightly-2024-10-30]
container:
image: cubejs/rust-builder:bookworm-llvm-18
env:
Expand Down Expand Up @@ -229,7 +229,7 @@ jobs:
- name: Setup Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2024-01-29
toolchain: nightly-2024-10-30
target: ${{ matrix.target }}
# override: true # this is by default on
rustflags: ""
Expand Down
1 change: 1 addition & 0 deletions rust/cubestore/cubestore/src/queryplanner/planning.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1597,6 +1597,7 @@ fn pull_up_cluster_send(mut p: LogicalPlan) -> Result<LogicalPlan, DataFusionErr
LogicalPlan::Extension { .. } => return Ok(p),
// These nodes collect results from multiple partitions, return unchanged.
LogicalPlan::Aggregate { .. }
| LogicalPlan::Window { .. }
| LogicalPlan::Repartition { .. }
| LogicalPlan::Limit { .. } => return Ok(p),
// Collects results but let's push sort,fetch underneath the input.
Expand Down
16 changes: 6 additions & 10 deletions rust/cubestore/cubestore/src/queryplanner/query_executor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,11 +710,9 @@ impl CubeTable {
let mut options = TableParquetOptions::new();
options.global = state.config_options().execution.parquet.clone();

let parquet_source = ParquetSource::new(
options,
get_reader_options_customizer(state.config()),
)
.with_parquet_file_reader_factory(self.parquet_metadata_cache.clone());
let parquet_source =
ParquetSource::new(options, get_reader_options_customizer(state.config()))
.with_parquet_file_reader_factory(self.parquet_metadata_cache.clone());
let parquet_source = if let Some(phys_pred) = &physical_predicate {
parquet_source.with_predicate(index_schema.clone(), phys_pred.clone())
} else {
Expand Down Expand Up @@ -792,11 +790,9 @@ impl CubeTable {

let mut options = TableParquetOptions::new();
options.global = state.config_options().execution.parquet.clone();
let parquet_source = ParquetSource::new(
options,
get_reader_options_customizer(state.config()),
)
.with_parquet_file_reader_factory(self.parquet_metadata_cache.clone());
let parquet_source =
ParquetSource::new(options, get_reader_options_customizer(state.config()))
.with_parquet_file_reader_factory(self.parquet_metadata_cache.clone());
let parquet_source = if let Some(phys_pred) = &physical_predicate {
parquet_source.with_predicate(index_schema.clone(), phys_pred.clone())
} else {
Expand Down
Loading