Skip to content

perf(cubestore): Arrow Cargo.lock pointers for GroupsAccumulator changes #8985

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
Nov 27, 2024
Merged

perf(cubestore): Arrow Cargo.lock pointers for GroupsAccumulator changes #8985

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
89ce6b7
perf(cubestore): Update DataFusion pointer to new GroupsAccumulator c…
srh Nov 25, 2024
a9b5fae
style(cubestore): Ran cargo fmt
srh Nov 27, 2024
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 rust/cubestore/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions rust/cubestore/cubestore-sql-tests/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3144,14 +3144,14 @@ async fn planning_inplace_aggregate2(service: Box<dyn SqlClient>) {
pp_phys_plan_ext(p.router.as_ref(), &verbose),
"Projection, [url, SUM(Data.hits)@1:hits]\
\n AggregateTopK, limit: 10, sortBy: [2 desc null last]\
\n ClusterSend, partitions: [[1, 2]]"
\n ClusterSend, partitions: [[1, 2]], sort_order: [1]"
);
assert_eq!(
pp_phys_plan_ext(p.worker.as_ref(), &verbose),
"Projection, [url, SUM(Data.hits)@1:hits]\
\n AggregateTopK, limit: 10, sortBy: [2 desc null last]\
\n Worker\
\n Sort, by: [SUM(hits)@1 desc nulls last]\
\n Worker, sort_order: [1]\
\n Sort, by: [SUM(hits)@1 desc nulls last], sort_order: [1]\
\n FullInplaceAggregate, sort_order: [0]\
\n MergeSort, single_vals: [0, 1], sort_order: [0, 1, 2]\
\n Union, single_vals: [0, 1], sort_order: [0, 1, 2]\
Expand Down
12 changes: 10 additions & 2 deletions rust/cubestore/cubestore/src/metastore/table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ use byteorder::{BigEndian, WriteBytesExt};
use chrono::DateTime;
use chrono::Utc;
use datafusion::arrow::datatypes::Schema as ArrowSchema;
use datafusion::physical_plan::expressions::{Column as FusionColumn, Max, Min, Sum};
use datafusion::physical_plan::expressions::{
sum_return_type, Column as FusionColumn, Max, Min, Sum,
};
use datafusion::physical_plan::{udaf, AggregateExpr, PhysicalExpr};
use itertools::Itertools;

Expand Down Expand Up @@ -76,7 +78,13 @@ impl AggregateColumn {
)?);
let res: Arc<dyn AggregateExpr> = match self.function {
AggregateFunction::SUM => {
Arc::new(Sum::new(col.clone(), col.name(), col.data_type(schema)?))
let input_data_type = col.data_type(schema)?;
Arc::new(Sum::new(
col.clone(),
col.name(),
sum_return_type(&input_data_type)?,
&input_data_type,
))
}
AggregateFunction::MAX => {
Arc::new(Max::new(col.clone(), col.name(), col.data_type(schema)?))
Expand Down
Loading