Zorba

Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

  1. pjl-misc
  2. Merge into trunk
Proposed by Paul J. Lucas
Status: Merged
Approved by: Paul J. Lucas
Approved revision: 11456
Merged at revision: 11699
Proposed branch: lp:~paul-lucas/zorba/pjl-misc
Merge into: lp:zorba
Diff against target: 7896 lines (+1613/-1613)
138 files modified
src/runtime/visitors/printer_visitor_impl.cpp (+2/-2)
test/iterplans/zorba/dblp/q0.iter (+10/-10)
test/iterplans/zorba/hashjoins/9065.iter (+6/-6)
test/iterplans/zorba/hashjoins/9066.iter (+3/-3)
test/iterplans/zorba/hashjoins/9067.iter (+2/-2)
test/iterplans/zorba/hashjoins/9068.iter (+3/-3)
test/iterplans/zorba/hashjoins/9197.iter (+2/-2)
test/iterplans/zorba/hashjoins/9198.iter (+2/-2)
test/iterplans/zorba/hashjoins/9199.iter (+2/-2)
test/iterplans/zorba/hashjoins/9204.iter (+2/-2)
test/iterplans/zorba/hashjoins/9206.iter (+2/-2)
test/iterplans/zorba/hashjoins/9207.iter (+2/-2)
test/iterplans/zorba/hashjoins/9210.iter (+2/-2)
test/iterplans/zorba/hashjoins/9211.iter (+2/-2)
test/iterplans/zorba/hashjoins/9212.iter (+4/-4)
test/iterplans/zorba/hashjoins/9389.iter (+2/-2)
test/iterplans/zorba/hashjoins/9390.iter (+2/-2)
test/iterplans/zorba/hashjoins/9391.iter (+2/-2)
test/iterplans/zorba/hashjoins/9392.iter (+2/-2)
test/iterplans/zorba/hashjoins/9399.iter (+2/-2)
test/iterplans/zorba/hashjoins/9400.iter (+2/-2)
test/iterplans/zorba/hashjoins/gary1.iter (+13/-13)
test/iterplans/zorba/hashjoins/gflwor_02.iter (+8/-8)
test/iterplans/zorba/hashjoins/gflwor_03.iter (+6/-6)
test/iterplans/zorba/hashjoins/idx1.iter (+11/-11)
test/iterplans/zorba/hashjoins/idx10.iter (+2/-2)
test/iterplans/zorba/hashjoins/idx2.iter (+11/-11)
test/iterplans/zorba/hashjoins/idx3.iter (+1/-1)
test/iterplans/zorba/hashjoins/idx4.iter (+2/-2)
test/iterplans/zorba/hashjoins/idx8.iter (+7/-7)
test/iterplans/zorba/hashjoins/idx9.iter (+4/-4)
test/iterplans/zorba/hashjoins/no_idx1.iter (+3/-3)
test/iterplans/zorba/hashjoins/q8.iter (+11/-11)
test/iterplans/zorba/index/match_veq_01.iter (+3/-3)
test/iterplans/zorba/index/match_veq_02.iter (+4/-4)
test/iterplans/zorba/index/match_veq_03.iter (+4/-4)
test/iterplans/zorba/index/match_veq_04.iter (+6/-6)
test/iterplans/zorba/index/match_veq_05.iter (+9/-9)
test/iterplans/zorba/index/match_veq_06.iter (+4/-4)
test/iterplans/zorba/index/match_veq_07.iter (+19/-19)
test/iterplans/zorba/index/match_veq_11.iter (+10/-10)
test/iterplans/zorba/index/match_vrange_01.iter (+5/-5)
test/iterplans/zorba/index/match_vrange_02.iter (+13/-13)
test/iterplans/zorba/index/match_vrange_02a.iter (+18/-18)
test/iterplans/zorba/index/match_vrange_02b.iter (+13/-13)
test/iterplans/zorba/index/match_vrange_03.iter (+13/-13)
test/iterplans/zorba/misc/hoist4.iter (+4/-4)
test/iterplans/zorba/misc/inline_var1.iter (+5/-5)
test/iterplans/zorba/no-copy/dataguide-c.iter (+4/-4)
test/iterplans/zorba/no-copy/dataguide-nc.iter (+4/-4)
test/iterplans/zorba/no-copy/dataguide2-c.iter (+4/-4)
test/iterplans/zorba/no-copy/dataguide2-nc.iter (+4/-4)
test/iterplans/zorba/no-copy/dblp-q0.iter (+10/-10)
test/iterplans/zorba/no-copy/hashjoin-9065.iter (+6/-6)
test/iterplans/zorba/no-copy/hashjoin-9198.iter (+2/-2)
test/iterplans/zorba/no-copy/hashjoin-9199.iter (+2/-2)
test/iterplans/zorba/no-copy/hashjoin-9212.iter (+4/-4)
test/iterplans/zorba/no-copy/hashjoin-9389.iter (+2/-2)
test/iterplans/zorba/no-copy/hashjoin-9390.iter (+2/-2)
test/iterplans/zorba/no-copy/hashjoin-9392.iter (+2/-2)
test/iterplans/zorba/no-copy/hashjoin-gary1.iter (+13/-13)
test/iterplans/zorba/no-copy/hashjoin-idx1.iter (+11/-11)
test/iterplans/zorba/no-copy/hashjoin-idx4.iter (+2/-2)
test/iterplans/zorba/no-copy/hashjoin-q8.iter (+11/-11)
test/iterplans/zorba/no-copy/node-copy-01.iter (+3/-3)
test/iterplans/zorba/no-copy/node-copy-02.iter (+3/-3)
test/iterplans/zorba/no-copy/node-copy-03.iter (+3/-3)
test/iterplans/zorba/no-copy/path17.iter (+6/-6)
test/iterplans/zorba/no-copy/q1.iter (+6/-6)
test/iterplans/zorba/no-copy/q10.iter (+40/-40)
test/iterplans/zorba/no-copy/q11.iter (+12/-12)
test/iterplans/zorba/no-copy/q12.iter (+14/-14)
test/iterplans/zorba/no-copy/q13.iter (+7/-7)
test/iterplans/zorba/no-copy/q14.iter (+5/-5)
test/iterplans/zorba/no-copy/q15.iter (+13/-13)
test/iterplans/zorba/no-copy/q16.iter (+15/-15)
test/iterplans/zorba/no-copy/q17.iter (+7/-7)
test/iterplans/zorba/no-copy/q18.iter (+4/-4)
test/iterplans/zorba/no-copy/q19.iter (+8/-8)
test/iterplans/zorba/no-copy/q2.iter (+6/-6)
test/iterplans/zorba/no-copy/q20.iter (+21/-21)
test/iterplans/zorba/no-copy/q3.iter (+15/-15)
test/iterplans/zorba/no-copy/q4.iter (+11/-11)
test/iterplans/zorba/no-copy/q5.iter (+6/-6)
test/iterplans/zorba/no-copy/q6.iter (+3/-3)
test/iterplans/zorba/no-copy/q7.iter (+4/-4)
test/iterplans/zorba/no-copy/q8.iter (+11/-11)
test/iterplans/zorba/no-copy/q9.iter (+20/-20)
test/iterplans/zorba/no-copy/ser_03.iter (+2/-2)
test/iterplans/zorba/no-copy/test5.iter (+2/-2)
test/iterplans/zorba/no-copy/test6.iter (+1/-1)
test/iterplans/zorba/no-copy/udfs1.iter (+2/-2)
test/iterplans/zorba/optim/doc_order_01.iter (+8/-8)
test/iterplans/zorba/optim/hoist_trycatch_01.iter (+5/-5)
test/iterplans/zorba/optim/hoist_window_01.iter (+11/-11)
test/iterplans/zorba/optim/pos_pred11.iter (+1/-1)
test/iterplans/zorba/optim/pos_pred12.iter (+7/-7)
test/iterplans/zorba/optim/pos_pred13.iter (+2/-2)
test/iterplans/zorba/optim/pos_pred2.iter (+2/-2)
test/iterplans/zorba/optim/pos_pred3.iter (+1/-1)
test/iterplans/zorba/optim/var_inline_05.iter (+1/-1)
test/iterplans/zorba/paths/path10.iter (+2/-2)
test/iterplans/zorba/paths/path11.iter (+1/-1)
test/iterplans/zorba/paths/path13.iter (+2/-2)
test/iterplans/zorba/paths/path17.iter (+6/-6)
test/iterplans/zorba/paths/path24.iter (+2/-2)
test/iterplans/zorba/paths/path_pred4.iter (+4/-4)
test/iterplans/zorba/paths/path_pred5.iter (+4/-4)
test/iterplans/zorba/udf/udf1.iter (+2/-2)
test/iterplans/zorba/w3c/ForExpr010.iter (+4/-4)
test/iterplans/zorba/w3c/ForExpr025.iter (+5/-5)
test/iterplans/zorba/w3c/WhereExpr001.iter (+5/-5)
test/iterplans/zorba/w3c/nodeexpression47.iter (+442/-442)
test/iterplans/zorba/w3c/rdb-queries-results-q5.iter (+22/-22)
test/iterplans/zorba/windowing/q10.iter (+7/-7)
test/iterplans/zorba/windowing/q4.iter (+7/-7)
test/iterplans/zorba/windowing/q9.iter (+9/-9)
test/iterplans/zorba/xmark/q1.iter (+6/-6)
test/iterplans/zorba/xmark/q10.iter (+40/-40)
test/iterplans/zorba/xmark/q11.iter (+12/-12)
test/iterplans/zorba/xmark/q12.iter (+14/-14)
test/iterplans/zorba/xmark/q13.iter (+7/-7)
test/iterplans/zorba/xmark/q14.iter (+5/-5)
test/iterplans/zorba/xmark/q15.iter (+13/-13)
test/iterplans/zorba/xmark/q16.iter (+15/-15)
test/iterplans/zorba/xmark/q17.iter (+7/-7)
test/iterplans/zorba/xmark/q18.iter (+4/-4)
test/iterplans/zorba/xmark/q19.iter (+8/-8)
test/iterplans/zorba/xmark/q2.iter (+6/-6)
test/iterplans/zorba/xmark/q20.iter (+21/-21)
test/iterplans/zorba/xmark/q3.iter (+15/-15)
test/iterplans/zorba/xmark/q4.iter (+11/-11)
test/iterplans/zorba/xmark/q5.iter (+6/-6)
test/iterplans/zorba/xmark/q6.iter (+3/-3)
test/iterplans/zorba/xmark/q7.iter (+4/-4)
test/iterplans/zorba/xmark/q8.iter (+11/-11)
test/iterplans/zorba/xmark/q9.iter (+20/-20)
test/iterplans/zorba/xray/ppm_10.iter (+223/-223)
To merge this branch: bzr merge lp:~paul-lucas/zorba/pjl-misc
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Paul J. Lucas Approve
Review via email: mp+208048@code.launchpad.net

Commit message

Fixed attribute names with spaces in iterator printer.

Description of the change

Fixed attribute names with spaces.
FYI: this wasn't my code.

To post a comment you must log in.
lp:~paul-lucas/zorba/pjl-misc updated
11456. By Paul J. Lucas

