Fix aggregates reordering domain size

knowsys · Nov 9, 2023 · e72588e · e72588e
1 parent fe77c23
commit e72588e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/nemo/src/execution/planning/aggregates.rs b/nemo/src/execution/planning/aggregates.rs
@@ -47,7 +47,8 @@ pub(super) fn generate_node_aggregate(
                 .map(|variable| *variable_order.get(variable).unwrap())
                 .collect();
 
-            let reordering = ProjectReordering::from_vector(reordering_column_indices, 3);
+            let reordering =
+                ProjectReordering::from_vector(reordering_column_indices, variable_order.len());
 
             node = current_plan.plan_mut().project(node, reordering);
 

diff --git a/resources/testcases/aggregate_basic/distinct.rls b/resources/testcases/aggregate_basic/distinct.rls
@@ -1,5 +1,7 @@
 @source sourceA[integer,integer,integer]: load-csv("sources/dataA.csv").
+@source sourceB[integer,integer,integer,integer]: load-csv("sources/dataB.csv").
 
 r0(#count(?X, ?Y)) :- sourceA(?X, ?Y, ?Z).
 r1(#count(?X, ?Y, ?Z)) :- sourceA(?X, ?Y, ?Z).
 r2(?X, #count(?Y, ?Z)) :- sourceA(?X, ?Y, ?Z).
+r3(?X1, #sum(?X2, ?X4)) :- sourceB(?X1, ?X2, ?X3, ?X4).
diff --git a/resources/testcases/aggregate_basic/distinct/r3.csv b/resources/testcases/aggregate_basic/distinct/r3.csv
@@ -0,0 +1,2 @@
+1,8
+2,1
diff --git a/resources/testcases/aggregate_basic/sources/dataB.csv b/resources/testcases/aggregate_basic/sources/dataB.csv
@@ -0,0 +1,7 @@
+1,1,1,1
+1,2,3,4
+1,2,4,4
+1,2,5,4
+1,2,6,3
+1,3,4,4
+2,1,1,1
-Original file line number
+Diff line change
@@ -0,0 +1,7 @@
+,1,1,1
+,2,3,4
+,2,4,4
+,2,5,4
+,2,6,3
+,3,4,4
+,1,1,1