Skip to content

Commit c7c8ef5

Browse files
committed
fix(cubestore): Allowing window functions in cluster send planning
1 parent c79d28c commit c7c8ef5

File tree

6 files changed

+14
-17
lines changed

6 files changed

+14
-17
lines changed

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ jobs:
618618
- name: Setup Rust toolchain
619619
uses: actions-rust-lang/setup-rust-toolchain@v1
620620
with:
621-
toolchain: nightly-2024-01-29
621+
toolchain: nightly-2024-10-30
622622
target: ${{ matrix.target }}
623623
# override: true # this is by default on
624624
rustflags: ""
@@ -705,7 +705,7 @@ jobs:
705705
- name: Setup Rust toolchain
706706
uses: actions-rust-lang/setup-rust-toolchain@v1
707707
with:
708-
toolchain: nightly-2024-01-29
708+
toolchain: nightly-2024-10-30
709709
target: ${{ matrix.target }}
710710
# override: true # this is by default on
711711
rustflags: ""

.github/workflows/push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ jobs:
237237
- name: Install Rust
238238
uses: actions-rust-lang/setup-rust-toolchain@v1
239239
with:
240-
toolchain: nightly-2024-01-29
240+
toolchain: nightly-2024-10-30
241241
# override: true # this is by default on
242242
rustflags: ""
243243
components: rustfmt

.github/workflows/rust-cubestore-master.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
rust: [nightly-2024-01-29]
24+
rust: [nightly-2024-10-30]
2525
env:
2626
RUST: ${{ matrix.rust }}
2727
steps:
@@ -304,7 +304,7 @@ jobs:
304304
- name: Setup Rust toolchain
305305
uses: actions-rust-lang/setup-rust-toolchain@v1
306306
with:
307-
toolchain: nightly-2024-01-29
307+
toolchain: nightly-2024-10-30
308308
target: ${{ matrix.target }}
309309
# override: true # this is by default on
310310
rustflags: ""

.github/workflows/rust-cubestore.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
rust: [nightly-2024-01-29]
29+
rust: [nightly-2024-10-30]
3030
container:
3131
image: cubejs/rust-builder:bookworm-llvm-18
3232
env:
@@ -229,7 +229,7 @@ jobs:
229229
- name: Setup Rust toolchain
230230
uses: actions-rust-lang/setup-rust-toolchain@v1
231231
with:
232-
toolchain: nightly-2024-01-29
232+
toolchain: nightly-2024-10-30
233233
target: ${{ matrix.target }}
234234
# override: true # this is by default on
235235
rustflags: ""

rust/cubestore/cubestore/src/queryplanner/planning.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1597,6 +1597,7 @@ fn pull_up_cluster_send(mut p: LogicalPlan) -> Result<LogicalPlan, DataFusionErr
15971597
LogicalPlan::Extension { .. } => return Ok(p),
15981598
// These nodes collect results from multiple partitions, return unchanged.
15991599
LogicalPlan::Aggregate { .. }
1600+
| LogicalPlan::Window { .. }
16001601
| LogicalPlan::Repartition { .. }
16011602
| LogicalPlan::Limit { .. } => return Ok(p),
16021603
// Collects results but let's push sort,fetch underneath the input.

rust/cubestore/cubestore/src/queryplanner/query_executor.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -710,11 +710,9 @@ impl CubeTable {
710710
let mut options = TableParquetOptions::new();
711711
options.global = state.config_options().execution.parquet.clone();
712712

713-
let parquet_source = ParquetSource::new(
714-
options,
715-
get_reader_options_customizer(state.config()),
716-
)
717-
.with_parquet_file_reader_factory(self.parquet_metadata_cache.clone());
713+
let parquet_source =
714+
ParquetSource::new(options, get_reader_options_customizer(state.config()))
715+
.with_parquet_file_reader_factory(self.parquet_metadata_cache.clone());
718716
let parquet_source = if let Some(phys_pred) = &physical_predicate {
719717
parquet_source.with_predicate(index_schema.clone(), phys_pred.clone())
720718
} else {
@@ -792,11 +790,9 @@ impl CubeTable {
792790

793791
let mut options = TableParquetOptions::new();
794792
options.global = state.config_options().execution.parquet.clone();
795-
let parquet_source = ParquetSource::new(
796-
options,
797-
get_reader_options_customizer(state.config()),
798-
)
799-
.with_parquet_file_reader_factory(self.parquet_metadata_cache.clone());
793+
let parquet_source =
794+
ParquetSource::new(options, get_reader_options_customizer(state.config()))
795+
.with_parquet_file_reader_factory(self.parquet_metadata_cache.clone());
800796
let parquet_source = if let Some(phys_pred) = &physical_predicate {
801797
parquet_source.with_predicate(index_schema.clone(), phys_pred.clone())
802798
} else {

0 commit comments

Comments
 (0)