Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21653/runtime
Modified Files:
ll_sibling.mx
Log Message:
propagated changes of Monday Feb 11 2008 - Tuesday Feb 12 2008
from the XQuery_0-22 branch to the development trunk
Index: ll_sibling.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/ll_sibling.mx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ll_sibling.mx 11 Jan 2008 10:47:19 -0000 1.5
+++ ll_sibling.mx 12 Feb 2008 18:52:12 -0000 1.6
@@ -305,7 +305,7 @@
/* count sibligs for excat result BAT allocation */
cur_lev = level[*ctx_cur];
cur_sib = *ctx_cur + size[*ctx_cur] + 1;
- while (cur_sib <= doc_max && ((sz = size[cur_sib]) < 0 ||
level[cur_sib] == cur_lev)) {
+ while (cur_sib < doc_max && ((sz = size[cur_sib]) < 0 ||
level[cur_sib] == cur_lev)) {
num_sib += (sz >= 0);
cur_sib += 1 + (sz & sz_msk);
}
@@ -316,7 +316,7 @@
PFll_check_BAT_capacity(res, grow, res_scur, res_hcur, res_tcur);
if (num_iter == 1) {
ALGODEBUG THRprintf(GDKout, "%s: 1 ctx, 1 iter\n", name);
- while (cur_sib <= doc_max && ((sz = size[cur_sib]) < 0 ||
level[cur_sib] == cur_lev)) {
+ while (cur_sib < doc_max && ((sz = size[cur_sib]) < 0 ||
level[cur_sib] == cur_lev)) {
if (sz >= 0) {
@1 {
*res_hcur++ = min_iter;
@@ -328,7 +328,7 @@
} else {
/* num_iter > 1 */
ALGODEBUG THRprintf(GDKout, "%s: 1 ctx, n iter\n", name);
- while (cur_sib <= doc_max && ((sz = size[cur_sib]) < 0 ||
level[cur_sib] == cur_lev)) {
+ while (cur_sib < doc_max && ((sz = size[cur_sib]) < 0 ||
level[cur_sib] == cur_lev)) {
if (sz >= 0) {
@1 {
oid *cur_iter = iter_cur;
@@ -409,6 +409,8 @@
@2 *stack = 0;
oid ctx;
+ ALGODEBUG THRprintf(GDKout, "%s: ll_foll_sib_n_ctx( @1 , @2 )\n",
name);
+
stack = (@2*)GDKmalloc(sizeof(@2) * (XML_DEPTH_MAX + 1));
if (stack == NULL) {
GDKerror("%s: could not allocate stack of size "SZFMT".\n", name,
sizeof(@2) * (XML_DEPTH_MAX + 1));
@@ -473,7 +475,7 @@
cur_lev = level[ctx];
cur_sib = ctx + size[ctx] + 1;
/* get all remaining siblings of active item */
- while (cur_sib <= doc_max && ((sz = size[cur_sib]) < 0 ||
level[cur_sib] == cur_lev)) {
+ while (cur_sib < doc_max && ((sz = size[cur_sib]) < 0 ||
level[cur_sib] == cur_lev)) {
if (sz >= 0) {
@1 {
/* check, if result buffer is big enough; otherwise
extend it */
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
