Update of /cvsroot/monetdb/pathfinder/modules/pftijah/tjc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26677/tjc
Modified Files:
tjc_milprint.c tjc_phys_optimize.c
Log Message:
-enable pftijah debugging outout
-some more checks in containment-joins
-add another operator tj_pre2nid_noprop that translates pre IDs to nid IDs
without score propagation
U tjc_milprint.c
Index: tjc_milprint.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/tjc/tjc_milprint.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- tjc_milprint.c 21 Feb 2009 09:57:47 -0000 1.17
+++ tjc_milprint.c 25 Feb 2009 14:43:19 -0000 1.18
@@ -344,10 +344,15 @@
}
node->visited++;
+ // debug output
+ if (tjc_c->debug > 9)
+ TJCPRINTF(MILOUT,"R%d.print();\n", nid);
+
// free children if their scope ends
for (c = 0; c < TJPNODE_MAXCHILD; c++)
if (child[c] != -1 && node_scope[child[c]] == nid)
TJCPRINTF(MILOUT,"R%d := nil;\n", child[c]);
+
}
char* milprint (tjc_config *tjc_c, TJpnode_t *root)
U tjc_phys_optimize.c
Index: tjc_phys_optimize.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/tjc/tjc_phys_optimize.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- tjc_phys_optimize.c 9 Feb 2009 10:39:28 -0000 1.6
+++ tjc_phys_optimize.c 25 Feb 2009 14:43:19 -0000 1.7
@@ -365,7 +365,7 @@
param1 = "prop";
else
param1 = "noprop";
- if (node->nested)
+ if (node->child[1]->nested)
param2 = "nest";
else
param2 = "unnest";
@@ -423,7 +423,11 @@
sprintf(operator, "nid2pre");
break;
case a_pre2nid :
- sprintf(operator, "pre2nid");
+ if (node->scored)
+ param1 = "prop";
+ else
+ param1 = "noprop";
+ sprintf(operator, "pre2nid_%s", param1);
break;
case a_add_pre :
sprintf(operator, "add_pre");
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
