1
=== modified file 'src/runtime/eval/eval.cpp'
2
--- src/runtime/eval/eval.cpp	2012-04-09 23:08:06 +0000
3
+++ src/runtime/eval/eval.cpp	2012-04-14 07:02:20 +0000
4
@@ -62,6 +62,20 @@
5
62
{
62
{
6
63
}
63
}
7
64
64
8
65
/****************************************************************************//**
9
66
10
67
********************************************************************************/
11
68
void
12
69
EvalIteratorState::reset(PlanState& aPlanState) 
13
70
{
14
71
  PlanIteratorState::reset(aPlanState);
15
72
  // When an exception is thrown during an EvalIterator::nextImpl invocation
16
73
  // or when the EvalIterator doesn't return all resulting items of an other reason,
17
74
  // the PlanWrapper is not properly destroyed. Therefore, we destroy it in the reset
18
75
  // to prevent troubles the next time the EvalIterator is used.
19
76
  thePlanWrapper = 0;
20
77
}
21
78
22
65
79
23
66
/****************************************************************************//**
80
/****************************************************************************//**
24
67
81
25
68
82
26
=== modified file 'src/runtime/eval/eval.h'
27
--- src/runtime/eval/eval.h	2012-03-30 19:03:09 +0000
28
+++ src/runtime/eval/eval.h	2012-04-14 07:02:20 +0000
29
@@ -37,6 +37,8 @@
30
37
  EvalIteratorState();
37
  EvalIteratorState();
31
38
38
32
39
  ~EvalIteratorState();
39
  ~EvalIteratorState();
33
40
34
41
  void reset(PlanState&);
35
40
};
42
};
36
41
43
37
42
44
38
43
45
39
=== added file 'test/rbkt/ExpQueryResults/zorba/eval/eval_reset.xml.res'
40
--- test/rbkt/ExpQueryResults/zorba/eval/eval_reset.xml.res	1970-01-01 00:00:00 +0000
41
+++ test/rbkt/ExpQueryResults/zorba/eval/eval_reset.xml.res	2012-04-14 07:02:20 +0000
42
@@ -0,0 +1,1 @@
43
1
not empty not empty not empty
44
0
2
45
=== added file 'test/rbkt/Queries/zorba/eval/eval_reset.xq'
46
--- test/rbkt/Queries/zorba/eval/eval_reset.xq	1970-01-01 00:00:00 +0000
47
+++ test/rbkt/Queries/zorba/eval/eval_reset.xq	2012-04-14 07:02:20 +0000
48
@@ -0,0 +1,15 @@
49
1
(:
50
2
 : Checks if the underlying EvalIterator is reset properly in case if not every 
51
3
 : resulting item of the EvalIterator in the iteration before was consumed.
52
4
 : Simulated by doing an empty check on resulting items of the eval function.
53
5
 :)
54
6
55
7
import module namespace reflection = "http://www.zorba-xquery.com/modules/reflection";
56
8
57
9
for $x in (1,2,3)
58
10
let $code := "($x, 1, 2, 3)" 
59
11
return
60
12
  if (not(empty(reflection:eval($code)))) then
61
13
    "not empty"
62
14
  else
63
15
    "empty"
Status:	Merged
Approved by:	Markos Zaharioudakis on 2012-04-16
Approved revision:	10752
Merged at revision:	10763
Proposed branch:	lp:~zorba-coders/zorba/bug-914655
Merge into:	lp:zorba
Diff against target:	63 lines (+32/-0) 4 files modified src/runtime/eval/eval.cpp (+14/-0) src/runtime/eval/eval.h (+2/-0) test/rbkt/ExpQueryResults/zorba/eval/eval_reset.xml.res (+1/-0) test/rbkt/Queries/zorba/eval/eval_reset.xq (+15/-0)
To merge this branch:	bzr merge lp:~zorba-coders/zorba/bug-914655
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Markos Zaharioudakis	2012-04-14	Approve on 2012-04-16
Matthias Brantner	2012-04-13	Approve on 2012-04-14
David Graf (community)		Approve on 2012-04-13
Review via email: mp+101922@code.launchpad.net
1	=== modified file 'src/runtime/eval/eval.cpp'
2	--- src/runtime/eval/eval.cpp 2012-04-09 23:08:06 +0000
3	+++ src/runtime/eval/eval.cpp 2012-04-14 07:02:20 +0000
4	@@ -62,6 +62,20 @@
5	62	{	62	{
6	63	}	63	}
7	64		64
8			65	/**************************************************************************//
9			66
10			67	********************************************************************************/
11			68	void
12			69	EvalIteratorState::reset(PlanState& aPlanState)
13			70	{
14			71	PlanIteratorState::reset(aPlanState);
15			72	// When an exception is thrown during an EvalIterator::nextImpl invocation
16			73	// or when the EvalIterator doesn't return all resulting items of an other reason,
17			74	// the PlanWrapper is not properly destroyed. Therefore, we destroy it in the reset
18			75	// to prevent troubles the next time the EvalIterator is used.
19			76	thePlanWrapper = 0;
20			77	}
21			78
22	65		79
23	66	/**************************************************************************//	80	/**************************************************************************//
24	67		81
25	68		82
26	=== modified file 'src/runtime/eval/eval.h'
27	--- src/runtime/eval/eval.h 2012-03-30 19:03:09 +0000
28	+++ src/runtime/eval/eval.h 2012-04-14 07:02:20 +0000
29	@@ -37,6 +37,8 @@
30	37	EvalIteratorState();	37	EvalIteratorState();
31	38		38
32	39	~EvalIteratorState();	39	~EvalIteratorState();
33			40
34			41	void reset(PlanState&);
35	40	};	42	};
36	41		43
37	42		44
38	43		45
39	=== added file 'test/rbkt/ExpQueryResults/zorba/eval/eval_reset.xml.res'
40	--- test/rbkt/ExpQueryResults/zorba/eval/eval_reset.xml.res 1970-01-01 00:00:00 +0000
41	+++ test/rbkt/ExpQueryResults/zorba/eval/eval_reset.xml.res 2012-04-14 07:02:20 +0000
42	@@ -0,0 +1,1 @@
43			1	not empty not empty not empty
44	0		2
45	=== added file 'test/rbkt/Queries/zorba/eval/eval_reset.xq'
46	--- test/rbkt/Queries/zorba/eval/eval_reset.xq 1970-01-01 00:00:00 +0000
47	+++ test/rbkt/Queries/zorba/eval/eval_reset.xq 2012-04-14 07:02:20 +0000
48	@@ -0,0 +1,15 @@
49			1	(:
50			2	: Checks if the underlying EvalIterator is reset properly in case if not every
51			3	: resulting item of the EvalIterator in the iteration before was consumed.
52			4	: Simulated by doing an empty check on resulting items of the eval function.
53			5	:)
54			6
55			7	import module namespace reflection = "http://www.zorba-xquery.com/modules/reflection";
56			8
57			9	for $x in (1,2,3)
58			10	let $code := "($x, 1, 2, 3)"
59			11	return
60			12	if (not(empty(reflection:eval($code)))) then
61			13	"not empty"
62			14	else
63			15	"empty"