Update of /cvsroot/monetdb/pathfinder/compiler
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1494/compiler
Modified Files:
Tag: Nov2009
compile.c
Log Message:
propagated changes of Monday Sep 28 2009 - Wednesday Oct 07 2009
from the Aug2009_NFI branch to the Nov2009 branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/09/28 - boncz: compiler/compile.c,1.182.6.1
optimizations for NFI XIRAF use case -- thanks a great bunch Jan R.!!
- ds_link (already in Stable) optimized for 1-node case
- indices now contain all data (but still not used automatically, nor based
on Lefteris' new indexing schemes)
most prominently though is: subexpression result caching
- caching hints in pragmas
- query enclosed in (# pf:session id:msec ) { query } or (# pf:session-use
id:msec ) { query }
+ queries in the same session use the same working set (documents opened
only once)
+ same working set allows to cache results
+ pf:session-use only uses cache, cannot add to it
- but, multiple pf:session-use can run concurrently; whereas pf:session
is exclusive
- inside a query, an arbitrary number of expressions can be marked up for
caching/reuse
+ (# pf:cache id ) { subexpr }
+ subexpr may not be enclosed by a for-loop
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/06 - boncz: compiler/compile.c,1.182.6.2
enable heuristic rewrite value-selections in the algebra backend of
MonetDB/xQuery
has to properly implement pf:attribute(ctx, node, ns1, loc1, ns2, loc2) first,
as only the verion without namespaces was there (that one is now gone).
many restrictions:
- only non-loop-lifted equality tests
- not involving fn:collection or pf:collection (as path reversal in the
latter will never find the supernode)
- not involving any date/time/etc typed expressions (as the indices only work
for string and numerical equality)
went through the testweb and fixed all apparant problems
note the Aug2009_NFI value indices are full; whereas previously they would
omit frequent data items
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
U compile.c
Index: compile.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/compile.c,v
retrieving revision 1.182
retrieving revision 1.182.4.1
diff -u -d -r1.182 -r1.182.4.1
--- compile.c 20 Jul 2009 13:55:45 -0000 1.182
+++ compile.c 7 Oct 2009 13:43:37 -0000 1.182.4.1
@@ -451,16 +451,14 @@
/* Heuristic path-reversal rewrites to start evaluation
with indexable expressions. */
- if (status->output_format == PFoutput_format_milprint_summer) {
- /* NOTE: algebra MIL/MAL generation could/should also use it.. */
- tm = PFtimer_start ();
+ tm = PFtimer_start ();
+ if (status->output_format == PFoutput_format_mil ||
+ status->output_format == PFoutput_format_milprint_summer) {
proot = PFheuristic_index (proot);
tm = PFtimer_stop (tm);
if (status->timing)
PFlog ("path heuristics:\t\t\t %s", PFtimer_str (tm));
-
}
-
STOP_POINT(3);
/* Initialize data structures in the Namespace department */
@@ -786,7 +784,7 @@
/* Map physical algebra to MIL */
tm = PFtimer_start ();
- mroot = PFmilgen (paroot, status->genType);
+ mroot = PFmilgen (paroot, status->genType, NULL, NULL, 30000);
tm = PFtimer_stop (tm);
if (status->timing)
@@ -948,7 +946,7 @@
char*
PFcompile_MonetDB (char *xquery, char* url,
char** prologue, char** query, char** epilogue,
- int options, char *genType)
+ int options, char *genType, char *qid, char *mode, long
long timeout)
{
PFstate_t PFstate;
PFpnode_t *proot = NULL;
@@ -1022,8 +1020,9 @@
module_base = PFparse_modules (proot, &PFquery,
PFstate.standoff_axis_steps);
proot = PFnormalize_abssyn (proot);
- if (PFstate.output_format == PFoutput_format_milprint_summer) {
- /* algebra MIL/MAL generation could/should also use it.. */
+
+ if (PFstate.output_format == PFoutput_format_mil ||
+ PFstate.output_format == PFoutput_format_milprint_summer) {
proot = PFheuristic_index (proot);
}
PFns_init ();
@@ -1068,7 +1067,7 @@
paroot = PFpa_intro_borders (paroot);
/* generate internal MIL representation */
- mroot = PFmilgen (paroot, genType);
+ mroot = PFmilgen (paroot, genType, qid, mode, timeout);
if (!strncmp ("timing", genType, 6))
/* make sure the timing variables are retained */
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
