Update of /cvsroot/monetdb/pathfinder/compiler/algebra/opt
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22821/compiler/algebra/opt
Modified Files:
Tag: M5XQ
opt_icol.c
Log Message:
propagated changes of Thursday Mar 18 2010
from the XQFT branch to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/03/18 - sjoerd: compiler/algebra/opt/opt_icol.c,1.34.8.3
compiler/algebra/opt/opt_icol.c,1.34.8.2
propagated changes of Wednesday Mar 17 2010 - Thursday Mar 18 2010
from the development trunk to the XQFT branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/03/17 - tsheyar: compiler/algebra/opt/opt_icol.c,1.36
-- Introduced a new column-name-origin property that enhances the column
names
in the DOT generated algebra plans. If a column stems from a ref_tbl or a
path step we now keep the original name throughout the plan.
(Use pf-option -fN to print the mapping of original names.)
-- Make property usage a little bit more defensive. Instead of !PFprop_icol
a new function PFprop_not_icol is introduced that copes correctly with
missing property information.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: opt_icol.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/opt/opt_icol.c,v
retrieving revision 1.32.2.3
retrieving revision 1.32.2.4
diff -u -d -r1.32.2.3 -r1.32.2.4
--- opt_icol.c 7 Jan 2010 16:56:47 -0000 1.32.2.3
+++ opt_icol.c 18 Mar 2010 11:45:12 -0000 1.32.2.4
@@ -185,7 +185,7 @@
case la_attach:
/* prune attach if result column is not required */
- if (!PFprop_icol (p->prop, p->sem.attach.res)) {
+ if (PFprop_not_icol (p->prop, p->sem.attach.res)) {
*p = *PFla_dummy (L(p));
break;
}
@@ -275,7 +275,7 @@
case la_fun_1to1:
/* prune generic function operator if result column is not
required */
- if (!PFprop_icol (p->prop, p->sem.fun_1to1.res)) {
+ if (PFprop_not_icol (p->prop, p->sem.fun_1to1.res)) {
*p = *PFla_dummy (L(p));
break;
}
@@ -286,7 +286,7 @@
case la_bool_and:
case la_bool_or:
/* prune binary operation if result column is not required */
- if (!PFprop_icol (p->prop, p->sem.binary.res)) {
+ if (PFprop_not_icol (p->prop, p->sem.binary.res)) {
*p = *PFla_dummy (L(p));
break;
}
@@ -294,7 +294,7 @@
case la_bool_not:
/* prune unary operation if result column is not required */
- if (!PFprop_icol (p->prop, p->sem.unary.res)) {
+ if (PFprop_not_icol (p->prop, p->sem.unary.res)) {
*p = *PFla_dummy (L(p));
break;
}
@@ -335,7 +335,7 @@
case la_rank:
/* prune rownum, rowrank, or rank if the result
column is not required */
- if (!PFprop_icol (p->prop, p->sem.sort.res)) {
+ if (PFprop_not_icol (p->prop, p->sem.sort.res)) {
*p = *PFla_dummy (L(p));
break;
}
@@ -343,7 +343,7 @@
case la_rowid:
/* prune rowid if result column is not required */
- if (!PFprop_icol (p->prop, p->sem.rowid.res)) {
+ if (PFprop_not_icol (p->prop, p->sem.rowid.res)) {
*p = *PFla_dummy (L(p));
break;
}
@@ -353,7 +353,7 @@
/* prune type if result column is not required */
case la_cast:
/* prune cast if result column is not required */
- if (!PFprop_icol (p->prop, p->sem.type.res)) {
+ if (PFprop_not_icol (p->prop, p->sem.type.res)) {
*p = *PFla_dummy (L(p));
break;
}
@@ -362,7 +362,7 @@
case la_type_assert:
/* prune type assertion if restricted column is not
used afterwards */
- if (!PFprop_icol (p->prop, p->sem.type.col)) {
+ if (PFprop_not_icol (p->prop, p->sem.type.col)) {
*p = *PFla_dummy (L(p));
break;
}
@@ -373,7 +373,7 @@
case la_doc_access:
/* prune doc_access if result column is not required */
- if (!PFprop_icol (p->prop, p->sem.doc_access.res)) {
+ if (PFprop_not_icol (p->prop, p->sem.doc_access.res)) {
*p = *PFla_dummy (R(p));
break;
}
@@ -382,7 +382,7 @@
case la_roots:
/* prune twig if result column is not required */
if (L(p)->kind == la_twig &&
- !PFprop_icol (p->prop, L(p)->sem.iter_item.item))
+ PFprop_not_icol (p->prop, L(p)->sem.iter_item.item))
switch (LL(p)->kind) {
case la_docnode:
@@ -430,7 +430,7 @@
assert(0);
}
else if (L(p)->kind == la_doc_tbl &&
- !PFprop_icol (L(p)->prop, L(p)->sem.doc_tbl.res)) {
+ PFprop_not_icol (L(p)->prop, L(p)->sem.doc_tbl.res)) {
*p = *PFla_dummy (LL(p));
break;
}
@@ -440,20 +440,20 @@
if (L(p)->kind == la_fragment &&
LL(p)->kind == la_twig &&
LLL(p)->kind != la_textnode && /* retain textnodes */
- !PFprop_icol (LL(p)->prop, LL(p)->sem.iter_item.item))
+ PFprop_not_icol (LL(p)->prop, LL(p)->sem.iter_item.item))
*p = *PFla_dummy (R(p));
else if (R(p)->kind == la_fragment &&
RL(p)->kind == la_twig &&
RLL(p)->kind != la_textnode && /* retain textnodes */
- !PFprop_icol (RL(p)->prop, RL(p)->sem.iter_item.item))
+ PFprop_not_icol (RL(p)->prop, RL(p)->sem.iter_item.item))
*p = *PFla_dummy (L(p));
else if (L(p)->kind == la_fragment &&
LL(p)->kind == la_doc_tbl &&
- !PFprop_icol (LL(p)->prop, LL(p)->sem.doc_tbl.res))
+ PFprop_not_icol (LL(p)->prop, LL(p)->sem.doc_tbl.res))
*p = *PFla_dummy (R(p));
else if (R(p)->kind == la_fragment &&
RL(p)->kind == la_doc_tbl &&
- !PFprop_icol (RL(p)->prop, RL(p)->sem.doc_tbl.res))
+ PFprop_not_icol (RL(p)->prop, RL(p)->sem.doc_tbl.res))
*p = *PFla_dummy (L(p));
break;
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
