Zorba

Merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba

  1. markos-scratch
  2. Merge into trunk
Proposed by Markos Zaharioudakis
Status: Merged
Approved by: Markos Zaharioudakis
Approved revision: 11029
Merged at revision: 11273
Proposed branch: lp:~zorba-coders/zorba/markos-scratch
Merge into: lp:zorba
Diff against target: 42 lines (+14/-0)
3 files modified
ChangeLog (+1/-0)
src/runtime/core/flwor_iterator.cpp (+3/-0)
test/rbkt/Queries/zorba/flwor/flwor23.xq (+10/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/markos-scratch
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Review via email: mp+151906@code.launchpad.net

Commit message

Fixed bug #1148335 (where-clause expression was not always reset when it should be)

Description of the change

Fixed bug #1148335 (where-clause expression was not always reset when it should be)

To post a comment you must log in.
Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-03-06T10-05-53.665Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job markos-scratch-2013-03-06T10-05-53.665Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-03-04 16:17:30 +0000
3+++ ChangeLog 2013-03-06 10:00:32 +0000
4@@ -29,6 +29,7 @@
5 * Fixed bug in index join rule (copy var ids after cloning index domain expr).
6 * Added missing wrapper expressions around some variable references.
7 * Fixed bug in the throwing of error XQTY0086 during node construction.
8+ * Fixed bug #1148335 (where-clause expression was not always reset when it should be)
9 * Fixed bug #1122396 (Associate origin/destination URI to I/O stream)
10 * Fixed bug #1111786 (xml/json parse error location in catch clause).
11 * NaN items are considered equal to each other during grouping
12
13=== modified file 'src/runtime/core/flwor_iterator.cpp'
14--- src/runtime/core/flwor_iterator.cpp 2013-02-26 04:12:43 +0000
15+++ src/runtime/core/flwor_iterator.cpp 2013-03-06 10:00:32 +0000
16@@ -1310,7 +1310,10 @@
17 {
18 store::Item_t boolValue;
19 if (!consumeNext(boolValue, predicateIter.getp(), planState))
20+ {
21+ predicateIter->reset(planState);
22 return false;
23+ }
24
25 bool value = boolValue->getBooleanValue();
26 predicateIter->reset(planState);
27
28=== added file 'test/rbkt/ExpQueryResults/zorba/flwor/flwor23.xml.res'
29=== added file 'test/rbkt/Queries/zorba/flwor/flwor23.xq'
30--- test/rbkt/Queries/zorba/flwor/flwor23.xq 1970-01-01 00:00:00 +0000
31+++ test/rbkt/Queries/zorba/flwor/flwor23.xq 2013-03-06 10:00:32 +0000
32@@ -0,0 +1,10 @@
33+
34+let $foo := (
35+ { "foo" : "bar" },
36+ { "foo" : "bar" },
37+ { "foo" : "bar" },
38+ { "foo" : "bar" },
39+ { "foo" : "bar" },
40+ { "foo" : "bar" }
41+)
42+return $foo[position() lt 4 and .("id") eq 3]

Subscribers

People subscribed via source and target branches