Fixed attribute names with spaces.

Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208048

Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue

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

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/runtime/visitors/printer_visitor_impl.cpp'
--- src/runtime/visitors/printer_visitor_impl.cpp 2014-02-21 03:53:46 +0000
+++ src/runtime/visitors/printer_visitor_impl.cpp 2014-02-25 00:37:05 +0000
@@ -91,7 +91,7 @@
91}91}
9292
93void PrinterVisitor::printNameOrKindTest(const AxisIteratorHelper* a) {93void PrinterVisitor::printNameOrKindTest(const AxisIteratorHelper* a) {
94 thePrinter.addAttribute("test kind", toString(a->getTestKind()));94 thePrinter.addAttribute("test-kind", toString(a->getTestKind()));
9595
96 if (a->getDocTestKind() != match_no_test)96 if (a->getDocTestKind() != match_no_test)
97 thePrinter.addAttribute("doc_test_kind", toString(a->getDocTestKind()));97 thePrinter.addAttribute("doc_test_kind", toString(a->getDocTestKind()));
@@ -108,7 +108,7 @@
108108
109 std::stringstream lStream;109 std::stringstream lStream;
110 lStream << a->nilledAllowed();110 lStream << a->nilledAllowed();
111 thePrinter.addAttribute("nill allowed", lStream.str());111 thePrinter.addAttribute("nill-allowed", lStream.str());
112112
113 if (a->getTargetPos() >= 0)113 if (a->getTargetPos() >= 0)
114 thePrinter.addAttribute("target_position", ztd::to_string(a->getTargetPos()));114 thePrinter.addAttribute("target_position", ztd::to_string(a->getTargetPos()));
115115
=== modified file 'test/iterplans/zorba/dblp/q0.iter'
--- test/iterplans/zorba/dblp/q0.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/dblp/q0.iter 2014-02-25 00:37:05 +0000
@@ -27,14 +27,14 @@
27 </LetVariable>27 </LetVariable>
28 <LetVariable name="$$opt_temp_1" materialize="true">28 <LetVariable name="$$opt_temp_1" materialize="true">
29 <HoistIterator>29 <HoistIterator>
30 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">30 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill-allowed="0">
31 <LetVarIterator varname="doc"/>31 <LetVarIterator varname="doc"/>
32 </ChildAxisIterator>32 </ChildAxisIterator>
33 </HoistIterator>33 </HoistIterator>
34 </LetVariable>34 </LetVariable>
35 <LetVariable name="$$opt_temp_0" materialize="true">35 <LetVariable name="$$opt_temp_0" materialize="true">
36 <HoistIterator>36 <HoistIterator>
37 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">37 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill-allowed="0">
38 <LetVarIterator varname="doc"/>38 <LetVarIterator varname="doc"/>
39 </ChildAxisIterator>39 </ChildAxisIterator>
40 </HoistIterator>40 </HoistIterator>
@@ -50,8 +50,8 @@
50 <SingletonIterator value="xs:QName(,,paper)"/>50 <SingletonIterator value="xs:QName(,,paper)"/>
51 <EnclosedIterator attr_cont="false">51 <EnclosedIterator attr_cont="false">
52 <FnCountIterator>52 <FnCountIterator>
53 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">53 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill-allowed="0">
54 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">54 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill-allowed="0">
55 <LetVarIterator varname="doc"/>55 <LetVarIterator varname="doc"/>
56 </ChildAxisIterator>56 </ChildAxisIterator>
57 </ChildAxisIterator>57 </ChildAxisIterator>
@@ -64,7 +64,7 @@
64 <FnCountIterator>64 <FnCountIterator>
65 <FnDistinctValuesIterator>65 <FnDistinctValuesIterator>
66 <FnDataIterator>66 <FnDataIterator>
67 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">67 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
68 <LetVarIterator varname="doc"/>68 <LetVarIterator varname="doc"/>
69 </DescendantAxisIterator>69 </DescendantAxisIterator>
70 </FnDataIterator>70 </FnDataIterator>
@@ -109,14 +109,14 @@
109 </UnhoistIterator>109 </UnhoistIterator>
110 </ForVariable>110 </ForVariable>
111 <ForVariable name="$$context-item">111 <ForVariable name="$$context-item">
112 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">112 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill-allowed="0">
113 <ForVarIterator varname="$$context-item"/>113 <ForVarIterator varname="$$context-item"/>
114 </ChildAxisIterator>114 </ChildAxisIterator>
115 </ForVariable>115 </ForVariable>
116 <WhereClause>116 <WhereClause>
117 <CompareIterator>117 <CompareIterator>
118 <FnDataIterator>118 <FnDataIterator>
119 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill allowed="0">119 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill-allowed="0">
120 <ForVarIterator varname="$$context-item"/>120 <ForVarIterator varname="$$context-item"/>
121 </ChildAxisIterator>121 </ChildAxisIterator>
122 </FnDataIterator>122 </FnDataIterator>
@@ -136,7 +136,7 @@
136 <FnCountIterator>136 <FnCountIterator>
137 <FnDistinctValuesIterator>137 <FnDistinctValuesIterator>
138 <FnDataIterator>138 <FnDataIterator>
139 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">139 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
140 <FLWORIterator>140 <FLWORIterator>
141 <ForVariable name="$$context-item">141 <ForVariable name="$$context-item">
142 <UnhoistIterator>142 <UnhoistIterator>
@@ -144,14 +144,14 @@
144 </UnhoistIterator>144 </UnhoistIterator>
145 </ForVariable>145 </ForVariable>
146 <ForVariable name="$$context-item">146 <ForVariable name="$$context-item">
147 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">147 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill-allowed="0">
148 <ForVarIterator varname="$$context-item"/>148 <ForVarIterator varname="$$context-item"/>
149 </ChildAxisIterator>149 </ChildAxisIterator>
150 </ForVariable>150 </ForVariable>
151 <WhereClause>151 <WhereClause>
152 <CompareIterator>152 <CompareIterator>
153 <FnDataIterator>153 <FnDataIterator>
154 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill allowed="0">154 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill-allowed="0">
155 <ForVarIterator varname="$$context-item"/>155 <ForVarIterator varname="$$context-item"/>
156 </ChildAxisIterator>156 </ChildAxisIterator>
157 </FnDataIterator>157 </FnDataIterator>
158158
=== modified file 'test/iterplans/zorba/hashjoins/9065.iter'
--- test/iterplans/zorba/hashjoins/9065.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9065.iter 2014-02-25 00:37:05 +0000
@@ -7,9 +7,9 @@
7 </ForVariable>7 </ForVariable>
8 <LetVariable name="$$opt_temp_1" materialize="true">8 <LetVariable name="$$opt_temp_1" materialize="true">
9 <HoistIterator>9 <HoistIterator>
10 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,title)" typename="*" nill allowed="0">10 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,title)" typename="*" nill-allowed="0">
11 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">11 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
12 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill allowed="0">12 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill-allowed="0">
13 <ForVarIterator varname="b"/>13 <ForVarIterator varname="b"/>
14 </ChildAxisIterator>14 </ChildAxisIterator>
15 </ChildAxisIterator>15 </ChildAxisIterator>
@@ -19,9 +19,9 @@
19 <ForVariable name="$$opt_temp_0">19 <ForVariable name="$$opt_temp_0">
20 <HoistIterator>20 <HoistIterator>
21 <FnCountIterator>21 <FnCountIterator>
22 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">22 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
23 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">23 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
24 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill allowed="0">24 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill-allowed="0">
25 <ForVarIterator varname="b"/>25 <ForVarIterator varname="b"/>
26 </ChildAxisIterator>26 </ChildAxisIterator>
27 </ChildAxisIterator>27 </ChildAxisIterator>
2828
=== modified file 'test/iterplans/zorba/hashjoins/9066.iter'
--- test/iterplans/zorba/hashjoins/9066.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9066.iter 2014-02-25 00:37:05 +0000
@@ -8,9 +8,9 @@
8 <ForVariable name="$$opt_temp_0">8 <ForVariable name="$$opt_temp_0">
9 <HoistIterator>9 <HoistIterator>
10 <FnCountIterator>10 <FnCountIterator>
11 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">11 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
12 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">12 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
13 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill allowed="0">13 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill-allowed="0">
14 <ForVarIterator varname="b"/>14 <ForVarIterator varname="b"/>
15 </ChildAxisIterator>15 </ChildAxisIterator>
16 </ChildAxisIterator>16 </ChildAxisIterator>
1717
=== modified file 'test/iterplans/zorba/hashjoins/9067.iter'
--- test/iterplans/zorba/hashjoins/9067.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9067.iter 2014-02-25 00:37:05 +0000
@@ -26,7 +26,7 @@
26 </CreateInternalIndexIterator>26 </CreateInternalIndexIterator>
27 </LetVariable>27 </LetVariable>
28 <ForVariable name="b">28 <ForVariable name="b">
29 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">29 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
30 <FnDocIterator>30 <FnDocIterator>
31 <SingletonIterator value="xs:string(books.xml)"/>31 <SingletonIterator value="xs:string(books.xml)"/>
32 </FnDocIterator>32 </FnDocIterator>
@@ -35,7 +35,7 @@
35 <ForVariable name="$$opt_temp_1">35 <ForVariable name="$$opt_temp_1">
36 <HoistIterator>36 <HoistIterator>
37 <FnCountIterator>37 <FnCountIterator>
38 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">38 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
39 <ForVarIterator varname="b"/>39 <ForVarIterator varname="b"/>
40 </ChildAxisIterator>40 </ChildAxisIterator>
41 </FnCountIterator>41 </FnCountIterator>
4242
=== modified file 'test/iterplans/zorba/hashjoins/9068.iter'
--- test/iterplans/zorba/hashjoins/9068.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9068.iter 2014-02-25 00:37:05 +0000
@@ -26,7 +26,7 @@
26 </CreateInternalIndexIterator>26 </CreateInternalIndexIterator>
27 </LetVariable>27 </LetVariable>
28 <ForVariable name="b">28 <ForVariable name="b">
29 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">29 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
30 <FnDocIterator>30 <FnDocIterator>
31 <SingletonIterator value="xs:string(books.xml)"/>31 <SingletonIterator value="xs:string(books.xml)"/>
32 </FnDocIterator>32 </FnDocIterator>
@@ -34,7 +34,7 @@
34 </ForVariable>34 </ForVariable>
35 <LetVariable name="$$opt_temp_2" materialize="true">35 <LetVariable name="$$opt_temp_2" materialize="true">
36 <HoistIterator>36 <HoistIterator>
37 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,title)" typename="*" nill allowed="0">37 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,title)" typename="*" nill-allowed="0">
38 <ForVarIterator varname="b"/>38 <ForVarIterator varname="b"/>
39 </ChildAxisIterator>39 </ChildAxisIterator>
40 </HoistIterator>40 </HoistIterator>
@@ -42,7 +42,7 @@
42 <ForVariable name="$$opt_temp_1">42 <ForVariable name="$$opt_temp_1">
43 <HoistIterator>43 <HoistIterator>
44 <FnCountIterator>44 <FnCountIterator>
45 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">45 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
46 <ForVarIterator varname="b"/>46 <ForVarIterator varname="b"/>
47 </ChildAxisIterator>47 </ChildAxisIterator>
48 </FnCountIterator>48 </FnCountIterator>
4949
=== modified file 'test/iterplans/zorba/hashjoins/9197.iter'
--- test/iterplans/zorba/hashjoins/9197.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9197.iter 2014-02-25 00:37:05 +0000
@@ -29,7 +29,7 @@
29 </CreateInternalIndexIterator>29 </CreateInternalIndexIterator>
30 </LetVariable>30 </LetVariable>
31 <ForVariable name="book">31 <ForVariable name="book">
32 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">32 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
33 <FnDocIterator>33 <FnDocIterator>
34 <SingletonIterator value="xs:string(books.xml)"/>34 <SingletonIterator value="xs:string(books.xml)"/>
35 </FnDocIterator>35 </FnDocIterator>
@@ -38,7 +38,7 @@
38 <ForVariable name="$$opt_temp_1">38 <ForVariable name="$$opt_temp_1">
39 <HoistIterator>39 <HoistIterator>
40 <FnCountIterator>40 <FnCountIterator>
41 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">41 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
42 <ForVarIterator varname="book"/>42 <ForVarIterator varname="book"/>
43 </ChildAxisIterator>43 </ChildAxisIterator>
44 </FnCountIterator>44 </FnCountIterator>
4545
=== modified file 'test/iterplans/zorba/hashjoins/9198.iter'
--- test/iterplans/zorba/hashjoins/9198.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9198.iter 2014-02-25 00:37:05 +0000
@@ -29,7 +29,7 @@
29 </CreateInternalIndexIterator>29 </CreateInternalIndexIterator>
30 </LetVariable>30 </LetVariable>
31 <ForVariable name="book">31 <ForVariable name="book">
32 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">32 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
33 <FnDocIterator>33 <FnDocIterator>
34 <SingletonIterator value="xs:string(books.xml)"/>34 <SingletonIterator value="xs:string(books.xml)"/>
35 </FnDocIterator>35 </FnDocIterator>
@@ -38,7 +38,7 @@
38 <ForVariable name="$$opt_temp_1">38 <ForVariable name="$$opt_temp_1">
39 <HoistIterator>39 <HoistIterator>
40 <FnCountIterator>40 <FnCountIterator>
41 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">41 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
42 <ForVarIterator varname="book"/>42 <ForVarIterator varname="book"/>
43 </ChildAxisIterator>43 </ChildAxisIterator>
44 </FnCountIterator>44 </FnCountIterator>
4545
=== modified file 'test/iterplans/zorba/hashjoins/9199.iter'
--- test/iterplans/zorba/hashjoins/9199.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9199.iter 2014-02-25 00:37:05 +0000
@@ -29,7 +29,7 @@
29 </CreateInternalIndexIterator>29 </CreateInternalIndexIterator>
30 </LetVariable>30 </LetVariable>
31 <ForVariable name="book">31 <ForVariable name="book">
32 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">32 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
33 <FnDocIterator>33 <FnDocIterator>
34 <SingletonIterator value="xs:string(books.xml)"/>34 <SingletonIterator value="xs:string(books.xml)"/>
35 </FnDocIterator>35 </FnDocIterator>
@@ -38,7 +38,7 @@
38 <ForVariable name="$$opt_temp_1">38 <ForVariable name="$$opt_temp_1">
39 <HoistIterator>39 <HoistIterator>
40 <FnCountIterator>40 <FnCountIterator>
41 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">41 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
42 <ForVarIterator varname="book"/>42 <ForVarIterator varname="book"/>
43 </ChildAxisIterator>43 </ChildAxisIterator>
44 </FnCountIterator>44 </FnCountIterator>
4545
=== modified file 'test/iterplans/zorba/hashjoins/9204.iter'
--- test/iterplans/zorba/hashjoins/9204.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9204.iter 2014-02-25 00:37:05 +0000
@@ -26,7 +26,7 @@
26 </CreateInternalIndexIterator>26 </CreateInternalIndexIterator>
27 </LetVariable>27 </LetVariable>
28 <ForVariable name="book">28 <ForVariable name="book">
29 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">29 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
30 <FnDocIterator>30 <FnDocIterator>
31 <SingletonIterator value="xs:string(books.xml)"/>31 <SingletonIterator value="xs:string(books.xml)"/>
32 </FnDocIterator>32 </FnDocIterator>
@@ -35,7 +35,7 @@
35 <ForVariable name="$$opt_temp_1">35 <ForVariable name="$$opt_temp_1">
36 <HoistIterator>36 <HoistIterator>
37 <FnCountIterator>37 <FnCountIterator>
38 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">38 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
39 <ForVarIterator varname="book"/>39 <ForVarIterator varname="book"/>
40 </ChildAxisIterator>40 </ChildAxisIterator>
41 </FnCountIterator>41 </FnCountIterator>
4242
=== modified file 'test/iterplans/zorba/hashjoins/9206.iter'
--- test/iterplans/zorba/hashjoins/9206.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9206.iter 2014-02-25 00:37:05 +0000
@@ -5,7 +5,7 @@
5 <FLWORIterator>5 <FLWORIterator>
6 <LetVariable name="$$opt_temp_0" materialize="true">6 <LetVariable name="$$opt_temp_0" materialize="true">
7 <HoistIterator>7 <HoistIterator>
8 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">8 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
9 <FnDocIterator>9 <FnDocIterator>
10 <SingletonIterator value="xs:string(books.xml)"/>10 <SingletonIterator value="xs:string(books.xml)"/>
11 </FnDocIterator>11 </FnDocIterator>
@@ -24,7 +24,7 @@
24 <ValueIndexEntryBuilderIterator>24 <ValueIndexEntryBuilderIterator>
25 <ForVarIterator varname="$$opt_temp_1"/>25 <ForVarIterator varname="$$opt_temp_1"/>
26 <FnCountIterator>26 <FnCountIterator>
27 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">27 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
28 <ForVarIterator varname="$$opt_temp_1"/>28 <ForVarIterator varname="$$opt_temp_1"/>
29 </ChildAxisIterator>29 </ChildAxisIterator>
30 </FnCountIterator>30 </FnCountIterator>
3131
=== modified file 'test/iterplans/zorba/hashjoins/9207.iter'
--- test/iterplans/zorba/hashjoins/9207.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9207.iter 2014-02-25 00:37:05 +0000
@@ -29,7 +29,7 @@
29 </CreateInternalIndexIterator>29 </CreateInternalIndexIterator>
30 </LetVariable>30 </LetVariable>
31 <ForVariable name="book">31 <ForVariable name="book">
32 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">32 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
33 <FnDocIterator>33 <FnDocIterator>
34 <SingletonIterator value="xs:string(books.xml)"/>34 <SingletonIterator value="xs:string(books.xml)"/>
35 </FnDocIterator>35 </FnDocIterator>
@@ -38,7 +38,7 @@
38 <ForVariable name="$$opt_temp_1">38 <ForVariable name="$$opt_temp_1">
39 <HoistIterator>39 <HoistIterator>
40 <FnCountIterator>40 <FnCountIterator>
41 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">41 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
42 <ForVarIterator varname="book"/>42 <ForVarIterator varname="book"/>
43 </ChildAxisIterator>43 </ChildAxisIterator>
44 </FnCountIterator>44 </FnCountIterator>
4545
=== modified file 'test/iterplans/zorba/hashjoins/9210.iter'
--- test/iterplans/zorba/hashjoins/9210.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9210.iter 2014-02-25 00:37:05 +0000
@@ -5,7 +5,7 @@
5 <FLWORIterator>5 <FLWORIterator>
6 <LetVariable name="$$opt_temp_0" materialize="true">6 <LetVariable name="$$opt_temp_0" materialize="true">
7 <HoistIterator>7 <HoistIterator>
8 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">8 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
9 <FnDocIterator>9 <FnDocIterator>
10 <SingletonIterator value="xs:string(books.xml)"/>10 <SingletonIterator value="xs:string(books.xml)"/>
11 </FnDocIterator>11 </FnDocIterator>
@@ -24,7 +24,7 @@
24 <ValueIndexEntryBuilderIterator>24 <ValueIndexEntryBuilderIterator>
25 <ForVarIterator varname="$$opt_temp_1"/>25 <ForVarIterator varname="$$opt_temp_1"/>
26 <FnCountIterator>26 <FnCountIterator>
27 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">27 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
28 <ForVarIterator varname="$$opt_temp_1"/>28 <ForVarIterator varname="$$opt_temp_1"/>
29 </ChildAxisIterator>29 </ChildAxisIterator>
30 </FnCountIterator>30 </FnCountIterator>
3131
=== modified file 'test/iterplans/zorba/hashjoins/9211.iter'
--- test/iterplans/zorba/hashjoins/9211.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9211.iter 2014-02-25 00:37:05 +0000
@@ -5,7 +5,7 @@
5 <FLWORIterator>5 <FLWORIterator>
6 <LetVariable name="$$opt_temp_0" materialize="true">6 <LetVariable name="$$opt_temp_0" materialize="true">
7 <HoistIterator>7 <HoistIterator>
8 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">8 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
9 <FnDocIterator>9 <FnDocIterator>
10 <SingletonIterator value="xs:string(books.xml)"/>10 <SingletonIterator value="xs:string(books.xml)"/>
11 </FnDocIterator>11 </FnDocIterator>
@@ -24,7 +24,7 @@
24 <ValueIndexEntryBuilderIterator>24 <ValueIndexEntryBuilderIterator>
25 <ForVarIterator varname="$$opt_temp_1"/>25 <ForVarIterator varname="$$opt_temp_1"/>
26 <FnCountIterator>26 <FnCountIterator>
27 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">27 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
28 <ForVarIterator varname="$$opt_temp_1"/>28 <ForVarIterator varname="$$opt_temp_1"/>
29 </ChildAxisIterator>29 </ChildAxisIterator>
30 </FnCountIterator>30 </FnCountIterator>
3131
=== modified file 'test/iterplans/zorba/hashjoins/9212.iter'
--- test/iterplans/zorba/hashjoins/9212.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9212.iter 2014-02-25 00:37:05 +0000
@@ -5,7 +5,7 @@
5 <FLWORIterator>5 <FLWORIterator>
6 <LetVariable name="$$opt_temp_0" materialize="true">6 <LetVariable name="$$opt_temp_0" materialize="true">
7 <HoistIterator>7 <HoistIterator>
8 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">8 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
9 <FnDocIterator>9 <FnDocIterator>
10 <SingletonIterator value="xs:string(books.xml)"/>10 <SingletonIterator value="xs:string(books.xml)"/>
11 </FnDocIterator>11 </FnDocIterator>
@@ -24,7 +24,7 @@
24 <ValueIndexEntryBuilderIterator>24 <ValueIndexEntryBuilderIterator>
25 <ForVarIterator varname="$$opt_temp_1"/>25 <ForVarIterator varname="$$opt_temp_1"/>
26 <FnCountIterator>26 <FnCountIterator>
27 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">27 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
28 <ForVarIterator varname="$$opt_temp_1"/>28 <ForVarIterator varname="$$opt_temp_1"/>
29 </ChildAxisIterator>29 </ChildAxisIterator>
30 </FnCountIterator>30 </FnCountIterator>
@@ -34,7 +34,7 @@
34 </CreateInternalIndexIterator>34 </CreateInternalIndexIterator>
35 </LetVariable>35 </LetVariable>
36 <ForVariable name="book">36 <ForVariable name="book">
37 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">37 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
38 <FnDocIterator>38 <FnDocIterator>
39 <SingletonIterator value="xs:string(books.xml)"/>39 <SingletonIterator value="xs:string(books.xml)"/>
40 </FnDocIterator>40 </FnDocIterator>
@@ -42,7 +42,7 @@
42 </ForVariable>42 </ForVariable>
43 <ForVariable name="anzahl">43 <ForVariable name="anzahl">
44 <FnCountIterator>44 <FnCountIterator>
45 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">45 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
46 <ForVarIterator varname="book"/>46 <ForVarIterator varname="book"/>
47 </ChildAxisIterator>47 </ChildAxisIterator>
48 </FnCountIterator>48 </FnCountIterator>
4949
=== modified file 'test/iterplans/zorba/hashjoins/9389.iter'
--- test/iterplans/zorba/hashjoins/9389.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9389.iter 2014-02-25 00:37:05 +0000
@@ -5,7 +5,7 @@
5 <FLWORIterator>5 <FLWORIterator>
6 <LetVariable name="$$opt_temp_0" materialize="true">6 <LetVariable name="$$opt_temp_0" materialize="true">
7 <HoistIterator>7 <HoistIterator>
8 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">8 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
9 <FnDocIterator>9 <FnDocIterator>
10 <SingletonIterator value="xs:string(books.xml)"/>10 <SingletonIterator value="xs:string(books.xml)"/>
11 </FnDocIterator>11 </FnDocIterator>
@@ -24,7 +24,7 @@
24 <ValueIndexEntryBuilderIterator>24 <ValueIndexEntryBuilderIterator>
25 <ForVarIterator varname="$$opt_temp_1"/>25 <ForVarIterator varname="$$opt_temp_1"/>
26 <FnCountIterator>26 <FnCountIterator>
27 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">27 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
28 <ForVarIterator varname="$$opt_temp_1"/>28 <ForVarIterator varname="$$opt_temp_1"/>
29 </ChildAxisIterator>29 </ChildAxisIterator>
30 </FnCountIterator>30 </FnCountIterator>
3131
=== modified file 'test/iterplans/zorba/hashjoins/9390.iter'
--- test/iterplans/zorba/hashjoins/9390.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9390.iter 2014-02-25 00:37:05 +0000
@@ -2,7 +2,7 @@
2 <FLWORIterator>2 <FLWORIterator>
3 <LetVariable name="$$opt_temp_0" materialize="true">3 <LetVariable name="$$opt_temp_0" materialize="true">
4 <HoistIterator>4 <HoistIterator>
5 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">5 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
6 <FnDocIterator>6 <FnDocIterator>
7 <SingletonIterator value="xs:string(books.xml)"/>7 <SingletonIterator value="xs:string(books.xml)"/>
8 </FnDocIterator>8 </FnDocIterator>
@@ -21,7 +21,7 @@
21 <ValueIndexEntryBuilderIterator>21 <ValueIndexEntryBuilderIterator>
22 <ForVarIterator varname="$$opt_temp_1"/>22 <ForVarIterator varname="$$opt_temp_1"/>
23 <FnCountIterator>23 <FnCountIterator>
24 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">24 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
25 <ForVarIterator varname="$$opt_temp_1"/>25 <ForVarIterator varname="$$opt_temp_1"/>
26 </ChildAxisIterator>26 </ChildAxisIterator>
27 </FnCountIterator>27 </FnCountIterator>
2828
=== modified file 'test/iterplans/zorba/hashjoins/9391.iter'
--- test/iterplans/zorba/hashjoins/9391.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9391.iter 2014-02-25 00:37:05 +0000
@@ -5,7 +5,7 @@
5 <FLWORIterator>5 <FLWORIterator>
6 <LetVariable name="$$opt_temp_0" materialize="true">6 <LetVariable name="$$opt_temp_0" materialize="true">
7 <HoistIterator>7 <HoistIterator>
8 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">8 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
9 <FnDocIterator>9 <FnDocIterator>
10 <SingletonIterator value="xs:string(books.xml)"/>10 <SingletonIterator value="xs:string(books.xml)"/>
11 </FnDocIterator>11 </FnDocIterator>
@@ -24,7 +24,7 @@
24 <ValueIndexEntryBuilderIterator>24 <ValueIndexEntryBuilderIterator>
25 <ForVarIterator varname="$$opt_temp_1"/>25 <ForVarIterator varname="$$opt_temp_1"/>
26 <FnCountIterator>26 <FnCountIterator>
27 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">27 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
28 <ForVarIterator varname="$$opt_temp_1"/>28 <ForVarIterator varname="$$opt_temp_1"/>
29 </ChildAxisIterator>29 </ChildAxisIterator>
30 </FnCountIterator>30 </FnCountIterator>
3131
=== modified file 'test/iterplans/zorba/hashjoins/9392.iter'
--- test/iterplans/zorba/hashjoins/9392.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9392.iter 2014-02-25 00:37:05 +0000
@@ -12,7 +12,7 @@
12 <FLWORIterator>12 <FLWORIterator>
13 <LetVariable name="$$opt_temp_0" materialize="true">13 <LetVariable name="$$opt_temp_0" materialize="true">
14 <HoistIterator>14 <HoistIterator>
15 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">15 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
16 <FnDocIterator>16 <FnDocIterator>
17 <SingletonIterator value="xs:string(books.xml)"/>17 <SingletonIterator value="xs:string(books.xml)"/>
18 </FnDocIterator>18 </FnDocIterator>
@@ -31,7 +31,7 @@
31 <ValueIndexEntryBuilderIterator>31 <ValueIndexEntryBuilderIterator>
32 <ForVarIterator varname="$$opt_temp_1"/>32 <ForVarIterator varname="$$opt_temp_1"/>
33 <FnCountIterator>33 <FnCountIterator>
34 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">34 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
35 <ForVarIterator varname="$$opt_temp_1"/>35 <ForVarIterator varname="$$opt_temp_1"/>
36 </ChildAxisIterator>36 </ChildAxisIterator>
37 </FnCountIterator>37 </FnCountIterator>
3838
=== modified file 'test/iterplans/zorba/hashjoins/9399.iter'
--- test/iterplans/zorba/hashjoins/9399.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9399.iter 2014-02-25 00:37:05 +0000
@@ -5,7 +5,7 @@
5 <FLWORIterator>5 <FLWORIterator>
6 <LetVariable name="$$opt_temp_0" materialize="true">6 <LetVariable name="$$opt_temp_0" materialize="true">
7 <HoistIterator>7 <HoistIterator>
8 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">8 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
9 <FnDocIterator>9 <FnDocIterator>
10 <SingletonIterator value="xs:string(books.xml)"/>10 <SingletonIterator value="xs:string(books.xml)"/>
11 </FnDocIterator>11 </FnDocIterator>
@@ -24,7 +24,7 @@
24 <ValueIndexEntryBuilderIterator>24 <ValueIndexEntryBuilderIterator>
25 <ForVarIterator varname="$$opt_temp_1"/>25 <ForVarIterator varname="$$opt_temp_1"/>
26 <FnCountIterator>26 <FnCountIterator>
27 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">27 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
28 <ForVarIterator varname="$$opt_temp_1"/>28 <ForVarIterator varname="$$opt_temp_1"/>
29 </ChildAxisIterator>29 </ChildAxisIterator>
30 </FnCountIterator>30 </FnCountIterator>
3131
=== modified file 'test/iterplans/zorba/hashjoins/9400.iter'
--- test/iterplans/zorba/hashjoins/9400.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/9400.iter 2014-02-25 00:37:05 +0000
@@ -5,7 +5,7 @@
5 <FLWORIterator>5 <FLWORIterator>
6 <LetVariable name="$$opt_temp_0" materialize="true">6 <LetVariable name="$$opt_temp_0" materialize="true">
7 <HoistIterator>7 <HoistIterator>
8 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">8 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
9 <FnDocIterator>9 <FnDocIterator>
10 <SingletonIterator value="xs:string(books.xml)"/>10 <SingletonIterator value="xs:string(books.xml)"/>
11 </FnDocIterator>11 </FnDocIterator>
@@ -24,7 +24,7 @@
24 <ValueIndexEntryBuilderIterator>24 <ValueIndexEntryBuilderIterator>
25 <ForVarIterator varname="$$opt_temp_1"/>25 <ForVarIterator varname="$$opt_temp_1"/>
26 <FnCountIterator>26 <FnCountIterator>
27 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">27 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
28 <ForVarIterator varname="$$opt_temp_1"/>28 <ForVarIterator varname="$$opt_temp_1"/>
29 </ChildAxisIterator>29 </ChildAxisIterator>
30 </FnCountIterator>30 </FnCountIterator>
3131
=== modified file 'test/iterplans/zorba/hashjoins/gary1.iter'
--- test/iterplans/zorba/hashjoins/gary1.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/gary1.iter 2014-02-25 00:37:05 +0000
@@ -25,7 +25,7 @@
25 <EnclosedIterator attr_cont="false">25 <EnclosedIterator attr_cont="false">
26 <FLWORIterator>26 <FLWORIterator>
27 <LetVariable name="y" materialize="true">27 <LetVariable name="y" materialize="true">
28 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill allowed="0">28 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill-allowed="0">
29 <TupleStreamIterator>29 <TupleStreamIterator>
30 <WhereIterator>30 <WhereIterator>
31 <WhereIterator>31 <WhereIterator>
@@ -38,13 +38,13 @@
38 <SingletonIterator value="xs:string(min_ic1980.xml)"/>38 <SingletonIterator value="xs:string(min_ic1980.xml)"/>
39 </FnDocIterator>39 </FnDocIterator>
40 </ForIterator>40 </ForIterator>
41 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,ipeds)" typename="*" nill allowed="0">41 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,ipeds)" typename="*" nill-allowed="0">
42 <ForVarIterator varname="$$context-item"/>42 <ForVarIterator varname="$$context-item"/>
43 </ChildAxisIterator>43 </ChildAxisIterator>
44 </ForIterator>44 </ForIterator>
45 <CompareIterator>45 <CompareIterator>
46 <FnDataIterator>46 <FnDataIterator>
47 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill allowed="0">47 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill-allowed="0">
48 <ForVarIterator varname="$$context-item"/>48 <ForVarIterator varname="$$context-item"/>
49 </AttributeAxisIterator>49 </AttributeAxisIterator>
50 </FnDataIterator>50 </FnDataIterator>
@@ -53,7 +53,7 @@
53 </WhereIterator>53 </WhereIterator>
54 <CompareIterator>54 <CompareIterator>
55 <FnDataIterator>55 <FnDataIterator>
56 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill allowed="0">56 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill-allowed="0">
57 <ForVarIterator varname="$$context-item"/>57 <ForVarIterator varname="$$context-item"/>
58 </AttributeAxisIterator>58 </AttributeAxisIterator>
59 </FnDataIterator>59 </FnDataIterator>
@@ -74,7 +74,7 @@
74 <GeneralIndexEntryBuilderIterator>74 <GeneralIndexEntryBuilderIterator>
75 <ForVarIterator varname="$$opt_temp_2"/>75 <ForVarIterator varname="$$opt_temp_2"/>
76 <FnDataIterator>76 <FnDataIterator>
77 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,unitid)" typename="*" nill allowed="0">77 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,unitid)" typename="*" nill-allowed="0">
78 <ForVarIterator varname="$$opt_temp_2"/>78 <ForVarIterator varname="$$opt_temp_2"/>
79 </AttributeAxisIterator>79 </AttributeAxisIterator>
80 </FnDataIterator>80 </FnDataIterator>
@@ -84,8 +84,8 @@
84 </CreateInternalIndexIterator>84 </CreateInternalIndexIterator>
85 </LetVariable>85 </LetVariable>
86 <ForVariable name="i">86 <ForVariable name="i">
87 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inst)" typename="*" nill allowed="0">87 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,inst)" typename="*" nill-allowed="0">
88 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,institutions)" typename="*" nill allowed="0">88 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,institutions)" typename="*" nill-allowed="0">
89 <FnDocIterator>89 <FnDocIterator>
90 <SingletonIterator value="xs:string(base.xml)"/>90 <SingletonIterator value="xs:string(base.xml)"/>
91 </FnDocIterator>91 </FnDocIterator>
@@ -93,13 +93,13 @@
93 </ChildAxisIterator>93 </ChildAxisIterator>
94 </ForVariable>94 </ForVariable>
95 <LetVariable name="unitid" materialize="true">95 <LetVariable name="unitid" materialize="true">
96 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,unitid)" typename="*" nill allowed="0">96 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,unitid)" typename="*" nill-allowed="0">
97 <ForVarIterator varname="i"/>97 <ForVarIterator varname="i"/>
98 </AttributeAxisIterator>98 </AttributeAxisIterator>
99 </LetVariable>99 </LetVariable>
100 <LetVariable name="$$opt_temp_1" materialize="true">100 <LetVariable name="$$opt_temp_1" materialize="true">
101 <HoistIterator>101 <HoistIterator>
102 <AttributeAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">102 <AttributeAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
103 <FLWORIterator>103 <FLWORIterator>
104 <ForVariable name="$$context-item">104 <ForVariable name="$$context-item">
105 <NodeSortIterator distinct="true" ascending="true">105 <NodeSortIterator distinct="true" ascending="true">
@@ -131,12 +131,12 @@
131 <EnclosedIterator attr_cont="false">131 <EnclosedIterator attr_cont="false">
132 <FLWORIterator>132 <FLWORIterator>
133 <ForVariable name="j">133 <ForVariable name="j">
134 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill allowed="0">134 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill-allowed="0">
135 <ForVarIterator varname="i"/>135 <ForVarIterator varname="i"/>
136 </ChildAxisIterator>136 </ChildAxisIterator>
137 </ForVariable>137 </ForVariable>
138 <LetVariable name="year" materialize="true">138 <LetVariable name="year" materialize="true">
139 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">139 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
140 <ForVarIterator varname="j"/>140 <ForVarIterator varname="j"/>
141 </AttributeAxisIterator>141 </AttributeAxisIterator>
142 </LetVariable>142 </LetVariable>
@@ -163,12 +163,12 @@
163 <EnclosedIterator attr_cont="false">163 <EnclosedIterator attr_cont="false">
164 <FLWORIterator>164 <FLWORIterator>
165 <ForVariable name="k">165 <ForVariable name="k">
166 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill allowed="0">166 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill-allowed="0">
167 <ForVarIterator varname="j"/>167 <ForVarIterator varname="j"/>
168 </ChildAxisIterator>168 </ChildAxisIterator>
169 </ForVariable>169 </ForVariable>
170 <LetVariable name="file" materialize="true">170 <LetVariable name="file" materialize="true">
171 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">171 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
172 <ForVarIterator varname="k"/>172 <ForVarIterator varname="k"/>
173 </AttributeAxisIterator>173 </AttributeAxisIterator>
174 </LetVariable>174 </LetVariable>
175175
=== modified file 'test/iterplans/zorba/hashjoins/gflwor_02.iter'
--- test/iterplans/zorba/hashjoins/gflwor_02.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/gflwor_02.iter 2014-02-25 00:37:05 +0000
@@ -116,7 +116,7 @@
116 <LetVariable name="$$opt_temp_0" materialize="true"/>116 <LetVariable name="$$opt_temp_0" materialize="true"/>
117 <TupleSourceIterator/>117 <TupleSourceIterator/>
118 <HoistIterator>118 <HoistIterator>
119 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sale)" typename="*" nill allowed="0">119 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sale)" typename="*" nill-allowed="0">
120 <CtxVarIterator varid="5" varname="sales" varkind="global"/>120 <CtxVarIterator varid="5" varname="sales" varkind="global"/>
121 </ChildAxisIterator>121 </ChildAxisIterator>
122 </HoistIterator>122 </HoistIterator>
@@ -132,7 +132,7 @@
132 <ValueIndexEntryBuilderIterator>132 <ValueIndexEntryBuilderIterator>
133 <ForVarIterator varname="$$opt_temp_4"/>133 <ForVarIterator varname="$$opt_temp_4"/>
134 <FnStringIterator>134 <FnStringIterator>
135 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,pid)" typename="*" nill allowed="0">135 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,pid)" typename="*" nill-allowed="0">
136 <ForVarIterator varname="$$opt_temp_4"/>136 <ForVarIterator varname="$$opt_temp_4"/>
137 </AttributeAxisIterator>137 </AttributeAxisIterator>
138 </FnStringIterator>138 </FnStringIterator>
@@ -141,14 +141,14 @@
141 </FLWORIterator>141 </FLWORIterator>
142 </CreateInternalIndexIterator>142 </CreateInternalIndexIterator>
143 </LetIterator>143 </LetIterator>
144 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,prod)" typename="*" nill allowed="0">144 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,prod)" typename="*" nill-allowed="0">
145 <CtxVarIterator varid="4" varname="products" varkind="global"/>145 <CtxVarIterator varid="4" varname="products" varkind="global"/>
146 </ChildAxisIterator>146 </ChildAxisIterator>
147 </ForIterator>147 </ForIterator>
148 <HoistIterator>148 <HoistIterator>
149 <PromoteIterator type="xs:anyAtomicType">149 <PromoteIterator type="xs:anyAtomicType">
150 <FnDataIterator>150 <FnDataIterator>
151 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill allowed="0">151 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill-allowed="0">
152 <ForVarIterator varname="p"/>152 <ForVarIterator varname="p"/>
153 </AttributeAxisIterator>153 </AttributeAxisIterator>
154 </FnDataIterator>154 </FnDataIterator>
@@ -157,7 +157,7 @@
157 </LetIterator>157 </LetIterator>
158 <HoistIterator>158 <HoistIterator>
159 <FnDataIterator>159 <FnDataIterator>
160 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">160 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
161 <ForVarIterator varname="p"/>161 <ForVarIterator varname="p"/>
162 </AttributeAxisIterator>162 </AttributeAxisIterator>
163 </FnDataIterator>163 </FnDataIterator>
@@ -165,7 +165,7 @@
165 </LetIterator>165 </LetIterator>
166 <HoistIterator>166 <HoistIterator>
167 <FnStringIterator>167 <FnStringIterator>
168 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">168 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
169 <ForVarIterator varname="p"/>169 <ForVarIterator varname="p"/>
170 </AttributeAxisIterator>170 </AttributeAxisIterator>
171 </FnStringIterator>171 </FnStringIterator>
@@ -174,7 +174,7 @@
174 <CompareIterator>174 <CompareIterator>
175 <CastIterator type="xs:integer">175 <CastIterator type="xs:integer">
176 <FnDataIterator>176 <FnDataIterator>
177 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill allowed="0">177 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill-allowed="0">
178 <ForVarIterator varname="p"/>178 <ForVarIterator varname="p"/>
179 </AttributeAxisIterator>179 </AttributeAxisIterator>
180 </FnDataIterator>180 </FnDataIterator>
@@ -207,7 +207,7 @@
207 </UnhoistIterator>207 </UnhoistIterator>
208 <PromoteIterator type="xs:anyAtomicType">208 <PromoteIterator type="xs:anyAtomicType">
209 <FnDataIterator>209 <FnDataIterator>
210 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,qty)" typename="*" nill allowed="0">210 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,qty)" typename="*" nill-allowed="0">
211 <ForVarIterator varname="s"/>211 <ForVarIterator varname="s"/>
212 </AttributeAxisIterator>212 </AttributeAxisIterator>
213 </FnDataIterator>213 </FnDataIterator>
214214
=== modified file 'test/iterplans/zorba/hashjoins/gflwor_03.iter'
--- test/iterplans/zorba/hashjoins/gflwor_03.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/gflwor_03.iter 2014-02-25 00:37:05 +0000
@@ -106,7 +106,7 @@
106 <LetVariable name="$$opt_temp_0" materialize="true"/>106 <LetVariable name="$$opt_temp_0" materialize="true"/>
107 <TupleSourceIterator/>107 <TupleSourceIterator/>
108 <HoistIterator>108 <HoistIterator>
109 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,loc)" typename="*" nill allowed="0">109 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,loc)" typename="*" nill-allowed="0">
110 <CtxVarIterator varid="5" varname="locations" varkind="global"/>110 <CtxVarIterator varid="5" varname="locations" varkind="global"/>
111 </ChildAxisIterator>111 </ChildAxisIterator>
112 </HoistIterator>112 </HoistIterator>
@@ -122,7 +122,7 @@
122 <ValueIndexEntryBuilderIterator>122 <ValueIndexEntryBuilderIterator>
123 <ForVarIterator varname="$$opt_temp_2"/>123 <ForVarIterator varname="$$opt_temp_2"/>
124 <FnStringIterator>124 <FnStringIterator>
125 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">125 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
126 <ForVarIterator varname="$$opt_temp_2"/>126 <ForVarIterator varname="$$opt_temp_2"/>
127 </AttributeAxisIterator>127 </AttributeAxisIterator>
128 </FnStringIterator>128 </FnStringIterator>
@@ -131,14 +131,14 @@
131 </FLWORIterator>131 </FLWORIterator>
132 </CreateInternalIndexIterator>132 </CreateInternalIndexIterator>
133 </LetIterator>133 </LetIterator>
134 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sale)" typename="*" nill allowed="0">134 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sale)" typename="*" nill-allowed="0">
135 <CtxVarIterator varid="4" varname="sales" varkind="global"/>135 <CtxVarIterator varid="4" varname="sales" varkind="global"/>
136 </ChildAxisIterator>136 </ChildAxisIterator>
137 </ForIterator>137 </ForIterator>
138 <Spec>138 <Spec>
139 <TreatIterator quant="?">139 <TreatIterator quant="?">
140 <FnDataIterator>140 <FnDataIterator>
141 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,locid)" typename="*" nill allowed="0">141 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,locid)" typename="*" nill-allowed="0">
142 <ForVarIterator varname="s"/>142 <ForVarIterator varname="s"/>
143 </AttributeAxisIterator>143 </AttributeAxisIterator>
144 </FnDataIterator>144 </FnDataIterator>
@@ -162,7 +162,7 @@
162 <AttributeIterator qname="xs:QName(,,city)">162 <AttributeIterator qname="xs:QName(,,city)">
163 <EnclosedIterator attr_cont="true">163 <EnclosedIterator attr_cont="true">
164 <FnDataIterator>164 <FnDataIterator>
165 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,city)" typename="*" nill allowed="0">165 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,city)" typename="*" nill-allowed="0">
166 <FLWORIterator>166 <FLWORIterator>
167 <ForVariable name="$$context-item">167 <ForVariable name="$$context-item">
168 <ProbeIndexPointValueIterator>168 <ProbeIndexPointValueIterator>
@@ -185,7 +185,7 @@
185 <FnSumIterator>185 <FnSumIterator>
186 <FnDataIterator>186 <FnDataIterator>
187 <NodeDistinctIterator allow-atomics="false" check-only="false">187 <NodeDistinctIterator allow-atomics="false" check-only="false">
188 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,qty)" typename="*" nill allowed="0">188 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,qty)" typename="*" nill-allowed="0">
189 <LetVarIterator varname="s"/>189 <LetVarIterator varname="s"/>
190 </AttributeAxisIterator>190 </AttributeAxisIterator>
191 </NodeDistinctIterator>191 </NodeDistinctIterator>
192192
=== modified file 'test/iterplans/zorba/hashjoins/idx1.iter'
--- test/iterplans/zorba/hashjoins/idx1.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/idx1.iter 2014-02-25 00:37:05 +0000
@@ -7,9 +7,9 @@
7 </LetVariable>7 </LetVariable>
8 <LetVariable name="$$opt_temp_0" materialize="true">8 <LetVariable name="$$opt_temp_0" materialize="true">
9 <HoistIterator>9 <HoistIterator>
10 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">10 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
11 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">11 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
12 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">12 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
13 <LetVarIterator varname="auction"/>13 <LetVarIterator varname="auction"/>
14 </ChildAxisIterator>14 </ChildAxisIterator>
15 </ChildAxisIterator>15 </ChildAxisIterator>
@@ -29,8 +29,8 @@
29 <ForVarIterator varname="$$opt_temp_3"/>29 <ForVarIterator varname="$$opt_temp_3"/>
30 <PromoteIterator type="xs:anyAtomicType">30 <PromoteIterator type="xs:anyAtomicType">
31 <FnDataIterator>31 <FnDataIterator>
32 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">32 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
33 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">33 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
34 <ForVarIterator varname="$$opt_temp_3"/>34 <ForVarIterator varname="$$opt_temp_3"/>
35 </ChildAxisIterator>35 </ChildAxisIterator>
36 </AttributeAxisIterator>36 </AttributeAxisIterator>
@@ -42,9 +42,9 @@
42 </CreateInternalIndexIterator>42 </CreateInternalIndexIterator>
43 </LetVariable>43 </LetVariable>
44 <ForVariable name="p">44 <ForVariable name="p">
45 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">45 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
46 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">46 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
47 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">47 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
48 <LetVarIterator varname="auction"/>48 <LetVarIterator varname="auction"/>
49 </ChildAxisIterator>49 </ChildAxisIterator>
50 </ChildAxisIterator>50 </ChildAxisIterator>
@@ -53,8 +53,8 @@
53 <LetVariable name="$$opt_temp_2" materialize="true">53 <LetVariable name="$$opt_temp_2" materialize="true">
54 <HoistIterator>54 <HoistIterator>
55 <FnDataIterator>55 <FnDataIterator>
56 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">56 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
57 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">57 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
58 <ForVarIterator varname="p"/>58 <ForVarIterator varname="p"/>
59 </ChildAxisIterator>59 </ChildAxisIterator>
60 </ChildAxisIterator>60 </ChildAxisIterator>
@@ -64,7 +64,7 @@
64 <LetVariable name="$$opt_temp_1" materialize="true">64 <LetVariable name="$$opt_temp_1" materialize="true">
65 <HoistIterator>65 <HoistIterator>
66 <FnDataIterator>66 <FnDataIterator>
67 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">67 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
68 <ForVarIterator varname="p"/>68 <ForVarIterator varname="p"/>
69 </AttributeAxisIterator>69 </AttributeAxisIterator>
70 </FnDataIterator>70 </FnDataIterator>
7171
=== modified file 'test/iterplans/zorba/hashjoins/idx10.iter'
--- test/iterplans/zorba/hashjoins/idx10.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/idx10.iter 2014-02-25 00:37:05 +0000
@@ -21,7 +21,7 @@
21 <FLWORIterator>21 <FLWORIterator>
22 <ForVariable name="$$opt_temp_3">22 <ForVariable name="$$opt_temp_3">
23 <NodeSortIterator distinct="true" ascending="true">23 <NodeSortIterator distinct="true" ascending="true">
24 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">24 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
25 <FunctionTraceIterator>25 <FunctionTraceIterator>
26 <FLWORIterator>26 <FLWORIterator>
27 <ForVariable name="$$opt_temp_0">27 <ForVariable name="$$opt_temp_0">
@@ -78,7 +78,7 @@
78 </LetVariable>78 </LetVariable>
79 <ForVariable name="i">79 <ForVariable name="i">
80 <NodeSortIterator distinct="true" ascending="true">80 <NodeSortIterator distinct="true" ascending="true">
81 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">81 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
82 <FunctionTraceIterator>82 <FunctionTraceIterator>
83 <FLWORIterator>83 <FLWORIterator>
84 <ForVariable name="i">84 <ForVariable name="i">
8585
=== modified file 'test/iterplans/zorba/hashjoins/idx2.iter'
--- test/iterplans/zorba/hashjoins/idx2.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/idx2.iter 2014-02-25 00:37:05 +0000
@@ -7,17 +7,17 @@
7 </LetVariable>7 </LetVariable>
8 <LetVariable name="$$opt_temp_0" materialize="true">8 <LetVariable name="$$opt_temp_0" materialize="true">
9 <HoistIterator>9 <HoistIterator>
10 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">10 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
11 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">11 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
12 <LetVarIterator varname="auction"/>12 <LetVarIterator varname="auction"/>
13 </ChildAxisIterator>13 </ChildAxisIterator>
14 </ChildAxisIterator>14 </ChildAxisIterator>
15 </HoistIterator>15 </HoistIterator>
16 </LetVariable>16 </LetVariable>
17 <ForVariable name="p">17 <ForVariable name="p">
18 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">18 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
19 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">19 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
20 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">20 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
21 <LetVarIterator varname="auction"/>21 <LetVarIterator varname="auction"/>
22 </ChildAxisIterator>22 </ChildAxisIterator>
23 </ChildAxisIterator>23 </ChildAxisIterator>
@@ -26,8 +26,8 @@
26 <LetVariable name="$$opt_temp_2" materialize="true">26 <LetVariable name="$$opt_temp_2" materialize="true">
27 <HoistIterator>27 <HoistIterator>
28 <FnDataIterator>28 <FnDataIterator>
29 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">29 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
30 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">30 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
31 <ForVarIterator varname="p"/>31 <ForVarIterator varname="p"/>
32 </ChildAxisIterator>32 </ChildAxisIterator>
33 </ChildAxisIterator>33 </ChildAxisIterator>
@@ -37,7 +37,7 @@
37 <LetVariable name="$$opt_temp_1" materialize="true">37 <LetVariable name="$$opt_temp_1" materialize="true">
38 <HoistIterator>38 <HoistIterator>
39 <FnDataIterator>39 <FnDataIterator>
40 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">40 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
41 <ForVarIterator varname="p"/>41 <ForVarIterator varname="p"/>
42 </AttributeAxisIterator>42 </AttributeAxisIterator>
43 </FnDataIterator>43 </FnDataIterator>
@@ -49,7 +49,7 @@
49 </UnhoistIterator>49 </UnhoistIterator>
50 </ForVariable>50 </ForVariable>
51 <ForVariable name="t">51 <ForVariable name="t">
52 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">52 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
53 <ForVarIterator varname="a"/>53 <ForVarIterator varname="a"/>
54 </ChildAxisIterator>54 </ChildAxisIterator>
55 </ForVariable>55 </ForVariable>
@@ -58,8 +58,8 @@
58 <TypedValueCompareIterator_STRING>58 <TypedValueCompareIterator_STRING>
59 <PromoteIterator type="xs:anyAtomicType">59 <PromoteIterator type="xs:anyAtomicType">
60 <FnDataIterator>60 <FnDataIterator>
61 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">61 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
62 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">62 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
63 <ForVarIterator varname="t"/>63 <ForVarIterator varname="t"/>
64 </ChildAxisIterator>64 </ChildAxisIterator>
65 </AttributeAxisIterator>65 </AttributeAxisIterator>
6666
=== modified file 'test/iterplans/zorba/hashjoins/idx3.iter'
--- test/iterplans/zorba/hashjoins/idx3.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/idx3.iter 2014-02-25 00:37:05 +0000
@@ -31,7 +31,7 @@
31 </LetVariable>31 </LetVariable>
32 <ForVariable name="rec">32 <ForVariable name="rec">
33 <NodeSortIterator distinct="true" ascending="true">33 <NodeSortIterator distinct="true" ascending="true">
34 <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">34 <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
35 <FnConcatIterator>35 <FnConcatIterator>
36 <ElementIterator>36 <ElementIterator>
37 <SingletonIterator value="xs:QName(,,a)"/>37 <SingletonIterator value="xs:QName(,,a)"/>
3838
=== modified file 'test/iterplans/zorba/hashjoins/idx4.iter'
--- test/iterplans/zorba/hashjoins/idx4.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/idx4.iter 2014-02-25 00:37:05 +0000
@@ -2,7 +2,7 @@
2 <FunctionTraceIterator>2 <FunctionTraceIterator>
3 <FLWORIterator>3 <FLWORIterator>
4 <LetVariable name="e" materialize="true">4 <LetVariable name="e" materialize="true">
5 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,r2)" typename="*" nill allowed="0" target_position="0">5 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,r2)" typename="*" nill-allowed="0" target_position="0">
6 <ElementIterator>6 <ElementIterator>
7 <SingletonIterator value="xs:QName(,,r1)"/>7 <SingletonIterator value="xs:QName(,,r1)"/>
8 <FnConcatIterator/>8 <FnConcatIterator/>
@@ -34,7 +34,7 @@
34 </HoistIterator>34 </HoistIterator>
35 </ForVariable>35 </ForVariable>
36 <LetVariable name="parent" materialize="true">36 <LetVariable name="parent" materialize="true">
37 <ParentAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">37 <ParentAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
38 <LetVarIterator varname="e"/>38 <LetVarIterator varname="e"/>
39 </ParentAxisIterator>39 </ParentAxisIterator>
40 </LetVariable>40 </LetVariable>
4141
=== modified file 'test/iterplans/zorba/hashjoins/idx8.iter'
--- test/iterplans/zorba/hashjoins/idx8.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/idx8.iter 2014-02-25 00:37:05 +0000
@@ -16,9 +16,9 @@
16 </HoistIterator>16 </HoistIterator>
17 </LetVariable>17 </LetVariable>
18 <LetVariable name="fs" materialize="true">18 <LetVariable name="fs" materialize="true">
19 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,function)" typename="*" nill allowed="0">19 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,function)" typename="*" nill-allowed="0">
20 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,functions)" typename="*" nill allowed="0">20 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,functions)" typename="*" nill-allowed="0">
21 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,xqdoc)" typename="*" nill allowed="0">21 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,xqdoc)" typename="*" nill-allowed="0">
22 <FnDocIterator>22 <FnDocIterator>
23 <SingletonIterator value="xs:string(xqdoc.xml)"/>23 <SingletonIterator value="xs:string(xqdoc.xml)"/>
24 </FnDocIterator>24 </FnDocIterator>
@@ -34,7 +34,7 @@
34 </ForVariable>34 </ForVariable>
35 <LetVariable name="$$opt_temp_2" materialize="true">35 <LetVariable name="$$opt_temp_2" materialize="true">
36 <HoistIterator>36 <HoistIterator>
37 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,invoked)" typename="*" nill allowed="0">37 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,invoked)" typename="*" nill-allowed="0">
38 <ForVarIterator varname="function"/>38 <ForVarIterator varname="function"/>
39 </ChildAxisIterator>39 </ChildAxisIterator>
40 </HoistIterator>40 </HoistIterator>
@@ -52,7 +52,7 @@
52 <ForVarIterator varname="$$opt_temp_3"/>52 <ForVarIterator varname="$$opt_temp_3"/>
53 <FnStringIterator>53 <FnStringIterator>
54 <TreatIterator quant="?">54 <TreatIterator quant="?">
55 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,uri)" typename="*" nill allowed="0">55 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,uri)" typename="*" nill-allowed="0">
56 <ForVarIterator varname="$$opt_temp_3"/>56 <ForVarIterator varname="$$opt_temp_3"/>
57 </ChildAxisIterator>57 </ChildAxisIterator>
58 </TreatIterator>58 </TreatIterator>
@@ -64,8 +64,8 @@
64 </LetVariable>64 </LetVariable>
65 <LetVariable name="$$opt_temp_1" materialize="true">65 <LetVariable name="$$opt_temp_1" materialize="true">
66 <HoistIterator>66 <HoistIterator>
67 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">67 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
68 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,name)" typename="*" nill allowed="0">68 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,name)" typename="*" nill-allowed="0">
69 <ForVarIterator varname="function"/>69 <ForVarIterator varname="function"/>
70 </ChildAxisIterator>70 </ChildAxisIterator>
71 </ChildAxisIterator>71 </ChildAxisIterator>
7272
=== modified file 'test/iterplans/zorba/hashjoins/idx9.iter'
--- test/iterplans/zorba/hashjoins/idx9.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/idx9.iter 2014-02-25 00:37:05 +0000
@@ -44,7 +44,7 @@
44 <GeneralIndexEntryBuilderIterator>44 <GeneralIndexEntryBuilderIterator>
45 <ForVarIterator varname="$$opt_temp_1"/>45 <ForVarIterator varname="$$opt_temp_1"/>
46 <FnDataIterator>46 <FnDataIterator>
47 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,gid)" typename="*" nill allowed="0">47 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,gid)" typename="*" nill-allowed="0">
48 <ForVarIterator varname="$$opt_temp_1"/>48 <ForVarIterator varname="$$opt_temp_1"/>
49 </AttributeAxisIterator>49 </AttributeAxisIterator>
50 </FnDataIterator>50 </FnDataIterator>
@@ -59,7 +59,7 @@
59 </ForIterator>59 </ForIterator>
60 <CompareIterator>60 <CompareIterator>
61 <FnDataIterator>61 <FnDataIterator>
62 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,uid)" typename="*" nill allowed="0">62 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,uid)" typename="*" nill-allowed="0">
63 <ForVarIterator varname="$$context-item"/>63 <ForVarIterator varname="$$context-item"/>
64 </AttributeAxisIterator>64 </AttributeAxisIterator>
65 </FnDataIterator>65 </FnDataIterator>
@@ -67,13 +67,13 @@
67 </CompareIterator>67 </CompareIterator>
68 </WhereIterator>68 </WhereIterator>
69 <FnBooleanIterator>69 <FnBooleanIterator>
70 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,result)" typename="*" nill allowed="0">70 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,result)" typename="*" nill-allowed="0">
71 <ProbeIndexPointGeneralIterator>71 <ProbeIndexPointGeneralIterator>
72 <SingletonIterator value="xs:QName(,,tempIndex0)"/>72 <SingletonIterator value="xs:QName(,,tempIndex0)"/>
73 <UnhoistIterator>73 <UnhoistIterator>
74 <HoistIterator>74 <HoistIterator>
75 <FnDataIterator>75 <FnDataIterator>
76 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,gid)" typename="*" nill allowed="0">76 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,gid)" typename="*" nill-allowed="0">
77 <ForVarIterator varname="$$context-item"/>77 <ForVarIterator varname="$$context-item"/>
78 </AttributeAxisIterator>78 </AttributeAxisIterator>
79 </FnDataIterator>79 </FnDataIterator>
8080
=== modified file 'test/iterplans/zorba/hashjoins/no_idx1.iter'
--- test/iterplans/zorba/hashjoins/no_idx1.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/no_idx1.iter 2014-02-25 00:37:05 +0000
@@ -9,7 +9,7 @@
9 <FunctionTraceIterator>9 <FunctionTraceIterator>
10 <FLWORIterator>10 <FLWORIterator>
11 <ForVariable name="ancestor">11 <ForVariable name="ancestor">
12 <AncestorSelfAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">12 <AncestorSelfAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
13 <ElementIterator>13 <ElementIterator>
14 <SingletonIterator value="xs:QName(,,a)"/>14 <SingletonIterator value="xs:QName(,,a)"/>
15 </ElementIterator>15 </ElementIterator>
@@ -33,12 +33,12 @@
33 </FnStringIterator>33 </FnStringIterator>
34 <FLWORIterator>34 <FLWORIterator>
35 <ForVariable name="$$context-item">35 <ForVariable name="$$context-item">
36 <ParentAxisIterator test kind="match_anykind_test" qname="*" typename="*" nill allowed="0">36 <ParentAxisIterator test-kind="match_anykind_test" qname="*" typename="*" nill-allowed="0">
37 <ForVarIterator varname="ancestor"/>37 <ForVarIterator varname="ancestor"/>
38 </ParentAxisIterator>38 </ParentAxisIterator>
39 </ForVariable>39 </ForVariable>
40 <ForVariable name="$$context-item">40 <ForVariable name="$$context-item">
41 <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">41 <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
42 <ForVarIterator varname="$$context-item"/>42 <ForVarIterator varname="$$context-item"/>
43 </ChildAxisIterator>43 </ChildAxisIterator>
44 </ForVariable>44 </ForVariable>
4545
=== modified file 'test/iterplans/zorba/hashjoins/q8.iter'
--- test/iterplans/zorba/hashjoins/q8.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/hashjoins/q8.iter 2014-02-25 00:37:05 +0000
@@ -7,9 +7,9 @@
7 </LetVariable>7 </LetVariable>
8 <LetVariable name="$$opt_temp_0" materialize="true">8 <LetVariable name="$$opt_temp_0" materialize="true">
9 <HoistIterator>9 <HoistIterator>
10 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">10 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
11 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">11 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
12 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">12 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
13 <LetVarIterator varname="auction"/>13 <LetVarIterator varname="auction"/>
14 </ChildAxisIterator>14 </ChildAxisIterator>
15 </ChildAxisIterator>15 </ChildAxisIterator>
@@ -29,8 +29,8 @@
29 <ForVarIterator varname="$$opt_temp_2"/>29 <ForVarIterator varname="$$opt_temp_2"/>
30 <CastIterator type="xs:string">30 <CastIterator type="xs:string">
31 <FnDataIterator>31 <FnDataIterator>
32 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">32 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
33 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">33 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
34 <ForVarIterator varname="$$opt_temp_2"/>34 <ForVarIterator varname="$$opt_temp_2"/>
35 </ChildAxisIterator>35 </ChildAxisIterator>
36 </AttributeAxisIterator>36 </AttributeAxisIterator>
@@ -42,9 +42,9 @@
42 </CreateInternalIndexIterator>42 </CreateInternalIndexIterator>
43 </LetVariable>43 </LetVariable>
44 <ForVariable name="p">44 <ForVariable name="p">
45 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">45 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
46 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">46 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
47 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">47 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
48 <LetVarIterator varname="auction"/>48 <LetVarIterator varname="auction"/>
49 </ChildAxisIterator>49 </ChildAxisIterator>
50 </ChildAxisIterator>50 </ChildAxisIterator>
@@ -54,7 +54,7 @@
54 <HoistIterator>54 <HoistIterator>
55 <CastIterator type="xs:string">55 <CastIterator type="xs:string">
56 <FnDataIterator>56 <FnDataIterator>
57 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">57 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
58 <ForVarIterator varname="p"/>58 <ForVarIterator varname="p"/>
59 </AttributeAxisIterator>59 </AttributeAxisIterator>
60 </FnDataIterator>60 </FnDataIterator>
@@ -67,8 +67,8 @@
67 <AttributeIterator qname="xs:QName(,,person)">67 <AttributeIterator qname="xs:QName(,,person)">
68 <EnclosedIterator attr_cont="true">68 <EnclosedIterator attr_cont="true">
69 <FnDataIterator>69 <FnDataIterator>
70 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">70 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
71 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">71 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
72 <ForVarIterator varname="p"/>72 <ForVarIterator varname="p"/>
73 </ChildAxisIterator>73 </ChildAxisIterator>
74 </ChildAxisIterator>74 </ChildAxisIterator>
7575
=== modified file 'test/iterplans/zorba/index/match_veq_01.iter'
--- test/iterplans/zorba/index/match_veq_01.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/index/match_veq_01.iter 2014-02-25 00:37:05 +0000
@@ -8,7 +8,7 @@
8 <ForVarIterator varname="$$context-item"/>8 <ForVarIterator varname="$$context-item"/>
9 <CastIterator type="xs:string">9 <CastIterator type="xs:string">
10 <FnDataIterator>10 <FnDataIterator>
11 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,email)" typename="*" nill allowed="0">11 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,email)" typename="*" nill-allowed="0">
12 <ForVarIterator varname="$$context-item"/>12 <ForVarIterator varname="$$context-item"/>
13 </AttributeAxisIterator>13 </AttributeAxisIterator>
14 </FnDataIterator>14 </FnDataIterator>
@@ -29,7 +29,7 @@
29 <ForVarIterator varname="$$context-item"/>29 <ForVarIterator varname="$$context-item"/>
30 <CastIterator type="xs:string">30 <CastIterator type="xs:string">
31 <FnDataIterator>31 <FnDataIterator>
32 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,email)" typename="*" nill allowed="0">32 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,email)" typename="*" nill-allowed="0">
33 <ForVarIterator varname="$$context-item"/>33 <ForVarIterator varname="$$context-item"/>
34 </AttributeAxisIterator>34 </AttributeAxisIterator>
35 </FnDataIterator>35 </FnDataIterator>
@@ -94,7 +94,7 @@
94 </ApplyIterator>94 </ApplyIterator>
95 <FLWORIterator>95 <FLWORIterator>
96 <ForVariable name="acc">96 <ForVariable name="acc">
97 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,account)" typename="*" nill allowed="0">97 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,account)" typename="*" nill-allowed="0">
98 <CtxVarIterator varid="4" varname="doc" varkind="global"/>98 <CtxVarIterator varid="4" varname="doc" varkind="global"/>
99 </ChildAxisIterator>99 </ChildAxisIterator>
100 </ForVariable>100 </ForVariable>
101101
=== modified file 'test/iterplans/zorba/index/match_veq_02.iter'
--- test/iterplans/zorba/index/match_veq_02.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/index/match_veq_02.iter 2014-02-25 00:37:05 +0000
@@ -8,7 +8,7 @@
8 <ForVarIterator varname="$$context-item"/>8 <ForVarIterator varname="$$context-item"/>
9 <CastIterator type="xs:string">9 <CastIterator type="xs:string">
10 <FnDataIterator>10 <FnDataIterator>
11 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">11 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
12 <ForVarIterator varname="$$context-item"/>12 <ForVarIterator varname="$$context-item"/>
13 </AttributeAxisIterator>13 </AttributeAxisIterator>
14 </FnDataIterator>14 </FnDataIterator>
@@ -29,7 +29,7 @@
29 <ForVarIterator varname="$$context-item"/>29 <ForVarIterator varname="$$context-item"/>
30 <CastIterator type="xs:string">30 <CastIterator type="xs:string">
31 <FnDataIterator>31 <FnDataIterator>
32 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">32 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
33 <ForVarIterator varname="$$context-item"/>33 <ForVarIterator varname="$$context-item"/>
34 </AttributeAxisIterator>34 </AttributeAxisIterator>
35 </FnDataIterator>35 </FnDataIterator>
@@ -102,7 +102,7 @@
102 </ApplyIterator>102 </ApplyIterator>
103 <FLWORIterator>103 <FLWORIterator>
104 <ForVariable name="s">104 <ForVariable name="s">
105 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill allowed="0">105 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill-allowed="0">
106 <CtxVarIterator varid="6" varname="doc" varkind="global"/>106 <CtxVarIterator varid="6" varname="doc" varkind="global"/>
107 </ChildAxisIterator>107 </ChildAxisIterator>
108 </ForVariable>108 </ForVariable>
@@ -158,7 +158,7 @@
158 <LetVarIterator varname="id"/>158 <LetVarIterator varname="id"/>
159 <SingletonIterator value="xs:string(no session with the given uuid)"/>159 <SingletonIterator value="xs:string(no session with the given uuid)"/>
160 </TraceIterator>160 </TraceIterator>
161 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill allowed="0">161 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill-allowed="0">
162 <LetVarIterator varname="session"/>162 <LetVarIterator varname="session"/>
163 </ChildAxisIterator>163 </ChildAxisIterator>
164 </IfThenElseIterator>164 </IfThenElseIterator>
165165
=== modified file 'test/iterplans/zorba/index/match_veq_03.iter'
--- test/iterplans/zorba/index/match_veq_03.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/index/match_veq_03.iter 2014-02-25 00:37:05 +0000
@@ -8,7 +8,7 @@
8 <ForVarIterator varname="$$context-item"/>8 <ForVarIterator varname="$$context-item"/>
9 <CastIterator type="xs:string">9 <CastIterator type="xs:string">
10 <FnDataIterator>10 <FnDataIterator>
11 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">11 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
12 <ForVarIterator varname="$$context-item"/>12 <ForVarIterator varname="$$context-item"/>
13 </AttributeAxisIterator>13 </AttributeAxisIterator>
14 </FnDataIterator>14 </FnDataIterator>
@@ -29,7 +29,7 @@
29 <ForVarIterator varname="$$context-item"/>29 <ForVarIterator varname="$$context-item"/>
30 <CastIterator type="xs:string">30 <CastIterator type="xs:string">
31 <FnDataIterator>31 <FnDataIterator>
32 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">32 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
33 <ForVarIterator varname="$$context-item"/>33 <ForVarIterator varname="$$context-item"/>
34 </AttributeAxisIterator>34 </AttributeAxisIterator>
35 </FnDataIterator>35 </FnDataIterator>
@@ -102,7 +102,7 @@
102 </ApplyIterator>102 </ApplyIterator>
103 <FLWORIterator>103 <FLWORIterator>
104 <ForVariable name="s">104 <ForVariable name="s">
105 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill allowed="0">105 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill-allowed="0">
106 <CtxVarIterator varid="6" varname="doc" varkind="global"/>106 <CtxVarIterator varid="6" varname="doc" varkind="global"/>
107 </ChildAxisIterator>107 </ChildAxisIterator>
108 </ForVariable>108 </ForVariable>
@@ -158,7 +158,7 @@
158 <LetVarIterator varname="id"/>158 <LetVarIterator varname="id"/>
159 <SingletonIterator value="xs:string(no session with the given uuid)"/>159 <SingletonIterator value="xs:string(no session with the given uuid)"/>
160 </TraceIterator>160 </TraceIterator>
161 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill allowed="0">161 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill-allowed="0">
162 <LetVarIterator varname="session"/>162 <LetVarIterator varname="session"/>
163 </ChildAxisIterator>163 </ChildAxisIterator>
164 </IfThenElseIterator>164 </IfThenElseIterator>
165165
=== modified file 'test/iterplans/zorba/index/match_veq_04.iter'
--- test/iterplans/zorba/index/match_veq_04.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/index/match_veq_04.iter 2014-02-25 00:37:05 +0000
@@ -15,7 +15,7 @@
15 <WhereClause>15 <WhereClause>
16 <CompareIterator>16 <CompareIterator>
17 <FnDataIterator>17 <FnDataIterator>
18 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill allowed="0">18 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill-allowed="0">
19 <ForVarIterator varname="$$context-item"/>19 <ForVarIterator varname="$$context-item"/>
20 </AttributeAxisIterator>20 </AttributeAxisIterator>
21 </FnDataIterator>21 </FnDataIterator>
@@ -32,7 +32,7 @@
32 <ForVarIterator varname="$$context-item"/>32 <ForVarIterator varname="$$context-item"/>
33 <CastIterator type="xs:string">33 <CastIterator type="xs:string">
34 <FnDataIterator>34 <FnDataIterator>
35 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">35 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
36 <ForVarIterator varname="$$context-item"/>36 <ForVarIterator varname="$$context-item"/>
37 </AttributeAxisIterator>37 </AttributeAxisIterator>
38 </FnDataIterator>38 </FnDataIterator>
@@ -53,7 +53,7 @@
53 <WhereClause>53 <WhereClause>
54 <CompareIterator>54 <CompareIterator>
55 <FnDataIterator>55 <FnDataIterator>
56 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill allowed="0">56 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill-allowed="0">
57 <ForVarIterator varname="$$context-item"/>57 <ForVarIterator varname="$$context-item"/>
58 </AttributeAxisIterator>58 </AttributeAxisIterator>
59 </FnDataIterator>59 </FnDataIterator>
@@ -70,7 +70,7 @@
70 <ForVarIterator varname="$$context-item"/>70 <ForVarIterator varname="$$context-item"/>
71 <CastIterator type="xs:string">71 <CastIterator type="xs:string">
72 <FnDataIterator>72 <FnDataIterator>
73 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">73 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
74 <ForVarIterator varname="$$context-item"/>74 <ForVarIterator varname="$$context-item"/>
75 </AttributeAxisIterator>75 </AttributeAxisIterator>
76 </FnDataIterator>76 </FnDataIterator>
@@ -165,7 +165,7 @@
165 </ApplyIterator>165 </ApplyIterator>
166 <FLWORIterator>166 <FLWORIterator>
167 <ForVariable name="s">167 <ForVariable name="s">
168 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill allowed="0">168 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill-allowed="0">
169 <CtxVarIterator varid="6" varname="doc" varkind="global"/>169 <CtxVarIterator varid="6" varname="doc" varkind="global"/>
170 </ChildAxisIterator>170 </ChildAxisIterator>
171 </ForVariable>171 </ForVariable>
@@ -219,7 +219,7 @@
219 <LetVarIterator varname="id"/>219 <LetVarIterator varname="id"/>
220 <SingletonIterator value="xs:string(no session with the given uuid)"/>220 <SingletonIterator value="xs:string(no session with the given uuid)"/>
221 </TraceIterator>221 </TraceIterator>
222 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill allowed="0">222 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill-allowed="0">
223 <LetVarIterator varname="session"/>223 <LetVarIterator varname="session"/>
224 </ChildAxisIterator>224 </ChildAxisIterator>
225 </IfThenElseIterator>225 </IfThenElseIterator>
226226
=== modified file 'test/iterplans/zorba/index/match_veq_05.iter'
--- test/iterplans/zorba/index/match_veq_05.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/index/match_veq_05.iter 2014-02-25 00:37:05 +0000
@@ -15,7 +15,7 @@
15 <WhereClause>15 <WhereClause>
16 <CompareIterator>16 <CompareIterator>
17 <FnDataIterator>17 <FnDataIterator>
18 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill allowed="0">18 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill-allowed="0">
19 <ForVarIterator varname="$$context-item"/>19 <ForVarIterator varname="$$context-item"/>
20 </AttributeAxisIterator>20 </AttributeAxisIterator>
21 </FnDataIterator>21 </FnDataIterator>
@@ -32,7 +32,7 @@
32 <ForVarIterator varname="$$context-item"/>32 <ForVarIterator varname="$$context-item"/>
33 <PromoteIterator type="xs:string">33 <PromoteIterator type="xs:string">
34 <FnDataIterator>34 <FnDataIterator>
35 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">35 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
36 <ForVarIterator varname="$$context-item"/>36 <ForVarIterator varname="$$context-item"/>
37 </AttributeAxisIterator>37 </AttributeAxisIterator>
38 </FnDataIterator>38 </FnDataIterator>
@@ -53,7 +53,7 @@
53 <WhereClause>53 <WhereClause>
54 <CompareIterator>54 <CompareIterator>
55 <FnDataIterator>55 <FnDataIterator>
56 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill allowed="0">56 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill-allowed="0">
57 <ForVarIterator varname="$$context-item"/>57 <ForVarIterator varname="$$context-item"/>
58 </AttributeAxisIterator>58 </AttributeAxisIterator>
59 </FnDataIterator>59 </FnDataIterator>
@@ -70,7 +70,7 @@
70 <ForVarIterator varname="$$context-item"/>70 <ForVarIterator varname="$$context-item"/>
71 <PromoteIterator type="xs:string">71 <PromoteIterator type="xs:string">
72 <FnDataIterator>72 <FnDataIterator>
73 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">73 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
74 <ForVarIterator varname="$$context-item"/>74 <ForVarIterator varname="$$context-item"/>
75 </AttributeAxisIterator>75 </AttributeAxisIterator>
76 </FnDataIterator>76 </FnDataIterator>
@@ -206,7 +206,7 @@
206 </ApplyIterator>206 </ApplyIterator>
207 <FLWORIterator>207 <FLWORIterator>
208 <ForVariable name="s">208 <ForVariable name="s">
209 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill allowed="0">209 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill-allowed="0">
210 <CtxVarIterator varid="6" varname="doc" varkind="global"/>210 <CtxVarIterator varid="6" varname="doc" varkind="global"/>
211 </ChildAxisIterator>211 </ChildAxisIterator>
212 </ForVariable>212 </ForVariable>
@@ -224,7 +224,7 @@
224 </FLWORIterator>224 </FLWORIterator>
225 <FLWORIterator>225 <FLWORIterator>
226 <ForVariable name="s">226 <ForVariable name="s">
227 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill allowed="0">227 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill-allowed="0">
228 <CtxVarIterator varid="7" varname="doc2" varkind="global"/>228 <CtxVarIterator varid="7" varname="doc2" varkind="global"/>
229 </ChildAxisIterator>229 </ChildAxisIterator>
230 </ForVariable>230 </ForVariable>
@@ -242,7 +242,7 @@
242 </FLWORIterator>242 </FLWORIterator>
243 <FLWORIterator>243 <FLWORIterator>
244 <ForVariable name="s">244 <ForVariable name="s">
245 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill allowed="0">245 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill-allowed="0">
246 <CtxVarIterator varid="7" varname="doc2" varkind="global"/>246 <CtxVarIterator varid="7" varname="doc2" varkind="global"/>
247 </ChildAxisIterator>247 </ChildAxisIterator>
248 </ForVariable>248 </ForVariable>
@@ -287,7 +287,7 @@
287 <WhereClause>287 <WhereClause>
288 <CompareIterator>288 <CompareIterator>
289 <FnDataIterator>289 <FnDataIterator>
290 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill allowed="0">290 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill-allowed="0">
291 <ForVarIterator varname="$$context-item"/>291 <ForVarIterator varname="$$context-item"/>
292 </AttributeAxisIterator>292 </AttributeAxisIterator>
293 </FnDataIterator>293 </FnDataIterator>
@@ -308,7 +308,7 @@
308 <LetVarIterator varname="id"/>308 <LetVarIterator varname="id"/>
309 <SingletonIterator value="xs:string(no session with the given uuid)"/>309 <SingletonIterator value="xs:string(no session with the given uuid)"/>
310 </TraceIterator>310 </TraceIterator>
311 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill allowed="0">311 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill-allowed="0">
312 <LetVarIterator varname="session"/>312 <LetVarIterator varname="session"/>
313 </ChildAxisIterator>313 </ChildAxisIterator>
314 </IfThenElseIterator>314 </IfThenElseIterator>
315315
=== modified file 'test/iterplans/zorba/index/match_veq_06.iter'
--- test/iterplans/zorba/index/match_veq_06.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/index/match_veq_06.iter 2014-02-25 00:37:05 +0000
@@ -8,14 +8,14 @@
8 <ForVarIterator varname="$$context-item"/>8 <ForVarIterator varname="$$context-item"/>
9 <PromoteIterator type="xs:string">9 <PromoteIterator type="xs:string">
10 <FnDataIterator>10 <FnDataIterator>
11 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,uri)" typename="*" nill allowed="0">11 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,uri)" typename="*" nill-allowed="0">
12 <ForVarIterator varname="$$context-item"/>12 <ForVarIterator varname="$$context-item"/>
13 </AttributeAxisIterator>13 </AttributeAxisIterator>
14 </FnDataIterator>14 </FnDataIterator>
15 </PromoteIterator>15 </PromoteIterator>
16 <PromoteIterator type="xs:string">16 <PromoteIterator type="xs:string">
17 <FnDataIterator>17 <FnDataIterator>
18 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,child)" typename="*" nill allowed="0">18 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,child)" typename="*" nill-allowed="0">
19 <ForVarIterator varname="$$context-item"/>19 <ForVarIterator varname="$$context-item"/>
20 </AttributeAxisIterator>20 </AttributeAxisIterator>
21 </FnDataIterator>21 </FnDataIterator>
@@ -36,14 +36,14 @@
36 <ForVarIterator varname="$$context-item"/>36 <ForVarIterator varname="$$context-item"/>
37 <PromoteIterator type="xs:string">37 <PromoteIterator type="xs:string">
38 <FnDataIterator>38 <FnDataIterator>
39 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,uri)" typename="*" nill allowed="0">39 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,uri)" typename="*" nill-allowed="0">
40 <ForVarIterator varname="$$context-item"/>40 <ForVarIterator varname="$$context-item"/>
41 </AttributeAxisIterator>41 </AttributeAxisIterator>
42 </FnDataIterator>42 </FnDataIterator>
43 </PromoteIterator>43 </PromoteIterator>
44 <PromoteIterator type="xs:string">44 <PromoteIterator type="xs:string">
45 <FnDataIterator>45 <FnDataIterator>
46 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,child)" typename="*" nill allowed="0">46 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,child)" typename="*" nill-allowed="0">
47 <ForVarIterator varname="$$context-item"/>47 <ForVarIterator varname="$$context-item"/>
48 </AttributeAxisIterator>48 </AttributeAxisIterator>
49 </FnDataIterator>49 </FnDataIterator>
5050
=== modified file 'test/iterplans/zorba/index/match_veq_07.iter'
--- test/iterplans/zorba/index/match_veq_07.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/index/match_veq_07.iter 2014-02-25 00:37:05 +0000
@@ -1,9 +1,9 @@
1<iterator-tree description="doc indexer">1<iterator-tree description="doc indexer">
2 <FLWORIterator>2 <FLWORIterator>
3 <ForVariable name="$$context-item">3 <ForVariable name="$$context-item">
4 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">4 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
5 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">5 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
6 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">6 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
7 <CtxVarIterator varid="1" varname="$$idx_doc_var" varkind="global"/>7 <CtxVarIterator varid="1" varname="$$idx_doc_var" varkind="global"/>
8 </ChildAxisIterator>8 </ChildAxisIterator>
9 </ChildAxisIterator>9 </ChildAxisIterator>
@@ -14,8 +14,8 @@
14 <ForVarIterator varname="$$context-item"/>14 <ForVarIterator varname="$$context-item"/>
15 <PromoteIterator type="xs:string">15 <PromoteIterator type="xs:string">
16 <FnDataIterator>16 <FnDataIterator>
17 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">17 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
18 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">18 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
19 <ForVarIterator varname="$$context-item"/>19 <ForVarIterator varname="$$context-item"/>
20 </ChildAxisIterator>20 </ChildAxisIterator>
21 </AttributeAxisIterator>21 </AttributeAxisIterator>
@@ -28,9 +28,9 @@
28<iterator-tree description="index">28<iterator-tree description="index">
29 <FLWORIterator>29 <FLWORIterator>
30 <ForVariable name="$$context-item">30 <ForVariable name="$$context-item">
31 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">31 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
32 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">32 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
33 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">33 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
34 <ZorbaCollectionIterator>34 <ZorbaCollectionIterator>
35 <SingletonIterator value="xs:QName(www.xmark.com,x,auctions)"/>35 <SingletonIterator value="xs:QName(www.xmark.com,x,auctions)"/>
36 </ZorbaCollectionIterator>36 </ZorbaCollectionIterator>
@@ -43,8 +43,8 @@
43 <ForVarIterator varname="$$context-item"/>43 <ForVarIterator varname="$$context-item"/>
44 <PromoteIterator type="xs:string">44 <PromoteIterator type="xs:string">
45 <FnDataIterator>45 <FnDataIterator>
46 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">46 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
47 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">47 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
48 <ForVarIterator varname="$$context-item"/>48 <ForVarIterator varname="$$context-item"/>
49 </ChildAxisIterator>49 </ChildAxisIterator>
50 </AttributeAxisIterator>50 </AttributeAxisIterator>
@@ -89,9 +89,9 @@
89 </LetVariable>89 </LetVariable>
90 <LetVariable name="$$opt_temp_0" materialize="true">90 <LetVariable name="$$opt_temp_0" materialize="true">
91 <HoistIterator>91 <HoistIterator>
92 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">92 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
93 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">93 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
94 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">94 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
95 <LetVarIterator varname="auctions"/>95 <LetVarIterator varname="auctions"/>
96 </ChildAxisIterator>96 </ChildAxisIterator>
97 </ChildAxisIterator>97 </ChildAxisIterator>
@@ -99,9 +99,9 @@
99 </HoistIterator>99 </HoistIterator>
100 </LetVariable>100 </LetVariable>
101 <ForVariable name="p">101 <ForVariable name="p">
102 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">102 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
103 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">103 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
104 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">104 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
105 <LetVarIterator varname="auctions"/>105 <LetVarIterator varname="auctions"/>
106 </ChildAxisIterator>106 </ChildAxisIterator>
107 </ChildAxisIterator>107 </ChildAxisIterator>
@@ -110,7 +110,7 @@
110 <LetVariable name="$$opt_temp_1" materialize="true">110 <LetVariable name="$$opt_temp_1" materialize="true">
111 <HoistIterator>111 <HoistIterator>
112 <FnDataIterator>112 <FnDataIterator>
113 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">113 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
114 <ForVarIterator varname="p"/>114 <ForVarIterator varname="p"/>
115 </AttributeAxisIterator>115 </AttributeAxisIterator>
116 </FnDataIterator>116 </FnDataIterator>
@@ -122,8 +122,8 @@
122 <AttributeIterator qname="xs:QName(,,person)">122 <AttributeIterator qname="xs:QName(,,person)">
123 <EnclosedIterator attr_cont="true">123 <EnclosedIterator attr_cont="true">
124 <FnDataIterator>124 <FnDataIterator>
125 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">125 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
126 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">126 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
127 <ForVarIterator varname="p"/>127 <ForVarIterator varname="p"/>
128 </ChildAxisIterator>128 </ChildAxisIterator>
129 </ChildAxisIterator>129 </ChildAxisIterator>
130130
=== modified file 'test/iterplans/zorba/index/match_veq_11.iter'
--- test/iterplans/zorba/index/match_veq_11.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/index/match_veq_11.iter 2014-02-25 00:37:05 +0000
@@ -9,7 +9,7 @@
9 <TreatIterator quant="">9 <TreatIterator quant="">
10 <CastIterator type="xs:int">10 <CastIterator type="xs:int">
11 <FnDataIterator>11 <FnDataIterator>
12 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">12 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
13 <ForVarIterator varname="$$context-item"/>13 <ForVarIterator varname="$$context-item"/>
14 </AttributeAxisIterator>14 </AttributeAxisIterator>
15 </FnDataIterator>15 </FnDataIterator>
@@ -32,7 +32,7 @@
32 <TreatIterator quant="">32 <TreatIterator quant="">
33 <CastIterator type="xs:int">33 <CastIterator type="xs:int">
34 <FnDataIterator>34 <FnDataIterator>
35 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">35 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
36 <ForVarIterator varname="$$context-item"/>36 <ForVarIterator varname="$$context-item"/>
37 </AttributeAxisIterator>37 </AttributeAxisIterator>
38 </FnDataIterator>38 </FnDataIterator>
@@ -52,7 +52,7 @@
52 <ForVarIterator varname="$$context-item"/>52 <ForVarIterator varname="$$context-item"/>
53 <PromoteIterator type="xs:string">53 <PromoteIterator type="xs:string">
54 <FnDataIterator>54 <FnDataIterator>
55 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">55 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
56 <ForVarIterator varname="$$context-item"/>56 <ForVarIterator varname="$$context-item"/>
57 </AttributeAxisIterator>57 </AttributeAxisIterator>
58 </FnDataIterator>58 </FnDataIterator>
@@ -73,7 +73,7 @@
73 <ForVarIterator varname="$$context-item"/>73 <ForVarIterator varname="$$context-item"/>
74 <PromoteIterator type="xs:string">74 <PromoteIterator type="xs:string">
75 <FnDataIterator>75 <FnDataIterator>
76 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">76 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
77 <ForVarIterator varname="$$context-item"/>77 <ForVarIterator varname="$$context-item"/>
78 </AttributeAxisIterator>78 </AttributeAxisIterator>
79 </FnDataIterator>79 </FnDataIterator>
@@ -135,7 +135,7 @@
135 <GeneralIndexEntryBuilderIterator>135 <GeneralIndexEntryBuilderIterator>
136 <ForVarIterator varname="$$opt_temp_0"/>136 <ForVarIterator varname="$$opt_temp_0"/>
137 <FnDataIterator>137 <FnDataIterator>
138 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,Acct)" typename="*" nill allowed="0">138 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,Acct)" typename="*" nill-allowed="0">
139 <ForVarIterator varname="$$opt_temp_0"/>139 <ForVarIterator varname="$$opt_temp_0"/>
140 </AttributeAxisIterator>140 </AttributeAxisIterator>
141 </FnDataIterator>141 </FnDataIterator>
@@ -153,9 +153,9 @@
153 </ProbeIndexPointValueIterator>153 </ProbeIndexPointValueIterator>
154 </ForVariable>154 </ForVariable>
155 <ForVariable name="$$context-item">155 <ForVariable name="$$context-item">
156 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">156 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
157 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,Account)" typename="*" nill allowed="0">157 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,Account)" typename="*" nill-allowed="0">
158 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,Accounts)" typename="*" nill allowed="0">158 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,Accounts)" typename="*" nill-allowed="0">
159 <ForVarIterator varname="$$context-item"/>159 <ForVarIterator varname="$$context-item"/>
160 </ChildAxisIterator>160 </ChildAxisIterator>
161 </ChildAxisIterator>161 </ChildAxisIterator>
@@ -175,8 +175,8 @@
175 </NodeSortIterator>175 </NodeSortIterator>
176 </ForVariable>176 </ForVariable>
177 <ReturnClause>177 <ReturnClause>
178 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,Cash)" typename="*" nill allowed="0">178 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,Cash)" typename="*" nill-allowed="0">
179 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,OrdQty)" typename="*" nill allowed="0">179 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,OrdQty)" typename="*" nill-allowed="0">
180 <ForVarIterator varname="ord"/>180 <ForVarIterator varname="ord"/>
181 </ChildAxisIterator>181 </ChildAxisIterator>
182 </AttributeAxisIterator>182 </AttributeAxisIterator>
183183
=== modified file 'test/iterplans/zorba/index/match_vrange_01.iter'
--- test/iterplans/zorba/index/match_vrange_01.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/index/match_vrange_01.iter 2014-02-25 00:37:05 +0000
@@ -8,14 +8,14 @@
8 <ForVarIterator varname="$$context-item"/>8 <ForVarIterator varname="$$context-item"/>
9 <PromoteIterator type="xs:string">9 <PromoteIterator type="xs:string">
10 <FnDataIterator>10 <FnDataIterator>
11 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,uri)" typename="*" nill allowed="0">11 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,uri)" typename="*" nill-allowed="0">
12 <ForVarIterator varname="$$context-item"/>12 <ForVarIterator varname="$$context-item"/>
13 </AttributeAxisIterator>13 </AttributeAxisIterator>
14 </FnDataIterator>14 </FnDataIterator>
15 </PromoteIterator>15 </PromoteIterator>
16 <PromoteIterator type="xs:string">16 <PromoteIterator type="xs:string">
17 <FnDataIterator>17 <FnDataIterator>
18 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">18 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
19 <ForVarIterator varname="$$context-item"/>19 <ForVarIterator varname="$$context-item"/>
20 </AttributeAxisIterator>20 </AttributeAxisIterator>
21 </FnDataIterator>21 </FnDataIterator>
@@ -36,14 +36,14 @@
36 <ForVarIterator varname="$$context-item"/>36 <ForVarIterator varname="$$context-item"/>
37 <PromoteIterator type="xs:string">37 <PromoteIterator type="xs:string">
38 <FnDataIterator>38 <FnDataIterator>
39 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,uri)" typename="*" nill allowed="0">39 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,uri)" typename="*" nill-allowed="0">
40 <ForVarIterator varname="$$context-item"/>40 <ForVarIterator varname="$$context-item"/>
41 </AttributeAxisIterator>41 </AttributeAxisIterator>
42 </FnDataIterator>42 </FnDataIterator>
43 </PromoteIterator>43 </PromoteIterator>
44 <PromoteIterator type="xs:string">44 <PromoteIterator type="xs:string">
45 <FnDataIterator>45 <FnDataIterator>
46 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">46 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
47 <ForVarIterator varname="$$context-item"/>47 <ForVarIterator varname="$$context-item"/>
48 </AttributeAxisIterator>48 </AttributeAxisIterator>
49 </FnDataIterator>49 </FnDataIterator>
@@ -176,7 +176,7 @@
176 </ApplyIterator>176 </ApplyIterator>
177 <FLWORIterator>177 <FLWORIterator>
178 <ForVariable name="p">178 <ForVariable name="p">
179 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,parent)" typename="*" nill allowed="0">179 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,parent)" typename="*" nill-allowed="0">
180 <CtxVarIterator varid="6" varname="doc" varkind="global"/>180 <CtxVarIterator varid="6" varname="doc" varkind="global"/>
181 </ChildAxisIterator>181 </ChildAxisIterator>
182 </ForVariable>182 </ForVariable>
183183
=== modified file 'test/iterplans/zorba/index/match_vrange_02.iter'
--- test/iterplans/zorba/index/match_vrange_02.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/index/match_vrange_02.iter 2014-02-25 00:37:05 +0000
@@ -9,8 +9,8 @@
9 <SubstringAfterIterator>9 <SubstringAfterIterator>
10 <PromoteIterator type="xs:string">10 <PromoteIterator type="xs:string">
11 <FnDataIterator>11 <FnDataIterator>
12 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill allowed="0">12 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill-allowed="0">
13 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">13 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
14 <ForVarIterator varname="$$context-item"/>14 <ForVarIterator varname="$$context-item"/>
15 </ChildAxisIterator>15 </ChildAxisIterator>
16 </AttributeAxisIterator>16 </AttributeAxisIterator>
@@ -20,9 +20,9 @@
20 </SubstringAfterIterator>20 </SubstringAfterIterator>
21 <FnStringIterator>21 <FnStringIterator>
22 <TreatIterator quant="?">22 <TreatIterator quant="?">
23 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">23 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
24 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">24 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
25 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">25 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
26 <ForVarIterator varname="$$context-item"/>26 <ForVarIterator varname="$$context-item"/>
27 </DescendantAxisIterator>27 </DescendantAxisIterator>
28 </ChildAxisIterator>28 </ChildAxisIterator>
@@ -46,8 +46,8 @@
46 <SubstringAfterIterator>46 <SubstringAfterIterator>
47 <PromoteIterator type="xs:string">47 <PromoteIterator type="xs:string">
48 <FnDataIterator>48 <FnDataIterator>
49 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill allowed="0">49 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill-allowed="0">
50 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">50 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
51 <ForVarIterator varname="$$context-item"/>51 <ForVarIterator varname="$$context-item"/>
52 </ChildAxisIterator>52 </ChildAxisIterator>
53 </AttributeAxisIterator>53 </AttributeAxisIterator>
@@ -57,9 +57,9 @@
57 </SubstringAfterIterator>57 </SubstringAfterIterator>
58 <FnStringIterator>58 <FnStringIterator>
59 <TreatIterator quant="?">59 <TreatIterator quant="?">
60 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">60 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
61 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">61 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
62 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">62 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
63 <ForVarIterator varname="$$context-item"/>63 <ForVarIterator varname="$$context-item"/>
64 </DescendantAxisIterator>64 </DescendantAxisIterator>
65 </ChildAxisIterator>65 </ChildAxisIterator>
@@ -272,9 +272,9 @@
272 <SingletonIterator value="xs:string(2012-12-31)"/>272 <SingletonIterator value="xs:string(2012-12-31)"/>
273 <FnStringIterator>273 <FnStringIterator>
274 <TreatIterator quant="?">274 <TreatIterator quant="?">
275 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">275 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
276 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">276 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
277 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">277 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
278 <ForVarIterator varname="$$context-item"/>278 <ForVarIterator varname="$$context-item"/>
279 </DescendantAxisIterator>279 </DescendantAxisIterator>
280 </ChildAxisIterator>280 </ChildAxisIterator>
281281
=== modified file 'test/iterplans/zorba/index/match_vrange_02a.iter'
--- test/iterplans/zorba/index/match_vrange_02a.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/index/match_vrange_02a.iter 2014-02-25 00:37:05 +0000
@@ -9,8 +9,8 @@
9 <SubstringAfterIterator>9 <SubstringAfterIterator>
10 <PromoteIterator type="xs:string">10 <PromoteIterator type="xs:string">
11 <FnDataIterator>11 <FnDataIterator>
12 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill allowed="0">12 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill-allowed="0">
13 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">13 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
14 <ForVarIterator varname="$$context-item"/>14 <ForVarIterator varname="$$context-item"/>
15 </ChildAxisIterator>15 </ChildAxisIterator>
16 </AttributeAxisIterator>16 </AttributeAxisIterator>
@@ -20,9 +20,9 @@
20 </SubstringAfterIterator>20 </SubstringAfterIterator>
21 <FnStringIterator>21 <FnStringIterator>
22 <TreatIterator quant="?">22 <TreatIterator quant="?">
23 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">23 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
24 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">24 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
25 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">25 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
26 <ForVarIterator varname="$$context-item"/>26 <ForVarIterator varname="$$context-item"/>
27 </DescendantAxisIterator>27 </DescendantAxisIterator>
28 </ChildAxisIterator>28 </ChildAxisIterator>
@@ -46,8 +46,8 @@
46 <SubstringAfterIterator>46 <SubstringAfterIterator>
47 <PromoteIterator type="xs:string">47 <PromoteIterator type="xs:string">
48 <FnDataIterator>48 <FnDataIterator>
49 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill allowed="0">49 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill-allowed="0">
50 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">50 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
51 <ForVarIterator varname="$$context-item"/>51 <ForVarIterator varname="$$context-item"/>
52 </ChildAxisIterator>52 </ChildAxisIterator>
53 </AttributeAxisIterator>53 </AttributeAxisIterator>
@@ -57,9 +57,9 @@
57 </SubstringAfterIterator>57 </SubstringAfterIterator>
58 <FnStringIterator>58 <FnStringIterator>
59 <TreatIterator quant="?">59 <TreatIterator quant="?">
60 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">60 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
61 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">61 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
62 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">62 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
63 <ForVarIterator varname="$$context-item"/>63 <ForVarIterator varname="$$context-item"/>
64 </DescendantAxisIterator>64 </DescendantAxisIterator>
65 </ChildAxisIterator>65 </ChildAxisIterator>
@@ -230,8 +230,8 @@
230 <ForIterator>230 <ForIterator>
231 <ForVariable name="group"/>231 <ForVariable name="group"/>
232 <TupleSourceIterator/>232 <TupleSourceIterator/>
233 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">233 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
234 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">234 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
235 <SubsequenceIntIterator>235 <SubsequenceIntIterator>
236 <ProbeIndexRangeValueIterator>236 <ProbeIndexRangeValueIterator>
237 <SingletonIterator value="xs:QName(www.data.com,data,idx)"/>237 <SingletonIterator value="xs:QName(www.data.com,data,idx)"/>
@@ -258,8 +258,8 @@
258 <TreatIterator quant="?">258 <TreatIterator quant="?">
259 <FLWORIterator>259 <FLWORIterator>
260 <ForVariable name="$$context-item">260 <ForVariable name="$$context-item">
261 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,revision-id)" typename="*" nill allowed="0">261 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,revision-id)" typename="*" nill-allowed="0">
262 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">262 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
263 <ForVarIterator varname="group"/>263 <ForVarIterator varname="group"/>
264 </ChildAxisIterator>264 </ChildAxisIterator>
265 </AttributeAxisIterator>265 </AttributeAxisIterator>
@@ -282,8 +282,8 @@
282 <FLWORIterator>282 <FLWORIterator>
283 <ForVariable name="$$context-item">283 <ForVariable name="$$context-item">
284 <NodeDistinctIterator allow-atomics="false" check-only="false">284 <NodeDistinctIterator allow-atomics="false" check-only="false">
285 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">285 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
286 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">286 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
287 <LetVarIterator varname="group"/>287 <LetVarIterator varname="group"/>
288 </ChildAxisIterator>288 </ChildAxisIterator>
289 </AttributeAxisIterator>289 </AttributeAxisIterator>
@@ -305,8 +305,8 @@
305 <WhereClause>305 <WhereClause>
306 <CompareIterator>306 <CompareIterator>
307 <FnDataIterator>307 <FnDataIterator>
308 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">308 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
309 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">309 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
310 <ForVarIterator varname="$$context-item"/>310 <ForVarIterator varname="$$context-item"/>
311 </ChildAxisIterator>311 </ChildAxisIterator>
312 </AttributeAxisIterator>312 </AttributeAxisIterator>
313313
=== modified file 'test/iterplans/zorba/index/match_vrange_02b.iter'
--- test/iterplans/zorba/index/match_vrange_02b.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/index/match_vrange_02b.iter 2014-02-25 00:37:05 +0000
@@ -9,8 +9,8 @@
9 <SubstringAfterIterator>9 <SubstringAfterIterator>
10 <PromoteIterator type="xs:string">10 <PromoteIterator type="xs:string">
11 <FnDataIterator>11 <FnDataIterator>
12 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill allowed="0">12 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill-allowed="0">
13 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">13 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
14 <ForVarIterator varname="$$context-item"/>14 <ForVarIterator varname="$$context-item"/>
15 </ChildAxisIterator>15 </ChildAxisIterator>
16 </AttributeAxisIterator>16 </AttributeAxisIterator>
@@ -20,9 +20,9 @@
20 </SubstringAfterIterator>20 </SubstringAfterIterator>
21 <FnStringIterator>21 <FnStringIterator>
22 <TreatIterator quant="?">22 <TreatIterator quant="?">
23 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">23 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
24 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">24 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
25 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">25 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
26 <ForVarIterator varname="$$context-item"/>26 <ForVarIterator varname="$$context-item"/>
27 </DescendantAxisIterator>27 </DescendantAxisIterator>
28 </ChildAxisIterator>28 </ChildAxisIterator>
@@ -46,8 +46,8 @@
46 <SubstringAfterIterator>46 <SubstringAfterIterator>
47 <PromoteIterator type="xs:string">47 <PromoteIterator type="xs:string">
48 <FnDataIterator>48 <FnDataIterator>
49 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill allowed="0">49 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill-allowed="0">
50 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">50 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
51 <ForVarIterator varname="$$context-item"/>51 <ForVarIterator varname="$$context-item"/>
52 </ChildAxisIterator>52 </ChildAxisIterator>
53 </AttributeAxisIterator>53 </AttributeAxisIterator>
@@ -57,9 +57,9 @@
57 </SubstringAfterIterator>57 </SubstringAfterIterator>
58 <FnStringIterator>58 <FnStringIterator>
59 <TreatIterator quant="?">59 <TreatIterator quant="?">
60 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">60 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
61 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">61 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
62 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">62 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
63 <ForVarIterator varname="$$context-item"/>63 <ForVarIterator varname="$$context-item"/>
64 </DescendantAxisIterator>64 </DescendantAxisIterator>
65 </ChildAxisIterator>65 </ChildAxisIterator>
@@ -278,9 +278,9 @@
278 <ForVariable name="key2">278 <ForVariable name="key2">
279 <FnStringIterator>279 <FnStringIterator>
280 <TreatIterator quant="?">280 <TreatIterator quant="?">
281 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">281 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
282 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">282 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
283 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">283 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
284 <ForVarIterator varname="d"/>284 <ForVarIterator varname="d"/>
285 </DescendantAxisIterator>285 </DescendantAxisIterator>
286 </ChildAxisIterator>286 </ChildAxisIterator>
287287
=== modified file 'test/iterplans/zorba/index/match_vrange_03.iter'
--- test/iterplans/zorba/index/match_vrange_03.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/index/match_vrange_03.iter 2014-02-25 00:37:05 +0000
@@ -9,8 +9,8 @@
9 <SubstringAfterIterator>9 <SubstringAfterIterator>
10 <PromoteIterator type="xs:string">10 <PromoteIterator type="xs:string">
11 <FnDataIterator>11 <FnDataIterator>
12 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill allowed="0">12 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill-allowed="0">
13 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">13 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
14 <ForVarIterator varname="$$context-item"/>14 <ForVarIterator varname="$$context-item"/>
15 </ChildAxisIterator>15 </ChildAxisIterator>
16 </AttributeAxisIterator>16 </AttributeAxisIterator>
@@ -20,9 +20,9 @@
20 </SubstringAfterIterator>20 </SubstringAfterIterator>
21 <FnStringIterator>21 <FnStringIterator>
22 <TreatIterator quant="?">22 <TreatIterator quant="?">
23 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">23 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
24 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">24 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
25 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">25 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
26 <ForVarIterator varname="$$context-item"/>26 <ForVarIterator varname="$$context-item"/>
27 </DescendantAxisIterator>27 </DescendantAxisIterator>
28 </ChildAxisIterator>28 </ChildAxisIterator>
@@ -46,8 +46,8 @@
46 <SubstringAfterIterator>46 <SubstringAfterIterator>
47 <PromoteIterator type="xs:string">47 <PromoteIterator type="xs:string">
48 <FnDataIterator>48 <FnDataIterator>
49 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill allowed="0">49 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill-allowed="0">
50 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">50 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
51 <ForVarIterator varname="$$context-item"/>51 <ForVarIterator varname="$$context-item"/>
52 </ChildAxisIterator>52 </ChildAxisIterator>
53 </AttributeAxisIterator>53 </AttributeAxisIterator>
@@ -57,9 +57,9 @@
57 </SubstringAfterIterator>57 </SubstringAfterIterator>
58 <FnStringIterator>58 <FnStringIterator>
59 <TreatIterator quant="?">59 <TreatIterator quant="?">
60 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">60 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
61 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">61 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
62 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">62 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
63 <ForVarIterator varname="$$context-item"/>63 <ForVarIterator varname="$$context-item"/>
64 </DescendantAxisIterator>64 </DescendantAxisIterator>
65 </ChildAxisIterator>65 </ChildAxisIterator>
@@ -270,9 +270,9 @@
270 <SingletonIterator value="xs:string(2012-12-31)"/>270 <SingletonIterator value="xs:string(2012-12-31)"/>
271 <FnStringIterator>271 <FnStringIterator>
272 <TreatIterator quant="?">272 <TreatIterator quant="?">
273 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">273 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
274 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">274 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
275 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">275 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
276 <ForVarIterator varname="$$context-item"/>276 <ForVarIterator varname="$$context-item"/>
277 </DescendantAxisIterator>277 </DescendantAxisIterator>
278 </ChildAxisIterator>278 </ChildAxisIterator>
279279
=== modified file 'test/iterplans/zorba/misc/hoist4.iter'
--- test/iterplans/zorba/misc/hoist4.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/misc/hoist4.iter 2014-02-25 00:37:05 +0000
@@ -1,7 +1,7 @@
1<iterator-tree description="main query">1<iterator-tree description="main query">
2 <FLWORIterator>2 <FLWORIterator>
3 <ForVariable name="a">3 <ForVariable name="a">
4 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,foo)" typename="*" nill allowed="0">4 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,foo)" typename="*" nill-allowed="0">
5 <ElementIterator copyInputNodes="false">5 <ElementIterator copyInputNodes="false">
6 <SingletonIterator value="xs:QName(,,root)"/>6 <SingletonIterator value="xs:QName(,,root)"/>
7 <FnConcatIterator>7 <FnConcatIterator>
@@ -50,14 +50,14 @@
50 </ChildAxisIterator>50 </ChildAxisIterator>
51 </ForVariable>51 </ForVariable>
52 <ForVariable name="b">52 <ForVariable name="b">
53 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,boo)" typename="*" nill allowed="0">53 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,boo)" typename="*" nill-allowed="0">
54 <ForVarIterator varname="a"/>54 <ForVarIterator varname="a"/>
55 </DescendantAxisIterator>55 </DescendantAxisIterator>
56 </ForVariable>56 </ForVariable>
57 <ReturnClause>57 <ReturnClause>
58 <SequentialIterator>58 <SequentialIterator>
59 <CtxVarDeclareIterator varid="4" varname="x">59 <CtxVarDeclareIterator varid="4" varname="x">
60 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">60 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
61 <ForVarIterator varname="b"/>61 <ForVarIterator varname="b"/>
62 </AttributeAxisIterator>62 </AttributeAxisIterator>
63 </CtxVarDeclareIterator>63 </CtxVarDeclareIterator>
@@ -67,7 +67,7 @@
67 <GenericArithIterator_AddOperation>67 <GenericArithIterator_AddOperation>
68 <PromoteIterator type="xs:anyAtomicType">68 <PromoteIterator type="xs:anyAtomicType">
69 <FnDataIterator>69 <FnDataIterator>
70 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">70 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
71 <ForVarIterator varname="a"/>71 <ForVarIterator varname="a"/>
72 </AttributeAxisIterator>72 </AttributeAxisIterator>
73 </FnDataIterator>73 </FnDataIterator>
7474
=== modified file 'test/iterplans/zorba/misc/inline_var1.iter'
--- test/iterplans/zorba/misc/inline_var1.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/misc/inline_var1.iter 2014-02-25 00:37:05 +0000
@@ -26,15 +26,15 @@
26 <ReturnClause>26 <ReturnClause>
27 <IfThenElseIterator>27 <IfThenElseIterator>
28 <FnBooleanIterator>28 <FnBooleanIterator>
29 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0">29 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill-allowed="0">
30 <ForVarIterator varname="x"/>30 <ForVarIterator varname="x"/>
31 </ChildAxisIterator>31 </ChildAxisIterator>
32 </FnBooleanIterator>32 </FnBooleanIterator>
33 <GenericArithIterator_AddOperation>33 <GenericArithIterator_AddOperation>
34 <PromoteIterator type="xs:anyAtomicType">34 <PromoteIterator type="xs:anyAtomicType">
35 <FnDataIterator>35 <FnDataIterator>
36 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,att1)" typename="*" nill allowed="0">36 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,att1)" typename="*" nill-allowed="0">
37 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">37 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
38 <ForVarIterator varname="x"/>38 <ForVarIterator varname="x"/>
39 </ChildAxisIterator>39 </ChildAxisIterator>
40 </AttributeAxisIterator>40 </AttributeAxisIterator>
@@ -45,10 +45,10 @@
45 <GenericArithIterator_AddOperation>45 <GenericArithIterator_AddOperation>
46 <PromoteIterator type="xs:anyAtomicType">46 <PromoteIterator type="xs:anyAtomicType">
47 <FnDataIterator>47 <FnDataIterator>
48 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,att2)" typename="*" nill allowed="0">48 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,att2)" typename="*" nill-allowed="0">
49 <FunctionTraceIterator>49 <FunctionTraceIterator>
50 <TreatIterator quant="">50 <TreatIterator quant="">
51 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">51 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
52 <ForVarIterator varname="x"/>52 <ForVarIterator varname="x"/>
53 </ChildAxisIterator>53 </ChildAxisIterator>
54 </TreatIterator>54 </TreatIterator>
5555
=== modified file 'test/iterplans/zorba/no-copy/dataguide-c.iter'
--- test/iterplans/zorba/no-copy/dataguide-c.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/dataguide-c.iter 2014-02-25 00:37:05 +0000
@@ -38,8 +38,8 @@
38 <SingletonIterator value="xs:QName(http://www.w3.org/2001/XMLSchema,,string)"/>38 <SingletonIterator value="xs:QName(http://www.w3.org/2001/XMLSchema,,string)"/>
39 </CtxVarDeclareIterator>39 </CtxVarDeclareIterator>
40 <CtxVarDeclareIterator varid="8" varname="input">40 <CtxVarDeclareIterator varid="8" varname="input">
41 <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">41 <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
42 <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">42 <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
43 <FnDocIterator>43 <FnDocIterator>
44 <SingletonIterator value="xs:string(books.xml)"/>44 <SingletonIterator value="xs:string(books.xml)"/>
45 </FnDocIterator>45 </FnDocIterator>
@@ -145,14 +145,14 @@
145 </CtxVarDeclareIterator>145 </CtxVarDeclareIterator>
146 <CtxVarDeclareIterator varid="5" varname="a">146 <CtxVarDeclareIterator varid="5" varname="a">
147 <NodeSortIterator distinct="true" ascending="true">147 <NodeSortIterator distinct="true" ascending="true">
148 <AttributeAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">148 <AttributeAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
149 <LetVarIterator varname="x"/>149 <LetVarIterator varname="x"/>
150 </AttributeAxisIterator>150 </AttributeAxisIterator>
151 </NodeSortIterator>151 </NodeSortIterator>
152 </CtxVarDeclareIterator>152 </CtxVarDeclareIterator>
153 <CtxVarDeclareIterator varid="6" varname="c">153 <CtxVarDeclareIterator varid="6" varname="c">
154 <NodeSortIterator distinct="true" ascending="true">154 <NodeSortIterator distinct="true" ascending="true">
155 <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">155 <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
156 <LetVarIterator varname="x"/>156 <LetVarIterator varname="x"/>
157 </ChildAxisIterator>157 </ChildAxisIterator>
158 </NodeSortIterator>158 </NodeSortIterator>
159159
=== modified file 'test/iterplans/zorba/no-copy/dataguide-nc.iter'
--- test/iterplans/zorba/no-copy/dataguide-nc.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/dataguide-nc.iter 2014-02-25 00:37:05 +0000
@@ -38,8 +38,8 @@
38 <SingletonIterator value="xs:QName(http://www.w3.org/2001/XMLSchema,,string)"/>38 <SingletonIterator value="xs:QName(http://www.w3.org/2001/XMLSchema,,string)"/>
39 </CtxVarDeclareIterator>39 </CtxVarDeclareIterator>
40 <CtxVarDeclareIterator varid="8" varname="input">40 <CtxVarDeclareIterator varid="8" varname="input">
41 <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">41 <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
42 <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">42 <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
43 <FnDocIterator>43 <FnDocIterator>
44 <SingletonIterator value="xs:string(books.xml)"/>44 <SingletonIterator value="xs:string(books.xml)"/>
45 </FnDocIterator>45 </FnDocIterator>
@@ -145,14 +145,14 @@
145 </CtxVarDeclareIterator>145 </CtxVarDeclareIterator>
146 <CtxVarDeclareIterator varid="5" varname="a">146 <CtxVarDeclareIterator varid="5" varname="a">
147 <NodeSortIterator distinct="true" ascending="true">147 <NodeSortIterator distinct="true" ascending="true">
148 <AttributeAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">148 <AttributeAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
149 <LetVarIterator varname="x"/>149 <LetVarIterator varname="x"/>
150 </AttributeAxisIterator>150 </AttributeAxisIterator>
151 </NodeSortIterator>151 </NodeSortIterator>
152 </CtxVarDeclareIterator>152 </CtxVarDeclareIterator>
153 <CtxVarDeclareIterator varid="6" varname="c">153 <CtxVarDeclareIterator varid="6" varname="c">
154 <NodeSortIterator distinct="true" ascending="true">154 <NodeSortIterator distinct="true" ascending="true">
155 <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">155 <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
156 <LetVarIterator varname="x"/>156 <LetVarIterator varname="x"/>
157 </ChildAxisIterator>157 </ChildAxisIterator>
158 </NodeSortIterator>158 </NodeSortIterator>
159159
=== modified file 'test/iterplans/zorba/no-copy/dataguide2-c.iter'
--- test/iterplans/zorba/no-copy/dataguide2-c.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/dataguide2-c.iter 2014-02-25 00:37:05 +0000
@@ -1,8 +1,8 @@
1<iterator-tree description="main query">1<iterator-tree description="main query">
2 <SequentialIterator>2 <SequentialIterator>
3 <CtxVarDeclareIterator varid="4" varname="input">3 <CtxVarDeclareIterator varid="4" varname="input">
4 <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">4 <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
5 <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">5 <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
6 <FnDocIterator>6 <FnDocIterator>
7 <SingletonIterator value="xs:string(books.xml)"/>7 <SingletonIterator value="xs:string(books.xml)"/>
8 </FnDocIterator>8 </FnDocIterator>
@@ -35,14 +35,14 @@
35 </CtxVarDeclareIterator>35 </CtxVarDeclareIterator>
36 <CtxVarDeclareIterator varid="3" varname="a">36 <CtxVarDeclareIterator varid="3" varname="a">
37 <NodeSortIterator distinct="true" ascending="true">37 <NodeSortIterator distinct="true" ascending="true">
38 <AttributeAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">38 <AttributeAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
39 <LetVarIterator varname="x"/>39 <LetVarIterator varname="x"/>
40 </AttributeAxisIterator>40 </AttributeAxisIterator>
41 </NodeSortIterator>41 </NodeSortIterator>
42 </CtxVarDeclareIterator>42 </CtxVarDeclareIterator>
43 <CtxVarDeclareIterator varid="4" varname="c">43 <CtxVarDeclareIterator varid="4" varname="c">
44 <NodeSortIterator distinct="true" ascending="true">44 <NodeSortIterator distinct="true" ascending="true">
45 <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">45 <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
46 <LetVarIterator varname="x"/>46 <LetVarIterator varname="x"/>
47 </ChildAxisIterator>47 </ChildAxisIterator>
48 </NodeSortIterator>48 </NodeSortIterator>
4949
=== modified file 'test/iterplans/zorba/no-copy/dataguide2-nc.iter'
--- test/iterplans/zorba/no-copy/dataguide2-nc.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/dataguide2-nc.iter 2014-02-25 00:37:05 +0000
@@ -1,8 +1,8 @@
1<iterator-tree description="main query">1<iterator-tree description="main query">
2 <SequentialIterator>2 <SequentialIterator>
3 <CtxVarDeclareIterator varid="4" varname="input">3 <CtxVarDeclareIterator varid="4" varname="input">
4 <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">4 <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
5 <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">5 <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
6 <FnDocIterator>6 <FnDocIterator>
7 <SingletonIterator value="xs:string(books.xml)"/>7 <SingletonIterator value="xs:string(books.xml)"/>
8 </FnDocIterator>8 </FnDocIterator>
@@ -35,14 +35,14 @@
35 </CtxVarDeclareIterator>35 </CtxVarDeclareIterator>
36 <CtxVarDeclareIterator varid="3" varname="a">36 <CtxVarDeclareIterator varid="3" varname="a">
37 <NodeSortIterator distinct="true" ascending="true">37 <NodeSortIterator distinct="true" ascending="true">
38 <AttributeAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">38 <AttributeAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
39 <LetVarIterator varname="x"/>39 <LetVarIterator varname="x"/>
40 </AttributeAxisIterator>40 </AttributeAxisIterator>
41 </NodeSortIterator>41 </NodeSortIterator>
42 </CtxVarDeclareIterator>42 </CtxVarDeclareIterator>
43 <CtxVarDeclareIterator varid="4" varname="c">43 <CtxVarDeclareIterator varid="4" varname="c">
44 <NodeSortIterator distinct="true" ascending="true">44 <NodeSortIterator distinct="true" ascending="true">
45 <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">45 <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
46 <LetVarIterator varname="x"/>46 <LetVarIterator varname="x"/>
47 </ChildAxisIterator>47 </ChildAxisIterator>
48 </NodeSortIterator>48 </NodeSortIterator>
4949
=== modified file 'test/iterplans/zorba/no-copy/dblp-q0.iter'
--- test/iterplans/zorba/no-copy/dblp-q0.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/dblp-q0.iter 2014-02-25 00:37:05 +0000
@@ -27,14 +27,14 @@
27 </LetVariable>27 </LetVariable>
28 <LetVariable name="$$opt_temp_1" materialize="true">28 <LetVariable name="$$opt_temp_1" materialize="true">
29 <HoistIterator>29 <HoistIterator>
30 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">30 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill-allowed="0">
31 <LetVarIterator varname="doc"/>31 <LetVarIterator varname="doc"/>
32 </ChildAxisIterator>32 </ChildAxisIterator>
33 </HoistIterator>33 </HoistIterator>
34 </LetVariable>34 </LetVariable>
35 <LetVariable name="$$opt_temp_0" materialize="true">35 <LetVariable name="$$opt_temp_0" materialize="true">
36 <HoistIterator>36 <HoistIterator>
37 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">37 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill-allowed="0">
38 <LetVarIterator varname="doc"/>38 <LetVarIterator varname="doc"/>
39 </ChildAxisIterator>39 </ChildAxisIterator>
40 </HoistIterator>40 </HoistIterator>
@@ -50,8 +50,8 @@
50 <SingletonIterator value="xs:QName(,,paper)"/>50 <SingletonIterator value="xs:QName(,,paper)"/>
51 <EnclosedIterator attr_cont="false">51 <EnclosedIterator attr_cont="false">
52 <FnCountIterator>52 <FnCountIterator>
53 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">53 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill-allowed="0">
54 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">54 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill-allowed="0">
55 <LetVarIterator varname="doc"/>55 <LetVarIterator varname="doc"/>
56 </ChildAxisIterator>56 </ChildAxisIterator>
57 </ChildAxisIterator>57 </ChildAxisIterator>
@@ -64,7 +64,7 @@
64 <FnCountIterator>64 <FnCountIterator>
65 <FnDistinctValuesIterator>65 <FnDistinctValuesIterator>
66 <FnDataIterator>66 <FnDataIterator>
67 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">67 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
68 <LetVarIterator varname="doc"/>68 <LetVarIterator varname="doc"/>
69 </DescendantAxisIterator>69 </DescendantAxisIterator>
70 </FnDataIterator>70 </FnDataIterator>
@@ -109,14 +109,14 @@
109 </UnhoistIterator>109 </UnhoistIterator>
110 </ForVariable>110 </ForVariable>
111 <ForVariable name="$$context-item">111 <ForVariable name="$$context-item">
112 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">112 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill-allowed="0">
113 <ForVarIterator varname="$$context-item"/>113 <ForVarIterator varname="$$context-item"/>
114 </ChildAxisIterator>114 </ChildAxisIterator>
115 </ForVariable>115 </ForVariable>
116 <WhereClause>116 <WhereClause>
117 <CompareIterator>117 <CompareIterator>
118 <FnDataIterator>118 <FnDataIterator>
119 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill allowed="0">119 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill-allowed="0">
120 <ForVarIterator varname="$$context-item"/>120 <ForVarIterator varname="$$context-item"/>
121 </ChildAxisIterator>121 </ChildAxisIterator>
122 </FnDataIterator>122 </FnDataIterator>
@@ -136,7 +136,7 @@
136 <FnCountIterator>136 <FnCountIterator>
137 <FnDistinctValuesIterator>137 <FnDistinctValuesIterator>
138 <FnDataIterator>138 <FnDataIterator>
139 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">139 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
140 <FLWORIterator>140 <FLWORIterator>
141 <ForVariable name="$$context-item">141 <ForVariable name="$$context-item">
142 <UnhoistIterator>142 <UnhoistIterator>
@@ -144,14 +144,14 @@
144 </UnhoistIterator>144 </UnhoistIterator>
145 </ForVariable>145 </ForVariable>
146 <ForVariable name="$$context-item">146 <ForVariable name="$$context-item">
147 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">147 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill-allowed="0">
148 <ForVarIterator varname="$$context-item"/>148 <ForVarIterator varname="$$context-item"/>
149 </ChildAxisIterator>149 </ChildAxisIterator>
150 </ForVariable>150 </ForVariable>
151 <WhereClause>151 <WhereClause>
152 <CompareIterator>152 <CompareIterator>
153 <FnDataIterator>153 <FnDataIterator>
154 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill allowed="0">154 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill-allowed="0">
155 <ForVarIterator varname="$$context-item"/>155 <ForVarIterator varname="$$context-item"/>
156 </ChildAxisIterator>156 </ChildAxisIterator>
157 </FnDataIterator>157 </FnDataIterator>
158158
=== modified file 'test/iterplans/zorba/no-copy/hashjoin-9065.iter'
--- test/iterplans/zorba/no-copy/hashjoin-9065.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/hashjoin-9065.iter 2014-02-25 00:37:05 +0000
@@ -7,9 +7,9 @@
7 </ForVariable>7 </ForVariable>
8 <LetVariable name="$$opt_temp_1" materialize="true">8 <LetVariable name="$$opt_temp_1" materialize="true">
9 <HoistIterator>9 <HoistIterator>
10 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,title)" typename="*" nill allowed="0">10 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,title)" typename="*" nill-allowed="0">
11 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">11 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
12 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill allowed="0">12 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill-allowed="0">
13 <ForVarIterator varname="b"/>13 <ForVarIterator varname="b"/>
14 </ChildAxisIterator>14 </ChildAxisIterator>
15 </ChildAxisIterator>15 </ChildAxisIterator>
@@ -19,9 +19,9 @@
19 <ForVariable name="$$opt_temp_0">19 <ForVariable name="$$opt_temp_0">
20 <HoistIterator>20 <HoistIterator>
21 <FnCountIterator>21 <FnCountIterator>
22 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">22 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
23 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">23 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
24 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill allowed="0">24 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill-allowed="0">
25 <ForVarIterator varname="b"/>25 <ForVarIterator varname="b"/>
26 </ChildAxisIterator>26 </ChildAxisIterator>
27 </ChildAxisIterator>27 </ChildAxisIterator>
2828
=== modified file 'test/iterplans/zorba/no-copy/hashjoin-9198.iter'
--- test/iterplans/zorba/no-copy/hashjoin-9198.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/hashjoin-9198.iter 2014-02-25 00:37:05 +0000
@@ -29,7 +29,7 @@
29 </CreateInternalIndexIterator>29 </CreateInternalIndexIterator>
30 </LetVariable>30 </LetVariable>
31 <ForVariable name="book">31 <ForVariable name="book">
32 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">32 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
33 <FnDocIterator>33 <FnDocIterator>
34 <SingletonIterator value="xs:string(books.xml)"/>34 <SingletonIterator value="xs:string(books.xml)"/>
35 </FnDocIterator>35 </FnDocIterator>
@@ -38,7 +38,7 @@
38 <ForVariable name="$$opt_temp_1">38 <ForVariable name="$$opt_temp_1">
39 <HoistIterator>39 <HoistIterator>
40 <FnCountIterator>40 <FnCountIterator>
41 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">41 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
42 <ForVarIterator varname="book"/>42 <ForVarIterator varname="book"/>
43 </ChildAxisIterator>43 </ChildAxisIterator>
44 </FnCountIterator>44 </FnCountIterator>
4545
=== modified file 'test/iterplans/zorba/no-copy/hashjoin-9199.iter'
--- test/iterplans/zorba/no-copy/hashjoin-9199.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/hashjoin-9199.iter 2014-02-25 00:37:05 +0000
@@ -29,7 +29,7 @@
29 </CreateInternalIndexIterator>29 </CreateInternalIndexIterator>
30 </LetVariable>30 </LetVariable>
31 <ForVariable name="book">31 <ForVariable name="book">
32 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">32 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
33 <FnDocIterator>33 <FnDocIterator>
34 <SingletonIterator value="xs:string(books.xml)"/>34 <SingletonIterator value="xs:string(books.xml)"/>
35 </FnDocIterator>35 </FnDocIterator>
@@ -38,7 +38,7 @@
38 <ForVariable name="$$opt_temp_1">38 <ForVariable name="$$opt_temp_1">
39 <HoistIterator>39 <HoistIterator>
40 <FnCountIterator>40 <FnCountIterator>
41 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">41 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
42 <ForVarIterator varname="book"/>42 <ForVarIterator varname="book"/>
43 </ChildAxisIterator>43 </ChildAxisIterator>
44 </FnCountIterator>44 </FnCountIterator>
4545
=== modified file 'test/iterplans/zorba/no-copy/hashjoin-9212.iter'
--- test/iterplans/zorba/no-copy/hashjoin-9212.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/hashjoin-9212.iter 2014-02-25 00:37:05 +0000
@@ -5,7 +5,7 @@
5 <FLWORIterator>5 <FLWORIterator>
6 <LetVariable name="$$opt_temp_0" materialize="true">6 <LetVariable name="$$opt_temp_0" materialize="true">
7 <HoistIterator>7 <HoistIterator>
8 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">8 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
9 <FnDocIterator>9 <FnDocIterator>
10 <SingletonIterator value="xs:string(books.xml)"/>10 <SingletonIterator value="xs:string(books.xml)"/>
11 </FnDocIterator>11 </FnDocIterator>
@@ -24,7 +24,7 @@
24 <ValueIndexEntryBuilderIterator>24 <ValueIndexEntryBuilderIterator>
25 <ForVarIterator varname="$$opt_temp_1"/>25 <ForVarIterator varname="$$opt_temp_1"/>
26 <FnCountIterator>26 <FnCountIterator>
27 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">27 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
28 <ForVarIterator varname="$$opt_temp_1"/>28 <ForVarIterator varname="$$opt_temp_1"/>
29 </ChildAxisIterator>29 </ChildAxisIterator>
30 </FnCountIterator>30 </FnCountIterator>
@@ -34,7 +34,7 @@
34 </CreateInternalIndexIterator>34 </CreateInternalIndexIterator>
35 </LetVariable>35 </LetVariable>
36 <ForVariable name="book">36 <ForVariable name="book">
37 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">37 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
38 <FnDocIterator>38 <FnDocIterator>
39 <SingletonIterator value="xs:string(books.xml)"/>39 <SingletonIterator value="xs:string(books.xml)"/>
40 </FnDocIterator>40 </FnDocIterator>
@@ -42,7 +42,7 @@
42 </ForVariable>42 </ForVariable>
43 <ForVariable name="anzahl">43 <ForVariable name="anzahl">
44 <FnCountIterator>44 <FnCountIterator>
45 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">45 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
46 <ForVarIterator varname="book"/>46 <ForVarIterator varname="book"/>
47 </ChildAxisIterator>47 </ChildAxisIterator>
48 </FnCountIterator>48 </FnCountIterator>
4949
=== modified file 'test/iterplans/zorba/no-copy/hashjoin-9389.iter'
--- test/iterplans/zorba/no-copy/hashjoin-9389.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/hashjoin-9389.iter 2014-02-25 00:37:05 +0000
@@ -5,7 +5,7 @@
5 <FLWORIterator>5 <FLWORIterator>
6 <LetVariable name="$$opt_temp_0" materialize="true">6 <LetVariable name="$$opt_temp_0" materialize="true">
7 <HoistIterator>7 <HoistIterator>
8 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">8 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
9 <FnDocIterator>9 <FnDocIterator>
10 <SingletonIterator value="xs:string(books.xml)"/>10 <SingletonIterator value="xs:string(books.xml)"/>
11 </FnDocIterator>11 </FnDocIterator>
@@ -24,7 +24,7 @@
24 <ValueIndexEntryBuilderIterator>24 <ValueIndexEntryBuilderIterator>
25 <ForVarIterator varname="$$opt_temp_1"/>25 <ForVarIterator varname="$$opt_temp_1"/>
26 <FnCountIterator>26 <FnCountIterator>
27 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">27 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
28 <ForVarIterator varname="$$opt_temp_1"/>28 <ForVarIterator varname="$$opt_temp_1"/>
29 </ChildAxisIterator>29 </ChildAxisIterator>
30 </FnCountIterator>30 </FnCountIterator>
3131
=== modified file 'test/iterplans/zorba/no-copy/hashjoin-9390.iter'
--- test/iterplans/zorba/no-copy/hashjoin-9390.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/hashjoin-9390.iter 2014-02-25 00:37:05 +0000
@@ -2,7 +2,7 @@
2 <FLWORIterator>2 <FLWORIterator>
3 <LetVariable name="$$opt_temp_0" materialize="true">3 <LetVariable name="$$opt_temp_0" materialize="true">
4 <HoistIterator>4 <HoistIterator>
5 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">5 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
6 <FnDocIterator>6 <FnDocIterator>
7 <SingletonIterator value="xs:string(books.xml)"/>7 <SingletonIterator value="xs:string(books.xml)"/>
8 </FnDocIterator>8 </FnDocIterator>
@@ -21,7 +21,7 @@
21 <ValueIndexEntryBuilderIterator>21 <ValueIndexEntryBuilderIterator>
22 <ForVarIterator varname="$$opt_temp_1"/>22 <ForVarIterator varname="$$opt_temp_1"/>
23 <FnCountIterator>23 <FnCountIterator>
24 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">24 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
25 <ForVarIterator varname="$$opt_temp_1"/>25 <ForVarIterator varname="$$opt_temp_1"/>
26 </ChildAxisIterator>26 </ChildAxisIterator>
27 </FnCountIterator>27 </FnCountIterator>
2828
=== modified file 'test/iterplans/zorba/no-copy/hashjoin-9392.iter'
--- test/iterplans/zorba/no-copy/hashjoin-9392.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/hashjoin-9392.iter 2014-02-25 00:37:05 +0000
@@ -12,7 +12,7 @@
12 <FLWORIterator>12 <FLWORIterator>
13 <LetVariable name="$$opt_temp_0" materialize="true">13 <LetVariable name="$$opt_temp_0" materialize="true">
14 <HoistIterator>14 <HoistIterator>
15 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">15 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
16 <FnDocIterator>16 <FnDocIterator>
17 <SingletonIterator value="xs:string(books.xml)"/>17 <SingletonIterator value="xs:string(books.xml)"/>
18 </FnDocIterator>18 </FnDocIterator>
@@ -31,7 +31,7 @@
31 <ValueIndexEntryBuilderIterator>31 <ValueIndexEntryBuilderIterator>
32 <ForVarIterator varname="$$opt_temp_1"/>32 <ForVarIterator varname="$$opt_temp_1"/>
33 <FnCountIterator>33 <FnCountIterator>
34 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">34 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
35 <ForVarIterator varname="$$opt_temp_1"/>35 <ForVarIterator varname="$$opt_temp_1"/>
36 </ChildAxisIterator>36 </ChildAxisIterator>
37 </FnCountIterator>37 </FnCountIterator>
3838
=== modified file 'test/iterplans/zorba/no-copy/hashjoin-gary1.iter'
--- test/iterplans/zorba/no-copy/hashjoin-gary1.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/hashjoin-gary1.iter 2014-02-25 00:37:05 +0000
@@ -25,7 +25,7 @@
25 <EnclosedIterator attr_cont="false">25 <EnclosedIterator attr_cont="false">
26 <FLWORIterator>26 <FLWORIterator>
27 <LetVariable name="y" materialize="true">27 <LetVariable name="y" materialize="true">
28 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill allowed="0">28 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill-allowed="0">
29 <TupleStreamIterator>29 <TupleStreamIterator>
30 <WhereIterator>30 <WhereIterator>
31 <WhereIterator>31 <WhereIterator>
@@ -38,13 +38,13 @@
38 <SingletonIterator value="xs:string(../hashjoins/min_ic1980.xml)"/>38 <SingletonIterator value="xs:string(../hashjoins/min_ic1980.xml)"/>
39 </FnDocIterator>39 </FnDocIterator>
40 </ForIterator>40 </ForIterator>
41 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,ipeds)" typename="*" nill allowed="0">41 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,ipeds)" typename="*" nill-allowed="0">
42 <ForVarIterator varname="$$context-item"/>42 <ForVarIterator varname="$$context-item"/>
43 </ChildAxisIterator>43 </ChildAxisIterator>
44 </ForIterator>44 </ForIterator>
45 <CompareIterator>45 <CompareIterator>
46 <FnDataIterator>46 <FnDataIterator>
47 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill allowed="0">47 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill-allowed="0">
48 <ForVarIterator varname="$$context-item"/>48 <ForVarIterator varname="$$context-item"/>
49 </AttributeAxisIterator>49 </AttributeAxisIterator>
50 </FnDataIterator>50 </FnDataIterator>
@@ -53,7 +53,7 @@
53 </WhereIterator>53 </WhereIterator>
54 <CompareIterator>54 <CompareIterator>
55 <FnDataIterator>55 <FnDataIterator>
56 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill allowed="0">56 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill-allowed="0">
57 <ForVarIterator varname="$$context-item"/>57 <ForVarIterator varname="$$context-item"/>
58 </AttributeAxisIterator>58 </AttributeAxisIterator>
59 </FnDataIterator>59 </FnDataIterator>
@@ -74,7 +74,7 @@
74 <GeneralIndexEntryBuilderIterator>74 <GeneralIndexEntryBuilderIterator>
75 <ForVarIterator varname="$$opt_temp_2"/>75 <ForVarIterator varname="$$opt_temp_2"/>
76 <FnDataIterator>76 <FnDataIterator>
77 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,unitid)" typename="*" nill allowed="0">77 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,unitid)" typename="*" nill-allowed="0">
78 <ForVarIterator varname="$$opt_temp_2"/>78 <ForVarIterator varname="$$opt_temp_2"/>
79 </AttributeAxisIterator>79 </AttributeAxisIterator>
80 </FnDataIterator>80 </FnDataIterator>
@@ -84,8 +84,8 @@
84 </CreateInternalIndexIterator>84 </CreateInternalIndexIterator>
85 </LetVariable>85 </LetVariable>
86 <ForVariable name="i">86 <ForVariable name="i">
87 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inst)" typename="*" nill allowed="0">87 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,inst)" typename="*" nill-allowed="0">
88 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,institutions)" typename="*" nill allowed="0">88 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,institutions)" typename="*" nill-allowed="0">
89 <FnDocIterator>89 <FnDocIterator>
90 <SingletonIterator value="xs:string(../hashjoins/base.xml)"/>90 <SingletonIterator value="xs:string(../hashjoins/base.xml)"/>
91 </FnDocIterator>91 </FnDocIterator>
@@ -93,13 +93,13 @@
93 </ChildAxisIterator>93 </ChildAxisIterator>
94 </ForVariable>94 </ForVariable>
95 <LetVariable name="unitid" materialize="true">95 <LetVariable name="unitid" materialize="true">
96 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,unitid)" typename="*" nill allowed="0">96 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,unitid)" typename="*" nill-allowed="0">
97 <ForVarIterator varname="i"/>97 <ForVarIterator varname="i"/>
98 </AttributeAxisIterator>98 </AttributeAxisIterator>
99 </LetVariable>99 </LetVariable>
100 <LetVariable name="$$opt_temp_1" materialize="true">100 <LetVariable name="$$opt_temp_1" materialize="true">
101 <HoistIterator>101 <HoistIterator>
102 <AttributeAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">102 <AttributeAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
103 <FLWORIterator>103 <FLWORIterator>
104 <ForVariable name="$$context-item">104 <ForVariable name="$$context-item">
105 <NodeSortIterator distinct="true" ascending="true">105 <NodeSortIterator distinct="true" ascending="true">
@@ -131,12 +131,12 @@
131 <EnclosedIterator attr_cont="false">131 <EnclosedIterator attr_cont="false">
132 <FLWORIterator>132 <FLWORIterator>
133 <ForVariable name="j">133 <ForVariable name="j">
134 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill allowed="0">134 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill-allowed="0">
135 <ForVarIterator varname="i"/>135 <ForVarIterator varname="i"/>
136 </ChildAxisIterator>136 </ChildAxisIterator>
137 </ForVariable>137 </ForVariable>
138 <LetVariable name="year" materialize="true">138 <LetVariable name="year" materialize="true">
139 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">139 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
140 <ForVarIterator varname="j"/>140 <ForVarIterator varname="j"/>
141 </AttributeAxisIterator>141 </AttributeAxisIterator>
142 </LetVariable>142 </LetVariable>
@@ -163,12 +163,12 @@
163 <EnclosedIterator attr_cont="false">163 <EnclosedIterator attr_cont="false">
164 <FLWORIterator>164 <FLWORIterator>
165 <ForVariable name="k">165 <ForVariable name="k">
166 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill allowed="0">166 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill-allowed="0">
167 <ForVarIterator varname="j"/>167 <ForVarIterator varname="j"/>
168 </ChildAxisIterator>168 </ChildAxisIterator>
169 </ForVariable>169 </ForVariable>
170 <LetVariable name="file" materialize="true">170 <LetVariable name="file" materialize="true">
171 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">171 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
172 <ForVarIterator varname="k"/>172 <ForVarIterator varname="k"/>
173 </AttributeAxisIterator>173 </AttributeAxisIterator>
174 </LetVariable>174 </LetVariable>
175175
=== modified file 'test/iterplans/zorba/no-copy/hashjoin-idx1.iter'
--- test/iterplans/zorba/no-copy/hashjoin-idx1.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/hashjoin-idx1.iter 2014-02-25 00:37:05 +0000
@@ -7,9 +7,9 @@
7 </LetVariable>7 </LetVariable>
8 <LetVariable name="$$opt_temp_0" materialize="true">8 <LetVariable name="$$opt_temp_0" materialize="true">
9 <HoistIterator>9 <HoistIterator>
10 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">10 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
11 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">11 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
12 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">12 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
13 <LetVarIterator varname="auction"/>13 <LetVarIterator varname="auction"/>
14 </ChildAxisIterator>14 </ChildAxisIterator>
15 </ChildAxisIterator>15 </ChildAxisIterator>
@@ -29,8 +29,8 @@
29 <ForVarIterator varname="$$opt_temp_3"/>29 <ForVarIterator varname="$$opt_temp_3"/>
30 <PromoteIterator type="xs:anyAtomicType">30 <PromoteIterator type="xs:anyAtomicType">
31 <FnDataIterator>31 <FnDataIterator>
32 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">32 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
33 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">33 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
34 <ForVarIterator varname="$$opt_temp_3"/>34 <ForVarIterator varname="$$opt_temp_3"/>
35 </ChildAxisIterator>35 </ChildAxisIterator>
36 </AttributeAxisIterator>36 </AttributeAxisIterator>
@@ -42,9 +42,9 @@
42 </CreateInternalIndexIterator>42 </CreateInternalIndexIterator>
43 </LetVariable>43 </LetVariable>
44 <ForVariable name="p">44 <ForVariable name="p">
45 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">45 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
46 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">46 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
47 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">47 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
48 <LetVarIterator varname="auction"/>48 <LetVarIterator varname="auction"/>
49 </ChildAxisIterator>49 </ChildAxisIterator>
50 </ChildAxisIterator>50 </ChildAxisIterator>
@@ -53,8 +53,8 @@
53 <LetVariable name="$$opt_temp_2" materialize="true">53 <LetVariable name="$$opt_temp_2" materialize="true">
54 <HoistIterator>54 <HoistIterator>
55 <FnDataIterator>55 <FnDataIterator>
56 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">56 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
57 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">57 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
58 <ForVarIterator varname="p"/>58 <ForVarIterator varname="p"/>
59 </ChildAxisIterator>59 </ChildAxisIterator>
60 </ChildAxisIterator>60 </ChildAxisIterator>
@@ -64,7 +64,7 @@
64 <LetVariable name="$$opt_temp_1" materialize="true">64 <LetVariable name="$$opt_temp_1" materialize="true">
65 <HoistIterator>65 <HoistIterator>
66 <FnDataIterator>66 <FnDataIterator>
67 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">67 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
68 <ForVarIterator varname="p"/>68 <ForVarIterator varname="p"/>
69 </AttributeAxisIterator>69 </AttributeAxisIterator>
70 </FnDataIterator>70 </FnDataIterator>
7171
=== modified file 'test/iterplans/zorba/no-copy/hashjoin-idx4.iter'
--- test/iterplans/zorba/no-copy/hashjoin-idx4.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/hashjoin-idx4.iter 2014-02-25 00:37:05 +0000
@@ -2,7 +2,7 @@
2 <FunctionTraceIterator>2 <FunctionTraceIterator>
3 <FLWORIterator>3 <FLWORIterator>
4 <LetVariable name="e" materialize="true">4 <LetVariable name="e" materialize="true">
5 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,r2)" typename="*" nill allowed="0" target_position="0">5 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,r2)" typename="*" nill-allowed="0" target_position="0">
6 <ElementIterator>6 <ElementIterator>
7 <SingletonIterator value="xs:QName(,,r1)"/>7 <SingletonIterator value="xs:QName(,,r1)"/>
8 <FnConcatIterator/>8 <FnConcatIterator/>
@@ -34,7 +34,7 @@
34 </HoistIterator>34 </HoistIterator>
35 </ForVariable>35 </ForVariable>
36 <LetVariable name="parent" materialize="true">36 <LetVariable name="parent" materialize="true">
37 <ParentAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">37 <ParentAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
38 <LetVarIterator varname="e"/>38 <LetVarIterator varname="e"/>
39 </ParentAxisIterator>39 </ParentAxisIterator>
40 </LetVariable>40 </LetVariable>
4141
=== modified file 'test/iterplans/zorba/no-copy/hashjoin-q8.iter'
--- test/iterplans/zorba/no-copy/hashjoin-q8.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/hashjoin-q8.iter 2014-02-25 00:37:05 +0000
@@ -7,9 +7,9 @@
7 </LetVariable>7 </LetVariable>
8 <LetVariable name="$$opt_temp_0" materialize="true">8 <LetVariable name="$$opt_temp_0" materialize="true">
9 <HoistIterator>9 <HoistIterator>
10 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">10 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
11 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">11 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
12 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">12 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
13 <LetVarIterator varname="auction"/>13 <LetVarIterator varname="auction"/>
14 </ChildAxisIterator>14 </ChildAxisIterator>
15 </ChildAxisIterator>15 </ChildAxisIterator>
@@ -29,8 +29,8 @@
29 <ForVarIterator varname="$$opt_temp_2"/>29 <ForVarIterator varname="$$opt_temp_2"/>
30 <CastIterator type="xs:string">30 <CastIterator type="xs:string">
31 <FnDataIterator>31 <FnDataIterator>
32 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">32 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
33 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">33 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
34 <ForVarIterator varname="$$opt_temp_2"/>34 <ForVarIterator varname="$$opt_temp_2"/>
35 </ChildAxisIterator>35 </ChildAxisIterator>
36 </AttributeAxisIterator>36 </AttributeAxisIterator>
@@ -42,9 +42,9 @@
42 </CreateInternalIndexIterator>42 </CreateInternalIndexIterator>
43 </LetVariable>43 </LetVariable>
44 <ForVariable name="p">44 <ForVariable name="p">
45 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">45 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
46 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">46 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
47 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">47 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
48 <LetVarIterator varname="auction"/>48 <LetVarIterator varname="auction"/>
49 </ChildAxisIterator>49 </ChildAxisIterator>
50 </ChildAxisIterator>50 </ChildAxisIterator>
@@ -54,7 +54,7 @@
54 <HoistIterator>54 <HoistIterator>
55 <CastIterator type="xs:string">55 <CastIterator type="xs:string">
56 <FnDataIterator>56 <FnDataIterator>
57 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">57 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
58 <ForVarIterator varname="p"/>58 <ForVarIterator varname="p"/>
59 </AttributeAxisIterator>59 </AttributeAxisIterator>
60 </FnDataIterator>60 </FnDataIterator>
@@ -67,8 +67,8 @@
67 <AttributeIterator qname="xs:QName(,,person)">67 <AttributeIterator qname="xs:QName(,,person)">
68 <EnclosedIterator attr_cont="true">68 <EnclosedIterator attr_cont="true">
69 <FnDataIterator>69 <FnDataIterator>
70 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">70 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
71 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">71 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
72 <ForVarIterator varname="p"/>72 <ForVarIterator varname="p"/>
73 </ChildAxisIterator>73 </ChildAxisIterator>
74 </ChildAxisIterator>74 </ChildAxisIterator>
7575
=== modified file 'test/iterplans/zorba/no-copy/node-copy-01.iter'
--- test/iterplans/zorba/no-copy/node-copy-01.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/node-copy-01.iter 2014-02-25 00:37:05 +0000
@@ -13,14 +13,14 @@
13 </ElementIterator>13 </ElementIterator>
14 </CtxVarDeclareIterator>14 </CtxVarDeclareIterator>
15 <FnConcatIterator>15 <FnConcatIterator>
16 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0">16 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill-allowed="0">
17 <NodeCopyIterator>17 <NodeCopyIterator>
18 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">18 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
19 <ElementIterator>19 <ElementIterator>
20 <SingletonIterator value="xs:QName(,,node)"/>20 <SingletonIterator value="xs:QName(,,node)"/>
21 <FnConcatIterator/>21 <FnConcatIterator/>
22 <EnclosedIterator attr_cont="false">22 <EnclosedIterator attr_cont="false">
23 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">23 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
24 <CtxVarIterator varid="4" varname="doc" varkind="global"/>24 <CtxVarIterator varid="4" varname="doc" varkind="global"/>
25 </ChildAxisIterator>25 </ChildAxisIterator>
26 </EnclosedIterator>26 </EnclosedIterator>
2727
=== modified file 'test/iterplans/zorba/no-copy/node-copy-02.iter'
--- test/iterplans/zorba/no-copy/node-copy-02.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/node-copy-02.iter 2014-02-25 00:37:05 +0000
@@ -13,14 +13,14 @@
13 </ElementIterator>13 </ElementIterator>
14 </CtxVarDeclareIterator>14 </CtxVarDeclareIterator>
15 <FnConcatIterator>15 <FnConcatIterator>
16 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0">16 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill-allowed="0">
17 <NodeCopyIterator>17 <NodeCopyIterator>
18 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">18 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
19 <ElementIterator copyInputNodes="false">19 <ElementIterator copyInputNodes="false">
20 <SingletonIterator value="xs:QName(,,node)"/>20 <SingletonIterator value="xs:QName(,,node)"/>
21 <FnConcatIterator/>21 <FnConcatIterator/>
22 <EnclosedIterator attr_cont="false">22 <EnclosedIterator attr_cont="false">
23 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">23 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
24 <CtxVarIterator varid="4" varname="doc" varkind="global"/>24 <CtxVarIterator varid="4" varname="doc" varkind="global"/>
25 </ChildAxisIterator>25 </ChildAxisIterator>
26 </EnclosedIterator>26 </EnclosedIterator>
2727
=== modified file 'test/iterplans/zorba/no-copy/node-copy-03.iter'
--- test/iterplans/zorba/no-copy/node-copy-03.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/node-copy-03.iter 2014-02-25 00:37:05 +0000
@@ -13,14 +13,14 @@
13 </ElementIterator>13 </ElementIterator>
14 </CtxVarDeclareIterator>14 </CtxVarDeclareIterator>
15 <FnConcatIterator>15 <FnConcatIterator>
16 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0">16 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill-allowed="0">
17 <NodeCopyIterator>17 <NodeCopyIterator>
18 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">18 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
19 <ElementIterator copyInputNodes="false">19 <ElementIterator copyInputNodes="false">
20 <SingletonIterator value="xs:QName(,,node)"/>20 <SingletonIterator value="xs:QName(,,node)"/>
21 <FnConcatIterator/>21 <FnConcatIterator/>
22 <EnclosedIterator attr_cont="false">22 <EnclosedIterator attr_cont="false">
23 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">23 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
24 <CtxVarIterator varid="4" varname="doc" varkind="global"/>24 <CtxVarIterator varid="4" varname="doc" varkind="global"/>
25 </ChildAxisIterator>25 </ChildAxisIterator>
26 </EnclosedIterator>26 </EnclosedIterator>
2727
=== modified file 'test/iterplans/zorba/no-copy/path17.iter'
--- test/iterplans/zorba/no-copy/path17.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/path17.iter 2014-02-25 00:37:05 +0000
@@ -16,7 +16,7 @@
16 <NodeSortIterator distinct="true" ascending="true">16 <NodeSortIterator distinct="true" ascending="true">
17 <FLWORIterator>17 <FLWORIterator>
18 <ForVariable name="$$context-item">18 <ForVariable name="$$context-item">
19 <DescendantSelfAxisIterator test kind="match_anykind_test" qname="*" typename="*" nill allowed="0">19 <DescendantSelfAxisIterator test-kind="match_anykind_test" qname="*" typename="*" nill-allowed="0">
20 <FnDocIterator>20 <FnDocIterator>
21 <PromoteIterator type="xs:string">21 <PromoteIterator type="xs:string">
22 <FnDataIterator>22 <FnDataIterator>
@@ -27,20 +27,20 @@
27 </DescendantSelfAxisIterator>27 </DescendantSelfAxisIterator>
28 </ForVariable>28 </ForVariable>
29 <ForVariable name="$$context-item">29 <ForVariable name="$$context-item">
30 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,wildcard,input-file)" typename="*" nill allowed="0">30 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,wildcard,input-file)" typename="*" nill-allowed="0">
31 <ForVarIterator varname="$$context-item"/>31 <ForVarIterator varname="$$context-item"/>
32 </ChildAxisIterator>32 </ChildAxisIterator>
33 </ForVariable>33 </ForVariable>
34 <WhereClause>34 <WhereClause>
35 <AndIterator>35 <AndIterator>
36 <FnEmptyIterator>36 <FnEmptyIterator>
37 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,variable)" typename="*" nill allowed="0">37 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,variable)" typename="*" nill-allowed="0">
38 <ForVarIterator varname="$$context-item"/>38 <ForVarIterator varname="$$context-item"/>
39 </AttributeAxisIterator>39 </AttributeAxisIterator>
40 </FnEmptyIterator>40 </FnEmptyIterator>
41 <CompareIterator>41 <CompareIterator>
42 <FnDataIterator>42 <FnDataIterator>
43 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">43 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
44 <ForVarIterator varname="$$context-item"/>44 <ForVarIterator varname="$$context-item"/>
45 </ChildAxisIterator>45 </ChildAxisIterator>
46 </FnDataIterator>46 </FnDataIterator>
@@ -56,8 +56,8 @@
56 </ForVariable>56 </ForVariable>
57 <ReturnClause>57 <ReturnClause>
58 <FnStringIterator>58 <FnStringIterator>
59 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">59 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
60 <ParentAxisIterator test kind="match_anykind_test" qname="*" typename="*" nill allowed="0">60 <ParentAxisIterator test-kind="match_anykind_test" qname="*" typename="*" nill-allowed="0">
61 <ForVarIterator varname="x"/>61 <ForVarIterator varname="x"/>
62 </ParentAxisIterator>62 </ParentAxisIterator>
63 </AttributeAxisIterator>63 </AttributeAxisIterator>
6464
=== modified file 'test/iterplans/zorba/no-copy/q1.iter'
--- test/iterplans/zorba/no-copy/q1.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q1.iter 2014-02-25 00:37:05 +0000
@@ -10,8 +10,8 @@
10 <CtxVarDeclareIterator varid="4" varname="input-context"/>10 <CtxVarDeclareIterator varid="4" varname="input-context"/>
11 <FLWORIterator>11 <FLWORIterator>
12 <ForVariable name="$$context-item">12 <ForVariable name="$$context-item">
13 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">13 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
14 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">14 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
15 <FnDocIterator>15 <FnDocIterator>
16 <PromoteIterator type="xs:string">16 <PromoteIterator type="xs:string">
17 <FnDataIterator>17 <FnDataIterator>
@@ -23,14 +23,14 @@
23 </ChildAxisIterator>23 </ChildAxisIterator>
24 </ForVariable>24 </ForVariable>
25 <ForVariable name="$$context-item">25 <ForVariable name="$$context-item">
26 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">26 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
27 <ForVarIterator varname="$$context-item"/>27 <ForVarIterator varname="$$context-item"/>
28 </ChildAxisIterator>28 </ChildAxisIterator>
29 </ForVariable>29 </ForVariable>
30 <WhereClause>30 <WhereClause>
31 <CompareIterator>31 <CompareIterator>
32 <FnDataIterator>32 <FnDataIterator>
33 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">33 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
34 <ForVarIterator varname="$$context-item"/>34 <ForVarIterator varname="$$context-item"/>
35 </AttributeAxisIterator>35 </AttributeAxisIterator>
36 </FnDataIterator>36 </FnDataIterator>
@@ -38,8 +38,8 @@
38 </CompareIterator>38 </CompareIterator>
39 </WhereClause>39 </WhereClause>
40 <ReturnClause>40 <ReturnClause>
41 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">41 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
42 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">42 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
43 <ForVarIterator varname="$$context-item"/>43 <ForVarIterator varname="$$context-item"/>
44 </ChildAxisIterator>44 </ChildAxisIterator>
45 </ChildAxisIterator>45 </ChildAxisIterator>
4646
=== modified file 'test/iterplans/zorba/no-copy/q10.iter'
--- test/iterplans/zorba/no-copy/q10.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q10.iter 2014-02-25 00:37:05 +0000
@@ -13,9 +13,9 @@
13 </LetVariable>13 </LetVariable>
14 <LetVariable name="$$opt_temp_0" materialize="true">14 <LetVariable name="$$opt_temp_0" materialize="true">
15 <HoistIterator>15 <HoistIterator>
16 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">16 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
17 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">17 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
18 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">18 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
19 <LetVarIterator varname="auction"/>19 <LetVarIterator varname="auction"/>
20 </ChildAxisIterator>20 </ChildAxisIterator>
21 </ChildAxisIterator>21 </ChildAxisIterator>
@@ -34,9 +34,9 @@
34 <GeneralIndexEntryBuilderIterator>34 <GeneralIndexEntryBuilderIterator>
35 <ForVarIterator varname="$$opt_temp_1"/>35 <ForVarIterator varname="$$opt_temp_1"/>
36 <FnDataIterator>36 <FnDataIterator>
37 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,category)" typename="*" nill allowed="0">37 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,category)" typename="*" nill-allowed="0">
38 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,interest)" typename="*" nill allowed="0">38 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,interest)" typename="*" nill-allowed="0">
39 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">39 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
40 <ForVarIterator varname="$$opt_temp_1"/>40 <ForVarIterator varname="$$opt_temp_1"/>
41 </ChildAxisIterator>41 </ChildAxisIterator>
42 </ChildAxisIterator>42 </ChildAxisIterator>
@@ -50,12 +50,12 @@
50 <ForVariable name="i">50 <ForVariable name="i">
51 <FnDistinctValuesIterator>51 <FnDistinctValuesIterator>
52 <FnDataIterator>52 <FnDataIterator>
53 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,category)" typename="*" nill allowed="0">53 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,category)" typename="*" nill-allowed="0">
54 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,interest)" typename="*" nill allowed="0">54 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,interest)" typename="*" nill-allowed="0">
55 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">55 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
56 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">56 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
57 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">57 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
58 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">58 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
59 <LetVarIterator varname="auction"/>59 <LetVarIterator varname="auction"/>
60 </ChildAxisIterator>60 </ChildAxisIterator>
61 </ChildAxisIterator>61 </ChildAxisIterator>
@@ -96,9 +96,9 @@
96 <ElementIterator copyInputNodes="false">96 <ElementIterator copyInputNodes="false">
97 <SingletonIterator value="xs:QName(,,sexe)"/>97 <SingletonIterator value="xs:QName(,,sexe)"/>
98 <EnclosedIterator attr_cont="false">98 <EnclosedIterator attr_cont="false">
99 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">99 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
100 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,gender)" typename="*" nill allowed="0">100 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,gender)" typename="*" nill-allowed="0">
101 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">101 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
102 <ForVarIterator varname="t"/>102 <ForVarIterator varname="t"/>
103 </ChildAxisIterator>103 </ChildAxisIterator>
104 </ChildAxisIterator>104 </ChildAxisIterator>
@@ -108,9 +108,9 @@
108 <ElementIterator copyInputNodes="false">108 <ElementIterator copyInputNodes="false">
109 <SingletonIterator value="xs:QName(,,age)"/>109 <SingletonIterator value="xs:QName(,,age)"/>
110 <EnclosedIterator attr_cont="false">110 <EnclosedIterator attr_cont="false">
111 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">111 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
112 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,age)" typename="*" nill allowed="0">112 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,age)" typename="*" nill-allowed="0">
113 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">113 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
114 <ForVarIterator varname="t"/>114 <ForVarIterator varname="t"/>
115 </ChildAxisIterator>115 </ChildAxisIterator>
116 </ChildAxisIterator>116 </ChildAxisIterator>
@@ -120,9 +120,9 @@
120 <ElementIterator copyInputNodes="false">120 <ElementIterator copyInputNodes="false">
121 <SingletonIterator value="xs:QName(,,education)"/>121 <SingletonIterator value="xs:QName(,,education)"/>
122 <EnclosedIterator attr_cont="false">122 <EnclosedIterator attr_cont="false">
123 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">123 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
124 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,education)" typename="*" nill allowed="0">124 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,education)" typename="*" nill-allowed="0">
125 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">125 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
126 <ForVarIterator varname="t"/>126 <ForVarIterator varname="t"/>
127 </ChildAxisIterator>127 </ChildAxisIterator>
128 </ChildAxisIterator>128 </ChildAxisIterator>
@@ -133,8 +133,8 @@
133 <SingletonIterator value="xs:QName(,,revenu)"/>133 <SingletonIterator value="xs:QName(,,revenu)"/>
134 <EnclosedIterator attr_cont="false">134 <EnclosedIterator attr_cont="false">
135 <FnDataIterator>135 <FnDataIterator>
136 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">136 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
137 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">137 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
138 <ForVarIterator varname="t"/>138 <ForVarIterator varname="t"/>
139 </ChildAxisIterator>139 </ChildAxisIterator>
140 </AttributeAxisIterator>140 </AttributeAxisIterator>
@@ -149,8 +149,8 @@
149 <ElementIterator copyInputNodes="false">149 <ElementIterator copyInputNodes="false">
150 <SingletonIterator value="xs:QName(,,nom)"/>150 <SingletonIterator value="xs:QName(,,nom)"/>
151 <EnclosedIterator attr_cont="false">151 <EnclosedIterator attr_cont="false">
152 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">152 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
153 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">153 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
154 <ForVarIterator varname="t"/>154 <ForVarIterator varname="t"/>
155 </ChildAxisIterator>155 </ChildAxisIterator>
156 </ChildAxisIterator>156 </ChildAxisIterator>
@@ -159,9 +159,9 @@
159 <ElementIterator copyInputNodes="false">159 <ElementIterator copyInputNodes="false">
160 <SingletonIterator value="xs:QName(,,rue)"/>160 <SingletonIterator value="xs:QName(,,rue)"/>
161 <EnclosedIterator attr_cont="false">161 <EnclosedIterator attr_cont="false">
162 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">162 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
163 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,street)" typename="*" nill allowed="0">163 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,street)" typename="*" nill-allowed="0">
164 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,address)" typename="*" nill allowed="0">164 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,address)" typename="*" nill-allowed="0">
165 <ForVarIterator varname="t"/>165 <ForVarIterator varname="t"/>
166 </ChildAxisIterator>166 </ChildAxisIterator>
167 </ChildAxisIterator>167 </ChildAxisIterator>
@@ -171,9 +171,9 @@
171 <ElementIterator copyInputNodes="false">171 <ElementIterator copyInputNodes="false">
172 <SingletonIterator value="xs:QName(,,ville)"/>172 <SingletonIterator value="xs:QName(,,ville)"/>
173 <EnclosedIterator attr_cont="false">173 <EnclosedIterator attr_cont="false">
174 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">174 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
175 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,city)" typename="*" nill allowed="0">175 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,city)" typename="*" nill-allowed="0">
176 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,address)" typename="*" nill allowed="0">176 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,address)" typename="*" nill-allowed="0">
177 <ForVarIterator varname="t"/>177 <ForVarIterator varname="t"/>
178 </ChildAxisIterator>178 </ChildAxisIterator>
179 </ChildAxisIterator>179 </ChildAxisIterator>
@@ -183,9 +183,9 @@
183 <ElementIterator copyInputNodes="false">183 <ElementIterator copyInputNodes="false">
184 <SingletonIterator value="xs:QName(,,pays)"/>184 <SingletonIterator value="xs:QName(,,pays)"/>
185 <EnclosedIterator attr_cont="false">185 <EnclosedIterator attr_cont="false">
186 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">186 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
187 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,country)" typename="*" nill allowed="0">187 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,country)" typename="*" nill-allowed="0">
188 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,address)" typename="*" nill allowed="0">188 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,address)" typename="*" nill-allowed="0">
189 <ForVarIterator varname="t"/>189 <ForVarIterator varname="t"/>
190 </ChildAxisIterator>190 </ChildAxisIterator>
191 </ChildAxisIterator>191 </ChildAxisIterator>
@@ -198,8 +198,8 @@
198 <ElementIterator copyInputNodes="false">198 <ElementIterator copyInputNodes="false">
199 <SingletonIterator value="xs:QName(,,courrier)"/>199 <SingletonIterator value="xs:QName(,,courrier)"/>
200 <EnclosedIterator attr_cont="false">200 <EnclosedIterator attr_cont="false">
201 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">201 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
202 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,emailaddress)" typename="*" nill allowed="0">202 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,emailaddress)" typename="*" nill-allowed="0">
203 <ForVarIterator varname="t"/>203 <ForVarIterator varname="t"/>
204 </ChildAxisIterator>204 </ChildAxisIterator>
205 </ChildAxisIterator>205 </ChildAxisIterator>
@@ -208,8 +208,8 @@
208 <ElementIterator copyInputNodes="false">208 <ElementIterator copyInputNodes="false">
209 <SingletonIterator value="xs:QName(,,pagePerso)"/>209 <SingletonIterator value="xs:QName(,,pagePerso)"/>
210 <EnclosedIterator attr_cont="false">210 <EnclosedIterator attr_cont="false">
211 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">211 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
212 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,homepage)" typename="*" nill allowed="0">212 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,homepage)" typename="*" nill-allowed="0">
213 <ForVarIterator varname="t"/>213 <ForVarIterator varname="t"/>
214 </ChildAxisIterator>214 </ChildAxisIterator>
215 </ChildAxisIterator>215 </ChildAxisIterator>
@@ -222,8 +222,8 @@
222 <ElementIterator copyInputNodes="false">222 <ElementIterator copyInputNodes="false">
223 <SingletonIterator value="xs:QName(,,cartePaiement)"/>223 <SingletonIterator value="xs:QName(,,cartePaiement)"/>
224 <EnclosedIterator attr_cont="false">224 <EnclosedIterator attr_cont="false">
225 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">225 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
226 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,creditcard)" typename="*" nill allowed="0">226 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,creditcard)" typename="*" nill-allowed="0">
227 <ForVarIterator varname="t"/>227 <ForVarIterator varname="t"/>
228 </ChildAxisIterator>228 </ChildAxisIterator>
229 </ChildAxisIterator>229 </ChildAxisIterator>
230230
=== modified file 'test/iterplans/zorba/no-copy/q11.iter'
--- test/iterplans/zorba/no-copy/q11.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q11.iter 2014-02-25 00:37:05 +0000
@@ -18,10 +18,10 @@
18 </LetVariable>18 </LetVariable>
19 <LetVariable name="$$opt_temp_0" materialize="true">19 <LetVariable name="$$opt_temp_0" materialize="true">
20 <HoistIterator>20 <HoistIterator>
21 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,initial)" typename="*" nill allowed="0">21 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,initial)" typename="*" nill-allowed="0">
22 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">22 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill-allowed="0">
23 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill allowed="0">23 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill-allowed="0">
24 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">24 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
25 <LetVarIterator varname="auction"/>25 <LetVarIterator varname="auction"/>
26 </ChildAxisIterator>26 </ChildAxisIterator>
27 </ChildAxisIterator>27 </ChildAxisIterator>
@@ -30,9 +30,9 @@
30 </HoistIterator>30 </HoistIterator>
31 </LetVariable>31 </LetVariable>
32 <ForVariable name="p">32 <ForVariable name="p">
33 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">33 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
34 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">34 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
35 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">35 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
36 <LetVarIterator varname="auction"/>36 <LetVarIterator varname="auction"/>
37 </ChildAxisIterator>37 </ChildAxisIterator>
38 </ChildAxisIterator>38 </ChildAxisIterator>
@@ -41,8 +41,8 @@
41 <LetVariable name="$$opt_temp_1" materialize="true">41 <LetVariable name="$$opt_temp_1" materialize="true">
42 <HoistIterator>42 <HoistIterator>
43 <FnDataIterator>43 <FnDataIterator>
44 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">44 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
45 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">45 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
46 <ForVarIterator varname="p"/>46 <ForVarIterator varname="p"/>
47 </ChildAxisIterator>47 </ChildAxisIterator>
48 </AttributeAxisIterator>48 </AttributeAxisIterator>
@@ -55,8 +55,8 @@
55 <AttributeIterator qname="xs:QName(,,name)">55 <AttributeIterator qname="xs:QName(,,name)">
56 <EnclosedIterator attr_cont="true">56 <EnclosedIterator attr_cont="true">
57 <FnDataIterator>57 <FnDataIterator>
58 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">58 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
59 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">59 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
60 <ForVarIterator varname="p"/>60 <ForVarIterator varname="p"/>
61 </ChildAxisIterator>61 </ChildAxisIterator>
62 </ChildAxisIterator>62 </ChildAxisIterator>
@@ -81,7 +81,7 @@
81 <PromoteIterator type="xs:double">81 <PromoteIterator type="xs:double">
82 <FnDataIterator>82 <FnDataIterator>
83 <FnExactlyOneIterator>83 <FnExactlyOneIterator>
84 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">84 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
85 <ForVarIterator varname="i"/>85 <ForVarIterator varname="i"/>
86 </ChildAxisIterator>86 </ChildAxisIterator>
87 </FnExactlyOneIterator>87 </FnExactlyOneIterator>
8888
=== modified file 'test/iterplans/zorba/no-copy/q12.iter'
--- test/iterplans/zorba/no-copy/q12.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q12.iter 2014-02-25 00:37:05 +0000
@@ -18,10 +18,10 @@
18 </LetVariable>18 </LetVariable>
19 <LetVariable name="$$opt_temp_0" materialize="true">19 <LetVariable name="$$opt_temp_0" materialize="true">
20 <HoistIterator>20 <HoistIterator>
21 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,initial)" typename="*" nill allowed="0">21 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,initial)" typename="*" nill-allowed="0">
22 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">22 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill-allowed="0">
23 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill allowed="0">23 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill-allowed="0">
24 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">24 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
25 <LetVarIterator varname="auction"/>25 <LetVarIterator varname="auction"/>
26 </ChildAxisIterator>26 </ChildAxisIterator>
27 </ChildAxisIterator>27 </ChildAxisIterator>
@@ -30,9 +30,9 @@
30 </HoistIterator>30 </HoistIterator>
31 </LetVariable>31 </LetVariable>
32 <ForVariable name="p">32 <ForVariable name="p">
33 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">33 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
34 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">34 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
35 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">35 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
36 <LetVarIterator varname="auction"/>36 <LetVarIterator varname="auction"/>
37 </ChildAxisIterator>37 </ChildAxisIterator>
38 </ChildAxisIterator>38 </ChildAxisIterator>
@@ -41,8 +41,8 @@
41 <LetVariable name="$$opt_temp_1" materialize="true">41 <LetVariable name="$$opt_temp_1" materialize="true">
42 <HoistIterator>42 <HoistIterator>
43 <FnDataIterator>43 <FnDataIterator>
44 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">44 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
45 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">45 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
46 <ForVarIterator varname="p"/>46 <ForVarIterator varname="p"/>
47 </ChildAxisIterator>47 </ChildAxisIterator>
48 </AttributeAxisIterator>48 </AttributeAxisIterator>
@@ -52,8 +52,8 @@
52 <WhereClause>52 <WhereClause>
53 <CompareIterator>53 <CompareIterator>
54 <FnDataIterator>54 <FnDataIterator>
55 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">55 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
56 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">56 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
57 <ForVarIterator varname="p"/>57 <ForVarIterator varname="p"/>
58 </ChildAxisIterator>58 </ChildAxisIterator>
59 </AttributeAxisIterator>59 </AttributeAxisIterator>
@@ -67,8 +67,8 @@
67 <AttributeIterator qname="xs:QName(,,person)">67 <AttributeIterator qname="xs:QName(,,person)">
68 <EnclosedIterator attr_cont="true">68 <EnclosedIterator attr_cont="true">
69 <FnDataIterator>69 <FnDataIterator>
70 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">70 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
71 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">71 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
72 <ForVarIterator varname="p"/>72 <ForVarIterator varname="p"/>
73 </ChildAxisIterator>73 </ChildAxisIterator>
74 </AttributeAxisIterator>74 </AttributeAxisIterator>
@@ -93,7 +93,7 @@
93 <PromoteIterator type="xs:double">93 <PromoteIterator type="xs:double">
94 <FnDataIterator>94 <FnDataIterator>
95 <FnExactlyOneIterator>95 <FnExactlyOneIterator>
96 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">96 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
97 <ForVarIterator varname="i"/>97 <ForVarIterator varname="i"/>
98 </ChildAxisIterator>98 </ChildAxisIterator>
99 </FnExactlyOneIterator>99 </FnExactlyOneIterator>
100100
=== modified file 'test/iterplans/zorba/no-copy/q13.iter'
--- test/iterplans/zorba/no-copy/q13.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q13.iter 2014-02-25 00:37:05 +0000
@@ -3,10 +3,10 @@
3 <CtxVarDeclareIterator varid="4" varname="input-context"/>3 <CtxVarDeclareIterator varid="4" varname="input-context"/>
4 <FLWORIterator>4 <FLWORIterator>
5 <ForVariable name="i">5 <ForVariable name="i">
6 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">6 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill-allowed="0">
7 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,australia)" typename="*" nill allowed="0">7 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,australia)" typename="*" nill-allowed="0">
8 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill allowed="0">8 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill-allowed="0">
9 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">9 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
10 <FnDocIterator>10 <FnDocIterator>
11 <PromoteIterator type="xs:string">11 <PromoteIterator type="xs:string">
12 <FnDataIterator>12 <FnDataIterator>
@@ -25,8 +25,8 @@
25 <AttributeIterator qname="xs:QName(,,name)">25 <AttributeIterator qname="xs:QName(,,name)">
26 <EnclosedIterator attr_cont="true">26 <EnclosedIterator attr_cont="true">
27 <FnDataIterator>27 <FnDataIterator>
28 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">28 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
29 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">29 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
30 <ForVarIterator varname="i"/>30 <ForVarIterator varname="i"/>
31 </ChildAxisIterator>31 </ChildAxisIterator>
32 </ChildAxisIterator>32 </ChildAxisIterator>
@@ -34,7 +34,7 @@
34 </EnclosedIterator>34 </EnclosedIterator>
35 </AttributeIterator>35 </AttributeIterator>
36 <EnclosedIterator attr_cont="false">36 <EnclosedIterator attr_cont="false">
37 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill allowed="0">37 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill-allowed="0">
38 <ForVarIterator varname="i"/>38 <ForVarIterator varname="i"/>
39 </ChildAxisIterator>39 </ChildAxisIterator>
40 </EnclosedIterator>40 </EnclosedIterator>
4141
=== modified file 'test/iterplans/zorba/no-copy/q14.iter'
--- test/iterplans/zorba/no-copy/q14.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q14.iter 2014-02-25 00:37:05 +0000
@@ -3,8 +3,8 @@
3 <CtxVarDeclareIterator varid="4" varname="input-context"/>3 <CtxVarDeclareIterator varid="4" varname="input-context"/>
4 <FLWORIterator>4 <FLWORIterator>
5 <ForVariable name="i">5 <ForVariable name="i">
6 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">6 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill-allowed="0">
7 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">7 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
8 <FnDocIterator>8 <FnDocIterator>
9 <PromoteIterator type="xs:string">9 <PromoteIterator type="xs:string">
10 <FnDataIterator>10 <FnDataIterator>
@@ -19,7 +19,7 @@
19 <ContainsIterator>19 <ContainsIterator>
20 <FnStringIterator>20 <FnStringIterator>
21 <FnExactlyOneIterator>21 <FnExactlyOneIterator>
22 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill allowed="0">22 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill-allowed="0">
23 <ForVarIterator varname="i"/>23 <ForVarIterator varname="i"/>
24 </ChildAxisIterator>24 </ChildAxisIterator>
25 </FnExactlyOneIterator>25 </FnExactlyOneIterator>
@@ -28,8 +28,8 @@
28 </ContainsIterator>28 </ContainsIterator>
29 </WhereClause>29 </WhereClause>
30 <ReturnClause>30 <ReturnClause>
31 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">31 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
32 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">32 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
33 <ForVarIterator varname="i"/>33 <ForVarIterator varname="i"/>
34 </ChildAxisIterator>34 </ChildAxisIterator>
35 </ChildAxisIterator>35 </ChildAxisIterator>
3636
=== modified file 'test/iterplans/zorba/no-copy/q15.iter'
--- test/iterplans/zorba/no-copy/q15.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q15.iter 2014-02-25 00:37:05 +0000
@@ -3,19 +3,19 @@
3 <CtxVarDeclareIterator varid="4" varname="input-context"/>3 <CtxVarDeclareIterator varid="4" varname="input-context"/>
4 <FLWORIterator>4 <FLWORIterator>
5 <ForVariable name="a">5 <ForVariable name="a">
6 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">6 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
7 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,keyword)" typename="*" nill allowed="0">7 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,keyword)" typename="*" nill-allowed="0">
8 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,emph)" typename="*" nill allowed="0">8 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,emph)" typename="*" nill-allowed="0">
9 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,text)" typename="*" nill allowed="0">9 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,text)" typename="*" nill-allowed="0">
10 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,listitem)" typename="*" nill allowed="0">10 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,listitem)" typename="*" nill-allowed="0">
11 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,parlist)" typename="*" nill allowed="0">11 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,parlist)" typename="*" nill-allowed="0">
12 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,listitem)" typename="*" nill allowed="0">12 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,listitem)" typename="*" nill-allowed="0">
13 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,parlist)" typename="*" nill allowed="0">13 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,parlist)" typename="*" nill-allowed="0">
14 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill allowed="0">14 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill-allowed="0">
15 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,annotation)" typename="*" nill allowed="0">15 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,annotation)" typename="*" nill-allowed="0">
16 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">16 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
17 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">17 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
18 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">18 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
19 <FnDocIterator>19 <FnDocIterator>
20 <PromoteIterator type="xs:string">20 <PromoteIterator type="xs:string">
21 <FnDataIterator>21 <FnDataIterator>
2222
=== modified file 'test/iterplans/zorba/no-copy/q16.iter'
--- test/iterplans/zorba/no-copy/q16.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q16.iter 2014-02-25 00:37:05 +0000
@@ -3,9 +3,9 @@
3 <CtxVarDeclareIterator varid="4" varname="input-context"/>3 <CtxVarDeclareIterator varid="4" varname="input-context"/>
4 <FLWORIterator>4 <FLWORIterator>
5 <ForVariable name="a">5 <ForVariable name="a">
6 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">6 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
7 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">7 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
8 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">8 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
9 <FnDocIterator>9 <FnDocIterator>
10 <PromoteIterator type="xs:string">10 <PromoteIterator type="xs:string">
11 <FnDataIterator>11 <FnDataIterator>
@@ -20,16 +20,16 @@
20 <WhereClause>20 <WhereClause>
21 <FnBooleanIterator>21 <FnBooleanIterator>
22 <FnEmptyIterator>22 <FnEmptyIterator>
23 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">23 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
24 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,keyword)" typename="*" nill allowed="0">24 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,keyword)" typename="*" nill-allowed="0">
25 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,emph)" typename="*" nill allowed="0">25 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,emph)" typename="*" nill-allowed="0">
26 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,text)" typename="*" nill allowed="0">26 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,text)" typename="*" nill-allowed="0">
27 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,listitem)" typename="*" nill allowed="0">27 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,listitem)" typename="*" nill-allowed="0">
28 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,parlist)" typename="*" nill allowed="0">28 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,parlist)" typename="*" nill-allowed="0">
29 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,listitem)" typename="*" nill allowed="0">29 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,listitem)" typename="*" nill-allowed="0">
30 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,parlist)" typename="*" nill allowed="0">30 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,parlist)" typename="*" nill-allowed="0">
31 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill allowed="0">31 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill-allowed="0">
32 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,annotation)" typename="*" nill allowed="0">32 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,annotation)" typename="*" nill-allowed="0">
33 <ForVarIterator varname="a"/>33 <ForVarIterator varname="a"/>
34 </ChildAxisIterator>34 </ChildAxisIterator>
35 </ChildAxisIterator>35 </ChildAxisIterator>
@@ -50,8 +50,8 @@
50 <AttributeIterator qname="xs:QName(,,id)">50 <AttributeIterator qname="xs:QName(,,id)">
51 <EnclosedIterator attr_cont="true">51 <EnclosedIterator attr_cont="true">
52 <FnDataIterator>52 <FnDataIterator>
53 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">53 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
54 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,seller)" typename="*" nill allowed="0">54 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,seller)" typename="*" nill-allowed="0">
55 <ForVarIterator varname="a"/>55 <ForVarIterator varname="a"/>
56 </ChildAxisIterator>56 </ChildAxisIterator>
57 </AttributeAxisIterator>57 </AttributeAxisIterator>
5858
=== modified file 'test/iterplans/zorba/no-copy/q17.iter'
--- test/iterplans/zorba/no-copy/q17.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q17.iter 2014-02-25 00:37:05 +0000
@@ -3,9 +3,9 @@
3 <CtxVarDeclareIterator varid="4" varname="input-context"/>3 <CtxVarDeclareIterator varid="4" varname="input-context"/>
4 <FLWORIterator>4 <FLWORIterator>
5 <ForVariable name="p">5 <ForVariable name="p">
6 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">6 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
7 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">7 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
8 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">8 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
9 <FnDocIterator>9 <FnDocIterator>
10 <PromoteIterator type="xs:string">10 <PromoteIterator type="xs:string">
11 <FnDataIterator>11 <FnDataIterator>
@@ -19,8 +19,8 @@
19 </ForVariable>19 </ForVariable>
20 <WhereClause>20 <WhereClause>
21 <FnEmptyIterator>21 <FnEmptyIterator>
22 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">22 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
23 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,homepage)" typename="*" nill allowed="0">23 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,homepage)" typename="*" nill-allowed="0">
24 <ForVarIterator varname="p"/>24 <ForVarIterator varname="p"/>
25 </ChildAxisIterator>25 </ChildAxisIterator>
26 </ChildAxisIterator>26 </ChildAxisIterator>
@@ -32,8 +32,8 @@
32 <AttributeIterator qname="xs:QName(,,name)">32 <AttributeIterator qname="xs:QName(,,name)">
33 <EnclosedIterator attr_cont="true">33 <EnclosedIterator attr_cont="true">
34 <FnDataIterator>34 <FnDataIterator>
35 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">35 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
36 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">36 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
37 <ForVarIterator varname="p"/>37 <ForVarIterator varname="p"/>
38 </ChildAxisIterator>38 </ChildAxisIterator>
39 </ChildAxisIterator>39 </ChildAxisIterator>
4040
=== modified file 'test/iterplans/zorba/no-copy/q18.iter'
--- test/iterplans/zorba/no-copy/q18.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q18.iter 2014-02-25 00:37:05 +0000
@@ -3,9 +3,9 @@
3 <CtxVarDeclareIterator varid="4" varname="input-context"/>3 <CtxVarDeclareIterator varid="4" varname="input-context"/>
4 <FLWORIterator>4 <FLWORIterator>
5 <ForVariable name="i">5 <ForVariable name="i">
6 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">6 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill-allowed="0">
7 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill allowed="0">7 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill-allowed="0">
8 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">8 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
9 <FnDocIterator>9 <FnDocIterator>
10 <PromoteIterator type="xs:string">10 <PromoteIterator type="xs:string">
11 <FnDataIterator>11 <FnDataIterator>
@@ -24,7 +24,7 @@
24 <PromoteIterator type="xs:decimal">24 <PromoteIterator type="xs:decimal">
25 <FnDataIterator>25 <FnDataIterator>
26 <FnZeroOrOneIterator>26 <FnZeroOrOneIterator>
27 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,reserve)" typename="*" nill allowed="0">27 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,reserve)" typename="*" nill-allowed="0">
28 <ForVarIterator varname="i"/>28 <ForVarIterator varname="i"/>
29 </ChildAxisIterator>29 </ChildAxisIterator>
30 </FnZeroOrOneIterator>30 </FnZeroOrOneIterator>
3131
=== modified file 'test/iterplans/zorba/no-copy/q19.iter'
--- test/iterplans/zorba/no-copy/q19.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q19.iter 2014-02-25 00:37:05 +0000
@@ -3,9 +3,9 @@
3 <CtxVarDeclareIterator varid="4" varname="input-context"/>3 <CtxVarDeclareIterator varid="4" varname="input-context"/>
4 <FLWORIterator>4 <FLWORIterator>
5 <ForVariable name="b">5 <ForVariable name="b">
6 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">6 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill-allowed="0">
7 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill allowed="0">7 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill-allowed="0">
8 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">8 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
9 <FnDocIterator>9 <FnDocIterator>
10 <PromoteIterator type="xs:string">10 <PromoteIterator type="xs:string">
11 <FnDataIterator>11 <FnDataIterator>
@@ -20,7 +20,7 @@
20 <OrderBySpec>20 <OrderBySpec>
21 <FnDataIterator>21 <FnDataIterator>
22 <FnZeroOrOneIterator>22 <FnZeroOrOneIterator>
23 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,location)" typename="*" nill allowed="0">23 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,location)" typename="*" nill-allowed="0">
24 <ForVarIterator varname="b"/>24 <ForVarIterator varname="b"/>
25 </ChildAxisIterator>25 </ChildAxisIterator>
26 </FnZeroOrOneIterator>26 </FnZeroOrOneIterator>
@@ -32,8 +32,8 @@
32 <AttributeIterator qname="xs:QName(,,name)">32 <AttributeIterator qname="xs:QName(,,name)">
33 <EnclosedIterator attr_cont="true">33 <EnclosedIterator attr_cont="true">
34 <FnDataIterator>34 <FnDataIterator>
35 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">35 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
36 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">36 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
37 <ForVarIterator varname="b"/>37 <ForVarIterator varname="b"/>
38 </ChildAxisIterator>38 </ChildAxisIterator>
39 </ChildAxisIterator>39 </ChildAxisIterator>
@@ -41,8 +41,8 @@
41 </EnclosedIterator>41 </EnclosedIterator>
42 </AttributeIterator>42 </AttributeIterator>
43 <EnclosedIterator attr_cont="false">43 <EnclosedIterator attr_cont="false">
44 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">44 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
45 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,location)" typename="*" nill allowed="0">45 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,location)" typename="*" nill-allowed="0">
46 <ForVarIterator varname="b"/>46 <ForVarIterator varname="b"/>
47 </ChildAxisIterator>47 </ChildAxisIterator>
48 </ChildAxisIterator>48 </ChildAxisIterator>
4949
=== modified file 'test/iterplans/zorba/no-copy/q2.iter'
--- test/iterplans/zorba/no-copy/q2.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q2.iter 2014-02-25 00:37:05 +0000
@@ -3,9 +3,9 @@
3 <CtxVarDeclareIterator varid="4" varname="input-context"/>3 <CtxVarDeclareIterator varid="4" varname="input-context"/>
4 <FLWORIterator>4 <FLWORIterator>
5 <ForVariable name="b">5 <ForVariable name="b">
6 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">6 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill-allowed="0">
7 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill allowed="0">7 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill-allowed="0">
8 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">8 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
9 <FnDocIterator>9 <FnDocIterator>
10 <PromoteIterator type="xs:string">10 <PromoteIterator type="xs:string">
11 <FnDataIterator>11 <FnDataIterator>
@@ -21,9 +21,9 @@
21 <ElementIterator copyInputNodes="false">21 <ElementIterator copyInputNodes="false">
22 <SingletonIterator value="xs:QName(,,increase)"/>22 <SingletonIterator value="xs:QName(,,increase)"/>
23 <EnclosedIterator attr_cont="false">23 <EnclosedIterator attr_cont="false">
24 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">24 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
25 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill allowed="0">25 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill-allowed="0">
26 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0" target_position="0">26 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill-allowed="0" target_position="0">
27 <ForVarIterator varname="b"/>27 <ForVarIterator varname="b"/>
28 </ChildAxisIterator>28 </ChildAxisIterator>
29 </ChildAxisIterator>29 </ChildAxisIterator>
3030
=== modified file 'test/iterplans/zorba/no-copy/q20.iter'
--- test/iterplans/zorba/no-copy/q20.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q20.iter 2014-02-25 00:37:05 +0000
@@ -42,23 +42,23 @@
42 <FnCountIterator>42 <FnCountIterator>
43 <FLWORIterator>43 <FLWORIterator>
44 <ForVariable name="$$context-item">44 <ForVariable name="$$context-item">
45 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">45 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
46 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">46 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
47 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">47 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
48 <LetVarIterator varname="auction"/>48 <LetVarIterator varname="auction"/>
49 </ChildAxisIterator>49 </ChildAxisIterator>
50 </ChildAxisIterator>50 </ChildAxisIterator>
51 </ChildAxisIterator>51 </ChildAxisIterator>
52 </ForVariable>52 </ForVariable>
53 <ForVariable name="$$context-item">53 <ForVariable name="$$context-item">
54 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">54 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
55 <ForVarIterator varname="$$context-item"/>55 <ForVarIterator varname="$$context-item"/>
56 </ChildAxisIterator>56 </ChildAxisIterator>
57 </ForVariable>57 </ForVariable>
58 <WhereClause>58 <WhereClause>
59 <CompareIterator>59 <CompareIterator>
60 <FnDataIterator>60 <FnDataIterator>
61 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">61 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
62 <ForVarIterator varname="$$context-item"/>62 <ForVarIterator varname="$$context-item"/>
63 </AttributeAxisIterator>63 </AttributeAxisIterator>
64 </FnDataIterator>64 </FnDataIterator>
@@ -78,16 +78,16 @@
78 <FnCountIterator>78 <FnCountIterator>
79 <FLWORIterator>79 <FLWORIterator>
80 <ForVariable name="$$context-item">80 <ForVariable name="$$context-item">
81 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">81 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
82 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">82 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
83 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">83 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
84 <LetVarIterator varname="auction"/>84 <LetVarIterator varname="auction"/>
85 </ChildAxisIterator>85 </ChildAxisIterator>
86 </ChildAxisIterator>86 </ChildAxisIterator>
87 </ChildAxisIterator>87 </ChildAxisIterator>
88 </ForVariable>88 </ForVariable>
89 <ForVariable name="$$context-item">89 <ForVariable name="$$context-item">
90 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">90 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
91 <ForVarIterator varname="$$context-item"/>91 <ForVarIterator varname="$$context-item"/>
92 </ChildAxisIterator>92 </ChildAxisIterator>
93 </ForVariable>93 </ForVariable>
@@ -95,7 +95,7 @@
95 <AndIterator>95 <AndIterator>
96 <CompareIterator>96 <CompareIterator>
97 <FnDataIterator>97 <FnDataIterator>
98 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">98 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
99 <ForVarIterator varname="$$context-item"/>99 <ForVarIterator varname="$$context-item"/>
100 </AttributeAxisIterator>100 </AttributeAxisIterator>
101 </FnDataIterator>101 </FnDataIterator>
@@ -103,7 +103,7 @@
103 </CompareIterator>103 </CompareIterator>
104 <CompareIterator>104 <CompareIterator>
105 <FnDataIterator>105 <FnDataIterator>
106 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">106 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
107 <ForVarIterator varname="$$context-item"/>107 <ForVarIterator varname="$$context-item"/>
108 </AttributeAxisIterator>108 </AttributeAxisIterator>
109 </FnDataIterator>109 </FnDataIterator>
@@ -124,23 +124,23 @@
124 <FnCountIterator>124 <FnCountIterator>
125 <FLWORIterator>125 <FLWORIterator>
126 <ForVariable name="$$context-item">126 <ForVariable name="$$context-item">
127 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">127 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
128 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">128 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
129 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">129 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
130 <LetVarIterator varname="auction"/>130 <LetVarIterator varname="auction"/>
131 </ChildAxisIterator>131 </ChildAxisIterator>
132 </ChildAxisIterator>132 </ChildAxisIterator>
133 </ChildAxisIterator>133 </ChildAxisIterator>
134 </ForVariable>134 </ForVariable>
135 <ForVariable name="$$context-item">135 <ForVariable name="$$context-item">
136 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">136 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
137 <ForVarIterator varname="$$context-item"/>137 <ForVarIterator varname="$$context-item"/>
138 </ChildAxisIterator>138 </ChildAxisIterator>
139 </ForVariable>139 </ForVariable>
140 <WhereClause>140 <WhereClause>
141 <CompareIterator>141 <CompareIterator>
142 <FnDataIterator>142 <FnDataIterator>
143 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">143 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
144 <ForVarIterator varname="$$context-item"/>144 <ForVarIterator varname="$$context-item"/>
145 </AttributeAxisIterator>145 </AttributeAxisIterator>
146 </FnDataIterator>146 </FnDataIterator>
@@ -160,9 +160,9 @@
160 <FnCountIterator>160 <FnCountIterator>
161 <FLWORIterator>161 <FLWORIterator>
162 <ForVariable name="p">162 <ForVariable name="p">
163 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">163 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
164 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">164 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
165 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">165 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
166 <LetVarIterator varname="auction"/>166 <LetVarIterator varname="auction"/>
167 </ChildAxisIterator>167 </ChildAxisIterator>
168 </ChildAxisIterator>168 </ChildAxisIterator>
@@ -170,8 +170,8 @@
170 </ForVariable>170 </ForVariable>
171 <WhereClause>171 <WhereClause>
172 <FnEmptyIterator>172 <FnEmptyIterator>
173 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">173 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
174 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">174 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
175 <ForVarIterator varname="p"/>175 <ForVarIterator varname="p"/>
176 </ChildAxisIterator>176 </ChildAxisIterator>
177 </AttributeAxisIterator>177 </AttributeAxisIterator>
178178
=== modified file 'test/iterplans/zorba/no-copy/q3.iter'
--- test/iterplans/zorba/no-copy/q3.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q3.iter 2014-02-25 00:37:05 +0000
@@ -8,9 +8,9 @@
8 <CtxVarDeclareIterator varid="4" varname="input-context"/>8 <CtxVarDeclareIterator varid="4" varname="input-context"/>
9 <FLWORIterator>9 <FLWORIterator>
10 <ForVariable name="b">10 <ForVariable name="b">
11 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">11 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill-allowed="0">
12 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill allowed="0">12 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill-allowed="0">
13 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">13 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
14 <FnDocIterator>14 <FnDocIterator>
15 <PromoteIterator type="xs:string">15 <PromoteIterator type="xs:string">
16 <FnDataIterator>16 <FnDataIterator>
@@ -28,9 +28,9 @@
28 <PromoteIterator type="xs:double">28 <PromoteIterator type="xs:double">
29 <FnDataIterator>29 <FnDataIterator>
30 <FnZeroOrOneIterator>30 <FnZeroOrOneIterator>
31 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">31 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
32 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill allowed="0">32 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill-allowed="0">
33 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0" target_position="0">33 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill-allowed="0" target_position="0">
34 <ForVarIterator varname="b"/>34 <ForVarIterator varname="b"/>
35 </ChildAxisIterator>35 </ChildAxisIterator>
36 </ChildAxisIterator>36 </ChildAxisIterator>
@@ -41,11 +41,11 @@
41 <SingletonIterator value="xs:double(2)"/>41 <SingletonIterator value="xs:double(2)"/>
42 </SpecificNumArithIterator_MultiplyOperation_DOUBLE>42 </SpecificNumArithIterator_MultiplyOperation_DOUBLE>
43 <FnDataIterator>43 <FnDataIterator>
44 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">44 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
45 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill allowed="0">45 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill-allowed="0">
46 <FLWORIterator>46 <FLWORIterator>
47 <LetVariable name="$$temp4" materialize="true">47 <LetVariable name="$$temp4" materialize="true">
48 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0">48 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill-allowed="0">
49 <ForVarIterator varname="b"/>49 <ForVarIterator varname="b"/>
50 </ChildAxisIterator>50 </ChildAxisIterator>
51 </LetVariable>51 </LetVariable>
@@ -69,9 +69,9 @@
69 <AttributeIterator qname="xs:QName(,,first)">69 <AttributeIterator qname="xs:QName(,,first)">
70 <EnclosedIterator attr_cont="true">70 <EnclosedIterator attr_cont="true">
71 <FnDataIterator>71 <FnDataIterator>
72 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">72 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
73 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill allowed="0">73 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill-allowed="0">
74 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0" target_position="0">74 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill-allowed="0" target_position="0">
75 <ForVarIterator varname="b"/>75 <ForVarIterator varname="b"/>
76 </ChildAxisIterator>76 </ChildAxisIterator>
77 </ChildAxisIterator>77 </ChildAxisIterator>
@@ -82,11 +82,11 @@
82 <AttributeIterator qname="xs:QName(,,last)">82 <AttributeIterator qname="xs:QName(,,last)">
83 <EnclosedIterator attr_cont="true">83 <EnclosedIterator attr_cont="true">
84 <FnDataIterator>84 <FnDataIterator>
85 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">85 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
86 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill allowed="0">86 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill-allowed="0">
87 <FLWORIterator>87 <FLWORIterator>
88 <LetVariable name="$$temp8" materialize="true">88 <LetVariable name="$$temp8" materialize="true">
89 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0">89 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill-allowed="0">
90 <ForVarIterator varname="b"/>90 <ForVarIterator varname="b"/>
91 </ChildAxisIterator>91 </ChildAxisIterator>
92 </LetVariable>92 </LetVariable>
9393
=== modified file 'test/iterplans/zorba/no-copy/q4.iter'
--- test/iterplans/zorba/no-copy/q4.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q4.iter 2014-02-25 00:37:05 +0000
@@ -17,9 +17,9 @@
17 <CtxVarDeclareIterator varid="4" varname="input-context"/>17 <CtxVarDeclareIterator varid="4" varname="input-context"/>
18 <FLWORIterator>18 <FLWORIterator>
19 <ForVariable name="b">19 <ForVariable name="b">
20 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">20 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill-allowed="0">
21 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill allowed="0">21 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill-allowed="0">
22 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">22 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
23 <FnDocIterator>23 <FnDocIterator>
24 <PromoteIterator type="xs:string">24 <PromoteIterator type="xs:string">
25 <FnDataIterator>25 <FnDataIterator>
@@ -33,7 +33,7 @@
33 </ForVariable>33 </ForVariable>
34 <LetVariable name="$$opt_temp_0" materialize="true">34 <LetVariable name="$$opt_temp_0" materialize="true">
35 <HoistIterator>35 <HoistIterator>
36 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0">36 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill-allowed="0">
37 <ForVarIterator varname="b"/>37 <ForVarIterator varname="b"/>
38 </ChildAxisIterator>38 </ChildAxisIterator>
39 </HoistIterator>39 </HoistIterator>
@@ -53,17 +53,17 @@
53 <ForIterator>53 <ForIterator>
54 <ForVariable name="$$context-item"/>54 <ForVariable name="$$context-item"/>
55 <TupleSourceIterator/>55 <TupleSourceIterator/>
56 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0">56 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill-allowed="0">
57 <ForVarIterator varname="b"/>57 <ForVarIterator varname="b"/>
58 </ChildAxisIterator>58 </ChildAxisIterator>
59 </ForIterator>59 </ForIterator>
60 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,personref)" typename="*" nill allowed="0">60 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,personref)" typename="*" nill-allowed="0">
61 <ForVarIterator varname="$$context-item"/>61 <ForVarIterator varname="$$context-item"/>
62 </ChildAxisIterator>62 </ChildAxisIterator>
63 </ForIterator>63 </ForIterator>
64 <CompareIterator>64 <CompareIterator>
65 <FnDataIterator>65 <FnDataIterator>
66 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">66 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
67 <ForVarIterator varname="$$context-item"/>67 <ForVarIterator varname="$$context-item"/>
68 </AttributeAxisIterator>68 </AttributeAxisIterator>
69 </FnDataIterator>69 </FnDataIterator>
@@ -74,13 +74,13 @@
74 <LetVarIterator varname="$$opt_temp_0"/>74 <LetVarIterator varname="$$opt_temp_0"/>
75 </UnhoistIterator>75 </UnhoistIterator>
76 </ForIterator>76 </ForIterator>
77 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,personref)" typename="*" nill allowed="0">77 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,personref)" typename="*" nill-allowed="0">
78 <ForVarIterator varname="$$context-item"/>78 <ForVarIterator varname="$$context-item"/>
79 </ChildAxisIterator>79 </ChildAxisIterator>
80 </ForIterator>80 </ForIterator>
81 <CompareIterator>81 <CompareIterator>
82 <FnDataIterator>82 <FnDataIterator>
83 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">83 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
84 <ForVarIterator varname="$$context-item"/>84 <ForVarIterator varname="$$context-item"/>
85 </AttributeAxisIterator>85 </AttributeAxisIterator>
86 </FnDataIterator>86 </FnDataIterator>
@@ -102,8 +102,8 @@
102 <ElementIterator copyInputNodes="false">102 <ElementIterator copyInputNodes="false">
103 <SingletonIterator value="xs:QName(,,history)"/>103 <SingletonIterator value="xs:QName(,,history)"/>
104 <EnclosedIterator attr_cont="false">104 <EnclosedIterator attr_cont="false">
105 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">105 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
106 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,reserve)" typename="*" nill allowed="0">106 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,reserve)" typename="*" nill-allowed="0">
107 <ForVarIterator varname="b"/>107 <ForVarIterator varname="b"/>
108 </ChildAxisIterator>108 </ChildAxisIterator>
109 </ChildAxisIterator>109 </ChildAxisIterator>
110110
=== modified file 'test/iterplans/zorba/no-copy/q5.iter'
--- test/iterplans/zorba/no-copy/q5.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q5.iter 2014-02-25 00:37:05 +0000
@@ -4,9 +4,9 @@
4 <FnCountIterator>4 <FnCountIterator>
5 <FLWORIterator>5 <FLWORIterator>
6 <ForVariable name="i">6 <ForVariable name="i">
7 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">7 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
8 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">8 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
9 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">9 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
10 <FnDocIterator>10 <FnDocIterator>
11 <PromoteIterator type="xs:string">11 <PromoteIterator type="xs:string">
12 <FnDataIterator>12 <FnDataIterator>
@@ -21,8 +21,8 @@
21 <WhereClause>21 <WhereClause>
22 <CompareIterator>22 <CompareIterator>
23 <FnDataIterator>23 <FnDataIterator>
24 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">24 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
25 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill allowed="0">25 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill-allowed="0">
26 <ForVarIterator varname="i"/>26 <ForVarIterator varname="i"/>
27 </ChildAxisIterator>27 </ChildAxisIterator>
28 </ChildAxisIterator>28 </ChildAxisIterator>
@@ -31,7 +31,7 @@
31 </CompareIterator>31 </CompareIterator>
32 </WhereClause>32 </WhereClause>
33 <ReturnClause>33 <ReturnClause>
34 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill allowed="0">34 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill-allowed="0">
35 <ForVarIterator varname="i"/>35 <ForVarIterator varname="i"/>
36 </ChildAxisIterator>36 </ChildAxisIterator>
37 </ReturnClause>37 </ReturnClause>
3838
=== modified file 'test/iterplans/zorba/no-copy/q6.iter'
--- test/iterplans/zorba/no-copy/q6.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q6.iter 2014-02-25 00:37:05 +0000
@@ -4,8 +4,8 @@
4 <FLWORIterator>4 <FLWORIterator>
5 <ForVariable name="b">5 <ForVariable name="b">
6 <NodeSortIterator distinct="false" ascending="true">6 <NodeSortIterator distinct="false" ascending="true">
7 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill allowed="0">7 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill-allowed="0">
8 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">8 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
9 <FnDocIterator>9 <FnDocIterator>
10 <PromoteIterator type="xs:string">10 <PromoteIterator type="xs:string">
11 <FnDataIterator>11 <FnDataIterator>
@@ -19,7 +19,7 @@
19 </ForVariable>19 </ForVariable>
20 <ReturnClause>20 <ReturnClause>
21 <FnCountIterator>21 <FnCountIterator>
22 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">22 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill-allowed="0">
23 <ForVarIterator varname="b"/>23 <ForVarIterator varname="b"/>
24 </DescendantAxisIterator>24 </DescendantAxisIterator>
25 </FnCountIterator>25 </FnCountIterator>
2626
=== modified file 'test/iterplans/zorba/no-copy/q7.iter'
--- test/iterplans/zorba/no-copy/q7.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q7.iter 2014-02-25 00:37:05 +0000
@@ -3,7 +3,7 @@
3 <CtxVarDeclareIterator varid="4" varname="input-context"/>3 <CtxVarDeclareIterator varid="4" varname="input-context"/>
4 <FLWORIterator>4 <FLWORIterator>
5 <ForVariable name="p">5 <ForVariable name="p">
6 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">6 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
7 <FnDocIterator>7 <FnDocIterator>
8 <PromoteIterator type="xs:string">8 <PromoteIterator type="xs:string">
9 <FnDataIterator>9 <FnDataIterator>
@@ -17,18 +17,18 @@
17 <SpecificNumArithIterator_AddOperation_INTEGER>17 <SpecificNumArithIterator_AddOperation_INTEGER>
18 <SpecificNumArithIterator_AddOperation_INTEGER>18 <SpecificNumArithIterator_AddOperation_INTEGER>
19 <FnCountIterator>19 <FnCountIterator>
20 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill allowed="0">20 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill-allowed="0">
21 <ForVarIterator varname="p"/>21 <ForVarIterator varname="p"/>
22 </DescendantAxisIterator>22 </DescendantAxisIterator>
23 </FnCountIterator>23 </FnCountIterator>
24 <FnCountIterator>24 <FnCountIterator>
25 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,annotation)" typename="*" nill allowed="0">25 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,annotation)" typename="*" nill-allowed="0">
26 <ForVarIterator varname="p"/>26 <ForVarIterator varname="p"/>
27 </DescendantAxisIterator>27 </DescendantAxisIterator>
28 </FnCountIterator>28 </FnCountIterator>
29 </SpecificNumArithIterator_AddOperation_INTEGER>29 </SpecificNumArithIterator_AddOperation_INTEGER>
30 <FnCountIterator>30 <FnCountIterator>
31 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,emailaddress)" typename="*" nill allowed="0">31 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,emailaddress)" typename="*" nill-allowed="0">
32 <ForVarIterator varname="p"/>32 <ForVarIterator varname="p"/>
33 </DescendantAxisIterator>33 </DescendantAxisIterator>
34 </FnCountIterator>34 </FnCountIterator>
3535
=== modified file 'test/iterplans/zorba/no-copy/q8.iter'
--- test/iterplans/zorba/no-copy/q8.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q8.iter 2014-02-25 00:37:05 +0000
@@ -13,9 +13,9 @@
13 </LetVariable>13 </LetVariable>
14 <LetVariable name="$$opt_temp_0" materialize="true">14 <LetVariable name="$$opt_temp_0" materialize="true">
15 <HoistIterator>15 <HoistIterator>
16 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">16 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
17 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">17 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
18 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">18 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
19 <LetVarIterator varname="auction"/>19 <LetVarIterator varname="auction"/>
20 </ChildAxisIterator>20 </ChildAxisIterator>
21 </ChildAxisIterator>21 </ChildAxisIterator>
@@ -34,8 +34,8 @@
34 <GeneralIndexEntryBuilderIterator>34 <GeneralIndexEntryBuilderIterator>
35 <ForVarIterator varname="$$opt_temp_2"/>35 <ForVarIterator varname="$$opt_temp_2"/>
36 <FnDataIterator>36 <FnDataIterator>
37 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">37 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
38 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">38 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
39 <ForVarIterator varname="$$opt_temp_2"/>39 <ForVarIterator varname="$$opt_temp_2"/>
40 </ChildAxisIterator>40 </ChildAxisIterator>
41 </AttributeAxisIterator>41 </AttributeAxisIterator>
@@ -46,9 +46,9 @@
46 </CreateInternalIndexIterator>46 </CreateInternalIndexIterator>
47 </LetVariable>47 </LetVariable>
48 <ForVariable name="p">48 <ForVariable name="p">
49 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">49 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
50 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">50 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
51 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">51 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
52 <LetVarIterator varname="auction"/>52 <LetVarIterator varname="auction"/>
53 </ChildAxisIterator>53 </ChildAxisIterator>
54 </ChildAxisIterator>54 </ChildAxisIterator>
@@ -57,7 +57,7 @@
57 <LetVariable name="$$opt_temp_1" materialize="true">57 <LetVariable name="$$opt_temp_1" materialize="true">
58 <HoistIterator>58 <HoistIterator>
59 <FnDataIterator>59 <FnDataIterator>
60 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">60 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
61 <ForVarIterator varname="p"/>61 <ForVarIterator varname="p"/>
62 </AttributeAxisIterator>62 </AttributeAxisIterator>
63 </FnDataIterator>63 </FnDataIterator>
@@ -69,8 +69,8 @@
69 <AttributeIterator qname="xs:QName(,,person)">69 <AttributeIterator qname="xs:QName(,,person)">
70 <EnclosedIterator attr_cont="true">70 <EnclosedIterator attr_cont="true">
71 <FnDataIterator>71 <FnDataIterator>
72 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">72 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
73 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">73 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
74 <ForVarIterator varname="p"/>74 <ForVarIterator varname="p"/>
75 </ChildAxisIterator>75 </ChildAxisIterator>
76 </ChildAxisIterator>76 </ChildAxisIterator>
7777
=== modified file 'test/iterplans/zorba/no-copy/q9.iter'
--- test/iterplans/zorba/no-copy/q9.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/q9.iter 2014-02-25 00:37:05 +0000
@@ -12,9 +12,9 @@
12 </FnDocIterator>12 </FnDocIterator>
13 </LetVariable>13 </LetVariable>
14 <LetVariable name="ca" materialize="true">14 <LetVariable name="ca" materialize="true">
15 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">15 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
16 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">16 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
17 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">17 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
18 <LetVarIterator varname="auction"/>18 <LetVarIterator varname="auction"/>
19 </ChildAxisIterator>19 </ChildAxisIterator>
20 </ChildAxisIterator>20 </ChildAxisIterator>
@@ -30,8 +30,8 @@
30 <GeneralIndexEntryBuilderIterator>30 <GeneralIndexEntryBuilderIterator>
31 <ForVarIterator varname="$$opt_temp_2"/>31 <ForVarIterator varname="$$opt_temp_2"/>
32 <FnDataIterator>32 <FnDataIterator>
33 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">33 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
34 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">34 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
35 <ForVarIterator varname="$$opt_temp_2"/>35 <ForVarIterator varname="$$opt_temp_2"/>
36 </ChildAxisIterator>36 </ChildAxisIterator>
37 </AttributeAxisIterator>37 </AttributeAxisIterator>
@@ -42,10 +42,10 @@
42 </CreateInternalIndexIterator>42 </CreateInternalIndexIterator>
43 </LetVariable>43 </LetVariable>
44 <LetVariable name="ei" materialize="true">44 <LetVariable name="ei" materialize="true">
45 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">45 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill-allowed="0">
46 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,europe)" typename="*" nill allowed="0">46 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,europe)" typename="*" nill-allowed="0">
47 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill allowed="0">47 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill-allowed="0">
48 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">48 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
49 <LetVarIterator varname="auction"/>49 <LetVarIterator varname="auction"/>
50 </ChildAxisIterator>50 </ChildAxisIterator>
51 </ChildAxisIterator>51 </ChildAxisIterator>
@@ -62,7 +62,7 @@
62 <GeneralIndexEntryBuilderIterator>62 <GeneralIndexEntryBuilderIterator>
63 <ForVarIterator varname="$$opt_temp_5"/>63 <ForVarIterator varname="$$opt_temp_5"/>
64 <FnDataIterator>64 <FnDataIterator>
65 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">65 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
66 <ForVarIterator varname="$$opt_temp_5"/>66 <ForVarIterator varname="$$opt_temp_5"/>
67 </AttributeAxisIterator>67 </AttributeAxisIterator>
68 </FnDataIterator>68 </FnDataIterator>
@@ -72,9 +72,9 @@
72 </CreateInternalIndexIterator>72 </CreateInternalIndexIterator>
73 </LetVariable>73 </LetVariable>
74 <ForVariable name="p">74 <ForVariable name="p">
75 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">75 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
76 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">76 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
77 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">77 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
78 <LetVarIterator varname="auction"/>78 <LetVarIterator varname="auction"/>
79 </ChildAxisIterator>79 </ChildAxisIterator>
80 </ChildAxisIterator>80 </ChildAxisIterator>
@@ -83,7 +83,7 @@
83 <LetVariable name="$$opt_temp_0" materialize="true">83 <LetVariable name="$$opt_temp_0" materialize="true">
84 <HoistIterator>84 <HoistIterator>
85 <FnDataIterator>85 <FnDataIterator>
86 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">86 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
87 <ForVarIterator varname="p"/>87 <ForVarIterator varname="p"/>
88 </AttributeAxisIterator>88 </AttributeAxisIterator>
89 </FnDataIterator>89 </FnDataIterator>
@@ -95,8 +95,8 @@
95 <AttributeIterator qname="xs:QName(,,name)">95 <AttributeIterator qname="xs:QName(,,name)">
96 <EnclosedIterator attr_cont="true">96 <EnclosedIterator attr_cont="true">
97 <FnDataIterator>97 <FnDataIterator>
98 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">98 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
99 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">99 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
100 <ForVarIterator varname="p"/>100 <ForVarIterator varname="p"/>
101 </ChildAxisIterator>101 </ChildAxisIterator>
102 </ChildAxisIterator>102 </ChildAxisIterator>
@@ -118,8 +118,8 @@
118 <LetVariable name="$$opt_temp_1" materialize="true">118 <LetVariable name="$$opt_temp_1" materialize="true">
119 <HoistIterator>119 <HoistIterator>
120 <FnDataIterator>120 <FnDataIterator>
121 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">121 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill-allowed="0">
122 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,itemref)" typename="*" nill allowed="0">122 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,itemref)" typename="*" nill-allowed="0">
123 <ForVarIterator varname="t"/>123 <ForVarIterator varname="t"/>
124 </ChildAxisIterator>124 </ChildAxisIterator>
125 </AttributeAxisIterator>125 </AttributeAxisIterator>
@@ -130,8 +130,8 @@
130 <ElementIterator copyInputNodes="false">130 <ElementIterator copyInputNodes="false">
131 <SingletonIterator value="xs:QName(,,item)"/>131 <SingletonIterator value="xs:QName(,,item)"/>
132 <EnclosedIterator attr_cont="false">132 <EnclosedIterator attr_cont="false">
133 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">133 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
134 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">134 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
135 <FLWORIterator>135 <FLWORIterator>
136 <ForVariable name="t2">136 <ForVariable name="t2">
137 <NodeSortIterator distinct="true" ascending="true">137 <NodeSortIterator distinct="true" ascending="true">
138138
=== modified file 'test/iterplans/zorba/no-copy/ser_03.iter'
--- test/iterplans/zorba/no-copy/ser_03.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/ser_03.iter 2014-02-25 00:37:05 +0000
@@ -18,12 +18,12 @@
18 </ElementIterator>18 </ElementIterator>
19 </CtxVarDeclareIterator>19 </CtxVarDeclareIterator>
20 <FnCountIterator>20 <FnCountIterator>
21 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">21 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
22 <ElementIterator copyInputNodes="false">22 <ElementIterator copyInputNodes="false">
23 <SingletonIterator value="xs:QName(,,doc2)"/>23 <SingletonIterator value="xs:QName(,,doc2)"/>
24 <FnConcatIterator/>24 <FnConcatIterator/>
25 <EnclosedIterator attr_cont="false">25 <EnclosedIterator attr_cont="false">
26 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">26 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
27 <CtxVarIterator varid="4" varname="doc1" varkind="global"/>27 <CtxVarIterator varid="4" varname="doc1" varkind="global"/>
28 </ChildAxisIterator>28 </ChildAxisIterator>
29 </EnclosedIterator>29 </EnclosedIterator>
3030
=== modified file 'test/iterplans/zorba/no-copy/test5.iter'
--- test/iterplans/zorba/no-copy/test5.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/test5.iter 2014-02-25 00:37:05 +0000
@@ -21,11 +21,11 @@
21 </CtxVarDeclareIterator>21 </CtxVarDeclareIterator>
22 <FLWORIterator>22 <FLWORIterator>
23 <LetVariable name="copyname" materialize="true">23 <LetVariable name="copyname" materialize="true">
24 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.zorba-xquery.org/simple,s,name)" typename="*" nill allowed="0">24 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.zorba-xquery.org/simple,s,name)" typename="*" nill-allowed="0">
25 <ElementIterator>25 <ElementIterator>
26 <SingletonIterator value="xs:QName(,,root)"/>26 <SingletonIterator value="xs:QName(,,root)"/>
27 <EnclosedIterator attr_cont="false">27 <EnclosedIterator attr_cont="false">
28 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.zorba-xquery.org/simple,s,name)" typename="*" nill allowed="0">28 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.zorba-xquery.org/simple,s,name)" typename="*" nill-allowed="0">
29 <ValidateIterator>29 <ValidateIterator>
30 <CtxVarIterator varid="4" varname="doc" varkind="global"/>30 <CtxVarIterator varid="4" varname="doc" varkind="global"/>
31 </ValidateIterator>31 </ValidateIterator>
3232
=== modified file 'test/iterplans/zorba/no-copy/test6.iter'
--- test/iterplans/zorba/no-copy/test6.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/test6.iter 2014-02-25 00:37:05 +0000
@@ -21,7 +21,7 @@
21 </CtxVarDeclareIterator>21 </CtxVarDeclareIterator>
22 <FnConcatIterator>22 <FnConcatIterator>
23 <FnDataIterator>23 <FnDataIterator>
24 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.zorba-xquery.org/simple,s,person)" typename="*" nill allowed="0">24 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.zorba-xquery.org/simple,s,person)" typename="*" nill-allowed="0">
25 <ElementIterator>25 <ElementIterator>
26 <SingletonIterator value="xs:QName(,,root)"/>26 <SingletonIterator value="xs:QName(,,root)"/>
27 <EnclosedIterator attr_cont="false">27 <EnclosedIterator attr_cont="false">
2828
=== modified file 'test/iterplans/zorba/no-copy/udfs1.iter'
--- test/iterplans/zorba/no-copy/udfs1.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/no-copy/udfs1.iter 2014-02-25 00:37:05 +0000
@@ -45,7 +45,7 @@
45 <TreatIterator quant="">45 <TreatIterator quant="">
46 <FLWORIterator>46 <FLWORIterator>
47 <ForVariable name="child">47 <ForVariable name="child">
48 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">48 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
49 <LetVarIterator varname="n"/>49 <LetVarIterator varname="n"/>
50 </ChildAxisIterator>50 </ChildAxisIterator>
51 </ForVariable>51 </ForVariable>
@@ -63,7 +63,7 @@
63 <ApplyIterator>63 <ApplyIterator>
64 <SingletonIterator value="xs:integer(2)"/>64 <SingletonIterator value="xs:integer(2)"/>
65 </ApplyIterator>65 </ApplyIterator>
66 <ParentAxisIterator test kind="match_anykind_test" qname="*" typename="*" nill allowed="0">66 <ParentAxisIterator test-kind="match_anykind_test" qname="*" typename="*" nill-allowed="0">
67 <LetVarIterator varname="n"/>67 <LetVarIterator varname="n"/>
68 </ParentAxisIterator>68 </ParentAxisIterator>
69 </SequentialIterator>69 </SequentialIterator>
7070
=== modified file 'test/iterplans/zorba/optim/doc_order_01.iter'
--- test/iterplans/zorba/optim/doc_order_01.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/optim/doc_order_01.iter 2014-02-25 00:37:05 +0000
@@ -2,9 +2,9 @@
2 <FLWORIterator>2 <FLWORIterator>
3 <ForVariable name="b">3 <ForVariable name="b">
4 <NodeDistinctIterator allow-atomics="false" check-only="false">4 <NodeDistinctIterator allow-atomics="false" check-only="false">
5 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">5 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill-allowed="0">
6 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill allowed="0">6 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill-allowed="0">
7 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">7 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
8 <FnDocIterator>8 <FnDocIterator>
9 <SingletonIterator value="xs:string(../xmark/auction.xml)"/>9 <SingletonIterator value="xs:string(../xmark/auction.xml)"/>
10 </FnDocIterator>10 </FnDocIterator>
@@ -16,7 +16,7 @@
16 <OrderBySpec>16 <OrderBySpec>
17 <FnDataIterator>17 <FnDataIterator>
18 <FnZeroOrOneIterator>18 <FnZeroOrOneIterator>
19 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,location)" typename="*" nill allowed="0">19 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,location)" typename="*" nill-allowed="0">
20 <ForVarIterator varname="b"/>20 <ForVarIterator varname="b"/>
21 </ChildAxisIterator>21 </ChildAxisIterator>
22 </FnZeroOrOneIterator>22 </FnZeroOrOneIterator>
@@ -28,8 +28,8 @@
28 <AttributeIterator qname="xs:QName(,,name)">28 <AttributeIterator qname="xs:QName(,,name)">
29 <EnclosedIterator attr_cont="true">29 <EnclosedIterator attr_cont="true">
30 <FnDataIterator>30 <FnDataIterator>
31 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">31 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
32 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">32 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
33 <ForVarIterator varname="b"/>33 <ForVarIterator varname="b"/>
34 </ChildAxisIterator>34 </ChildAxisIterator>
35 </ChildAxisIterator>35 </ChildAxisIterator>
@@ -37,8 +37,8 @@
37 </EnclosedIterator>37 </EnclosedIterator>
38 </AttributeIterator>38 </AttributeIterator>
39 <EnclosedIterator attr_cont="false">39 <EnclosedIterator attr_cont="false">
40 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">40 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
41 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,location)" typename="*" nill allowed="0">41 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,location)" typename="*" nill-allowed="0">
42 <ForVarIterator varname="b"/>42 <ForVarIterator varname="b"/>
43 </ChildAxisIterator>43 </ChildAxisIterator>
44 </ChildAxisIterator>44 </ChildAxisIterator>
4545
=== modified file 'test/iterplans/zorba/optim/hoist_trycatch_01.iter'
--- test/iterplans/zorba/optim/hoist_trycatch_01.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/optim/hoist_trycatch_01.iter 2014-02-25 00:37:05 +0000
@@ -136,7 +136,7 @@
136 <FLWORIterator>136 <FLWORIterator>
137 <LetVariable name="$$opt_temp_0" materialize="true">137 <LetVariable name="$$opt_temp_0" materialize="true">
138 <HoistIterator>138 <HoistIterator>
139 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,loc)" typename="*" nill allowed="0">139 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,loc)" typename="*" nill-allowed="0">
140 <CtxVarIterator varid="6" varname="locations" varkind="global"/>140 <CtxVarIterator varid="6" varname="locations" varkind="global"/>
141 </ChildAxisIterator>141 </ChildAxisIterator>
142 </HoistIterator>142 </HoistIterator>
@@ -157,7 +157,7 @@
157 </GenericArithIterator_MultiplyOperation>157 </GenericArithIterator_MultiplyOperation>
158 <FLWORIterator>158 <FLWORIterator>
159 <ForVariable name="s">159 <ForVariable name="s">
160 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sale)" typename="*" nill allowed="0">160 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sale)" typename="*" nill-allowed="0">
161 <CtxVarIterator varid="5" varname="sales" varkind="global"/>161 <CtxVarIterator varid="5" varname="sales" varkind="global"/>
162 </ChildAxisIterator>162 </ChildAxisIterator>
163 </ForVariable>163 </ForVariable>
@@ -165,7 +165,7 @@
165 <HoistIterator>165 <HoistIterator>
166 <PromoteIterator type="xs:anyAtomicType">166 <PromoteIterator type="xs:anyAtomicType">
167 <FnDataIterator>167 <FnDataIterator>
168 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,locid)" typename="*" nill allowed="0">168 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,locid)" typename="*" nill-allowed="0">
169 <ForVarIterator varname="s"/>169 <ForVarIterator varname="s"/>
170 </AttributeAxisIterator>170 </AttributeAxisIterator>
171 </FnDataIterator>171 </FnDataIterator>
@@ -185,7 +185,7 @@
185 </UnhoistIterator>185 </UnhoistIterator>
186 <PromoteIterator type="xs:anyAtomicType">186 <PromoteIterator type="xs:anyAtomicType">
187 <FnDataIterator>187 <FnDataIterator>
188 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">188 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
189 <ForVarIterator varname="l"/>189 <ForVarIterator varname="l"/>
190 </AttributeAxisIterator>190 </AttributeAxisIterator>
191 </FnDataIterator>191 </FnDataIterator>
@@ -197,7 +197,7 @@
197 <ElementIterator>197 <ElementIterator>
198 <SingletonIterator value="xs:QName(,,sale)"/>198 <SingletonIterator value="xs:QName(,,sale)"/>
199 <EnclosedIterator attr_cont="false">199 <EnclosedIterator attr_cont="false">
200 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,city)" typename="*" nill allowed="0">200 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,city)" typename="*" nill-allowed="0">
201 <ForVarIterator varname="l"/>201 <ForVarIterator varname="l"/>
202 </AttributeAxisIterator>202 </AttributeAxisIterator>
203 </EnclosedIterator>203 </EnclosedIterator>
204204
=== modified file 'test/iterplans/zorba/optim/hoist_window_01.iter'
--- test/iterplans/zorba/optim/hoist_window_01.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/optim/hoist_window_01.iter 2014-02-25 00:37:05 +0000
@@ -142,7 +142,7 @@
142 <TupleStreamIterator>142 <TupleStreamIterator>
143 <WindowIterator>143 <WindowIterator>
144 <WindowVariable name="yearly-sales">144 <WindowVariable name="yearly-sales">
145 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sale)" typename="*" nill allowed="0">145 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sale)" typename="*" nill-allowed="0">
146 <CtxVarIterator varid="4" varname="sales" varkind="global"/>146 <CtxVarIterator varid="4" varname="sales" varkind="global"/>
147 </ChildAxisIterator>147 </ChildAxisIterator>
148 </WindowVariable>148 </WindowVariable>
@@ -154,7 +154,7 @@
154 <SubstringIntOptIterator>154 <SubstringIntOptIterator>
155 <PromoteIterator type="xs:string">155 <PromoteIterator type="xs:string">
156 <FnDataIterator>156 <FnDataIterator>
157 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill allowed="0">157 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill-allowed="0">
158 <ForVarIterator varname="s"/>158 <ForVarIterator varname="s"/>
159 </AttributeAxisIterator>159 </AttributeAxisIterator>
160 </FnDataIterator>160 </FnDataIterator>
@@ -165,7 +165,7 @@
165 <SubstringIntOptIterator>165 <SubstringIntOptIterator>
166 <PromoteIterator type="xs:string">166 <PromoteIterator type="xs:string">
167 <FnDataIterator>167 <FnDataIterator>
168 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill allowed="0">168 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill-allowed="0">
169 <ForVarIterator varname="p"/>169 <ForVarIterator varname="p"/>
170 </AttributeAxisIterator>170 </AttributeAxisIterator>
171 </FnDataIterator>171 </FnDataIterator>
@@ -179,7 +179,7 @@
179 <HoistIterator>179 <HoistIterator>
180 <PromoteIterator type="xs:anyAtomicType">180 <PromoteIterator type="xs:anyAtomicType">
181 <FnDataIterator>181 <FnDataIterator>
182 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,locid)" typename="*" nill allowed="0">182 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,locid)" typename="*" nill-allowed="0">
183 <ForVarIterator varname="s"/>183 <ForVarIterator varname="s"/>
184 </AttributeAxisIterator>184 </AttributeAxisIterator>
185 </FnDataIterator>185 </FnDataIterator>
@@ -196,7 +196,7 @@
196 <CompareIterator>196 <CompareIterator>
197 <PromoteIterator type="xs:anyAtomicType">197 <PromoteIterator type="xs:anyAtomicType">
198 <FnDataIterator>198 <FnDataIterator>
199 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">199 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
200 <ForVarIterator varname="$$context-item"/>200 <ForVarIterator varname="$$context-item"/>
201 </AttributeAxisIterator>201 </AttributeAxisIterator>
202 </FnDataIterator>202 </FnDataIterator>
@@ -208,7 +208,7 @@
208 <CompareIterator>208 <CompareIterator>
209 <PromoteIterator type="xs:anyAtomicType">209 <PromoteIterator type="xs:anyAtomicType">
210 <FnDataIterator>210 <FnDataIterator>
211 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,city)" typename="*" nill allowed="0">211 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,city)" typename="*" nill-allowed="0">
212 <ForVarIterator varname="$$context-item"/>212 <ForVarIterator varname="$$context-item"/>
213 </AttributeAxisIterator>213 </AttributeAxisIterator>
214 </FnDataIterator>214 </FnDataIterator>
@@ -227,7 +227,7 @@
227 <SubstringIntOptIterator>227 <SubstringIntOptIterator>
228 <PromoteIterator type="xs:string">228 <PromoteIterator type="xs:string">
229 <FnDataIterator>229 <FnDataIterator>
230 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill allowed="0">230 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill-allowed="0">
231 <ForVarIterator varname="s"/>231 <ForVarIterator varname="s"/>
232 </AttributeAxisIterator>232 </AttributeAxisIterator>
233 </FnDataIterator>233 </FnDataIterator>
@@ -238,7 +238,7 @@
238 <SubstringIntOptIterator>238 <SubstringIntOptIterator>
239 <PromoteIterator type="xs:string">239 <PromoteIterator type="xs:string">
240 <FnDataIterator>240 <FnDataIterator>
241 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill allowed="0">241 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill-allowed="0">
242 <ForVarIterator varname="n"/>242 <ForVarIterator varname="n"/>
243 </AttributeAxisIterator>243 </AttributeAxisIterator>
244 </FnDataIterator>244 </FnDataIterator>
@@ -251,7 +251,7 @@
251 <LetVariable name="$$opt_temp_0" materialize="true"/>251 <LetVariable name="$$opt_temp_0" materialize="true"/>
252 <TupleSourceIterator/>252 <TupleSourceIterator/>
253 <HoistIterator>253 <HoistIterator>
254 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,loc)" typename="*" nill allowed="0">254 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,loc)" typename="*" nill-allowed="0">
255 <CtxVarIterator varid="5" varname="locations" varkind="global"/>255 <CtxVarIterator varid="5" varname="locations" varkind="global"/>
256 </ChildAxisIterator>256 </ChildAxisIterator>
257 </HoistIterator>257 </HoistIterator>
@@ -265,7 +265,7 @@
265 <SubstringIntOptIterator>265 <SubstringIntOptIterator>
266 <PromoteIterator type="xs:string">266 <PromoteIterator type="xs:string">
267 <FnDataIterator>267 <FnDataIterator>
268 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill allowed="0">268 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill-allowed="0">
269 <ForVarIterator varname="s"/>269 <ForVarIterator varname="s"/>
270 </AttributeAxisIterator>270 </AttributeAxisIterator>
271 </FnDataIterator>271 </FnDataIterator>
@@ -280,7 +280,7 @@
280 <FnSumIterator>280 <FnSumIterator>
281 <FnDataIterator>281 <FnDataIterator>
282 <NodeDistinctIterator allow-atomics="false" check-only="false">282 <NodeDistinctIterator allow-atomics="false" check-only="false">
283 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,qty)" typename="*" nill allowed="0">283 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,qty)" typename="*" nill-allowed="0">
284 <LetVarIterator varname="yearly-sales"/>284 <LetVarIterator varname="yearly-sales"/>
285 </AttributeAxisIterator>285 </AttributeAxisIterator>
286 </NodeDistinctIterator>286 </NodeDistinctIterator>
287287
=== modified file 'test/iterplans/zorba/optim/pos_pred11.iter'
--- test/iterplans/zorba/optim/pos_pred11.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/optim/pos_pred11.iter 2014-02-25 00:37:05 +0000
@@ -25,7 +25,7 @@
25 <FLWORIterator>25 <FLWORIterator>
26 <ForVariable name="$$context-item">26 <ForVariable name="$$context-item">
27 <NodeSortIterator distinct="true" ascending="true">27 <NodeSortIterator distinct="true" ascending="true">
28 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">28 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
29 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">29 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
30 <CtxVarIterator varid="4" varname="doc" varkind="local"/>30 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
31 </TreatIterator>31 </TreatIterator>
3232
=== modified file 'test/iterplans/zorba/optim/pos_pred12.iter'
--- test/iterplans/zorba/optim/pos_pred12.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/optim/pos_pred12.iter 2014-02-25 00:37:05 +0000
@@ -118,7 +118,7 @@
118 <FnConcatIterator>118 <FnConcatIterator>
119 <SubsequenceIntIterator>119 <SubsequenceIntIterator>
120 <NodeSortIterator distinct="true" ascending="true">120 <NodeSortIterator distinct="true" ascending="true">
121 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">121 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
122 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">122 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
123 <CtxVarIterator varid="4" varname="doc" varkind="local"/>123 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
124 </TreatIterator>124 </TreatIterator>
@@ -131,7 +131,7 @@
131)"/>131)"/>
132 <SubsequenceIntIterator>132 <SubsequenceIntIterator>
133 <NodeSortIterator distinct="true" ascending="true">133 <NodeSortIterator distinct="true" ascending="true">
134 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">134 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
135 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">135 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
136 <CtxVarIterator varid="4" varname="doc" varkind="local"/>136 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
137 </TreatIterator>137 </TreatIterator>
@@ -144,7 +144,7 @@
144)"/>144)"/>
145 <SubsequenceIntIterator>145 <SubsequenceIntIterator>
146 <NodeSortIterator distinct="true" ascending="true">146 <NodeSortIterator distinct="true" ascending="true">
147 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">147 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
148 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">148 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
149 <CtxVarIterator varid="4" varname="doc" varkind="local"/>149 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
150 </TreatIterator>150 </TreatIterator>
@@ -157,7 +157,7 @@
157)"/>157)"/>
158 <SubsequenceIntIterator>158 <SubsequenceIntIterator>
159 <NodeSortIterator distinct="true" ascending="true">159 <NodeSortIterator distinct="true" ascending="true">
160 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">160 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
161 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">161 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
162 <CtxVarIterator varid="4" varname="doc" varkind="local"/>162 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
163 </TreatIterator>163 </TreatIterator>
@@ -170,7 +170,7 @@
170)"/>170)"/>
171 <SubsequenceIntIterator>171 <SubsequenceIntIterator>
172 <NodeSortIterator distinct="true" ascending="true">172 <NodeSortIterator distinct="true" ascending="true">
173 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">173 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
174 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">174 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
175 <CtxVarIterator varid="4" varname="doc" varkind="local"/>175 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
176 </TreatIterator>176 </TreatIterator>
@@ -183,7 +183,7 @@
183)"/>183)"/>
184 <SubsequenceIntIterator>184 <SubsequenceIntIterator>
185 <NodeSortIterator distinct="true" ascending="true">185 <NodeSortIterator distinct="true" ascending="true">
186 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">186 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
187 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">187 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
188 <CtxVarIterator varid="4" varname="doc" varkind="local"/>188 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
189 </TreatIterator>189 </TreatIterator>
@@ -195,7 +195,7 @@
195)"/>195)"/>
196 <SubsequenceIntIterator>196 <SubsequenceIntIterator>
197 <NodeSortIterator distinct="true" ascending="true">197 <NodeSortIterator distinct="true" ascending="true">
198 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">198 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
199 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">199 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
200 <CtxVarIterator varid="4" varname="doc" varkind="local"/>200 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
201 </TreatIterator>201 </TreatIterator>
202202
=== modified file 'test/iterplans/zorba/optim/pos_pred13.iter'
--- test/iterplans/zorba/optim/pos_pred13.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/optim/pos_pred13.iter 2014-02-25 00:37:05 +0000
@@ -54,7 +54,7 @@
54 <ForVariable name="$$context-item">54 <ForVariable name="$$context-item">
55 <SubsequenceIntIterator>55 <SubsequenceIntIterator>
56 <NodeSortIterator distinct="true" ascending="true">56 <NodeSortIterator distinct="true" ascending="true">
57 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">57 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
58 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">58 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
59 <CtxVarIterator varid="4" varname="doc" varkind="local"/>59 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
60 </TreatIterator>60 </TreatIterator>
@@ -68,7 +68,7 @@
68 <CompareIterator>68 <CompareIterator>
69 <PromoteIterator type="xs:anyAtomicType">69 <PromoteIterator type="xs:anyAtomicType">
70 <FnDataIterator>70 <FnDataIterator>
71 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,i)" typename="*" nill allowed="0">71 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,i)" typename="*" nill-allowed="0">
72 <ForVarIterator varname="$$context-item"/>72 <ForVarIterator varname="$$context-item"/>
73 </AttributeAxisIterator>73 </AttributeAxisIterator>
74 </FnDataIterator>74 </FnDataIterator>
7575
=== modified file 'test/iterplans/zorba/optim/pos_pred2.iter'
--- test/iterplans/zorba/optim/pos_pred2.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/optim/pos_pred2.iter 2014-02-25 00:37:05 +0000
@@ -14,7 +14,7 @@
14 <OuterForIterator varname="x">14 <OuterForIterator varname="x">
15 <TupleSourceIterator/>15 <TupleSourceIterator/>
16 <NodeSortIterator distinct="true" ascending="true">16 <NodeSortIterator distinct="true" ascending="true">
17 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,foo)" typename="*" nill allowed="0">17 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,foo)" typename="*" nill-allowed="0">
18 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">18 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
19 <CtxVarIterator varid="4" varname="doc" varkind="local"/>19 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
20 </TreatIterator>20 </TreatIterator>
@@ -41,7 +41,7 @@
41 <TupleSourceIterator/>41 <TupleSourceIterator/>
42 <SubsequenceIntIterator>42 <SubsequenceIntIterator>
43 <NodeSortIterator distinct="true" ascending="true">43 <NodeSortIterator distinct="true" ascending="true">
44 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,foo)" typename="*" nill allowed="0">44 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,foo)" typename="*" nill-allowed="0">
45 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">45 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
46 <CtxVarIterator varid="4" varname="doc" varkind="local"/>46 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
47 </TreatIterator>47 </TreatIterator>
4848
=== modified file 'test/iterplans/zorba/optim/pos_pred3.iter'
--- test/iterplans/zorba/optim/pos_pred3.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/optim/pos_pred3.iter 2014-02-25 00:37:05 +0000
@@ -37,7 +37,7 @@
37 </ForIterator>37 </ForIterator>
38 <Spec>38 <Spec>
39 <FnDataIterator>39 <FnDataIterator>
40 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,grp)" typename="*" nill allowed="0">40 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,grp)" typename="*" nill-allowed="0">
41 <ForVarIterator varname="x"/>41 <ForVarIterator varname="x"/>
42 </AttributeAxisIterator>42 </AttributeAxisIterator>
43 </FnDataIterator>43 </FnDataIterator>
4444
=== modified file 'test/iterplans/zorba/optim/var_inline_05.iter'
--- test/iterplans/zorba/optim/var_inline_05.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/optim/var_inline_05.iter 2014-02-25 00:37:05 +0000
@@ -54,7 +54,7 @@
54 <HoistIterator>54 <HoistIterator>
55 <CastIterator type="xs:integer">55 <CastIterator type="xs:integer">
56 <FnDataIterator>56 <FnDataIterator>
57 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0" target_position="1">57 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0" target_position="1">
58 <ForVarIterator varname="x"/>58 <ForVarIterator varname="x"/>
59 </ChildAxisIterator>59 </ChildAxisIterator>
60 </FnDataIterator>60 </FnDataIterator>
6161
=== modified file 'test/iterplans/zorba/paths/path10.iter'
--- test/iterplans/zorba/paths/path10.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/paths/path10.iter 2014-02-25 00:37:05 +0000
@@ -1,7 +1,7 @@
1<iterator-tree description="main query">1<iterator-tree description="main query">
2 <NodeSortIterator distinct="false" ascending="true">2 <NodeSortIterator distinct="false" ascending="true">
3 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0">3 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill-allowed="0">
4 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">4 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
5 <ElementIterator>5 <ElementIterator>
6 <SingletonIterator value="xs:QName(,,a)"/>6 <SingletonIterator value="xs:QName(,,a)"/>
7 <FnConcatIterator>7 <FnConcatIterator>
88
=== modified file 'test/iterplans/zorba/paths/path11.iter'
--- test/iterplans/zorba/paths/path11.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/paths/path11.iter 2014-02-25 00:37:05 +0000
@@ -1,6 +1,6 @@
1<iterator-tree description="main query">1<iterator-tree description="main query">
2 <NodeSortIterator distinct="true" ascending="true">2 <NodeSortIterator distinct="true" ascending="true">
3 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">3 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
4 <FLWORIterator>4 <FLWORIterator>
5 <ForVariable name="x">5 <ForVariable name="x">
6 <ElementIterator>6 <ElementIterator>
77
=== modified file 'test/iterplans/zorba/paths/path13.iter'
--- test/iterplans/zorba/paths/path13.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/paths/path13.iter 2014-02-25 00:37:05 +0000
@@ -8,7 +8,7 @@
8<iterator-tree description="main query">8<iterator-tree description="main query">
9 <FLWORIterator>9 <FLWORIterator>
10 <ForVariable name="$$context-item">10 <ForVariable name="$$context-item">
11 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">11 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
12 <ElementIterator>12 <ElementIterator>
13 <SingletonIterator value="xs:QName(,,a)"/>13 <SingletonIterator value="xs:QName(,,a)"/>
14 <FnConcatIterator>14 <FnConcatIterator>
@@ -42,7 +42,7 @@
42 </ForVariable>42 </ForVariable>
43 <WhereClause>43 <WhereClause>
44 <FnBooleanIterator>44 <FnBooleanIterator>
45 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0">45 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill-allowed="0">
46 <ForVarIterator varname="$$context-item"/>46 <ForVarIterator varname="$$context-item"/>
47 </ChildAxisIterator>47 </ChildAxisIterator>
48 </FnBooleanIterator>48 </FnBooleanIterator>
4949
=== modified file 'test/iterplans/zorba/paths/path17.iter'
--- test/iterplans/zorba/paths/path17.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/paths/path17.iter 2014-02-25 00:37:05 +0000
@@ -16,7 +16,7 @@
16 <NodeSortIterator distinct="true" ascending="true">16 <NodeSortIterator distinct="true" ascending="true">
17 <FLWORIterator>17 <FLWORIterator>
18 <ForVariable name="$$context-item">18 <ForVariable name="$$context-item">
19 <DescendantSelfAxisIterator test kind="match_anykind_test" qname="*" typename="*" nill allowed="0">19 <DescendantSelfAxisIterator test-kind="match_anykind_test" qname="*" typename="*" nill-allowed="0">
20 <FnDocIterator>20 <FnDocIterator>
21 <PromoteIterator type="xs:string">21 <PromoteIterator type="xs:string">
22 <FnDataIterator>22 <FnDataIterator>
@@ -27,20 +27,20 @@
27 </DescendantSelfAxisIterator>27 </DescendantSelfAxisIterator>
28 </ForVariable>28 </ForVariable>
29 <ForVariable name="$$context-item">29 <ForVariable name="$$context-item">
30 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,wildcard,input-file)" typename="*" nill allowed="0">30 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,wildcard,input-file)" typename="*" nill-allowed="0">
31 <ForVarIterator varname="$$context-item"/>31 <ForVarIterator varname="$$context-item"/>
32 </ChildAxisIterator>32 </ChildAxisIterator>
33 </ForVariable>33 </ForVariable>
34 <WhereClause>34 <WhereClause>
35 <AndIterator>35 <AndIterator>
36 <FnEmptyIterator>36 <FnEmptyIterator>
37 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,variable)" typename="*" nill allowed="0">37 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,variable)" typename="*" nill-allowed="0">
38 <ForVarIterator varname="$$context-item"/>38 <ForVarIterator varname="$$context-item"/>
39 </AttributeAxisIterator>39 </AttributeAxisIterator>
40 </FnEmptyIterator>40 </FnEmptyIterator>
41 <CompareIterator>41 <CompareIterator>
42 <FnDataIterator>42 <FnDataIterator>
43 <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">43 <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
44 <ForVarIterator varname="$$context-item"/>44 <ForVarIterator varname="$$context-item"/>
45 </ChildAxisIterator>45 </ChildAxisIterator>
46 </FnDataIterator>46 </FnDataIterator>
@@ -56,8 +56,8 @@
56 </ForVariable>56 </ForVariable>
57 <ReturnClause>57 <ReturnClause>
58 <FnStringIterator>58 <FnStringIterator>
59 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">59 <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
60 <ParentAxisIterator test kind="match_anykind_test" qname="*" typename="*" nill allowed="0">60 <ParentAxisIterator test-kind="match_anykind_test" qname="*" typename="*" nill-allowed="0">
61 <ForVarIterator varname="x"/>61 <ForVarIterator varname="x"/>
62 </ParentAxisIterator>62 </ParentAxisIterator>
63 </AttributeAxisIterator>63 </AttributeAxisIterator>
6464
=== modified file 'test/iterplans/zorba/paths/path24.iter'
--- test/iterplans/zorba/paths/path24.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/paths/path24.iter 2014-02-25 00:37:05 +0000
@@ -1,6 +1,6 @@
1<iterator-tree description="main query">1<iterator-tree description="main query">
2 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">2 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
3 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">3 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
4 <ElementIterator>4 <ElementIterator>
5 <SingletonIterator value="xs:QName(,,a)"/>5 <SingletonIterator value="xs:QName(,,a)"/>
6 </ElementIterator>6 </ElementIterator>
77
=== modified file 'test/iterplans/zorba/paths/path_pred4.iter'
--- test/iterplans/zorba/paths/path_pred4.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/paths/path_pred4.iter 2014-02-25 00:37:05 +0000
@@ -1,9 +1,9 @@
1<iterator-tree description="main query">1<iterator-tree description="main query">
2 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,d)" typename="*" nill allowed="0">2 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,d)" typename="*" nill-allowed="0">
3 <FLWORIterator>3 <FLWORIterator>
4 <ForVariable name="$$context-item">4 <ForVariable name="$$context-item">
5 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">5 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
6 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">6 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
7 <ElementIterator>7 <ElementIterator>
8 <SingletonIterator value="xs:QName(,,root1)"/>8 <SingletonIterator value="xs:QName(,,root1)"/>
9 <FnConcatIterator>9 <FnConcatIterator>
@@ -47,7 +47,7 @@
47 </ChildAxisIterator>47 </ChildAxisIterator>
48 </ForVariable>48 </ForVariable>
49 <ReturnClause>49 <ReturnClause>
50 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0" target_position="1">50 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill-allowed="0" target_position="1">
51 <ForVarIterator varname="$$context-item"/>51 <ForVarIterator varname="$$context-item"/>
52 </ChildAxisIterator>52 </ChildAxisIterator>
53 </ReturnClause>53 </ReturnClause>
5454
=== modified file 'test/iterplans/zorba/paths/path_pred5.iter'
--- test/iterplans/zorba/paths/path_pred5.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/paths/path_pred5.iter 2014-02-25 00:37:05 +0000
@@ -1,9 +1,9 @@
1<iterator-tree description="main query">1<iterator-tree description="main query">
2 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,d)" typename="*" nill allowed="0">2 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,d)" typename="*" nill-allowed="0">
3 <SequencePointAccessIterator>3 <SequencePointAccessIterator>
4 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0">4 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill-allowed="0">
5 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">5 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
6 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">6 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
7 <ElementIterator>7 <ElementIterator>
8 <SingletonIterator value="xs:QName(,,root1)"/>8 <SingletonIterator value="xs:QName(,,root1)"/>
9 <ElementIterator>9 <ElementIterator>
1010
=== modified file 'test/iterplans/zorba/udf/udf1.iter'
--- test/iterplans/zorba/udf/udf1.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/udf/udf1.iter 2014-02-25 00:37:05 +0000
@@ -4,8 +4,8 @@
4 <SingletonIterator value="xs:integer(1)"/>4 <SingletonIterator value="xs:integer(1)"/>
5 </CtxVarDeclareIterator>5 </CtxVarDeclareIterator>
6 <UDFunctionCallIterator function="local:sum">6 <UDFunctionCallIterator function="local:sum">
7 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill allowed="0">7 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill-allowed="0">
8 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">8 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
9 <ElementIterator copyInputNodes="false">9 <ElementIterator copyInputNodes="false">
10 <SingletonIterator value="xs:QName(,,books)"/>10 <SingletonIterator value="xs:QName(,,books)"/>
11 <FnConcatIterator>11 <FnConcatIterator>
1212
=== modified file 'test/iterplans/zorba/w3c/ForExpr010.iter'
--- test/iterplans/zorba/w3c/ForExpr010.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/w3c/ForExpr010.iter 2014-02-25 00:37:05 +0000
@@ -4,7 +4,7 @@
4 <FLWORIterator>4 <FLWORIterator>
5 <ForVariable name="folder">5 <ForVariable name="folder">
6 <NodeSortIterator distinct="true" ascending="true">6 <NodeSortIterator distinct="true" ascending="true">
7 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,Folder)" typename="*" nill allowed="0">7 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,Folder)" typename="*" nill-allowed="0">
8 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">8 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
9 <CtxVarIterator varid="4" varname="input-context" varkind="global"/>9 <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
10 </TreatIterator>10 </TreatIterator>
@@ -14,14 +14,14 @@
14 <LetVariable name="$$opt_temp_0" materialize="true">14 <LetVariable name="$$opt_temp_0" materialize="true">
15 <HoistIterator>15 <HoistIterator>
16 <FnDataIterator>16 <FnDataIterator>
17 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,FolderName)" typename="*" nill allowed="0">17 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,FolderName)" typename="*" nill-allowed="0">
18 <ForVarIterator varname="folder"/>18 <ForVarIterator varname="folder"/>
19 </ChildAxisIterator>19 </ChildAxisIterator>
20 </FnDataIterator>20 </FnDataIterator>
21 </HoistIterator>21 </HoistIterator>
22 </LetVariable>22 </LetVariable>
23 <ForVariable name="file">23 <ForVariable name="file">
24 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill allowed="0">24 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill-allowed="0">
25 <ForVarIterator varname="folder"/>25 <ForVarIterator varname="folder"/>
26 </DescendantAxisIterator>26 </DescendantAxisIterator>
27 </ForVariable>27 </ForVariable>
@@ -37,7 +37,7 @@
37 </AttributeIterator>37 </AttributeIterator>
38 <EnclosedIterator attr_cont="false">38 <EnclosedIterator attr_cont="false">
39 <FnStringIterator>39 <FnStringIterator>
40 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,FileName)" typename="*" nill allowed="0" target_position="0">40 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,FileName)" typename="*" nill-allowed="0" target_position="0">
41 <ForVarIterator varname="file"/>41 <ForVarIterator varname="file"/>
42 </ChildAxisIterator>42 </ChildAxisIterator>
43 </FnStringIterator>43 </FnStringIterator>
4444
=== modified file 'test/iterplans/zorba/w3c/ForExpr025.iter'
--- test/iterplans/zorba/w3c/ForExpr025.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/w3c/ForExpr025.iter 2014-02-25 00:37:05 +0000
@@ -4,10 +4,10 @@
4 <FLWORIterator>4 <FLWORIterator>
5 <LetVariable name="$$opt_temp_0" materialize="true">5 <LetVariable name="$$opt_temp_0" materialize="true">
6 <HoistIterator>6 <HoistIterator>
7 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill allowed="0">7 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill-allowed="0">
8 <SequencePointAccessIterator>8 <SequencePointAccessIterator>
9 <NodeSortIterator distinct="true" ascending="true">9 <NodeSortIterator distinct="true" ascending="true">
10 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,Folder)" typename="*" nill allowed="0">10 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,Folder)" typename="*" nill-allowed="0">
11 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">11 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
12 <CtxVarIterator varid="4" varname="input-context" varkind="global"/>12 <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
13 </TreatIterator>13 </TreatIterator>
@@ -19,10 +19,10 @@
19 </HoistIterator>19 </HoistIterator>
20 </LetVariable>20 </LetVariable>
21 <ForVariable name="file">21 <ForVariable name="file">
22 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill allowed="0">22 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill-allowed="0">
23 <SequencePointAccessIterator>23 <SequencePointAccessIterator>
24 <NodeSortIterator distinct="true" ascending="true">24 <NodeSortIterator distinct="true" ascending="true">
25 <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,Folder)" typename="*" nill allowed="0">25 <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,Folder)" typename="*" nill-allowed="0">
26 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">26 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
27 <CtxVarIterator varid="4" varname="input-context" varkind="global"/>27 <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
28 </TreatIterator>28 </TreatIterator>
@@ -38,7 +38,7 @@
38 </UnhoistIterator>38 </UnhoistIterator>
39 </ForVariable>39 </ForVariable>
40 <ReturnClause>40 <ReturnClause>
41 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,FileName)" typename="*" nill allowed="0">41 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,FileName)" typename="*" nill-allowed="0">
42 <ForVarIterator varname="file"/>42 <ForVarIterator varname="file"/>
43 </ChildAxisIterator>43 </ChildAxisIterator>
44 </ReturnClause>44 </ReturnClause>
4545
=== modified file 'test/iterplans/zorba/w3c/WhereExpr001.iter'
--- test/iterplans/zorba/w3c/WhereExpr001.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/w3c/WhereExpr001.iter 2014-02-25 00:37:05 +0000
@@ -7,7 +7,7 @@
7 <FLWORIterator>7 <FLWORIterator>
8 <ForVariable name="f">8 <ForVariable name="f">
9 <NodeDistinctIterator allow-atomics="false" check-only="false">9 <NodeDistinctIterator allow-atomics="false" check-only="false">
10 <DescendantAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">10 <DescendantAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
11 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">11 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
12 <CtxVarIterator varid="4" varname="input-context" varkind="global"/>12 <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
13 </TreatIterator>13 </TreatIterator>
@@ -16,13 +16,13 @@
16 </ForVariable>16 </ForVariable>
17 <WhereClause>17 <WhereClause>
18 <FnBooleanIterator>18 <FnBooleanIterator>
19 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill allowed="0">19 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill-allowed="0">
20 <ForVarIterator varname="f"/>20 <ForVarIterator varname="f"/>
21 </ChildAxisIterator>21 </ChildAxisIterator>
22 </FnBooleanIterator>22 </FnBooleanIterator>
23 </WhereClause>23 </WhereClause>
24 <ReturnClause>24 <ReturnClause>
25 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill allowed="0" target_position="0">25 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill-allowed="0" target_position="0">
26 <ForVarIterator varname="f"/>26 <ForVarIterator varname="f"/>
27 </ChildAxisIterator>27 </ChildAxisIterator>
28 </ReturnClause>28 </ReturnClause>
@@ -33,7 +33,7 @@
33 <FLWORIterator>33 <FLWORIterator>
34 <ForVariable name="$$context-item">34 <ForVariable name="$$context-item">
35 <NodeDistinctIterator allow-atomics="false" check-only="false">35 <NodeDistinctIterator allow-atomics="false" check-only="false">
36 <DescendantSelfAxisIterator test kind="match_anykind_test" qname="*" typename="*" nill allowed="0">36 <DescendantSelfAxisIterator test-kind="match_anykind_test" qname="*" typename="*" nill-allowed="0">
37 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">37 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
38 <CtxVarIterator varid="4" varname="input-context" varkind="global"/>38 <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
39 </TreatIterator>39 </TreatIterator>
@@ -41,7 +41,7 @@
41 </NodeDistinctIterator>41 </NodeDistinctIterator>
42 </ForVariable>42 </ForVariable>
43 <ReturnClause>43 <ReturnClause>
44 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill allowed="0" target_position="0">44 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill-allowed="0" target_position="0">
45 <ForVarIterator varname="$$context-item"/>45 <ForVarIterator varname="$$context-item"/>
46 </ChildAxisIterator>46 </ChildAxisIterator>
47 </ReturnClause>47 </ReturnClause>
4848
=== modified file 'test/iterplans/zorba/w3c/nodeexpression47.iter'
--- test/iterplans/zorba/w3c/nodeexpression47.iter 2014-02-24 20:08:54 +0000
+++ test/iterplans/zorba/w3c/nodeexpression47.iter 2014-02-25 00:37:05 +0000
@@ -22,227 +22,227 @@
22 </NodeDistinctIterator>22 </NodeDistinctIterator>
23 </ForVariable>23 </ForVariable>
24 <ReturnClause>24 <ReturnClause>
25 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,works)" typename="*" nill allowed="0" target_position="0">25 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,works)" typename="*" nill-allowed="0" target_position="0">
26 <ForVarIterator varname="$$context-item"/>26 <ForVarIterator varname="$$context-item"/>
27 </ChildAxisIterator>27 </ChildAxisIterator>
28 </ReturnClause>28 </ReturnClause>
29 </FLWORIterator>29 </FLWORIterator>
30 </NodeDistinctIterator>30 </NodeDistinctIterator>
31 </ForVariable>31 </ForVariable>
32 <ReturnClause>32 <ReturnClause>
33 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,employee)" typename="*" nill allowed="0" target_position="0">33 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,employee)" typename="*" nill-allowed="0" target_position="0">
34 <ForVarIterator varname="$$context-item"/>34 <ForVarIterator varname="$$context-item"/>
35 </ChildAxisIterator>35 </ChildAxisIterator>
36 </ReturnClause>36 </ReturnClause>
37 </FLWORIterator>37 </FLWORIterator>
38 </NodeDistinctIterator>38 </NodeDistinctIterator>
39 </ForVariable>39 </ForVariable>
40 <ReturnClause>40 <ReturnClause>
41 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,empnum)" typename="*" nill allowed="0" target_position="0">41 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,empnum)" typename="*" nill-allowed="0" target_position="0">
42 <ForVarIterator varname="$$context-item"/>42 <ForVarIterator varname="$$context-item"/>
43 </ChildAxisIterator>43 </ChildAxisIterator>
44 </ReturnClause>44 </ReturnClause>
45 </FLWORIterator>45 </FLWORIterator>
46 </NodeDistinctIterator>46 </NodeDistinctIterator>
47 </TreatIterator>47 </TreatIterator>
48 <TreatIterator quant="?">48 <TreatIterator quant="?">
49 <NodeDistinctIterator allow-atomics="false" check-only="false">49 <NodeDistinctIterator allow-atomics="false" check-only="false">
50 <FLWORIterator>50 <FLWORIterator>
51 <ForVariable name="$$context-item">51 <ForVariable name="$$context-item">
52 <NodeDistinctIterator allow-atomics="false" check-only="false">52 <NodeDistinctIterator allow-atomics="false" check-only="false">
53 <FLWORIterator>53 <FLWORIterator>
54 <ForVariable name="$$context-item">54 <ForVariable name="$$context-item">
55 <NodeDistinctIterator allow-atomics="false" check-only="false">55 <NodeDistinctIterator allow-atomics="false" check-only="false">
56 <FLWORIterator>56 <FLWORIterator>
57 <ForVariable name="$$context-item">57 <ForVariable name="$$context-item">
58 <NodeDistinctIterator allow-atomics="false" check-only="false">58 <NodeDistinctIterator allow-atomics="false" check-only="false">
59 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">59 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
60 <CtxVarIterator varid="5" varname="input-context2" varkind="global"/>60 <CtxVarIterator varid="5" varname="input-context2" varkind="global"/>
61 </TreatIterator>61 </TreatIterator>
62 </NodeDistinctIterator>62 </NodeDistinctIterator>
63 </ForVariable>63 </ForVariable>
64 <ReturnClause>64 <ReturnClause>
65 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,staff)" typename="*" nill allowed="0" target_position="0">65 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,staff)" typename="*" nill-allowed="0" target_position="0">
66 <ForVarIterator varname="$$context-item"/>66 <ForVarIterator varname="$$context-item"/>
67 </ChildAxisIterator>67 </ChildAxisIterator>
68 </ReturnClause>68 </ReturnClause>
69 </FLWORIterator>69 </FLWORIterator>
70 </NodeDistinctIterator>70 </NodeDistinctIterator>
71 </ForVariable>71 </ForVariable>
72 <ReturnClause>72 <ReturnClause>
73 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,employee)" typename="*" nill allowed="0" target_position="0">73 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,employee)" typename="*" nill-allowed="0" target_position="0">
74 <ForVarIterator varname="$$context-item"/>74 <ForVarIterator varname="$$context-item"/>
75 </ChildAxisIterator>75 </ChildAxisIterator>
76 </ReturnClause>76 </ReturnClause>
77 </FLWORIterator>77 </FLWORIterator>
78 </NodeDistinctIterator>78 </NodeDistinctIterator>
79 </ForVariable>79 </ForVariable>
80 <ReturnClause>80 <ReturnClause>
81 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,empnum)" typename="*" nill allowed="0" target_position="0">81 <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,empnum)" typename="*" nill-allowed="0" target_position="0">
82 <ForVarIterator varname="$$context-item"/>82 <ForVarIterator varname="$$context-item"/>
83 </ChildAxisIterator>83 </ChildAxisIterator>
84 </ReturnClause>84 </ReturnClause>
85 </FLWORIterator>85 </FLWORIterator>
86 </NodeDistinctIterator>86 </NodeDistinctIterator>
87 </TreatIterator>87 </TreatIterator>
88 </NodeAfterIterator>88 </NodeAfterIterator>
89 <NodeAfterIterator>89 <NodeAfterIterator>
90 <TreatIterator quant="?">90 <TreatIterator quant="?">
91 <NodeDistinctIterator allow-atomics="false" check-only="false">91 <NodeDistinctIterator allow-atomics="false" check-only="false">
92 <FLWORIterator>92 <FLWORIterator>
93 <ForVariable name="$$context-item">93 <ForVariable name="$$context-item">
94 <NodeDistinctIterator allow-atomics="false" check-only="false">94 <NodeDistinctIterator allow-atomics="false" check-only="false">
95 <FLWORIterator>95 <FLWORIterator>
96 <ForVariable name="$$context-item">96 <ForVariable name="$$context-item">
97 <NodeDistinctIterator allow-atomics="false" check-only="false">
98 <FLWORIterator>
99 <ForVariable name="$$context-item">
100 <NodeDistinctIterator allow-atomics="false" check-only="false">
101 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
102 <CtxVarIterator varid="4" varname="input-context1" varkind="global"/>
103 </TreatIterator>
104 </NodeDistinctIterator>
105 </ForVariable>
106 <ReturnClause>
107 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,works)" typename="*" nill allowed="0" target_position="0">
108 <ForVarIterator varname="$$context-item"/>
109 </ChildAxisIterator>
110 </ReturnClause>
111 </FLWORIterator>
112 </NodeDistinctIterator>
113 </ForVariable>
114 <ReturnClause>
115 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,employee)" typename="*" nill allowed="0" target_position="1">
116 <ForVarIterator varname="$$context-item"/>
117 </ChildAxisIterator>
118 </ReturnClause>
119 </FLWORIterator>
120 </NodeDistinctIterator>
121 </ForVariable>
122 <ReturnClause>
123 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,empnum)" typename="*" nill allowed="0" target_position="0">
124 <ForVarIterator varname="$$context-item"/>
125 </ChildAxisIterator>
126 </ReturnClause>
127 </FLWORIterator>
128 </NodeDistinctIterator>
129 </TreatIterator>
130 <TreatIterator quant="?">
131 <NodeDistinctIterator allow-atomics="false" check-only="false">
132 <FLWORIterator>
133 <ForVariable name="$$context-item">
134 <NodeDistinctIterator allow-atomics="false" check-only="false">
135 <FLWORIterator>
136 <ForVariable name="$$context-item">
137 <NodeDistinctIterator allow-atomics="false" check-only="false">
138 <FLWORIterator>
139 <ForVariable name="$$context-item">
140 <NodeDistinctIterator allow-atomics="false" check-only="false">
141 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
142 <CtxVarIterator varid="5" varname="input-context2" varkind="global"/>
143 </TreatIterator>
144 </NodeDistinctIterator>
145 </ForVariable>
146 <ReturnClause>
147 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,staff)" typename="*" nill allowed="0" target_position="0">
148 <ForVarIterator varname="$$context-item"/>
149 </ChildAxisIterator>
150 </ReturnClause>
151 </FLWORIterator>
152 </NodeDistinctIterator>
153 </ForVariable>
154 <ReturnClause>
155 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,employee)" typename="*" nill allowed="0" target_position="1">
156 <ForVarIterator varname="$$context-item"/>
157 </ChildAxisIterator>
158 </ReturnClause>
159 </FLWORIterator>
160 </NodeDistinctIterator>
161 </ForVariable>
162 <ReturnClause>
163 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,empnum)" typename="*" nill allowed="0" target_position="0">
164 <ForVarIterator varname="$$context-item"/>
165 </ChildAxisIterator>
166 </ReturnClause>
167 </FLWORIterator>
168 </NodeDistinctIterator>
169 </TreatIterator>
170 </NodeAfterIterator>
171 <NodeAfterIterator>
172 <TreatIterator quant="?">
173 <NodeDistinctIterator allow-atomics="false" check-only="false">
174 <FLWORIterator>
175 <ForVariable name="$$context-item">
176 <NodeDistinctIterator allow-atomics="false" check-only="false">
177 <FLWORIterator>
178 <ForVariable name="$$context-item">
179 <NodeDistinctIterator allow-atomics="false" check-only="false">
180 <FLWORIterator>
181 <ForVariable name="$$context-item">
182 <NodeDistinctIterator allow-atomics="false" check-only="false">
183 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
184 <CtxVarIterator varid="4" varname="input-context1" varkind="global"/>
185 </TreatIterator>
186 </NodeDistinctIterator>
187 </ForVariable>
188 <ReturnClause>
189 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,works)" typename="*" nill allowed="0" target_position="0">
190 <ForVarIterator varname="$$context-item"/>
191 </ChildAxisIterator>
192 </ReturnClause>
193 </FLWORIterator>
194 </NodeDistinctIterator>
195 </ForVariable>
196 <ReturnClause>
197 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,employee)" typename="*" nill allowed="0" target_position="2">
198 <ForVarIterator varname="$$context-item"/>
199 </ChildAxisIterator>
200 </ReturnClause>
201 </FLWORIterator>
202 </NodeDistinctIterator>
203 </ForVariable>
204 <ReturnClause>
205 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,empnum)" typename="*" nill allowed="0" target_position="0">
206 <ForVarIterator varname="$$context-item"/>
207 </ChildAxisIterator>
208 </ReturnClause>
209 </FLWORIterator>
210 </NodeDistinctIterator>
211 </TreatIterator>
212 <TreatIterator quant="?">
213 <NodeDistinctIterator allow-atomics="false" check-only="false">
214 <FLWORIterator>
215 <ForVariable name="$$context-item">
216 <NodeDistinctIterator allow-atomics="false" check-only="false">
217 <FLWORIterator>
218 <ForVariable name="$$context-item">
219 <NodeDistinctIterator allow-atomics="false" check-only="false">
220 <FLWORIterator>
221 <ForVariable name="$$context-item">
222 <NodeDistinctIterator allow-atomics="false" check-only="false">
223 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
224 <CtxVarIterator varid="5" varname="input-context2" varkind="global"/>
225 </TreatIterator>
226 </NodeDistinctIterator>
227 </ForVariable>
228 <ReturnClause>
229 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,staff)" typename="*" nill allowed="0" target_position="0">
230 <ForVarIterator varname="$$context-item"/>
231 </ChildAxisIterator>
232 </ReturnClause>
233 </FLWORIterator>
234 </NodeDistinctIterator>
235 </ForVariable>
236 <ReturnClause>
237 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,employee)" typename="*" nill allowed="0" target_position="2">
238 <ForVarIterator varname="$$context-item"/>
239 </ChildAxisIterator>
240 </ReturnClause>
241 </FLWORIterator>
242 </NodeDistinctIterator>
243 </ForVariable>
244 <ReturnClause>
245 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,empnum)" typename="*" nill allowed="0" target_position="0">
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches