Changeset: e656a6724343 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e656a6724343
Modified Files:
Branch: Oct2010
Log Message:
reverting 37536
diffs (truncated from 354 to 300 lines):
diff -r 5cb57bad7497 -r e656a6724343 MonetDB5/src/modules/mal/mat.mx
--- a/MonetDB5/src/modules/mal/mat.mx Wed Sep 08 21:51:17 2010 +0200
+++ b/MonetDB5/src/modules/mal/mat.mx Wed Sep 08 22:23:01 2010 +0200
@@ -69,38 +69,6 @@
address MATpackSlice
comment "Materialize a sliced MAT into a BAT";
-pattern project(map:bat[:void,:bte], b:bat[:any_1,:any_2]...):bat[:void,:any_2]
-address MATpack
-comment "project using the map bat (contains which bat to use in scan order)";
-
-pattern sort(b:bat[:any_1,:any_2]...)
- (sorted:bat[:any_1,:any_2], map:bat[:void,:bte])
-address MATpack
-comment "Returns a BAT copy sorted on the head column.";
-
-pattern sortReverse(b:bat[:any_1,:any_2]...)
- (sorted:bat[:any_1,:any_2], map:bat[:void,:bte])
-address MATpack
-comment "Returns a BAT copy sorted on the head column.";
-
-pattern refine(sorted:bat[:any_1,:any_3], map:bat[:any_1,:bte],
a:bat[:any_1,:any_2]...)
- (rsorted:bat[:any_1,:any_2], rmap:bat[:void,:bte])
-address MATpack
-comment "refine the ordering of a tail-ordered BAT by sub-ordering on the
- values of a second mat 'a' (where the heads of a and b match 1-1).
- The effect of this is similar to (hash-based) GRPderive, with the
- distinction that the group ids respect the ordering of the group
- values.";
-
-pattern refine_reverse(sorted:bat[:any_1,:any_3], map:bat[:any_1,:bte],
a:bat[:any_1,:any_2]...)
- (rsorted:bat[:any_1,:any_2], rmap:bat[:void,:bte])
-address MATpack
-comment "refine the ordering of a tail-ordered BAT by sub-ordering on the
- values of a second mat 'a' (where the heads of a and b match 1-1).
- The effect of this is similar to (hash-based) GRPderive, with the
- distinction that the group ids respect the ordering of the group
- values.";
-
pattern print(b:bat[:any_1,:any_2]...):void
address MATprint;
diff -r 5cb57bad7497 -r e656a6724343 MonetDB5/src/optimizer/opt_mergetable.mx
--- a/MonetDB5/src/optimizer/opt_mergetable.mx Wed Sep 08 21:51:17 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_mergetable.mx Wed Sep 08 22:23:01 2010 +0200
@@ -1245,141 +1245,6 @@
return mat_pack_topn_project(mb, p, mat, mtop, mirror_mid);
}
-static int
-sort_find_mirror(MalBlkPtr mb, int var, int topstmt)
-{
- int s = resultof(mb, var, topstmt);
- InstrPtr p = mb->stmt[s];
-
- if (s && p->argc == 2 &&
- getModuleId(p) == batRef && getFunctionId(p) == mirrorRef)
- return getArg(p, 1);
- return 0;
-}
-
-static int
-sort_chain_list_length(MalBlkPtr mb, int var)
-{
- int cnt = 0;
-
- var = sort_find_mirror(mb, var, mb->stop);
- while(var) {
- int s = resultof(mb, var, mb->stop);
- InstrPtr p = mb->stmt[s];
-
- var = 0;
- if (s == 0)
- return 0;
- if ((p->argc == 3 || p->argc == 4) && isOrderby(p)) {
- var = getArg(p, 1);
- cnt++;
- }
- }
- return cnt;
-}
-
-static void
-sort_stmt(int *stmt, MalBlkPtr mb, int var)
-{
- int cnt = 0;
-
- var = sort_find_mirror(mb, var, mb->stop);
- while(var) {
- int s = resultof(mb, var, mb->stop);
- InstrPtr p = mb->stmt[s];
-
- assert(s!=0);
- var = 0;
- if ((p->argc == 3 || p->argc == 4) && isOrderby(p)) {
- var = getArg(p, 1);
- stmt[cnt++] = s;
- }
- }
-}
-
-static int
-mat_pack_sort_project(MalBlkPtr mb, InstrPtr p, mat_t *mat, int mtop, int
merged_orderby_mid)
-{
- int k, a = mtop - 1;
- mat_t *merged_orderby = mat+merged_orderby_mid;
- InstrPtr pck = copyInstruction(p);
-
- /* 2 cases,
- 1) first time we need to merge
- 2) second simply use result of first an repeat projection
- */
- assert(merged_orderby->mm);
-
- /* replace leftjoin by mat.project */
- pck = newInstruction(mb, ASSIGNsymbol);
- setModuleId(pck,matRef);
- setFunctionId(pck,"project");
- getArg(pck,0) = newTmpVariable(mb, getVarType(mb, getArg(mat[a].mi,1)));
-
- pck = pushArgument(mb, pck, getArg(merged_orderby->mm,1));
- for(k=1; k<mat[a].mi->argc; k++)
- pck = pushArgument(mb, pck, getArg(mat[a].mi,k) );
- pushInstruction(mb, pck);
- MATshift(mat, mtop-1, &mtop);
- return mtop;
-}
-
-static int
-mat_pack_sort(MalBlkPtr mb, InstrPtr p, mat_t *mat, int mtop, int mirror_mid)
-{
- /* find chain of orderby's */
- mat_t *mirror = mat+mirror_mid;
- int k, i;
- int cnt = sort_chain_list_length(mb, getArg(mirror->mi,1));
- int *stmt = (int*) alloca( cnt * sizeof(int) * mirror->mi->argc );
- InstrPtr cur_sort = NULL;
-
- for(k=1; k < mirror->mi->argc; k++)
- sort_stmt(stmt+k*cnt, mb, getArg(mirror->mi, k));
- for(i=cnt-1; i>=0; i--) {
- InstrPtr q, s = mb->stmt[stmt[cnt+i]];
- InstrPtr pck = newInstruction(mb, ASSIGNsymbol);
- /* get attribute of sort instruction */
- int var = (s->argc == 3)?1:2; /* sort with 1 or 2 args*/
- int tpe = getVarType(mb, getArg(s, var));
-
- /* double outputs (sorted values and map) */
- tpe = newBatType(TYPE_oid,tpe);
-
- /* mat sort/sortReverse and refine/refineReverse */
- setModuleId(pck,matRef);
- setFunctionId(pck,getFunctionId(s));
- getArg(pck,0) = newTmpVariable(mb, tpe);
- getArg(pck,1) = newTmpVariable(mb,
newBatType(TYPE_oid,TYPE_bte));
- if (cur_sort) {
- pck = pushArgument(mb, pck, getArg(cur_sort,0));
- pck = pushArgument(mb, pck, getArg(cur_sort,1));
- }
-
- /* merge sort(m.leftjoin(attr)); */
- for(k=1; k < mirror->mi->argc; k++) {
- s = mb->stmt[stmt[k*cnt+i]];
-
- q = newInstruction(mb, ASSIGNsymbol);
- setModuleId(q, algebraRef);
- setFunctionId(q, leftjoinRef);
- getArg(q, 0) = newTmpVariable(mb, tpe);
- q = pushArgument(mb, q, getArg(mirror->mi, k));
- q = pushArgument(mb, q, getArg(s, var));
- pushInstruction(mb, q);
-
- pck = pushArgument(mb, pck, getArg(q,0));
- }
- pushInstruction(mb, pck);
- cur_sort = pck;
- }
- /* all sort's done, keep 'which bat order' in mm */
- mirror->mm = bat_mirror(mb, getArg(cur_sort,1));
-
- /* now project */
- return mat_pack_sort_project(mb, p, mat, mtop, mirror_mid);
-}
-
static void
mat_aggr(MalBlkPtr mb, InstrPtr p, mat_t *mat, int m)
{
@@ -1560,7 +1425,7 @@
return mtop;
}
-/* TODO cleanup mat_topn and mat_sort using mat_unop */
+/* could use mat_unop ?? */
static int
mat_topn(MalBlkPtr mb, InstrPtr p, mat_t *mat, int mtop, int m)
{
@@ -1585,6 +1450,7 @@
return mat_add(mat, mtop, pck, NULL, isSlice(p)?mat_slc:mat_tpn);
}
+/* could use mat_unop ?? */
static int
mat_topn2(MalBlkPtr mb, InstrPtr p, mat_t *mat, int mtop, int m, int n)
{
@@ -1611,6 +1477,7 @@
return mat_add(mat, mtop, pck, NULL, mat_tpn);
}
+#if 0
static int
mat_sort(MalBlkPtr mb, InstrPtr p, mat_t *mat, int mtop, int m)
{
@@ -1629,37 +1496,11 @@
pushInstruction(mb,q);
/* pack result */
- propagateProp(mb, q, getArg(q,1));
pck = pushArgument(mb,pck,getArg(q,0));
}
return mat_add(mat, mtop, pck, NULL, mat_rdr);
}
-
-static int
-mat_sort2(MalBlkPtr mb, InstrPtr p, mat_t *mat, int mtop, int m, int n)
-{
- int tpe = getArgType(mb,p,0), k;
- InstrPtr pck = NULL, q = NULL;
-
- /* we pack the partitial result */
- pck = newInstruction(mb,ASSIGNsymbol);
- setModuleId(pck, matRef);
- setFunctionId(pck, packRef);
- getArg(pck,0) = getArg(p,0);
- assert (mat[m].mi->argc == mat[n].mi->argc);
- for(k=1; k< mat[m].mi->argc; k++) {
- q = copyInstruction(p);
- getArg(q,0) = newTmpVariable(mb, tpe);
- getArg(q,1) = getArg(mat[m].mi,k);
- getArg(q,2) = getArg(mat[n].mi,k);
- pushInstruction(mb,q);
-
- /* pack result */
- propagateProp(mb, q, getArg(q,1));
- pck = pushArgument(mb,pck,getArg(q,0));
- }
- return mat_add(mat, mtop, pck, NULL, mat_rdr);
-}
+#endif
static int
mat_union(MalBlkPtr mb, InstrPtr p, mat_t *mat, int mtop, int m, int n)
@@ -2048,12 +1889,6 @@
mtop = mat_pack_topn(mb, p, mat, mtop, om);
else if (tpe == mat_tpn && mat[om].mm)
mtop = mat_pack_topn_project(mb, p, mat, mtop,
om);
-
- /* after sort projection we should mat.merge */
- if (tpe == mat_rdr && !mat[om].mm)
- mtop = mat_pack_sort(mb, p, mat, mtop, om);
- else if (tpe == mat_tpn && mat[om].mm)
- mtop = mat_pack_sort_project(mb, p, mat, mtop,
om);
actions++;
continue;
}
@@ -2181,23 +2016,45 @@
}
if (match == 1 && p->argc == 4 && isSlice(p) &&
(m=isMATalias(getArg(p,1), mat, mtop)) >= 0) {
+ /* TODO check for start from 0 */
mtop = mat_topn(mb, p, mat, mtop, m);
actions++;
continue;
}
/* Only handle sorting after a topn */
- if (match == 1 && p->argc == 1 && isOrderby(p) &&
- (m=isMATalias(getArg(p,1), mat, mtop)) >=0) {
- mtop = mat_sort(mb, p, mat, mtop, m);
+ if (match == 1 && (
+ (getModuleId(p) == groupRef) || (
+ (m=isMATalias(getArg(p,1), mat, mtop)) >=0 &&
+ mat[m].type == mat_tpn &&
+ // mtop = mat_sort(mb, p, mat, mtop, m);
+ p->argc == 2 &&
+ (getModuleId(p) == algebraRef &&
+ (getFunctionId(p) == sortTailRef ||
+ getFunctionId(p) == sortReverseTailRef))))) {
+ m=isMATalias(getArg(p,1), mat, mtop);
+ if (m<0)
+ m=isMATalias(getArg(p,2), mat, mtop);
+ if (m>=0)
+ MATpackAll2(mb, NULL, mat, m, &mtop);
+ assert(m>=0);
+ /* after pack we can call sort/refine */
+ pushInstruction(mb, copyInstruction(p));
actions++;
continue;
}
- if (match == 2 && p->argc == 2 && isOrderby(p) &&
- (m=isMATalias(getArg(p,1), mat, mtop)) >= 0 &&
- (n=isMATalias(getArg(p,2), mat, mtop)) >= 0) {
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
