Skip to content

fix(cubesql): Fix sort push down projection on complex expressions #9787

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 2 commits into from
Jul 17, 2025
Merged

fix(cubesql): Fix sort push down projection on complex expressions #9787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cea93d6
fix(cubesql): Fix sort push down projection on complex expressions
MazterQyou Jul 16, 2025
454ff2e
temp switch to macos14 for gh ci runner
KSDaemon Jul 17, 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
6 changes: 3 additions & 3 deletions .github/workflows/rust-cubesql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ jobs:
matrix:
# We do not need to test under all versions, we do it under linux
node-version: [22.x]
os-version: ["macos-13"]
os-version: ["macos-14"]
target: ["x86_64-apple-darwin", "aarch64-apple-darwin"]
include:
- target: x86_64-apple-darwin
Expand Down Expand Up @@ -308,8 +308,8 @@ jobs:
CARGO_BUILD_TARGET: ${{ matrix.target }}
run: cd packages/cubejs-backend-native && yarn run native:build-debug-python
- name: Tests
# We cannot test arm64 on x64
if: (matrix.target == 'x86_64-apple-darwin')
# We cannot test x64 on arm64
if: (matrix.target == 'aarch64-apple-darwin')
env:
CUBESQL_STREAM_MODE: true
CUBEJS_NATIVE_INTERNAL_DEBUG: true
Expand Down
9 changes: 8 additions & 1 deletion rust/cubesql/cubesql/src/compile/rewrite/rules/order.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use egg::Subst;

use crate::{
compile::{
datafusion::logical_plan::Column,
datafusion::logical_plan::{Column, Expr},
rewrite::{
analysis::OriginalExpr,
column_expr, column_name_to_member_vec,
Expand Down Expand Up @@ -370,6 +370,13 @@ impl OrderRules {
continue;
};

// TODO: workaround the issue with `generate_sql_for_push_to_cube`
// accepting only columns and erroring on more complex expressions.
// Remove this when `generate_sql_for_push_to_cube` is fixed.
if !matches!(expr, Expr::Column(_)) {
continue;
}

let Ok(new_expr_id) =
LogicalPlanToLanguageConverter::add_expr(egraph, expr, flat_list)
else {
Expand Down
Loading