Merge lp:~zorba-coders/zorba/bug-914655 into lp:zorba

[David Graf]

Fix for bug #914655.

Fix for bug #914655.

[David Graf (davidagraf)]

Fix for bug #914655.

[David Graf (davidagraf)]

review: Approve

[Matthias Brantner (matthias-brantner)]

Looks good to me. Could the problem be reproduced without debugger? If so, we should add a test for it.

Also adding Markos as a reviewer.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-914655-2012-04-14T06-16-05.653Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-914655-2012-04-14T06-16-05.653Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Approve, 2 Pending.

[David Graf (davidagraf)]

> Looks good to me. Could the problem be reproduced without debugger? If so, we
> should add a test for it.

Good point. I found a test to add.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-914655-2012-04-15T16-56-58.153Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-914655-2012-04-15T16-56-58.153Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Approve, 2 Pending.

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-914655-2012-04-16T08-11-01.617Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-914655-2012-04-16T08-11-01.617Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/runtime/eval/eval.cpp'
--- src/runtime/eval/eval.cpp	2012-04-09 23:08:06 +0000
+++ src/runtime/eval/eval.cpp	2012-04-14 07:02:20 +0000
@@ -62,6 +62,20 @@
 {
 }
 
+/****************************************************************************//**
+
+********************************************************************************/
+void
+EvalIteratorState::reset(PlanState& aPlanState) 
+{
+  PlanIteratorState::reset(aPlanState);
+  // When an exception is thrown during an EvalIterator::nextImpl invocation
+  // or when the EvalIterator doesn't return all resulting items of an other reason,
+  // the PlanWrapper is not properly destroyed. Therefore, we destroy it in the reset
+  // to prevent troubles the next time the EvalIterator is used.
+  thePlanWrapper = 0;
+}
+
 
 /****************************************************************************//**
 

=== modified file 'src/runtime/eval/eval.h'
--- src/runtime/eval/eval.h	2012-03-30 19:03:09 +0000
+++ src/runtime/eval/eval.h	2012-04-14 07:02:20 +0000
@@ -37,6 +37,8 @@
   EvalIteratorState();
 
   ~EvalIteratorState();
+
+  void reset(PlanState&);
 };
 
 

=== added file 'test/rbkt/ExpQueryResults/zorba/eval/eval_reset.xml.res'
--- test/rbkt/ExpQueryResults/zorba/eval/eval_reset.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/eval/eval_reset.xml.res	2012-04-14 07:02:20 +0000
@@ -0,0 +1,1 @@
+not empty not empty not empty

=== added file 'test/rbkt/Queries/zorba/eval/eval_reset.xq'
--- test/rbkt/Queries/zorba/eval/eval_reset.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/eval/eval_reset.xq	2012-04-14 07:02:20 +0000
@@ -0,0 +1,15 @@
+(:
+ : Checks if the underlying EvalIterator is reset properly in case if not every 
+ : resulting item of the EvalIterator in the iteration before was consumed.
+ : Simulated by doing an empty check on resulting items of the eval function.
+ :)
+
+import module namespace reflection = "http://www.zorba-xquery.com/modules/reflection";
+
+for $x in (1,2,3)
+let $code := "($x, 1, 2, 3)" 
+return
+  if (not(empty(reflection:eval($code)))) then
+    "not empty"
+  else
+    "empty"