Changeset: 8dace860d137 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8dace860d137
Modified Files:
monetdb5/extras/jaql/jaqlgencode.c
Branch: Jul2012
Log Message:
co-group: make sure we include all columns in the output grouping
The co-group needs to join with 'preserve' flag on all columns in order
to make sure they all remain in the output, and hence the grouping.
diffs (19 lines):
diff --git a/monetdb5/extras/jaql/jaqlgencode.c
b/monetdb5/extras/jaql/jaqlgencode.c
--- a/monetdb5/extras/jaql/jaqlgencode.c
+++ b/monetdb5/extras/jaql/jaqlgencode.c
@@ -6114,13 +6114,13 @@ dumptree(jc *j, Client cntxt, MalBlkPtr
int i;
MALCOMMENT(mb, "co-group {");
- /* first compute with join */
+ /* first compute with join (preserve
all group keys) */
for (i = 0, w = t->tval1; w != NULL; w
= w->next, i++)
;
js = GDKmalloc(sizeof(json_var) * (i +
1));
for (i = 0, w = t->tval1; w != NULL; w
= w->next, i++) {
js[i].name = w->tval3->sval; /*
always _IDENT */
- js[i].preserve = 0;
+ js[i].preserve = 1;
dumpgetvar(mb, w->tval1->sval,
&js[i].j1,
&js[i].j2, &js[i].j3, &js[i].j4,
&js[i].j5,
&js[i].j6, &js[i].j7);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
