Skip to content

Commit 13854e5

Browse files
committed
Merge branch 'stack/native-761' into stack/native-759
2 parents 140eff1 + 8e197aa commit 13854e5

3 files changed

Lines changed: 14 additions & 13 deletions

File tree

‎Cargo.lock‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ version = "0.1.0"
1515
[workspace.dependencies]
1616
# Keep Planner frontends, selection, and IR on the same immutable revision.
1717
# Alias upstream asap-types because this workspace also defines asap_types.
18-
planner-types = { package = "asap-types", git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "93a0fa2b60219c624fe74a0218ff4a76cd97ea78" }
19-
asap-aware-mapping = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "93a0fa2b60219c624fe74a0218ff4a76cd97ea78" }
20-
asap-frontend-promql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "93a0fa2b60219c624fe74a0218ff4a76cd97ea78" }
21-
asap-frontend-sql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "93a0fa2b60219c624fe74a0218ff4a76cd97ea78" }
18+
planner-types = { package = "asap-types", git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "645cacb04a451e25147f0d23aaddd05da16b4746" }
19+
asap-aware-mapping = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "645cacb04a451e25147f0d23aaddd05da16b4746" }
20+
asap-frontend-promql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "645cacb04a451e25147f0d23aaddd05da16b4746" }
21+
asap-frontend-sql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "645cacb04a451e25147f0d23aaddd05da16b4746" }
2222

2323
# Shared external deps (used by 2+ crates)
2424
serde = { version = "1.0", features = ["derive"] }
@@ -38,8 +38,8 @@ arc-swap = "1.7"
3838
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
3939

4040
# Internal crates
41-
asap-physical-operators = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "93a0fa2b60219c624fe74a0218ff4a76cd97ea78" }
42-
asap_sketch_codec = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "93a0fa2b60219c624fe74a0218ff4a76cd97ea78" }
41+
asap-physical-operators = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "645cacb04a451e25147f0d23aaddd05da16b4746" }
42+
asap_sketch_codec = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "645cacb04a451e25147f0d23aaddd05da16b4746" }
4343
asap_types = { path = "crates/asap_types" }
4444
asap_otel_proto = { path = "crates/asap_otel_proto" }
4545
indexmap = { version = "2.0", features = ["serde"] }

‎control_plane/src/query_plan.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ where
386386
child.schema.fields.get(column).map(|field| &field.dtype),
387387
Some(SummaryFamilyType::Plain(
388388
planner_types::pre_asap::DataType::Float64
389+
| planner_types::pre_asap::DataType::Int64
389390
)) | Some(SummaryFamilyType::ExactAggregate(..))
390391
) {
391392
return Err(QueryPlanError::Invalid(

0 commit comments

Comments
 (0)