Changeset: 69feea05a494 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=69feea05a494
Modified Files:
MonetDB5/src/optimizer/opt_mergetable.mx
Branch: Oct2010
Log Message:
fix std_dev test
diffs (28 lines):
diff -r 650172374d65 -r 69feea05a494 MonetDB5/src/optimizer/opt_mergetable.mx
--- a/MonetDB5/src/optimizer/opt_mergetable.mx Sun Oct 03 15:26:37 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_mergetable.mx Sun Oct 03 21:41:14 2010 +0200
@@ -156,6 +156,9 @@
mat_rdr = 5 /* Phase one of sorting, ie sorted the parts sofar */
} mat_type;
+/* TODO have a seperate mat_variable list, ie old_var, mat instruction */
+/* including first or second result */
+
typedef struct mat {
InstrPtr mi; /* mat instruction */
InstrPtr mi1; /* second result, mat instruction */
@@ -2248,6 +2251,14 @@
actions++;
continue;
}
+ /* TODO: grp before sorting, isn't handled */
+ if (match == 1 && p->argc == 2 && isOrderby(p) &&
+ (m=isMATalias(getArg(p,1), mat, mtop)) >=0 &&
+ mat[m].type == mat_grp) {
+ assert(mat[m].mm); // should be packed
+ error++;
+ goto fail;
+ }
if (match == 2 && p->argc == 3 && isOrderby(p) &&
(m=isMATalias(getArg(p,1), mat, mtop)) >= 0 &&
(n=isMATalias(getArg(p,2), mat, mtop)) >= 0 &&
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
