Changeset: 6a42641251e5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6a42641251e5
Modified Files:
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
Branch: default
Log Message:
Approve change in output due to groups optimizer.
diffs (80 lines):
diff --git
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
--- a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
+++ b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
@@ -50,7 +50,6 @@ function user.s4_1{autoCommit=true}():vo
X_5:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","t2564",1);
X_8 := bat.reverse(X_5);
X_35 := algebra.kdifference(X_34,X_8);
- (ext53,grp51) := group.new(X_35);
X_21:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c3",0);
X_20:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c3",2);
X_22 := algebra.kdifference(X_21,X_20);
@@ -58,7 +57,6 @@ function user.s4_1{autoCommit=true}():vo
X_19:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c3",1);
X_24 := algebra.kunion(X_23,X_19);
X_25 := algebra.kdifference(X_24,X_8);
- (ext56,grp54) := group.derive(ext53,grp51,X_25);
X_12:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c1",0);
X_10:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c1",2);
X_14 := algebra.kdifference(X_12,X_10);
@@ -66,13 +64,13 @@ function user.s4_1{autoCommit=true}():vo
X_9:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c1",1);
X_16 := algebra.kunion(X_15,X_9);
X_17 := algebra.kdifference(X_16,X_8);
- (ext59,grp57) := group.done(ext56,grp54,X_17);
- X_42 := bat.mirror(ext59);
- X_43:bat[:oid,:wrd] := aggr.count(grp57,grp57,X_42);
- X_44 := sql.resultSet(1,1,X_43);
- sql.rsColumn(X_44,"sys.t2564","L1":str,"wrd",64,0,X_43);
- X_52 := io.stdout();
- sql.exportResult(X_52,X_44);
+ (ext59,grp57) := group.multicolumns(X_35,X_25,X_17);
+ X_38 := bat.mirror(ext59);
+ X_39:bat[:oid,:wrd] := aggr.count(grp57,grp57,X_38);
+ X_40 := sql.resultSet(1,1,X_39);
+ sql.rsColumn(X_40,"sys.t2564","L1":str,"wrd",64,0,X_39);
+ X_48 := io.stdout();
+ sql.exportResult(X_48,X_40);
end s4_1;
#select count(*) from t2564 group by c1, c2, c3;
% sys.t2564 # table_name
diff --git
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
---
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
+++
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
@@ -50,7 +50,6 @@ function user.s4_1{autoCommit=true}():vo
X_5:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","t2564",1);
X_8 := bat.reverse(X_5);
X_35 := algebra.kdifference(X_34,X_8);
- (ext53,grp51) := group.new(X_35);
X_21:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c3",0);
X_20:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c3",2);
X_22 := algebra.kdifference(X_21,X_20);
@@ -58,7 +57,6 @@ function user.s4_1{autoCommit=true}():vo
X_19:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c3",1);
X_24 := algebra.kunion(X_23,X_19);
X_25 := algebra.kdifference(X_24,X_8);
- (ext56,grp54) := group.derive(ext53,grp51,X_25);
X_12:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c1",0);
X_10:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c1",2);
X_14 := algebra.kdifference(X_12,X_10);
@@ -66,13 +64,13 @@ function user.s4_1{autoCommit=true}():vo
X_9:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c1",1);
X_16 := algebra.kunion(X_15,X_9);
X_17 := algebra.kdifference(X_16,X_8);
- (ext59,grp57) := group.done(ext56,grp54,X_17);
- X_42 := bat.mirror(ext59);
- X_43:bat[:oid,:wrd] := aggr.count(grp57,grp57,X_42);
- X_44 := sql.resultSet(1,1,X_43);
- sql.rsColumn(X_44,"sys.t2564","L1":str,"wrd",32,0,X_43);
- X_52 := io.stdout();
- sql.exportResult(X_52,X_44);
+ (ext59,grp57) := group.multicolumns(X_35,X_25,X_17);
+ X_38 := bat.mirror(ext59);
+ X_39:bat[:oid,:wrd] := aggr.count(grp57,grp57,X_38);
+ X_40 := sql.resultSet(1,1,X_39);
+ sql.rsColumn(X_40,"sys.t2564","L1":str,"wrd",32,0,X_39);
+ X_48 := io.stdout();
+ sql.exportResult(X_48,X_40);
end s4_1;
#select count(*) from t2564 group by c1, c2, c3;
% sys.t2564 # table_name
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
