Changeset: 878792b316af for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=878792b316af
Modified Files:
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_pipes.c
Branch: geo
Log Message:
add some printouts
diffs (127 lines):
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -320,6 +320,8 @@ mat_apply1(MalBlkPtr mb, InstrPtr p, mat
}
for(k=1; k < mat[m].mi->argc; k++) {
q = copyInstruction(p);
+if(getModuleId(p) && !strcasecmp(getModuleId(p),"batgeom"))
+fprintf(stderr, "(mat_apply1) MergeTable: %d Processing instruction %s\n", k,
getFunctionId(p));
if (is_assign)
getArg(q, 0) = getArg(mat[n].mi, k);
@@ -367,6 +369,8 @@ mat_apply2(MalBlkPtr mb, InstrPtr p, mat
for(k=1; k < mat[m].mi->argc; k++) {
InstrPtr q = copyInstruction(p);
+if(getModuleId(p) && !strcasecmp(getModuleId(p),"batgeom"))
+fprintf(stderr, "(mat_apply2) MergeTable: %d Processing instruction %s\n", k,
getFunctionId(p));
getArg(q, 0) = newTmpVariable(mb, tpe);
getArg(q, mvar) = getArg(mat[m].mi, k);
@@ -1425,6 +1429,8 @@ OPTmergetableImplementation(Client cntxt
int j;
p = old[i];
+if(getModuleId(p) && !strcasecmp(getModuleId(p),"batgeom"))
+fprintf(stderr, "(1) MergeTable: %d Processing instruction %s\n", i,
getFunctionId(p));
for (j = 0; j<p->retc; j++) {
int res = getArg(p, j);
@@ -1470,6 +1476,9 @@ OPTmergetableImplementation(Client cntxt
InstrPtr r;
p = old[i];
+if(getModuleId(p) && !strcasecmp(getModuleId(p),"batgeom"))
+fprintf(stderr, "(2) MergeTable: %d Processing instruction %s\n", i,
getFunctionId(p));
+
if (getModuleId(p) == matRef &&
(getFunctionId(p) == newRef || getFunctionId(p) == packRef)){
mat_set_prop(mb, p);
@@ -1664,6 +1673,9 @@ OPTmergetableImplementation(Client cntxt
/* subselect on insert, should use last tid only */
if (match == 1 && fm == 2 && isSubSelect(p) && p->retc == 1 &&
(m=is_a_mat(getArg(p,fm), mat, mtop)) >= 0) {
+if(getModuleId(p) && !strcasecmp(getModuleId(p),"batgeom"))
+fprintf(stderr, "(2.4) MergeTable: %d Processing instruction %s\n", i,
getFunctionId(p));
+
r = copyInstruction(p);
getArg(r, fm) = getArg(mat[m].mi, mat[m].mi->argc-1);
pushInstruction(mb, r);
@@ -1675,6 +1687,9 @@ OPTmergetableImplementation(Client cntxt
(m=is_a_mat(getArg(p,fm), mat, mtop)) >= 0 &&
(n=is_a_mat(getArg(p,fn), mat, mtop)) >= 0 &&
(o=is_a_mat(getArg(p,fo), mat, mtop)) >= 0){
+if(getModuleId(p) && !strcasecmp(getModuleId(p),"batgeom"))
+fprintf(stderr, "(2.3) MergeTable: %d Processing instruction %s\n", i,
getFunctionId(p));
+
assert(mat[m].mi->argc == mat[n].mi->argc);
if ((r = mat_apply3(mb, p, mat, m, n, o, fm, fn, fo))
!= NULL)
mtop = mat_add(mat, mtop, r, mat_type(mat, m),
getFunctionId(p));
@@ -1684,6 +1699,9 @@ OPTmergetableImplementation(Client cntxt
if (match == 2 && bats == 2 && (isFragmentGroup(p) ||
isFragmentGroup2(p) || isMapOp(p)) && p->retc != 2 &&
(m=is_a_mat(getArg(p,fm), mat, mtop)) >= 0 &&
(n=is_a_mat(getArg(p,fn), mat, mtop)) >= 0){
+if(getModuleId(p) && !strcasecmp(getModuleId(p),"batgeom"))
+fprintf(stderr, "(2.2) MergeTable: %d Processing instruction %s\n", i,
getFunctionId(p));
+
assert(mat[m].mi->argc == mat[n].mi->argc);
if ((r = mat_apply2(mb, p, mat, m, n, fm, fn)) != NULL)
mtop = mat_add(mat, mtop, r, mat_type(mat, m),
getFunctionId(p));
@@ -1694,11 +1712,16 @@ OPTmergetableImplementation(Client cntxt
if (match == 1 && bats == 1 && (isFragmentGroup(p) ||
isMapOp(p) ||
(!getModuleId(p) && !getFunctionId(p) && p->barrier == 0 /*
simple assignment */)) && p->retc != 2 &&
(m=is_a_mat(getArg(p,fm), mat, mtop)) >= 0){
+if(getModuleId(p) && !strcasecmp(getModuleId(p),"batgeom"))
+fprintf(stderr, "(2.1) MergeTable: %d Processing instruction %s\n", i,
getFunctionId(p));
+
if ((r = mat_apply1(mb, p, mat, mtop, m, fm)) != NULL)
mtop = mat_add(mat, mtop, r, mat_type(mat, m),
getFunctionId(p));
actions++;
continue;
}
+if(getModuleId(p) && !strcasecmp(getModuleId(p),"batgeom"))
+fprintf(stderr, "(OUT) MergeTable: %d Processing instruction %s\n", i,
getFunctionId(p));
/*
* All other instructions should be checked for remaining MAT
dependencies.
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -253,7 +253,7 @@ static struct PIPELINES {
#endif
/*geospatial pipe*/
- {"geom_pipe",
+/* {"geom_pipe",
"optimizer.inline();"
"optimizer.remap();"
"optimizer.geospatial();"
@@ -262,7 +262,7 @@ static struct PIPELINES {
"optimizer.generator();"
"optimizer.garbageCollector();",
"experimental", NULL, NULL, 1},
-/*
+*/
{"geom_pipe",
"optimizer.inline();"
"optimizer.remap();"
@@ -271,8 +271,8 @@ static struct PIPELINES {
"optimizer.evaluate();"
"optimizer.emptySet();"
"optimizer.aliases();"
+ "optimizer.pushselect();"
"optimizer.geospatial();"
- "optimizer.pushselect();"
"optimizer.mitosis();"
"optimizer.mergetable();"
"optimizer.deadcode();"
@@ -288,7 +288,7 @@ static struct PIPELINES {
"optimizer.generator();"
"optimizer.garbageCollector();",
"experimental", NULL, NULL, 1},
-*/
+
/* sentinel */
{NULL, NULL, NULL, NULL, NULL, 0}
};
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
