Update of /cvsroot/monetdb/pathfinder/runtime
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22316/runtime
Modified Files:
pathfinder.mx
Log Message:
propagated changes of Thursday Nov 12 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/11/12 - boncz: runtime/pathfinder.mx,1.462.4.8
my batch of promised bugfixes for Nov2009
- disable prepared query mechanism for function-only queries (avoid mps!)
- make heuristic to use indices even more strict (not inside the where clause
of a for-loop with >1 variables, as it may be a join).
- fix property bug in shredder (in case of tables with a single tuple, being
appended to my a incremental multi-doc shred).
- fix simple bug (crash in printf format) in xrpc_client
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: pathfinder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pathfinder.mx,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -d -r1.470 -r1.471
--- pathfinder.mx 10 Nov 2009 18:29:50 -0000 1.470
+++ pathfinder.mx 12 Nov 2009 08:39:42 -0000 1.471
@@ -5917,6 +5917,7 @@
return p+1;
}
+#ifdef XQUERY_PREPARE
/*
* parse an XML datamodel numeric, and determine its minimal type (xs:integer,
xs:decimal or xs:double)
*/
@@ -5949,16 +5950,19 @@
* from a cached MIL tree. Otherwise use pathfinder to compile. Returns error
string (NULL if ok).
*/
static char xquery_too_complex[80] = "xquery_prepare: xquery is too complex
for cached execution.\n";
+#endif
#define xquery_nondescriptive_error ((char*) -1)
+
static char*
xquery_prepare(xquery_client *ctx,
lng usec,
char* query)
{
+ char *err = NULL;
+#ifdef XQUERY_PREPARE
int nsbuf = 0, loaded_modules = 0, len;
char *ns = (char*)&nsbuf, *nsend = ns, *locend, *loc = NULL, *q, *p =
query;
char val[1024], url1[1024], url2[1024];
- char *err = NULL;
if (ctx->mode&XQ_DEBUG) {
/* for debugging purposes, we simulate a full MIL on the log; even if
parts are cached */
@@ -6141,7 +6145,11 @@
*/
if (err == xquery_function_error) /* MIL execution failed, do not generate
error in PF compiler */
return xquery_nondescriptive_error;
- if (err) {
+ if (err)
+#else
+ (void) usec;
+#endif
+ {
char *sec1 = NULL;
char *sec2 = NULL;
char *sec3 = NULL;
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
