Merge lp:~zorba-coders/zorba/bug-967428 into lp:zorba
- bug-967428
- Merge into trunk
Proposed by
Markos Zaharioudakis
| Status: | Merged |
|---|---|
| Approved by: | Markos Zaharioudakis |
| Approved revision: | 10869 |
| Merged at revision: | 10876 |
| Proposed branch: | lp:~zorba-coders/zorba/bug-967428 |
| Merge into: | lp:zorba |
| Diff against target: |
2943 lines (+1239/-1121) 28 files modified
ChangeLog (+3/-0) src/compiler/expression/expr.h (+2/-0) src/compiler/rewriter/rules/hoist_rules.cpp (+55/-55) src/compiler/rewriter/rules/index_join_rule.cpp (+8/-8) test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9197.iter (+34/-34) test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9198.iter (+34/-34) test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9199.iter (+34/-34) test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9206.iter (+38/-38) test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9207.iter (+34/-34) test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9210.iter (+38/-38) test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9211.iter (+38/-38) test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9212.iter (+38/-38) test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9389.iter (+38/-38) test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9391.iter (+38/-38) test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9392.iter (+52/-52) test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9399.iter (+38/-38) test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9400.iter (+38/-38) test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/idx4.iter (+74/-78) test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/idx5.iter (+78/-82) test/rbkt/ExpCompilerResults/IterPlan/zorba/misc/hoist4.iter (+16/-20) test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9198.iter (+34/-34) test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9199.iter (+34/-34) test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9212.iter (+38/-38) test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9389.iter (+38/-38) test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9392.iter (+52/-52) test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-idx4.iter (+74/-78) test/rbkt/ExpCompilerResults/IterPlan/zorba/xray/ppm_10.iter (+107/-111) test/rbkt/Queries/zorba/hashjoins/idx10.xq (+134/-1) |
| To merge this branch: | bzr merge lp:~zorba-coders/zorba/bug-967428 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Markos Zaharioudakis | Approve | ||
|
Review via email:
|
|||
Commit message
Improved hoist rule: tighter hoisting of expressions (also fixes bug #967428)
Description of the change
Improved hoist rule: tighter hoisting of expressions (also fixes bug #967428)
To post a comment you must log in.
Revision history for this message
| Markos Zaharioudakis (markos-za) : | # |
review:
Approve
Revision history for this message
| Zorba Build Bot (zorba-buildbot) wrote : | # |
Revision history for this message
| Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Revision history for this message
| Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue job bug-967428-2012-06-
All tests succeeded!
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'ChangeLog' | |||
| 2 | --- ChangeLog 2012-06-14 13:21:03 +0000 | |||
| 3 | +++ ChangeLog 2012-06-14 14:31:26 +0000 | |||
| 4 | @@ -1,5 +1,6 @@ | |||
| 5 | 1 | Zorba - The XQuery Processor | 1 | Zorba - The XQuery Processor |
| 6 | 2 | 2 | ||
| 7 | 3 | |||
| 8 | 3 | version 2.x | 4 | version 2.x |
| 9 | 4 | 5 | ||
| 10 | 5 | New Features: | 6 | New Features: |
| 11 | @@ -7,6 +8,8 @@ | |||
| 12 | 7 | 8 | ||
| 13 | 8 | Optimizations: | 9 | Optimizations: |
| 14 | 9 | * Small optimization of comparison operations. | 10 | * Small optimization of comparison operations. |
| 15 | 11 | * Improved hoist rule: tighter hoisting of expressions (also fixes bug #967428, | ||
| 16 | 12 | which is only a performance bug) | ||
| 17 | 10 | 13 | ||
| 18 | 11 | Bug Fixes/Other Changes: | 14 | Bug Fixes/Other Changes: |
| 19 | 12 | * Fixed bug #854506 (ugly type error messages) and partial fix for bug #867008 | 15 | * Fixed bug #854506 (ugly type error messages) and partial fix for bug #867008 |
| 20 | 13 | 16 | ||
| 21 | === modified file 'src/compiler/expression/expr.h' | |||
| 22 | --- src/compiler/expression/expr.h 2012-06-14 13:21:03 +0000 | |||
| 23 | +++ src/compiler/expression/expr.h 2012-06-14 14:31:26 +0000 | |||
| 24 | @@ -1007,6 +1007,8 @@ | |||
| 25 | 1007 | 1007 | ||
| 26 | 1008 | expr* get_try_expr() const { return theTryExpr.getp(); } | 1008 | expr* get_try_expr() const { return theTryExpr.getp(); } |
| 27 | 1009 | 1009 | ||
| 28 | 1010 | void set_try_expr(expr* e) { theTryExpr = e; } | ||
| 29 | 1011 | |||
| 30 | 1010 | expr* get_catch_expr(csize i) const { return theCatchExprs[i].getp(); } | 1012 | expr* get_catch_expr(csize i) const { return theCatchExprs[i].getp(); } |
| 31 | 1011 | 1013 | ||
| 32 | 1012 | void add_catch_expr(expr_t e); | 1014 | void add_catch_expr(expr_t e); |
| 33 | 1013 | 1015 | ||
| 34 | === modified file 'src/compiler/rewriter/rules/hoist_rules.cpp' | |||
| 35 | --- src/compiler/rewriter/rules/hoist_rules.cpp 2012-06-14 13:21:03 +0000 | |||
| 36 | +++ src/compiler/rewriter/rules/hoist_rules.cpp 2012-06-14 14:31:26 +0000 | |||
| 37 | @@ -137,9 +137,9 @@ | |||
| 38 | 137 | { | 137 | { |
| 39 | 138 | flwor_expr* flwor = static_cast<flwor_expr *>(e); | 138 | flwor_expr* flwor = static_cast<flwor_expr *>(e); |
| 40 | 139 | 139 | ||
| 44 | 140 | PathHolder curr_holder; | 140 | PathHolder step; |
| 45 | 141 | curr_holder.prev = path; | 141 | step.prev = path; |
| 46 | 142 | curr_holder.expr = e; | 142 | step.expr = e; |
| 47 | 143 | 143 | ||
| 48 | 144 | csize numForLetClauses = flwor->num_forlet_clauses(); | 144 | csize numForLetClauses = flwor->num_forlet_clauses(); |
| 49 | 145 | csize i = 0; | 145 | csize i = 0; |
| 50 | @@ -147,32 +147,26 @@ | |||
| 51 | 147 | while (i < numForLetClauses) | 147 | while (i < numForLetClauses) |
| 52 | 148 | { | 148 | { |
| 53 | 149 | forletwin_clause* flc = static_cast<forletwin_clause*>(flwor->get_clause(i)); | 149 | forletwin_clause* flc = static_cast<forletwin_clause*>(flwor->get_clause(i)); |
| 54 | 150 | |||
| 55 | 151 | expr* domainExpr = flc->get_expr(); | 150 | expr* domainExpr = flc->get_expr(); |
| 56 | 152 | 151 | ||
| 62 | 153 | expr_t unhoistExpr = try_hoisting(rCtx, | 152 | expr_t unhoistExpr = |
| 63 | 154 | domainExpr, | 153 | try_hoisting(rCtx, domainExpr, varmap, freevarMap, &step); |
| 64 | 155 | varmap, | 154 | |
| 60 | 156 | freevarMap, | ||
| 61 | 157 | &curr_holder); | ||
| 65 | 158 | if (unhoistExpr != NULL) | 155 | if (unhoistExpr != NULL) |
| 66 | 159 | { | 156 | { |
| 67 | 160 | flc->set_expr(unhoistExpr.getp()); | 157 | flc->set_expr(unhoistExpr.getp()); |
| 68 | 161 | status = true; | 158 | status = true; |
| 69 | 162 | |||
| 70 | 163 | numForLetClauses = flwor->num_forlet_clauses(); | 159 | numForLetClauses = flwor->num_forlet_clauses(); |
| 71 | 164 | |||
| 72 | 165 | // TODO: the expr that was just hoisted here, may contain sub-exprs that | 160 | // TODO: the expr that was just hoisted here, may contain sub-exprs that |
| 73 | 166 | // can be hoisted even earlier. | 161 | // can be hoisted even earlier. |
| 74 | 167 | } | 162 | } |
| 75 | 168 | else if (domainExpr->is_sequential()) | 163 | else if (domainExpr->is_sequential()) |
| 76 | 169 | { | 164 | { |
| 77 | 170 | PathHolder root; | 165 | PathHolder root; |
| 83 | 171 | bool hoisted = hoist_expressions(rCtx, | 166 | |
| 84 | 172 | domainExpr, | 167 | bool hoisted = |
| 85 | 173 | varmap, | 168 | hoist_expressions(rCtx, domainExpr, varmap, freevarMap, &root); |
| 86 | 174 | freevarMap, | 169 | |
| 82 | 175 | &root); | ||
| 87 | 176 | if (hoisted) | 170 | if (hoisted) |
| 88 | 177 | { | 171 | { |
| 89 | 178 | if (root.expr != NULL) | 172 | if (root.expr != NULL) |
| 90 | @@ -180,7 +174,6 @@ | |||
| 91 | 180 | assert(root.expr->get_expr_kind() == flwor_expr_kind); | 174 | assert(root.expr->get_expr_kind() == flwor_expr_kind); |
| 92 | 181 | 175 | ||
| 93 | 182 | static_cast<flwor_expr*>(root.expr.getp())->set_return_expr(domainExpr); | 176 | static_cast<flwor_expr*>(root.expr.getp())->set_return_expr(domainExpr); |
| 94 | 183 | |||
| 95 | 184 | flc->set_expr(root.expr.getp()); | 177 | flc->set_expr(root.expr.getp()); |
| 96 | 185 | } | 178 | } |
| 97 | 186 | 179 | ||
| 98 | @@ -190,11 +183,9 @@ | |||
| 99 | 190 | } | 183 | } |
| 100 | 191 | else | 184 | else |
| 101 | 192 | { | 185 | { |
| 107 | 193 | bool hoisted = hoist_expressions(rCtx, | 186 | bool hoisted = |
| 108 | 194 | domainExpr, | 187 | hoist_expressions(rCtx, domainExpr, varmap, freevarMap, &step); |
| 109 | 195 | varmap, | 188 | |
| 105 | 196 | freevarMap, | ||
| 106 | 197 | &curr_holder); | ||
| 110 | 198 | if (hoisted) | 189 | if (hoisted) |
| 111 | 199 | { | 190 | { |
| 112 | 200 | status = true; | 191 | status = true; |
| 113 | @@ -202,7 +193,7 @@ | |||
| 114 | 202 | } | 193 | } |
| 115 | 203 | } | 194 | } |
| 116 | 204 | 195 | ||
| 118 | 205 | i = ++(curr_holder.clauseCount); | 196 | i = ++(step.clauseCount); |
| 119 | 206 | 197 | ||
| 120 | 207 | assert(numForLetClauses == flwor->num_forlet_clauses()); | 198 | assert(numForLetClauses == flwor->num_forlet_clauses()); |
| 121 | 208 | } | 199 | } |
| 122 | @@ -212,7 +203,8 @@ | |||
| 123 | 212 | { | 203 | { |
| 124 | 213 | ZORBA_ASSERT(!we->is_sequential()); | 204 | ZORBA_ASSERT(!we->is_sequential()); |
| 125 | 214 | 205 | ||
| 127 | 215 | expr_t unhoistExpr = try_hoisting(rCtx, we, varmap, freevarMap, &curr_holder); | 206 | expr_t unhoistExpr = try_hoisting(rCtx, we, varmap, freevarMap, &step); |
| 128 | 207 | |||
| 129 | 216 | if (unhoistExpr != NULL) | 208 | if (unhoistExpr != NULL) |
| 130 | 217 | { | 209 | { |
| 131 | 218 | flwor->set_where(unhoistExpr.getp()); | 210 | flwor->set_where(unhoistExpr.getp()); |
| 132 | @@ -220,14 +212,14 @@ | |||
| 133 | 220 | } | 212 | } |
| 134 | 221 | else | 213 | else |
| 135 | 222 | { | 214 | { |
| 137 | 223 | status = hoist_expressions(rCtx, we, varmap, freevarMap, &curr_holder) || status; | 215 | status = hoist_expressions(rCtx, we, varmap, freevarMap, &step) || status; |
| 138 | 224 | } | 216 | } |
| 139 | 225 | } | 217 | } |
| 140 | 226 | 218 | ||
| 141 | 227 | // TODO: hoist orderby exprs | 219 | // TODO: hoist orderby exprs |
| 142 | 228 | 220 | ||
| 143 | 229 | expr_t re = flwor->get_return_expr(); | 221 | expr_t re = flwor->get_return_expr(); |
| 145 | 230 | expr_t unhoistExpr = try_hoisting(rCtx, re, varmap, freevarMap, &curr_holder); | 222 | expr_t unhoistExpr = try_hoisting(rCtx, re, varmap, freevarMap, &step); |
| 146 | 231 | 223 | ||
| 147 | 232 | if (unhoistExpr != NULL) | 224 | if (unhoistExpr != NULL) |
| 148 | 233 | { | 225 | { |
| 149 | @@ -251,15 +243,15 @@ | |||
| 150 | 251 | } | 243 | } |
| 151 | 252 | else | 244 | else |
| 152 | 253 | { | 245 | { |
| 154 | 254 | status = hoist_expressions(rCtx, re, varmap, freevarMap, &curr_holder) || status; | 246 | status = hoist_expressions(rCtx, re, varmap, freevarMap, &step) || status; |
| 155 | 255 | } | 247 | } |
| 156 | 256 | } | 248 | } |
| 157 | 257 | 249 | ||
| 158 | 258 | else if (e->get_expr_kind() == trycatch_expr_kind) | 250 | else if (e->get_expr_kind() == trycatch_expr_kind) |
| 159 | 259 | { | 251 | { |
| 163 | 260 | PathHolder pathStep; | 252 | PathHolder step; |
| 164 | 261 | pathStep.prev = path; | 253 | step.prev = path; |
| 165 | 262 | pathStep.expr = e; | 254 | step.expr = e; |
| 166 | 263 | 255 | ||
| 167 | 264 | ExprIterator iter(e); | 256 | ExprIterator iter(e); |
| 168 | 265 | 257 | ||
| 169 | @@ -268,7 +260,7 @@ | |||
| 170 | 268 | expr* ce = &*(*iter); | 260 | expr* ce = &*(*iter); |
| 171 | 269 | if (ce) | 261 | if (ce) |
| 172 | 270 | { | 262 | { |
| 174 | 271 | expr_t unhoistExpr = try_hoisting(rCtx, ce, varmap, freevarMap, &pathStep); | 263 | expr_t unhoistExpr = try_hoisting(rCtx, ce, varmap, freevarMap, &step); |
| 175 | 272 | if (unhoistExpr != NULL) | 264 | if (unhoistExpr != NULL) |
| 176 | 273 | { | 265 | { |
| 177 | 274 | *iter = unhoistExpr.getp(); | 266 | *iter = unhoistExpr.getp(); |
| 178 | @@ -276,7 +268,7 @@ | |||
| 179 | 276 | } | 268 | } |
| 180 | 277 | else | 269 | else |
| 181 | 278 | { | 270 | { |
| 183 | 279 | status = hoist_expressions(rCtx, ce, varmap, freevarMap, &pathStep) || status; | 271 | status = hoist_expressions(rCtx, ce, varmap, freevarMap, &step) || status; |
| 184 | 280 | } | 272 | } |
| 185 | 281 | } | 273 | } |
| 186 | 282 | 274 | ||
| 187 | @@ -358,7 +350,7 @@ | |||
| 188 | 358 | expr* e, | 350 | expr* e, |
| 189 | 359 | const VarIdMap& varmap, | 351 | const VarIdMap& varmap, |
| 190 | 360 | const ExprVarsMap& freevarMap, | 352 | const ExprVarsMap& freevarMap, |
| 192 | 361 | struct PathHolder* holder) | 353 | struct PathHolder* path) |
| 193 | 362 | { | 354 | { |
| 194 | 363 | if (non_hoistable(e) || e->contains_node_construction()) | 355 | if (non_hoistable(e) || e->contains_node_construction()) |
| 195 | 364 | { | 356 | { |
| 196 | @@ -371,21 +363,21 @@ | |||
| 197 | 371 | ZORBA_ASSERT(fvme != freevarMap.end()); | 363 | ZORBA_ASSERT(fvme != freevarMap.end()); |
| 198 | 372 | const DynamicBitset& varset = fvme->second; | 364 | const DynamicBitset& varset = fvme->second; |
| 199 | 373 | 365 | ||
| 201 | 374 | PathHolder* h = holder; | 366 | PathHolder* step = path; |
| 202 | 375 | 367 | ||
| 203 | 376 | bool inloop = false; | 368 | bool inloop = false; |
| 204 | 377 | bool foundReferencedFLWORVar = false; | 369 | bool foundReferencedFLWORVar = false; |
| 205 | 378 | bool foundSequentialClause = false; | 370 | bool foundSequentialClause = false; |
| 206 | 379 | int i = 0; | 371 | int i = 0; |
| 207 | 380 | 372 | ||
| 209 | 381 | // h->prev == NULL means that expr e is not inside any flwor expr, and as a | 373 | // step->prev == NULL means that expr e is not inside any flwor expr, and as a |
| 210 | 382 | // result, there is nothing to hoist. | 374 | // result, there is nothing to hoist. |
| 212 | 383 | while (h->prev != NULL) | 375 | while (step->prev != NULL) |
| 213 | 384 | { | 376 | { |
| 215 | 385 | if (h->expr->get_expr_kind() == trycatch_expr_kind) | 377 | if (step->expr->get_expr_kind() == trycatch_expr_kind) |
| 216 | 386 | { | 378 | { |
| 217 | 387 | // Should not hoist an expr out of a try-catch if it contains any try-catch vars | 379 | // Should not hoist an expr out of a try-catch if it contains any try-catch vars |
| 219 | 388 | trycatch_expr* trycatch = static_cast<trycatch_expr*>(h->expr.getp()); | 380 | trycatch_expr* trycatch = static_cast<trycatch_expr*>(step->expr.getp()); |
| 220 | 389 | csize numClauses = trycatch->clause_count(); | 381 | csize numClauses = trycatch->clause_count(); |
| 221 | 390 | 382 | ||
| 222 | 391 | for (csize i = 0; i < numClauses; ++i) | 383 | for (csize i = 0; i < numClauses; ++i) |
| 223 | @@ -407,10 +399,9 @@ | |||
| 224 | 407 | } | 399 | } |
| 225 | 408 | else | 400 | else |
| 226 | 409 | { | 401 | { |
| 228 | 410 | assert(h->expr->get_expr_kind() == flwor_expr_kind); | 402 | assert(step->expr->get_expr_kind() == flwor_expr_kind); |
| 229 | 411 | 403 | ||
| 232 | 412 | flwor_expr* flwor = static_cast<flwor_expr*>(h->expr.getp()); | 404 | flwor_expr* flwor = static_cast<flwor_expr*>(step->expr.getp()); |
| 231 | 413 | |||
| 233 | 414 | group_clause* gc = flwor->get_group_clause(); | 405 | group_clause* gc = flwor->get_group_clause(); |
| 234 | 415 | 406 | ||
| 235 | 416 | // If any free variable is a group-by variable, give up. | 407 | // If any free variable is a group-by variable, give up. |
| 236 | @@ -441,7 +432,7 @@ | |||
| 237 | 441 | // If yes, then let V be the inner-most var referenced by e. If there are any | 432 | // If yes, then let V be the inner-most var referenced by e. If there are any |
| 238 | 442 | // FOR vars after V, e can be hoisted out of any such FOR vars. Otherwise, e | 433 | // FOR vars after V, e can be hoisted out of any such FOR vars. Otherwise, e |
| 239 | 443 | // cannot be hoisted. | 434 | // cannot be hoisted. |
| 241 | 444 | for (i = h->clauseCount - 1; i >= 0; --i) | 435 | for (i = step->clauseCount - 1; i >= 0; --i) |
| 242 | 445 | { | 436 | { |
| 243 | 446 | const forletwin_clause* flc = | 437 | const forletwin_clause* flc = |
| 244 | 447 | static_cast<const forletwin_clause*>(flwor->get_clause(i)); | 438 | static_cast<const forletwin_clause*>(flwor->get_clause(i)); |
| 245 | @@ -469,7 +460,10 @@ | |||
| 246 | 469 | break; | 460 | break; |
| 247 | 470 | } | 461 | } |
| 248 | 471 | 462 | ||
| 250 | 472 | h = h->prev; | 463 | if (step->prev->prev == NULL) |
| 251 | 464 | break; | ||
| 252 | 465 | |||
| 253 | 466 | step = step->prev; | ||
| 254 | 473 | } | 467 | } |
| 255 | 474 | 468 | ||
| 256 | 475 | if (!inloop) | 469 | if (!inloop) |
| 257 | @@ -489,27 +483,33 @@ | |||
| 258 | 489 | hoisted->setFlags(e->getFlags()); | 483 | hoisted->setFlags(e->getFlags()); |
| 259 | 490 | letvar->setFlags(e->getFlags()); | 484 | letvar->setFlags(e->getFlags()); |
| 260 | 491 | 485 | ||
| 265 | 492 | let_clause_t flref(new let_clause(e->get_sctx(), | 486 | let_clause_t flref(new let_clause(e->get_sctx(), e->get_loc(), letvar, hoisted)); |
| 262 | 493 | e->get_loc(), | ||
| 263 | 494 | letvar, | ||
| 264 | 495 | hoisted)); | ||
| 266 | 496 | 487 | ||
| 267 | 497 | letvar->set_flwor_clause(flref.getp()); | 488 | letvar->set_flwor_clause(flref.getp()); |
| 268 | 498 | 489 | ||
| 270 | 499 | if (h->prev == NULL) | 490 | if (step->prev == NULL) |
| 271 | 500 | { | 491 | { |
| 273 | 501 | if (h->expr == NULL) | 492 | if (step->expr == NULL) |
| 274 | 502 | { | 493 | { |
| 276 | 503 | h->expr = new flwor_expr(e->get_sctx(), e->get_loc(), false); | 494 | step->expr = new flwor_expr(e->get_sctx(), e->get_loc(), false); |
| 277 | 504 | } | 495 | } |
| 279 | 505 | static_cast<flwor_expr*>(h->expr.getp())->add_clause(flref); | 496 | static_cast<flwor_expr*>(step->expr.getp())->add_clause(flref); |
| 280 | 497 | } | ||
| 281 | 498 | else if (step->expr->get_expr_kind() == flwor_expr_kind) | ||
| 282 | 499 | { | ||
| 283 | 500 | static_cast<flwor_expr*>(step->expr.getp())->add_clause(i + 1, flref); | ||
| 284 | 501 | ++step->clauseCount; | ||
| 285 | 506 | } | 502 | } |
| 286 | 507 | else | 503 | else |
| 287 | 508 | { | 504 | { |
| 292 | 509 | assert(h->expr->get_expr_kind() == flwor_expr_kind); | 505 | assert(step->expr->get_expr_kind() == trycatch_expr_kind); |
| 293 | 510 | 506 | trycatch_expr* trycatchExpr = static_cast<trycatch_expr*>(step->expr.getp()); | |
| 294 | 511 | static_cast<flwor_expr*>(h->expr.getp())->add_clause(i + 1, flref); | 507 | |
| 295 | 512 | ++h->clauseCount; | 508 | flwor_expr_t flwor = new flwor_expr(e->get_sctx(), e->get_loc(), false); |
| 296 | 509 | flwor->add_clause(flref); | ||
| 297 | 510 | flwor->set_return_expr(trycatchExpr->get_try_expr()); | ||
| 298 | 511 | |||
| 299 | 512 | trycatchExpr->set_try_expr(flwor); | ||
| 300 | 513 | } | 513 | } |
| 301 | 514 | 514 | ||
| 302 | 515 | expr_t unhoisted = new fo_expr(e->get_sctx(), | 515 | expr_t unhoisted = new fo_expr(e->get_sctx(), |
| 303 | 516 | 516 | ||
| 304 | === modified file 'src/compiler/rewriter/rules/index_join_rule.cpp' | |||
| 305 | --- src/compiler/rewriter/rules/index_join_rule.cpp 2012-05-03 12:31:51 +0000 | |||
| 306 | +++ src/compiler/rewriter/rules/index_join_rule.cpp 2012-06-14 14:31:26 +0000 | |||
| 307 | @@ -518,7 +518,7 @@ | |||
| 308 | 518 | innerPosInStack)) | 518 | innerPosInStack)) |
| 309 | 519 | return; | 519 | return; |
| 310 | 520 | 520 | ||
| 312 | 521 | ulong numClauses = innerFlwor->num_clauses(); | 521 | csize numClauses = innerFlwor->num_clauses(); |
| 313 | 522 | 522 | ||
| 314 | 523 | if (innerFlwor->defines_variable(predInfo.theOuterVar) >= 0 || | 523 | if (innerFlwor->defines_variable(predInfo.theOuterVar) >= 0 || |
| 315 | 524 | mostInnerVarPos < numClauses-1) | 524 | mostInnerVarPos < numClauses-1) |
| 316 | @@ -529,12 +529,12 @@ | |||
| 317 | 529 | 529 | ||
| 318 | 530 | flwor_expr_t nestedFlwor = new flwor_expr(sctx, nestedLoc, false); | 530 | flwor_expr_t nestedFlwor = new flwor_expr(sctx, nestedLoc, false); |
| 319 | 531 | 531 | ||
| 321 | 532 | for (ulong i = mostInnerVarPos+1; i < numClauses; ++i) | 532 | for (csize i = mostInnerVarPos+1; i < numClauses; ++i) |
| 322 | 533 | { | 533 | { |
| 323 | 534 | nestedFlwor->add_clause(innerFlwor->get_clause(i)); | 534 | nestedFlwor->add_clause(innerFlwor->get_clause(i)); |
| 324 | 535 | } | 535 | } |
| 325 | 536 | 536 | ||
| 327 | 537 | for (ulong i = numClauses - 1; i > mostInnerVarPos; --i) | 537 | for (csize i = numClauses - 1; i > mostInnerVarPos; --i) |
| 328 | 538 | { | 538 | { |
| 329 | 539 | innerFlwor->remove_clause(i); | 539 | innerFlwor->remove_clause(i); |
| 330 | 540 | } | 540 | } |
| 331 | @@ -563,8 +563,8 @@ | |||
| 332 | 563 | { | 563 | { |
| 333 | 564 | block_expr* seqExpr = static_cast<block_expr*>(returnExpr); | 564 | block_expr* seqExpr = static_cast<block_expr*>(returnExpr); |
| 334 | 565 | 565 | ||
| 337 | 566 | ulong numArgs = seqExpr->size(); | 566 | csize numArgs = seqExpr->size(); |
| 338 | 567 | ulong arg; | 567 | csize arg; |
| 339 | 568 | for (arg = 0; arg < numArgs; ++arg) | 568 | for (arg = 0; arg < numArgs; ++arg) |
| 340 | 569 | { | 569 | { |
| 341 | 570 | if ((*seqExpr)[arg]->get_function_kind() != | 570 | if ((*seqExpr)[arg]->get_function_kind() != |
| 342 | @@ -590,9 +590,9 @@ | |||
| 343 | 590 | } | 590 | } |
| 344 | 591 | else | 591 | else |
| 345 | 592 | { | 592 | { |
| 349 | 593 | // All the variables referenced by the inner domain expr are defined after | 593 | // The inner domain expr does not reference any flwor vars. In this case, |
| 350 | 594 | // the outer var. In this case, Find the flwor expr defining the outer var | 594 | // find the flwor expr defining the outer var and create the index just |
| 351 | 595 | // and create the index just before this flwor. | 595 | // before this flwor. |
| 352 | 596 | flwor_expr* outerFlworExpr = NULL; | 596 | flwor_expr* outerFlworExpr = NULL; |
| 353 | 597 | ulong outerPosInStack = 0; | 597 | ulong outerPosInStack = 0; |
| 354 | 598 | ulong dummy = 0; | 598 | ulong dummy = 0; |
| 355 | 599 | 599 | ||
| 356 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9197.iter' | |||
| 357 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9197.iter 2012-05-03 12:31:51 +0000 | |||
| 358 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9197.iter 2012-06-14 14:31:26 +0000 | |||
| 359 | @@ -1,33 +1,33 @@ | |||
| 360 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 390 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator> |
| 391 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 392 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 393 | 5 | <OpToIterator> | 5 | <flwor::FLWORIterator> |
| 394 | 6 | <SingletonIterator value="xs:integer(1)"/> | 6 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 395 | 7 | <SingletonIterator value="xs:integer(2)"/> | 7 | <HoistIterator> |
| 396 | 8 | </OpToIterator> | 8 | <OpToIterator> |
| 397 | 9 | </HoistIterator> | 9 | <SingletonIterator value="xs:integer(1)"/> |
| 398 | 10 | </LetVariable> | 10 | <SingletonIterator value="xs:integer(2)"/> |
| 399 | 11 | <ReturnClause> | 11 | </OpToIterator> |
| 400 | 12 | <SequentialIterator> | 12 | </HoistIterator> |
| 401 | 13 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 13 | </LetVariable> |
| 402 | 14 | <flwor::FLWORIterator> | 14 | <ReturnClause> |
| 403 | 15 | <ForVariable name="$$opt_temp_2"> | 15 | <SequentialIterator> |
| 404 | 16 | <UnhoistIterator> | 16 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 405 | 17 | <LetVarIterator varname="$$opt_temp_0"/> | 17 | <flwor::FLWORIterator> |
| 406 | 18 | </UnhoistIterator> | 18 | <ForVariable name="$$opt_temp_2"> |
| 407 | 19 | </ForVariable> | 19 | <UnhoistIterator> |
| 408 | 20 | <ReturnClause> | 20 | <LetVarIterator varname="$$opt_temp_0"/> |
| 409 | 21 | <ValueIndexEntryBuilderIterator> | 21 | </UnhoistIterator> |
| 410 | 22 | <ForVarIterator varname="$$opt_temp_2"/> | 22 | </ForVariable> |
| 411 | 23 | <ForVarIterator varname="$$opt_temp_2"/> | 23 | <ReturnClause> |
| 412 | 24 | </ValueIndexEntryBuilderIterator> | 24 | <ValueIndexEntryBuilderIterator> |
| 413 | 25 | </ReturnClause> | 25 | <ForVarIterator varname="$$opt_temp_2"/> |
| 414 | 26 | </flwor::FLWORIterator> | 26 | <ForVarIterator varname="$$opt_temp_2"/> |
| 415 | 27 | </CreateInternalIndexIterator> | 27 | </ValueIndexEntryBuilderIterator> |
| 416 | 28 | <ElementIterator> | 28 | </ReturnClause> |
| 417 | 29 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 29 | </flwor::FLWORIterator> |
| 418 | 30 | <EnclosedIterator attr_cont="false"> | 30 | </CreateInternalIndexIterator> |
| 419 | 31 | <flwor::FLWORIterator> | 31 | <flwor::FLWORIterator> |
| 420 | 32 | <ForVariable name="book"> | 32 | <ForVariable name="book"> |
| 421 | 33 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 33 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 422 | @@ -64,9 +64,9 @@ | |||
| 423 | 64 | </ElementIterator> | 64 | </ElementIterator> |
| 424 | 65 | </ReturnClause> | 65 | </ReturnClause> |
| 425 | 66 | </flwor::FLWORIterator> | 66 | </flwor::FLWORIterator> |
| 431 | 67 | </EnclosedIterator> | 67 | </SequentialIterator> |
| 432 | 68 | </ElementIterator> | 68 | </ReturnClause> |
| 433 | 69 | </SequentialIterator> | 69 | </flwor::FLWORIterator> |
| 434 | 70 | </ReturnClause> | 70 | </EnclosedIterator> |
| 435 | 71 | </flwor::FLWORIterator> | 71 | </ElementIterator> |
| 436 | 72 | 72 | ||
| 437 | 73 | 73 | ||
| 438 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9198.iter' | |||
| 439 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9198.iter 2012-05-03 12:31:51 +0000 | |||
| 440 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9198.iter 2012-06-14 14:31:26 +0000 | |||
| 441 | @@ -1,33 +1,33 @@ | |||
| 442 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 472 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator> |
| 473 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 474 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 475 | 5 | <OpToIterator> | 5 | <flwor::FLWORIterator> |
| 476 | 6 | <SingletonIterator value="xs:integer(1)"/> | 6 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 477 | 7 | <SingletonIterator value="xs:integer(2)"/> | 7 | <HoistIterator> |
| 478 | 8 | </OpToIterator> | 8 | <OpToIterator> |
| 479 | 9 | </HoistIterator> | 9 | <SingletonIterator value="xs:integer(1)"/> |
| 480 | 10 | </LetVariable> | 10 | <SingletonIterator value="xs:integer(2)"/> |
| 481 | 11 | <ReturnClause> | 11 | </OpToIterator> |
| 482 | 12 | <SequentialIterator> | 12 | </HoistIterator> |
| 483 | 13 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 13 | </LetVariable> |
| 484 | 14 | <flwor::FLWORIterator> | 14 | <ReturnClause> |
| 485 | 15 | <ForVariable name="$$opt_temp_2"> | 15 | <SequentialIterator> |
| 486 | 16 | <UnhoistIterator> | 16 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 487 | 17 | <LetVarIterator varname="$$opt_temp_0"/> | 17 | <flwor::FLWORIterator> |
| 488 | 18 | </UnhoistIterator> | 18 | <ForVariable name="$$opt_temp_2"> |
| 489 | 19 | </ForVariable> | 19 | <UnhoistIterator> |
| 490 | 20 | <ReturnClause> | 20 | <LetVarIterator varname="$$opt_temp_0"/> |
| 491 | 21 | <ValueIndexEntryBuilderIterator> | 21 | </UnhoistIterator> |
| 492 | 22 | <ForVarIterator varname="$$opt_temp_2"/> | 22 | </ForVariable> |
| 493 | 23 | <ForVarIterator varname="$$opt_temp_2"/> | 23 | <ReturnClause> |
| 494 | 24 | </ValueIndexEntryBuilderIterator> | 24 | <ValueIndexEntryBuilderIterator> |
| 495 | 25 | </ReturnClause> | 25 | <ForVarIterator varname="$$opt_temp_2"/> |
| 496 | 26 | </flwor::FLWORIterator> | 26 | <ForVarIterator varname="$$opt_temp_2"/> |
| 497 | 27 | </CreateInternalIndexIterator> | 27 | </ValueIndexEntryBuilderIterator> |
| 498 | 28 | <ElementIterator> | 28 | </ReturnClause> |
| 499 | 29 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 29 | </flwor::FLWORIterator> |
| 500 | 30 | <EnclosedIterator attr_cont="false"> | 30 | </CreateInternalIndexIterator> |
| 501 | 31 | <flwor::FLWORIterator> | 31 | <flwor::FLWORIterator> |
| 502 | 32 | <ForVariable name="book"> | 32 | <ForVariable name="book"> |
| 503 | 33 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 33 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 504 | @@ -67,9 +67,9 @@ | |||
| 505 | 67 | </ElementIterator> | 67 | </ElementIterator> |
| 506 | 68 | </ReturnClause> | 68 | </ReturnClause> |
| 507 | 69 | </flwor::FLWORIterator> | 69 | </flwor::FLWORIterator> |
| 513 | 70 | </EnclosedIterator> | 70 | </SequentialIterator> |
| 514 | 71 | </ElementIterator> | 71 | </ReturnClause> |
| 515 | 72 | </SequentialIterator> | 72 | </flwor::FLWORIterator> |
| 516 | 73 | </ReturnClause> | 73 | </EnclosedIterator> |
| 517 | 74 | </flwor::FLWORIterator> | 74 | </ElementIterator> |
| 518 | 75 | 75 | ||
| 519 | 76 | 76 | ||
| 520 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9199.iter' | |||
| 521 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9199.iter 2012-05-03 12:31:51 +0000 | |||
| 522 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9199.iter 2012-06-14 14:31:26 +0000 | |||
| 523 | @@ -1,33 +1,33 @@ | |||
| 524 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 554 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator> |
| 555 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 556 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 557 | 5 | <OpToIterator> | 5 | <flwor::FLWORIterator> |
| 558 | 6 | <SingletonIterator value="xs:integer(1)"/> | 6 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 559 | 7 | <SingletonIterator value="xs:integer(2)"/> | 7 | <HoistIterator> |
| 560 | 8 | </OpToIterator> | 8 | <OpToIterator> |
| 561 | 9 | </HoistIterator> | 9 | <SingletonIterator value="xs:integer(1)"/> |
| 562 | 10 | </LetVariable> | 10 | <SingletonIterator value="xs:integer(2)"/> |
| 563 | 11 | <ReturnClause> | 11 | </OpToIterator> |
| 564 | 12 | <SequentialIterator> | 12 | </HoistIterator> |
| 565 | 13 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 13 | </LetVariable> |
| 566 | 14 | <flwor::FLWORIterator> | 14 | <ReturnClause> |
| 567 | 15 | <ForVariable name="$$opt_temp_2"> | 15 | <SequentialIterator> |
| 568 | 16 | <UnhoistIterator> | 16 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 569 | 17 | <LetVarIterator varname="$$opt_temp_0"/> | 17 | <flwor::FLWORIterator> |
| 570 | 18 | </UnhoistIterator> | 18 | <ForVariable name="$$opt_temp_2"> |
| 571 | 19 | </ForVariable> | 19 | <UnhoistIterator> |
| 572 | 20 | <ReturnClause> | 20 | <LetVarIterator varname="$$opt_temp_0"/> |
| 573 | 21 | <ValueIndexEntryBuilderIterator> | 21 | </UnhoistIterator> |
| 574 | 22 | <ForVarIterator varname="$$opt_temp_2"/> | 22 | </ForVariable> |
| 575 | 23 | <ForVarIterator varname="$$opt_temp_2"/> | 23 | <ReturnClause> |
| 576 | 24 | </ValueIndexEntryBuilderIterator> | 24 | <ValueIndexEntryBuilderIterator> |
| 577 | 25 | </ReturnClause> | 25 | <ForVarIterator varname="$$opt_temp_2"/> |
| 578 | 26 | </flwor::FLWORIterator> | 26 | <ForVarIterator varname="$$opt_temp_2"/> |
| 579 | 27 | </CreateInternalIndexIterator> | 27 | </ValueIndexEntryBuilderIterator> |
| 580 | 28 | <ElementIterator> | 28 | </ReturnClause> |
| 581 | 29 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 29 | </flwor::FLWORIterator> |
| 582 | 30 | <EnclosedIterator attr_cont="false"> | 30 | </CreateInternalIndexIterator> |
| 583 | 31 | <flwor::FLWORIterator> | 31 | <flwor::FLWORIterator> |
| 584 | 32 | <ForVariable name="book"> | 32 | <ForVariable name="book"> |
| 585 | 33 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 33 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 586 | @@ -67,9 +67,9 @@ | |||
| 587 | 67 | </ElementIterator> | 67 | </ElementIterator> |
| 588 | 68 | </ReturnClause> | 68 | </ReturnClause> |
| 589 | 69 | </flwor::FLWORIterator> | 69 | </flwor::FLWORIterator> |
| 595 | 70 | </EnclosedIterator> | 70 | </SequentialIterator> |
| 596 | 71 | </ElementIterator> | 71 | </ReturnClause> |
| 597 | 72 | </SequentialIterator> | 72 | </flwor::FLWORIterator> |
| 598 | 73 | </ReturnClause> | 73 | </EnclosedIterator> |
| 599 | 74 | </flwor::FLWORIterator> | 74 | </ElementIterator> |
| 600 | 75 | 75 | ||
| 601 | 76 | 76 | ||
| 602 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9206.iter' | |||
| 603 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9206.iter 2012-05-03 12:31:51 +0000 | |||
| 604 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9206.iter 2012-06-14 14:31:26 +0000 | |||
| 605 | @@ -1,38 +1,38 @@ | |||
| 606 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 631 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator> |
| 632 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 633 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 634 | 5 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 5 | <flwor::FLWORIterator> |
| 635 | 6 | <FnDocIterator> | 6 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 636 | 7 | <SingletonIterator value="xs:string(books.xml)"/> | 7 | <HoistIterator> |
| 637 | 8 | </FnDocIterator> | 8 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 638 | 9 | </DescendantAxisIterator> | 9 | <FnDocIterator> |
| 639 | 10 | </HoistIterator> | 10 | <SingletonIterator value="xs:string(books.xml)"/> |
| 640 | 11 | </LetVariable> | 11 | </FnDocIterator> |
| 641 | 12 | <ReturnClause> | 12 | </DescendantAxisIterator> |
| 642 | 13 | <SequentialIterator> | 13 | </HoistIterator> |
| 643 | 14 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 14 | </LetVariable> |
| 644 | 15 | <flwor::FLWORIterator> | 15 | <ReturnClause> |
| 645 | 16 | <ForVariable name="$$opt_temp_1"> | 16 | <SequentialIterator> |
| 646 | 17 | <UnhoistIterator> | 17 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 647 | 18 | <LetVarIterator varname="$$opt_temp_0"/> | 18 | <flwor::FLWORIterator> |
| 648 | 19 | </UnhoistIterator> | 19 | <ForVariable name="$$opt_temp_1"> |
| 649 | 20 | </ForVariable> | 20 | <UnhoistIterator> |
| 650 | 21 | <ReturnClause> | 21 | <LetVarIterator varname="$$opt_temp_0"/> |
| 651 | 22 | <ValueIndexEntryBuilderIterator> | 22 | </UnhoistIterator> |
| 652 | 23 | <ForVarIterator varname="$$opt_temp_1"/> | 23 | </ForVariable> |
| 653 | 24 | <FnCountIterator> | 24 | <ReturnClause> |
| 654 | 25 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> | 25 | <ValueIndexEntryBuilderIterator> |
| 655 | 26 | <ForVarIterator varname="$$opt_temp_1"/> | 26 | <ForVarIterator varname="$$opt_temp_1"/> |
| 665 | 27 | </ChildAxisIterator> | 27 | <FnCountIterator> |
| 666 | 28 | </FnCountIterator> | 28 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> |
| 667 | 29 | </ValueIndexEntryBuilderIterator> | 29 | <ForVarIterator varname="$$opt_temp_1"/> |
| 668 | 30 | </ReturnClause> | 30 | </ChildAxisIterator> |
| 669 | 31 | </flwor::FLWORIterator> | 31 | </FnCountIterator> |
| 670 | 32 | </CreateInternalIndexIterator> | 32 | </ValueIndexEntryBuilderIterator> |
| 671 | 33 | <ElementIterator> | 33 | </ReturnClause> |
| 672 | 34 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 34 | </flwor::FLWORIterator> |
| 673 | 35 | <EnclosedIterator attr_cont="false"> | 35 | </CreateInternalIndexIterator> |
| 674 | 36 | <flwor::FLWORIterator> | 36 | <flwor::FLWORIterator> |
| 675 | 37 | <ForVariable name="anzahl"> | 37 | <ForVariable name="anzahl"> |
| 676 | 38 | <OpToIterator> | 38 | <OpToIterator> |
| 677 | @@ -60,9 +60,9 @@ | |||
| 678 | 60 | </ElementIterator> | 60 | </ElementIterator> |
| 679 | 61 | </ReturnClause> | 61 | </ReturnClause> |
| 680 | 62 | </flwor::FLWORIterator> | 62 | </flwor::FLWORIterator> |
| 686 | 63 | </EnclosedIterator> | 63 | </SequentialIterator> |
| 687 | 64 | </ElementIterator> | 64 | </ReturnClause> |
| 688 | 65 | </SequentialIterator> | 65 | </flwor::FLWORIterator> |
| 689 | 66 | </ReturnClause> | 66 | </EnclosedIterator> |
| 690 | 67 | </flwor::FLWORIterator> | 67 | </ElementIterator> |
| 691 | 68 | 68 | ||
| 692 | 69 | 69 | ||
| 693 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9207.iter' | |||
| 694 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9207.iter 2012-05-03 12:31:51 +0000 | |||
| 695 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9207.iter 2012-06-14 14:31:26 +0000 | |||
| 696 | @@ -1,33 +1,33 @@ | |||
| 697 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 727 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator> |
| 728 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 729 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 730 | 5 | <OpToIterator> | 5 | <flwor::FLWORIterator> |
| 731 | 6 | <SingletonIterator value="xs:integer(1)"/> | 6 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 732 | 7 | <SingletonIterator value="xs:integer(2)"/> | 7 | <HoistIterator> |
| 733 | 8 | </OpToIterator> | 8 | <OpToIterator> |
| 734 | 9 | </HoistIterator> | 9 | <SingletonIterator value="xs:integer(1)"/> |
| 735 | 10 | </LetVariable> | 10 | <SingletonIterator value="xs:integer(2)"/> |
| 736 | 11 | <ReturnClause> | 11 | </OpToIterator> |
| 737 | 12 | <SequentialIterator> | 12 | </HoistIterator> |
| 738 | 13 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 13 | </LetVariable> |
| 739 | 14 | <flwor::FLWORIterator> | 14 | <ReturnClause> |
| 740 | 15 | <ForVariable name="$$opt_temp_2"> | 15 | <SequentialIterator> |
| 741 | 16 | <UnhoistIterator> | 16 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 742 | 17 | <LetVarIterator varname="$$opt_temp_0"/> | 17 | <flwor::FLWORIterator> |
| 743 | 18 | </UnhoistIterator> | 18 | <ForVariable name="$$opt_temp_2"> |
| 744 | 19 | </ForVariable> | 19 | <UnhoistIterator> |
| 745 | 20 | <ReturnClause> | 20 | <LetVarIterator varname="$$opt_temp_0"/> |
| 746 | 21 | <ValueIndexEntryBuilderIterator> | 21 | </UnhoistIterator> |
| 747 | 22 | <ForVarIterator varname="$$opt_temp_2"/> | 22 | </ForVariable> |
| 748 | 23 | <ForVarIterator varname="$$opt_temp_2"/> | 23 | <ReturnClause> |
| 749 | 24 | </ValueIndexEntryBuilderIterator> | 24 | <ValueIndexEntryBuilderIterator> |
| 750 | 25 | </ReturnClause> | 25 | <ForVarIterator varname="$$opt_temp_2"/> |
| 751 | 26 | </flwor::FLWORIterator> | 26 | <ForVarIterator varname="$$opt_temp_2"/> |
| 752 | 27 | </CreateInternalIndexIterator> | 27 | </ValueIndexEntryBuilderIterator> |
| 753 | 28 | <ElementIterator> | 28 | </ReturnClause> |
| 754 | 29 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 29 | </flwor::FLWORIterator> |
| 755 | 30 | <EnclosedIterator attr_cont="false"> | 30 | </CreateInternalIndexIterator> |
| 756 | 31 | <flwor::FLWORIterator> | 31 | <flwor::FLWORIterator> |
| 757 | 32 | <ForVariable name="book"> | 32 | <ForVariable name="book"> |
| 758 | 33 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 33 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 759 | @@ -67,9 +67,9 @@ | |||
| 760 | 67 | </ElementIterator> | 67 | </ElementIterator> |
| 761 | 68 | </ReturnClause> | 68 | </ReturnClause> |
| 762 | 69 | </flwor::FLWORIterator> | 69 | </flwor::FLWORIterator> |
| 768 | 70 | </EnclosedIterator> | 70 | </SequentialIterator> |
| 769 | 71 | </ElementIterator> | 71 | </ReturnClause> |
| 770 | 72 | </SequentialIterator> | 72 | </flwor::FLWORIterator> |
| 771 | 73 | </ReturnClause> | 73 | </EnclosedIterator> |
| 772 | 74 | </flwor::FLWORIterator> | 74 | </ElementIterator> |
| 773 | 75 | 75 | ||
| 774 | 76 | 76 | ||
| 775 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9210.iter' | |||
| 776 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9210.iter 2012-05-03 12:31:51 +0000 | |||
| 777 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9210.iter 2012-06-14 14:31:26 +0000 | |||
| 778 | @@ -1,38 +1,38 @@ | |||
| 779 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 804 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator> |
| 805 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 806 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 807 | 5 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 5 | <flwor::FLWORIterator> |
| 808 | 6 | <FnDocIterator> | 6 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 809 | 7 | <SingletonIterator value="xs:string(books.xml)"/> | 7 | <HoistIterator> |
| 810 | 8 | </FnDocIterator> | 8 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 811 | 9 | </DescendantAxisIterator> | 9 | <FnDocIterator> |
| 812 | 10 | </HoistIterator> | 10 | <SingletonIterator value="xs:string(books.xml)"/> |
| 813 | 11 | </LetVariable> | 11 | </FnDocIterator> |
| 814 | 12 | <ReturnClause> | 12 | </DescendantAxisIterator> |
| 815 | 13 | <SequentialIterator> | 13 | </HoistIterator> |
| 816 | 14 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 14 | </LetVariable> |
| 817 | 15 | <flwor::FLWORIterator> | 15 | <ReturnClause> |
| 818 | 16 | <ForVariable name="$$opt_temp_1"> | 16 | <SequentialIterator> |
| 819 | 17 | <UnhoistIterator> | 17 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 820 | 18 | <LetVarIterator varname="$$opt_temp_0"/> | 18 | <flwor::FLWORIterator> |
| 821 | 19 | </UnhoistIterator> | 19 | <ForVariable name="$$opt_temp_1"> |
| 822 | 20 | </ForVariable> | 20 | <UnhoistIterator> |
| 823 | 21 | <ReturnClause> | 21 | <LetVarIterator varname="$$opt_temp_0"/> |
| 824 | 22 | <ValueIndexEntryBuilderIterator> | 22 | </UnhoistIterator> |
| 825 | 23 | <ForVarIterator varname="$$opt_temp_1"/> | 23 | </ForVariable> |
| 826 | 24 | <FnCountIterator> | 24 | <ReturnClause> |
| 827 | 25 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> | 25 | <ValueIndexEntryBuilderIterator> |
| 828 | 26 | <ForVarIterator varname="$$opt_temp_1"/> | 26 | <ForVarIterator varname="$$opt_temp_1"/> |
| 838 | 27 | </ChildAxisIterator> | 27 | <FnCountIterator> |
| 839 | 28 | </FnCountIterator> | 28 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> |
| 840 | 29 | </ValueIndexEntryBuilderIterator> | 29 | <ForVarIterator varname="$$opt_temp_1"/> |
| 841 | 30 | </ReturnClause> | 30 | </ChildAxisIterator> |
| 842 | 31 | </flwor::FLWORIterator> | 31 | </FnCountIterator> |
| 843 | 32 | </CreateInternalIndexIterator> | 32 | </ValueIndexEntryBuilderIterator> |
| 844 | 33 | <ElementIterator> | 33 | </ReturnClause> |
| 845 | 34 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 34 | </flwor::FLWORIterator> |
| 846 | 35 | <EnclosedIterator attr_cont="false"> | 35 | </CreateInternalIndexIterator> |
| 847 | 36 | <flwor::FLWORIterator> | 36 | <flwor::FLWORIterator> |
| 848 | 37 | <ForVariable name="anzahl"> | 37 | <ForVariable name="anzahl"> |
| 849 | 38 | <OpToIterator> | 38 | <OpToIterator> |
| 850 | @@ -64,9 +64,9 @@ | |||
| 851 | 64 | </ElementIterator> | 64 | </ElementIterator> |
| 852 | 65 | </ReturnClause> | 65 | </ReturnClause> |
| 853 | 66 | </flwor::FLWORIterator> | 66 | </flwor::FLWORIterator> |
| 859 | 67 | </EnclosedIterator> | 67 | </SequentialIterator> |
| 860 | 68 | </ElementIterator> | 68 | </ReturnClause> |
| 861 | 69 | </SequentialIterator> | 69 | </flwor::FLWORIterator> |
| 862 | 70 | </ReturnClause> | 70 | </EnclosedIterator> |
| 863 | 71 | </flwor::FLWORIterator> | 71 | </ElementIterator> |
| 864 | 72 | 72 | ||
| 865 | 73 | 73 | ||
| 866 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9211.iter' | |||
| 867 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9211.iter 2012-05-03 12:31:51 +0000 | |||
| 868 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9211.iter 2012-06-14 14:31:26 +0000 | |||
| 869 | @@ -1,38 +1,38 @@ | |||
| 870 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 895 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator> |
| 896 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 897 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 898 | 5 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 5 | <flwor::FLWORIterator> |
| 899 | 6 | <FnDocIterator> | 6 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 900 | 7 | <SingletonIterator value="xs:string(books.xml)"/> | 7 | <HoistIterator> |
| 901 | 8 | </FnDocIterator> | 8 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 902 | 9 | </DescendantAxisIterator> | 9 | <FnDocIterator> |
| 903 | 10 | </HoistIterator> | 10 | <SingletonIterator value="xs:string(books.xml)"/> |
| 904 | 11 | </LetVariable> | 11 | </FnDocIterator> |
| 905 | 12 | <ReturnClause> | 12 | </DescendantAxisIterator> |
| 906 | 13 | <SequentialIterator> | 13 | </HoistIterator> |
| 907 | 14 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 14 | </LetVariable> |
| 908 | 15 | <flwor::FLWORIterator> | 15 | <ReturnClause> |
| 909 | 16 | <ForVariable name="$$opt_temp_1"> | 16 | <SequentialIterator> |
| 910 | 17 | <UnhoistIterator> | 17 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 911 | 18 | <LetVarIterator varname="$$opt_temp_0"/> | 18 | <flwor::FLWORIterator> |
| 912 | 19 | </UnhoistIterator> | 19 | <ForVariable name="$$opt_temp_1"> |
| 913 | 20 | </ForVariable> | 20 | <UnhoistIterator> |
| 914 | 21 | <ReturnClause> | 21 | <LetVarIterator varname="$$opt_temp_0"/> |
| 915 | 22 | <ValueIndexEntryBuilderIterator> | 22 | </UnhoistIterator> |
| 916 | 23 | <ForVarIterator varname="$$opt_temp_1"/> | 23 | </ForVariable> |
| 917 | 24 | <FnCountIterator> | 24 | <ReturnClause> |
| 918 | 25 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> | 25 | <ValueIndexEntryBuilderIterator> |
| 919 | 26 | <ForVarIterator varname="$$opt_temp_1"/> | 26 | <ForVarIterator varname="$$opt_temp_1"/> |
| 929 | 27 | </ChildAxisIterator> | 27 | <FnCountIterator> |
| 930 | 28 | </FnCountIterator> | 28 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> |
| 931 | 29 | </ValueIndexEntryBuilderIterator> | 29 | <ForVarIterator varname="$$opt_temp_1"/> |
| 932 | 30 | </ReturnClause> | 30 | </ChildAxisIterator> |
| 933 | 31 | </flwor::FLWORIterator> | 31 | </FnCountIterator> |
| 934 | 32 | </CreateInternalIndexIterator> | 32 | </ValueIndexEntryBuilderIterator> |
| 935 | 33 | <ElementIterator> | 33 | </ReturnClause> |
| 936 | 34 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 34 | </flwor::FLWORIterator> |
| 937 | 35 | <EnclosedIterator attr_cont="false"> | 35 | </CreateInternalIndexIterator> |
| 938 | 36 | <flwor::FLWORIterator> | 36 | <flwor::FLWORIterator> |
| 939 | 37 | <ForVariable name="anzahl"> | 37 | <ForVariable name="anzahl"> |
| 940 | 38 | <OpToIterator> | 38 | <OpToIterator> |
| 941 | @@ -67,9 +67,9 @@ | |||
| 942 | 67 | </ElementIterator> | 67 | </ElementIterator> |
| 943 | 68 | </ReturnClause> | 68 | </ReturnClause> |
| 944 | 69 | </flwor::FLWORIterator> | 69 | </flwor::FLWORIterator> |
| 950 | 70 | </EnclosedIterator> | 70 | </SequentialIterator> |
| 951 | 71 | </ElementIterator> | 71 | </ReturnClause> |
| 952 | 72 | </SequentialIterator> | 72 | </flwor::FLWORIterator> |
| 953 | 73 | </ReturnClause> | 73 | </EnclosedIterator> |
| 954 | 74 | </flwor::FLWORIterator> | 74 | </ElementIterator> |
| 955 | 75 | 75 | ||
| 956 | 76 | 76 | ||
| 957 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9212.iter' | |||
| 958 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9212.iter 2012-05-03 12:31:51 +0000 | |||
| 959 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9212.iter 2012-06-14 14:31:26 +0000 | |||
| 960 | @@ -1,38 +1,38 @@ | |||
| 961 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 986 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator> |
| 987 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 988 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 989 | 5 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 5 | <flwor::FLWORIterator> |
| 990 | 6 | <FnDocIterator> | 6 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 991 | 7 | <SingletonIterator value="xs:string(books.xml)"/> | 7 | <HoistIterator> |
| 992 | 8 | </FnDocIterator> | 8 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 993 | 9 | </DescendantAxisIterator> | 9 | <FnDocIterator> |
| 994 | 10 | </HoistIterator> | 10 | <SingletonIterator value="xs:string(books.xml)"/> |
| 995 | 11 | </LetVariable> | 11 | </FnDocIterator> |
| 996 | 12 | <ReturnClause> | 12 | </DescendantAxisIterator> |
| 997 | 13 | <SequentialIterator> | 13 | </HoistIterator> |
| 998 | 14 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 14 | </LetVariable> |
| 999 | 15 | <flwor::FLWORIterator> | 15 | <ReturnClause> |
| 1000 | 16 | <ForVariable name="$$opt_temp_1"> | 16 | <SequentialIterator> |
| 1001 | 17 | <UnhoistIterator> | 17 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 1002 | 18 | <LetVarIterator varname="$$opt_temp_0"/> | 18 | <flwor::FLWORIterator> |
| 1003 | 19 | </UnhoistIterator> | 19 | <ForVariable name="$$opt_temp_1"> |
| 1004 | 20 | </ForVariable> | 20 | <UnhoistIterator> |
| 1005 | 21 | <ReturnClause> | 21 | <LetVarIterator varname="$$opt_temp_0"/> |
| 1006 | 22 | <ValueIndexEntryBuilderIterator> | 22 | </UnhoistIterator> |
| 1007 | 23 | <ForVarIterator varname="$$opt_temp_1"/> | 23 | </ForVariable> |
| 1008 | 24 | <FnCountIterator> | 24 | <ReturnClause> |
| 1009 | 25 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> | 25 | <ValueIndexEntryBuilderIterator> |
| 1010 | 26 | <ForVarIterator varname="$$opt_temp_1"/> | 26 | <ForVarIterator varname="$$opt_temp_1"/> |
| 1020 | 27 | </ChildAxisIterator> | 27 | <FnCountIterator> |
| 1021 | 28 | </FnCountIterator> | 28 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> |
| 1022 | 29 | </ValueIndexEntryBuilderIterator> | 29 | <ForVarIterator varname="$$opt_temp_1"/> |
| 1023 | 30 | </ReturnClause> | 30 | </ChildAxisIterator> |
| 1024 | 31 | </flwor::FLWORIterator> | 31 | </FnCountIterator> |
| 1025 | 32 | </CreateInternalIndexIterator> | 32 | </ValueIndexEntryBuilderIterator> |
| 1026 | 33 | <ElementIterator> | 33 | </ReturnClause> |
| 1027 | 34 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 34 | </flwor::FLWORIterator> |
| 1028 | 35 | <EnclosedIterator attr_cont="false"> | 35 | </CreateInternalIndexIterator> |
| 1029 | 36 | <flwor::FLWORIterator> | 36 | <flwor::FLWORIterator> |
| 1030 | 37 | <ForVariable name="book"> | 37 | <ForVariable name="book"> |
| 1031 | 38 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 38 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 1032 | @@ -75,9 +75,9 @@ | |||
| 1033 | 75 | </ElementIterator> | 75 | </ElementIterator> |
| 1034 | 76 | </ReturnClause> | 76 | </ReturnClause> |
| 1035 | 77 | </flwor::FLWORIterator> | 77 | </flwor::FLWORIterator> |
| 1041 | 78 | </EnclosedIterator> | 78 | </SequentialIterator> |
| 1042 | 79 | </ElementIterator> | 79 | </ReturnClause> |
| 1043 | 80 | </SequentialIterator> | 80 | </flwor::FLWORIterator> |
| 1044 | 81 | </ReturnClause> | 81 | </EnclosedIterator> |
| 1045 | 82 | </flwor::FLWORIterator> | 82 | </ElementIterator> |
| 1046 | 83 | 83 | ||
| 1047 | 84 | 84 | ||
| 1048 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9389.iter' | |||
| 1049 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9389.iter 2012-05-03 12:31:51 +0000 | |||
| 1050 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9389.iter 2012-06-14 14:31:26 +0000 | |||
| 1051 | @@ -1,38 +1,38 @@ | |||
| 1052 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 1077 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator> |
| 1078 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 1079 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 1080 | 5 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 5 | <flwor::FLWORIterator> |
| 1081 | 6 | <FnDocIterator> | 6 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 1082 | 7 | <SingletonIterator value="xs:string(books.xml)"/> | 7 | <HoistIterator> |
| 1083 | 8 | </FnDocIterator> | 8 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 1084 | 9 | </DescendantAxisIterator> | 9 | <FnDocIterator> |
| 1085 | 10 | </HoistIterator> | 10 | <SingletonIterator value="xs:string(books.xml)"/> |
| 1086 | 11 | </LetVariable> | 11 | </FnDocIterator> |
| 1087 | 12 | <ReturnClause> | 12 | </DescendantAxisIterator> |
| 1088 | 13 | <SequentialIterator> | 13 | </HoistIterator> |
| 1089 | 14 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 14 | </LetVariable> |
| 1090 | 15 | <flwor::FLWORIterator> | 15 | <ReturnClause> |
| 1091 | 16 | <ForVariable name="$$opt_temp_1"> | 16 | <SequentialIterator> |
| 1092 | 17 | <UnhoistIterator> | 17 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 1093 | 18 | <LetVarIterator varname="$$opt_temp_0"/> | 18 | <flwor::FLWORIterator> |
| 1094 | 19 | </UnhoistIterator> | 19 | <ForVariable name="$$opt_temp_1"> |
| 1095 | 20 | </ForVariable> | 20 | <UnhoistIterator> |
| 1096 | 21 | <ReturnClause> | 21 | <LetVarIterator varname="$$opt_temp_0"/> |
| 1097 | 22 | <ValueIndexEntryBuilderIterator> | 22 | </UnhoistIterator> |
| 1098 | 23 | <ForVarIterator varname="$$opt_temp_1"/> | 23 | </ForVariable> |
| 1099 | 24 | <FnCountIterator> | 24 | <ReturnClause> |
| 1100 | 25 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> | 25 | <ValueIndexEntryBuilderIterator> |
| 1101 | 26 | <ForVarIterator varname="$$opt_temp_1"/> | 26 | <ForVarIterator varname="$$opt_temp_1"/> |
| 1111 | 27 | </ChildAxisIterator> | 27 | <FnCountIterator> |
| 1112 | 28 | </FnCountIterator> | 28 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> |
| 1113 | 29 | </ValueIndexEntryBuilderIterator> | 29 | <ForVarIterator varname="$$opt_temp_1"/> |
| 1114 | 30 | </ReturnClause> | 30 | </ChildAxisIterator> |
| 1115 | 31 | </flwor::FLWORIterator> | 31 | </FnCountIterator> |
| 1116 | 32 | </CreateInternalIndexIterator> | 32 | </ValueIndexEntryBuilderIterator> |
| 1117 | 33 | <ElementIterator> | 33 | </ReturnClause> |
| 1118 | 34 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 34 | </flwor::FLWORIterator> |
| 1119 | 35 | <EnclosedIterator attr_cont="false"> | 35 | </CreateInternalIndexIterator> |
| 1120 | 36 | <flwor::FLWORIterator> | 36 | <flwor::FLWORIterator> |
| 1121 | 37 | <ForVariable name="anzahl"> | 37 | <ForVariable name="anzahl"> |
| 1122 | 38 | <OpToIterator> | 38 | <OpToIterator> |
| 1123 | @@ -62,9 +62,9 @@ | |||
| 1124 | 62 | </ElementIterator> | 62 | </ElementIterator> |
| 1125 | 63 | </ReturnClause> | 63 | </ReturnClause> |
| 1126 | 64 | </flwor::FLWORIterator> | 64 | </flwor::FLWORIterator> |
| 1132 | 65 | </EnclosedIterator> | 65 | </SequentialIterator> |
| 1133 | 66 | </ElementIterator> | 66 | </ReturnClause> |
| 1134 | 67 | </SequentialIterator> | 67 | </flwor::FLWORIterator> |
| 1135 | 68 | </ReturnClause> | 68 | </EnclosedIterator> |
| 1136 | 69 | </flwor::FLWORIterator> | 69 | </ElementIterator> |
| 1137 | 70 | 70 | ||
| 1138 | 71 | 71 | ||
| 1139 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9391.iter' | |||
| 1140 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9391.iter 2012-05-03 12:31:51 +0000 | |||
| 1141 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9391.iter 2012-06-14 14:31:26 +0000 | |||
| 1142 | @@ -1,38 +1,38 @@ | |||
| 1143 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 1168 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator> |
| 1169 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 1170 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 1171 | 5 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 5 | <flwor::FLWORIterator> |
| 1172 | 6 | <FnDocIterator> | 6 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 1173 | 7 | <SingletonIterator value="xs:string(books.xml)"/> | 7 | <HoistIterator> |
| 1174 | 8 | </FnDocIterator> | 8 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 1175 | 9 | </DescendantAxisIterator> | 9 | <FnDocIterator> |
| 1176 | 10 | </HoistIterator> | 10 | <SingletonIterator value="xs:string(books.xml)"/> |
| 1177 | 11 | </LetVariable> | 11 | </FnDocIterator> |
| 1178 | 12 | <ReturnClause> | 12 | </DescendantAxisIterator> |
| 1179 | 13 | <SequentialIterator> | 13 | </HoistIterator> |
| 1180 | 14 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 14 | </LetVariable> |
| 1181 | 15 | <flwor::FLWORIterator> | 15 | <ReturnClause> |
| 1182 | 16 | <ForVariable name="$$opt_temp_1"> | 16 | <SequentialIterator> |
| 1183 | 17 | <UnhoistIterator> | 17 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 1184 | 18 | <LetVarIterator varname="$$opt_temp_0"/> | 18 | <flwor::FLWORIterator> |
| 1185 | 19 | </UnhoistIterator> | 19 | <ForVariable name="$$opt_temp_1"> |
| 1186 | 20 | </ForVariable> | 20 | <UnhoistIterator> |
| 1187 | 21 | <ReturnClause> | 21 | <LetVarIterator varname="$$opt_temp_0"/> |
| 1188 | 22 | <ValueIndexEntryBuilderIterator> | 22 | </UnhoistIterator> |
| 1189 | 23 | <ForVarIterator varname="$$opt_temp_1"/> | 23 | </ForVariable> |
| 1190 | 24 | <FnCountIterator> | 24 | <ReturnClause> |
| 1191 | 25 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> | 25 | <ValueIndexEntryBuilderIterator> |
| 1192 | 26 | <ForVarIterator varname="$$opt_temp_1"/> | 26 | <ForVarIterator varname="$$opt_temp_1"/> |
| 1202 | 27 | </ChildAxisIterator> | 27 | <FnCountIterator> |
| 1203 | 28 | </FnCountIterator> | 28 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> |
| 1204 | 29 | </ValueIndexEntryBuilderIterator> | 29 | <ForVarIterator varname="$$opt_temp_1"/> |
| 1205 | 30 | </ReturnClause> | 30 | </ChildAxisIterator> |
| 1206 | 31 | </flwor::FLWORIterator> | 31 | </FnCountIterator> |
| 1207 | 32 | </CreateInternalIndexIterator> | 32 | </ValueIndexEntryBuilderIterator> |
| 1208 | 33 | <ElementIterator> | 33 | </ReturnClause> |
| 1209 | 34 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 34 | </flwor::FLWORIterator> |
| 1210 | 35 | <EnclosedIterator attr_cont="false"> | 35 | </CreateInternalIndexIterator> |
| 1211 | 36 | <flwor::FLWORIterator> | 36 | <flwor::FLWORIterator> |
| 1212 | 37 | <ForVariable name="anzahl"> | 37 | <ForVariable name="anzahl"> |
| 1213 | 38 | <OpToIterator> | 38 | <OpToIterator> |
| 1214 | @@ -67,9 +67,9 @@ | |||
| 1215 | 67 | </ElementIterator> | 67 | </ElementIterator> |
| 1216 | 68 | </ReturnClause> | 68 | </ReturnClause> |
| 1217 | 69 | </flwor::FLWORIterator> | 69 | </flwor::FLWORIterator> |
| 1223 | 70 | </EnclosedIterator> | 70 | </SequentialIterator> |
| 1224 | 71 | </ElementIterator> | 71 | </ReturnClause> |
| 1225 | 72 | </SequentialIterator> | 72 | </flwor::FLWORIterator> |
| 1226 | 73 | </ReturnClause> | 73 | </EnclosedIterator> |
| 1227 | 74 | </flwor::FLWORIterator> | 74 | </ElementIterator> |
| 1228 | 75 | 75 | ||
| 1229 | 76 | 76 | ||
| 1230 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9392.iter' | |||
| 1231 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9392.iter 2012-05-03 12:31:51 +0000 | |||
| 1232 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9392.iter 2012-06-14 14:31:26 +0000 | |||
| 1233 | @@ -1,45 +1,45 @@ | |||
| 1234 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 1276 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator> |
| 1277 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 1278 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 1279 | 5 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 5 | <ElementIterator> |
| 1280 | 6 | <FnDocIterator> | 6 | <SingletonIterator value="xs:QName(,,gruppe)"/> |
| 1281 | 7 | <SingletonIterator value="xs:string(books.xml)"/> | 7 | <AttributeIterator qname="xs:QName(,,anzahl)"> |
| 1282 | 8 | </FnDocIterator> | 8 | <FnDataIterator> |
| 1283 | 9 | </DescendantAxisIterator> | 9 | <FnConcatIterator> |
| 1284 | 10 | </HoistIterator> | 10 | <SingletonIterator value="xs:string( )"/> |
| 1285 | 11 | </LetVariable> | 11 | <EnclosedIterator attr_cont="true"> |
| 1286 | 12 | <ReturnClause> | 12 | <flwor::FLWORIterator> |
| 1287 | 13 | <SequentialIterator> | 13 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 1288 | 14 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 14 | <HoistIterator> |
| 1289 | 15 | <flwor::FLWORIterator> | 15 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 1290 | 16 | <ForVariable name="$$opt_temp_1"> | 16 | <FnDocIterator> |
| 1291 | 17 | <UnhoistIterator> | 17 | <SingletonIterator value="xs:string(books.xml)"/> |
| 1292 | 18 | <LetVarIterator varname="$$opt_temp_0"/> | 18 | </FnDocIterator> |
| 1293 | 19 | </UnhoistIterator> | 19 | </DescendantAxisIterator> |
| 1294 | 20 | </ForVariable> | 20 | </HoistIterator> |
| 1295 | 21 | <ReturnClause> | 21 | </LetVariable> |
| 1296 | 22 | <ValueIndexEntryBuilderIterator> | 22 | <ReturnClause> |
| 1297 | 23 | <ForVarIterator varname="$$opt_temp_1"/> | 23 | <SequentialIterator> |
| 1298 | 24 | <FnCountIterator> | 24 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 1299 | 25 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> | 25 | <flwor::FLWORIterator> |
| 1300 | 26 | <ForVarIterator varname="$$opt_temp_1"/> | 26 | <ForVariable name="$$opt_temp_1"> |
| 1301 | 27 | </ChildAxisIterator> | 27 | <UnhoistIterator> |
| 1302 | 28 | </FnCountIterator> | 28 | <LetVarIterator varname="$$opt_temp_0"/> |
| 1303 | 29 | </ValueIndexEntryBuilderIterator> | 29 | </UnhoistIterator> |
| 1304 | 30 | </ReturnClause> | 30 | </ForVariable> |
| 1305 | 31 | </flwor::FLWORIterator> | 31 | <ReturnClause> |
| 1306 | 32 | </CreateInternalIndexIterator> | 32 | <ValueIndexEntryBuilderIterator> |
| 1307 | 33 | <ElementIterator> | 33 | <ForVarIterator varname="$$opt_temp_1"/> |
| 1308 | 34 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 34 | <FnCountIterator> |
| 1309 | 35 | <EnclosedIterator attr_cont="false"> | 35 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> |
| 1310 | 36 | <ElementIterator> | 36 | <ForVarIterator varname="$$opt_temp_1"/> |
| 1311 | 37 | <SingletonIterator value="xs:QName(,,gruppe)"/> | 37 | </ChildAxisIterator> |
| 1312 | 38 | <AttributeIterator qname="xs:QName(,,anzahl)"> | 38 | </FnCountIterator> |
| 1313 | 39 | <FnDataIterator> | 39 | </ValueIndexEntryBuilderIterator> |
| 1314 | 40 | <FnConcatIterator> | 40 | </ReturnClause> |
| 1315 | 41 | <SingletonIterator value="xs:string( )"/> | 41 | </flwor::FLWORIterator> |
| 1316 | 42 | <EnclosedIterator attr_cont="true"> | 42 | </CreateInternalIndexIterator> |
| 1317 | 43 | <flwor::FLWORIterator> | 43 | <flwor::FLWORIterator> |
| 1318 | 44 | <ForVariable name="anzahl"> | 44 | <ForVariable name="anzahl"> |
| 1319 | 45 | <OpToIterator> | 45 | <OpToIterator> |
| 1320 | @@ -57,15 +57,15 @@ | |||
| 1321 | 57 | <ForVarIterator varname="anzahl"/> | 57 | <ForVarIterator varname="anzahl"/> |
| 1322 | 58 | </ReturnClause> | 58 | </ReturnClause> |
| 1323 | 59 | </flwor::FLWORIterator> | 59 | </flwor::FLWORIterator> |
| 1335 | 60 | </EnclosedIterator> | 60 | </SequentialIterator> |
| 1336 | 61 | </FnConcatIterator> | 61 | </ReturnClause> |
| 1337 | 62 | </FnDataIterator> | 62 | </flwor::FLWORIterator> |
| 1338 | 63 | </AttributeIterator> | 63 | </EnclosedIterator> |
| 1339 | 64 | <FnConcatIterator/> | 64 | </FnConcatIterator> |
| 1340 | 65 | </ElementIterator> | 65 | </FnDataIterator> |
| 1341 | 66 | </EnclosedIterator> | 66 | </AttributeIterator> |
| 1342 | 67 | </ElementIterator> | 67 | <FnConcatIterator/> |
| 1343 | 68 | </SequentialIterator> | 68 | </ElementIterator> |
| 1344 | 69 | </ReturnClause> | 69 | </EnclosedIterator> |
| 1345 | 70 | </flwor::FLWORIterator> | 70 | </ElementIterator> |
| 1346 | 71 | 71 | ||
| 1347 | 72 | 72 | ||
| 1348 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9399.iter' | |||
| 1349 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9399.iter 2012-05-03 12:31:51 +0000 | |||
| 1350 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9399.iter 2012-06-14 14:31:26 +0000 | |||
| 1351 | @@ -1,38 +1,38 @@ | |||
| 1352 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 1377 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator> |
| 1378 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 1379 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 1380 | 5 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 5 | <flwor::FLWORIterator> |
| 1381 | 6 | <FnDocIterator> | 6 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 1382 | 7 | <SingletonIterator value="xs:string(books.xml)"/> | 7 | <HoistIterator> |
| 1383 | 8 | </FnDocIterator> | 8 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 1384 | 9 | </DescendantAxisIterator> | 9 | <FnDocIterator> |
| 1385 | 10 | </HoistIterator> | 10 | <SingletonIterator value="xs:string(books.xml)"/> |
| 1386 | 11 | </LetVariable> | 11 | </FnDocIterator> |
| 1387 | 12 | <ReturnClause> | 12 | </DescendantAxisIterator> |
| 1388 | 13 | <SequentialIterator> | 13 | </HoistIterator> |
| 1389 | 14 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 14 | </LetVariable> |
| 1390 | 15 | <flwor::FLWORIterator> | 15 | <ReturnClause> |
| 1391 | 16 | <ForVariable name="$$opt_temp_1"> | 16 | <SequentialIterator> |
| 1392 | 17 | <UnhoistIterator> | 17 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 1393 | 18 | <LetVarIterator varname="$$opt_temp_0"/> | 18 | <flwor::FLWORIterator> |
| 1394 | 19 | </UnhoistIterator> | 19 | <ForVariable name="$$opt_temp_1"> |
| 1395 | 20 | </ForVariable> | 20 | <UnhoistIterator> |
| 1396 | 21 | <ReturnClause> | 21 | <LetVarIterator varname="$$opt_temp_0"/> |
| 1397 | 22 | <ValueIndexEntryBuilderIterator> | 22 | </UnhoistIterator> |
| 1398 | 23 | <ForVarIterator varname="$$opt_temp_1"/> | 23 | </ForVariable> |
| 1399 | 24 | <FnCountIterator> | 24 | <ReturnClause> |
| 1400 | 25 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> | 25 | <ValueIndexEntryBuilderIterator> |
| 1401 | 26 | <ForVarIterator varname="$$opt_temp_1"/> | 26 | <ForVarIterator varname="$$opt_temp_1"/> |
| 1411 | 27 | </ChildAxisIterator> | 27 | <FnCountIterator> |
| 1412 | 28 | </FnCountIterator> | 28 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> |
| 1413 | 29 | </ValueIndexEntryBuilderIterator> | 29 | <ForVarIterator varname="$$opt_temp_1"/> |
| 1414 | 30 | </ReturnClause> | 30 | </ChildAxisIterator> |
| 1415 | 31 | </flwor::FLWORIterator> | 31 | </FnCountIterator> |
| 1416 | 32 | </CreateInternalIndexIterator> | 32 | </ValueIndexEntryBuilderIterator> |
| 1417 | 33 | <ElementIterator> | 33 | </ReturnClause> |
| 1418 | 34 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 34 | </flwor::FLWORIterator> |
| 1419 | 35 | <EnclosedIterator attr_cont="false"> | 35 | </CreateInternalIndexIterator> |
| 1420 | 36 | <flwor::FLWORIterator> | 36 | <flwor::FLWORIterator> |
| 1421 | 37 | <ForVariable name="anzahl"> | 37 | <ForVariable name="anzahl"> |
| 1422 | 38 | <OpToIterator> | 38 | <OpToIterator> |
| 1423 | @@ -61,9 +61,9 @@ | |||
| 1424 | 61 | </ElementIterator> | 61 | </ElementIterator> |
| 1425 | 62 | </ReturnClause> | 62 | </ReturnClause> |
| 1426 | 63 | </flwor::FLWORIterator> | 63 | </flwor::FLWORIterator> |
| 1432 | 64 | </EnclosedIterator> | 64 | </SequentialIterator> |
| 1433 | 65 | </ElementIterator> | 65 | </ReturnClause> |
| 1434 | 66 | </SequentialIterator> | 66 | </flwor::FLWORIterator> |
| 1435 | 67 | </ReturnClause> | 67 | </EnclosedIterator> |
| 1436 | 68 | </flwor::FLWORIterator> | 68 | </ElementIterator> |
| 1437 | 69 | 69 | ||
| 1438 | 70 | 70 | ||
| 1439 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9400.iter' | |||
| 1440 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9400.iter 2012-05-03 12:31:51 +0000 | |||
| 1441 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9400.iter 2012-06-14 14:31:26 +0000 | |||
| 1442 | @@ -1,38 +1,38 @@ | |||
| 1443 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 1468 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator> |
| 1469 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 1470 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 1471 | 5 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 5 | <flwor::FLWORIterator> |
| 1472 | 6 | <FnDocIterator> | 6 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 1473 | 7 | <SingletonIterator value="xs:string(books.xml)"/> | 7 | <HoistIterator> |
| 1474 | 8 | </FnDocIterator> | 8 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 1475 | 9 | </DescendantAxisIterator> | 9 | <FnDocIterator> |
| 1476 | 10 | </HoistIterator> | 10 | <SingletonIterator value="xs:string(books.xml)"/> |
| 1477 | 11 | </LetVariable> | 11 | </FnDocIterator> |
| 1478 | 12 | <ReturnClause> | 12 | </DescendantAxisIterator> |
| 1479 | 13 | <SequentialIterator> | 13 | </HoistIterator> |
| 1480 | 14 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 14 | </LetVariable> |
| 1481 | 15 | <flwor::FLWORIterator> | 15 | <ReturnClause> |
| 1482 | 16 | <ForVariable name="$$opt_temp_1"> | 16 | <SequentialIterator> |
| 1483 | 17 | <UnhoistIterator> | 17 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 1484 | 18 | <LetVarIterator varname="$$opt_temp_0"/> | 18 | <flwor::FLWORIterator> |
| 1485 | 19 | </UnhoistIterator> | 19 | <ForVariable name="$$opt_temp_1"> |
| 1486 | 20 | </ForVariable> | 20 | <UnhoistIterator> |
| 1487 | 21 | <ReturnClause> | 21 | <LetVarIterator varname="$$opt_temp_0"/> |
| 1488 | 22 | <ValueIndexEntryBuilderIterator> | 22 | </UnhoistIterator> |
| 1489 | 23 | <ForVarIterator varname="$$opt_temp_1"/> | 23 | </ForVariable> |
| 1490 | 24 | <FnCountIterator> | 24 | <ReturnClause> |
| 1491 | 25 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> | 25 | <ValueIndexEntryBuilderIterator> |
| 1492 | 26 | <ForVarIterator varname="$$opt_temp_1"/> | 26 | <ForVarIterator varname="$$opt_temp_1"/> |
| 1502 | 27 | </ChildAxisIterator> | 27 | <FnCountIterator> |
| 1503 | 28 | </FnCountIterator> | 28 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> |
| 1504 | 29 | </ValueIndexEntryBuilderIterator> | 29 | <ForVarIterator varname="$$opt_temp_1"/> |
| 1505 | 30 | </ReturnClause> | 30 | </ChildAxisIterator> |
| 1506 | 31 | </flwor::FLWORIterator> | 31 | </FnCountIterator> |
| 1507 | 32 | </CreateInternalIndexIterator> | 32 | </ValueIndexEntryBuilderIterator> |
| 1508 | 33 | <ElementIterator> | 33 | </ReturnClause> |
| 1509 | 34 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 34 | </flwor::FLWORIterator> |
| 1510 | 35 | <EnclosedIterator attr_cont="false"> | 35 | </CreateInternalIndexIterator> |
| 1511 | 36 | <flwor::FLWORIterator> | 36 | <flwor::FLWORIterator> |
| 1512 | 37 | <ForVariable name="anzahl"> | 37 | <ForVariable name="anzahl"> |
| 1513 | 38 | <OpToIterator> | 38 | <OpToIterator> |
| 1514 | @@ -62,9 +62,9 @@ | |||
| 1515 | 62 | </ElementIterator> | 62 | </ElementIterator> |
| 1516 | 63 | </ReturnClause> | 63 | </ReturnClause> |
| 1517 | 64 | </flwor::FLWORIterator> | 64 | </flwor::FLWORIterator> |
| 1523 | 65 | </EnclosedIterator> | 65 | </SequentialIterator> |
| 1524 | 66 | </ElementIterator> | 66 | </ReturnClause> |
| 1525 | 67 | </SequentialIterator> | 67 | </flwor::FLWORIterator> |
| 1526 | 68 | </ReturnClause> | 68 | </EnclosedIterator> |
| 1527 | 69 | </flwor::FLWORIterator> | 69 | </ElementIterator> |
| 1528 | 70 | 70 | ||
| 1529 | 71 | 71 | ||
| 1530 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/idx4.iter' | |||
| 1531 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/idx4.iter 2012-05-03 12:31:51 +0000 | |||
| 1532 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/idx4.iter 2012-06-14 14:31:26 +0000 | |||
| 1533 | @@ -76,89 +76,85 @@ | |||
| 1534 | 76 | </TreatIterator> | 76 | </TreatIterator> |
| 1535 | 77 | </HoistIterator> | 77 | </HoistIterator> |
| 1536 | 78 | </LetVariable> | 78 | </LetVariable> |
| 1537 | 79 | <ForVariable name="prefix"> | ||
| 1538 | 80 | <flwor::FLWORIterator> | ||
| 1539 | 81 | <ForVariable name="prefixE"> | ||
| 1540 | 82 | <InScopePrefixesIterator> | ||
| 1541 | 83 | <TreatIterator quant=""> | ||
| 1542 | 84 | <LetVarIterator varname="e"/> | ||
| 1543 | 85 | </TreatIterator> | ||
| 1544 | 86 | </InScopePrefixesIterator> | ||
| 1545 | 87 | </ForVariable> | ||
| 1546 | 88 | <LetVariable name="$$opt_temp_1" materialize="true"> | ||
| 1547 | 89 | <HoistIterator> | ||
| 1548 | 90 | <NamespaceUriForPrefixIterator> | ||
| 1549 | 91 | <ForVarIterator varname="prefixE"/> | ||
| 1550 | 92 | <UnhoistIterator> | ||
| 1551 | 93 | <LetVarIterator varname="$$opt_temp_0"/> | ||
| 1552 | 94 | </UnhoistIterator> | ||
| 1553 | 95 | </NamespaceUriForPrefixIterator> | ||
| 1554 | 96 | </HoistIterator> | ||
| 1555 | 97 | </LetVariable> | ||
| 1556 | 98 | <ForVariable name="prefixP"> | ||
| 1557 | 99 | <ProbeIndexPointValueIterator> | ||
| 1558 | 100 | <SingletonIterator value="xs:QName(,,tempIndex0)"/> | ||
| 1559 | 101 | <ForVarIterator varname="prefixE"/> | ||
| 1560 | 102 | </ProbeIndexPointValueIterator> | ||
| 1561 | 103 | </ForVariable> | ||
| 1562 | 104 | <WhereClause> | ||
| 1563 | 105 | <FnBooleanIterator> | ||
| 1564 | 106 | <CompareIterator> | ||
| 1565 | 107 | <UnhoistIterator> | ||
| 1566 | 108 | <LetVarIterator varname="$$opt_temp_1"/> | ||
| 1567 | 109 | </UnhoistIterator> | ||
| 1568 | 110 | <NamespaceUriForPrefixIterator> | ||
| 1569 | 111 | <ForVarIterator varname="prefixP"/> | ||
| 1570 | 112 | <UnhoistIterator> | ||
| 1571 | 113 | <ForVarIterator varname="$$opt_temp_2"/> | ||
| 1572 | 114 | </UnhoistIterator> | ||
| 1573 | 115 | </NamespaceUriForPrefixIterator> | ||
| 1574 | 116 | </CompareIterator> | ||
| 1575 | 117 | </FnBooleanIterator> | ||
| 1576 | 118 | </WhereClause> | ||
| 1577 | 119 | <ReturnClause> | ||
| 1578 | 120 | <ForVarIterator varname="prefixE"/> | ||
| 1579 | 121 | </ReturnClause> | ||
| 1580 | 122 | </flwor::FLWORIterator> | ||
| 1581 | 123 | </ForVariable> | ||
| 1582 | 79 | <ReturnClause> | 124 | <ReturnClause> |
| 1615 | 80 | <flwor::FLWORIterator> | 125 | <FnConcatIterator> |
| 1616 | 81 | <ForVariable name="prefix"> | 126 | <SingletonIterator value="xs:string( )"/> |
| 1617 | 82 | <flwor::FLWORIterator> | 127 | <ElementIterator> |
| 1618 | 83 | <ForVariable name="prefixE"> | 128 | <SingletonIterator value="xs:QName(,,span)"/> |
| 1619 | 84 | <InScopePrefixesIterator> | 129 | <AttributeIterator qname="xs:QName(,,class)"> |
| 1620 | 85 | <TreatIterator quant=""> | 130 | <SingletonIterator value="xs:string(ns)"/> |
| 1621 | 86 | <LetVarIterator varname="e"/> | 131 | </AttributeIterator> |
| 1622 | 87 | </TreatIterator> | 132 | <EnclosedIterator attr_cont="false"> |
| 1623 | 88 | </InScopePrefixesIterator> | 133 | <FnConcatIterator> |
| 1624 | 89 | </ForVariable> | 134 | <ConcatStrIterator> |
| 1625 | 90 | <LetVariable name="$$opt_temp_1" materialize="true"> | 135 | <SingletonIterator value="xs:string(xmlns:)"/> |
| 1626 | 91 | <HoistIterator> | 136 | <ForVarIterator varname="prefix"/> |
| 1627 | 92 | <NamespaceUriForPrefixIterator> | 137 | <SingletonIterator value="xs:string(=")"/> |
| 1628 | 93 | <ForVarIterator varname="prefixE"/> | 138 | </ConcatStrIterator> |
| 1629 | 94 | <UnhoistIterator> | 139 | <ElementIterator> |
| 1630 | 95 | <LetVarIterator varname="$$opt_temp_0"/> | 140 | <SingletonIterator value="xs:QName(,,span)"/> |
| 1631 | 96 | </UnhoistIterator> | 141 | <AttributeIterator qname="xs:QName(,,class)"> |
| 1632 | 97 | </NamespaceUriForPrefixIterator> | 142 | <SingletonIterator value="xs:string(nsUri)"/> |
| 1633 | 98 | </HoistIterator> | 143 | </AttributeIterator> |
| 1634 | 99 | </LetVariable> | 144 | <EnclosedIterator attr_cont="false"> |
| 1603 | 100 | <ForVariable name="prefixP"> | ||
| 1604 | 101 | <ProbeIndexPointValueIterator> | ||
| 1605 | 102 | <SingletonIterator value="xs:QName(,,tempIndex0)"/> | ||
| 1606 | 103 | <ForVarIterator varname="prefixE"/> | ||
| 1607 | 104 | </ProbeIndexPointValueIterator> | ||
| 1608 | 105 | </ForVariable> | ||
| 1609 | 106 | <WhereClause> | ||
| 1610 | 107 | <FnBooleanIterator> | ||
| 1611 | 108 | <CompareIterator> | ||
| 1612 | 109 | <UnhoistIterator> | ||
| 1613 | 110 | <LetVarIterator varname="$$opt_temp_1"/> | ||
| 1614 | 111 | </UnhoistIterator> | ||
| 1635 | 112 | <NamespaceUriForPrefixIterator> | 145 | <NamespaceUriForPrefixIterator> |
| 1637 | 113 | <ForVarIterator varname="prefixP"/> | 146 | <ForVarIterator varname="prefix"/> |
| 1638 | 114 | <UnhoistIterator> | 147 | <UnhoistIterator> |
| 1640 | 115 | <ForVarIterator varname="$$opt_temp_2"/> | 148 | <ForVarIterator varname="$$opt_temp_3"/> |
| 1641 | 116 | </UnhoistIterator> | 149 | </UnhoistIterator> |
| 1642 | 117 | </NamespaceUriForPrefixIterator> | 150 | </NamespaceUriForPrefixIterator> |
| 1687 | 118 | </CompareIterator> | 151 | </EnclosedIterator> |
| 1688 | 119 | </FnBooleanIterator> | 152 | </ElementIterator> |
| 1689 | 120 | </WhereClause> | 153 | <SingletonIterator value="xs:string(")"/> |
| 1690 | 121 | <ReturnClause> | 154 | </FnConcatIterator> |
| 1691 | 122 | <ForVarIterator varname="prefixE"/> | 155 | </EnclosedIterator> |
| 1692 | 123 | </ReturnClause> | 156 | </ElementIterator> |
| 1693 | 124 | </flwor::FLWORIterator> | 157 | </FnConcatIterator> |
| 1650 | 125 | </ForVariable> | ||
| 1651 | 126 | <ReturnClause> | ||
| 1652 | 127 | <FnConcatIterator> | ||
| 1653 | 128 | <SingletonIterator value="xs:string( )"/> | ||
| 1654 | 129 | <ElementIterator> | ||
| 1655 | 130 | <SingletonIterator value="xs:QName(,,span)"/> | ||
| 1656 | 131 | <AttributeIterator qname="xs:QName(,,class)"> | ||
| 1657 | 132 | <SingletonIterator value="xs:string(ns)"/> | ||
| 1658 | 133 | </AttributeIterator> | ||
| 1659 | 134 | <EnclosedIterator attr_cont="false"> | ||
| 1660 | 135 | <FnConcatIterator> | ||
| 1661 | 136 | <ConcatStrIterator> | ||
| 1662 | 137 | <SingletonIterator value="xs:string(xmlns:)"/> | ||
| 1663 | 138 | <ForVarIterator varname="prefix"/> | ||
| 1664 | 139 | <SingletonIterator value="xs:string(=")"/> | ||
| 1665 | 140 | </ConcatStrIterator> | ||
| 1666 | 141 | <ElementIterator> | ||
| 1667 | 142 | <SingletonIterator value="xs:QName(,,span)"/> | ||
| 1668 | 143 | <AttributeIterator qname="xs:QName(,,class)"> | ||
| 1669 | 144 | <SingletonIterator value="xs:string(nsUri)"/> | ||
| 1670 | 145 | </AttributeIterator> | ||
| 1671 | 146 | <EnclosedIterator attr_cont="false"> | ||
| 1672 | 147 | <NamespaceUriForPrefixIterator> | ||
| 1673 | 148 | <ForVarIterator varname="prefix"/> | ||
| 1674 | 149 | <UnhoistIterator> | ||
| 1675 | 150 | <ForVarIterator varname="$$opt_temp_3"/> | ||
| 1676 | 151 | </UnhoistIterator> | ||
| 1677 | 152 | </NamespaceUriForPrefixIterator> | ||
| 1678 | 153 | </EnclosedIterator> | ||
| 1679 | 154 | </ElementIterator> | ||
| 1680 | 155 | <SingletonIterator value="xs:string(")"/> | ||
| 1681 | 156 | </FnConcatIterator> | ||
| 1682 | 157 | </EnclosedIterator> | ||
| 1683 | 158 | </ElementIterator> | ||
| 1684 | 159 | </FnConcatIterator> | ||
| 1685 | 160 | </ReturnClause> | ||
| 1686 | 161 | </flwor::FLWORIterator> | ||
| 1694 | 162 | </ReturnClause> | 158 | </ReturnClause> |
| 1695 | 163 | </flwor::FLWORIterator> | 159 | </flwor::FLWORIterator> |
| 1696 | 164 | </SequentialIterator> | 160 | </SequentialIterator> |
| 1697 | 165 | 161 | ||
| 1698 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/idx5.iter' | |||
| 1699 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/idx5.iter 2012-05-03 12:31:51 +0000 | |||
| 1700 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/idx5.iter 2012-06-14 14:31:26 +0000 | |||
| 1701 | @@ -19,98 +19,94 @@ | |||
| 1702 | 19 | <SingletonIterator value="xs:QName(,,tests)"/> | 19 | <SingletonIterator value="xs:QName(,,tests)"/> |
| 1703 | 20 | </ElementIterator> | 20 | </ElementIterator> |
| 1704 | 21 | </CtxVarDeclareIterator> | 21 | </CtxVarDeclareIterator> |
| 1730 | 22 | <flwor::FLWORIterator> | 22 | <SequentialIterator> |
| 1731 | 23 | <LetVariable name="$$opt_temp_1" materialize="true"> | 23 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 1732 | 24 | <HoistIterator> | 24 | <flwor::FLWORIterator> |
| 1733 | 25 | <flwor::FLWORIterator> | 25 | <ForVariable name="$$opt_temp_2"> |
| 1734 | 26 | <ForVariable name="$$dot"> | 26 | <CtxVarIterator varid="2" varname="tests" varkind="global"/> |
| 1735 | 27 | <CtxVarIterator varid="2" varname="tests" varkind="global"/> | 27 | </ForVariable> |
| 1736 | 28 | </ForVariable> | 28 | <ReturnClause> |
| 1737 | 29 | <WhereClause> | 29 | <ValueIndexEntryBuilderIterator> |
| 1738 | 30 | <FnBooleanIterator> | 30 | <ForVarIterator varname="$$opt_temp_2"/> |
| 1739 | 31 | <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0"> | 31 | <CastIterator type="xs:string"> |
| 1740 | 32 | <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*"> | 32 | <PromoteIterator type="xs:anyAtomicType"> |
| 1741 | 33 | <ForVarIterator varname="$$dot"/> | 33 | <FnDataIterator> |
| 1742 | 34 | </TreatIterator> | 34 | <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0"> |
| 1743 | 35 | </AttributeAxisIterator> | 35 | <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*"> |
| 1744 | 36 | </FnBooleanIterator> | 36 | <ForVarIterator varname="$$opt_temp_2"/> |
| 1745 | 37 | </WhereClause> | 37 | </TreatIterator> |
| 1746 | 38 | <ReturnClause> | 38 | </ChildAxisIterator> |
| 1747 | 39 | <ForVarIterator varname="$$dot"/> | 39 | </FnDataIterator> |
| 1748 | 40 | </ReturnClause> | 40 | </PromoteIterator> |
| 1749 | 41 | </flwor::FLWORIterator> | 41 | </CastIterator> |
| 1750 | 42 | </HoistIterator> | 42 | </ValueIndexEntryBuilderIterator> |
| 1751 | 43 | </LetVariable> | 43 | </ReturnClause> |
| 1752 | 44 | <ReturnClause> | 44 | </flwor::FLWORIterator> |
| 1753 | 45 | <SequentialIterator> | 45 | </CreateInternalIndexIterator> |
| 1754 | 46 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 46 | <flwor::FLWORIterator> |
| 1755 | 47 | <LetVariable name="$$opt_temp_1" materialize="true"> | ||
| 1756 | 48 | <HoistIterator> | ||
| 1757 | 47 | <flwor::FLWORIterator> | 49 | <flwor::FLWORIterator> |
| 1759 | 48 | <ForVariable name="$$opt_temp_2"> | 50 | <ForVariable name="$$dot"> |
| 1760 | 49 | <CtxVarIterator varid="2" varname="tests" varkind="global"/> | 51 | <CtxVarIterator varid="2" varname="tests" varkind="global"/> |
| 1761 | 50 | </ForVariable> | 52 | </ForVariable> |
| 1762 | 53 | <WhereClause> | ||
| 1763 | 54 | <FnBooleanIterator> | ||
| 1764 | 55 | <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0"> | ||
| 1765 | 56 | <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*"> | ||
| 1766 | 57 | <ForVarIterator varname="$$dot"/> | ||
| 1767 | 58 | </TreatIterator> | ||
| 1768 | 59 | </AttributeAxisIterator> | ||
| 1769 | 60 | </FnBooleanIterator> | ||
| 1770 | 61 | </WhereClause> | ||
| 1771 | 51 | <ReturnClause> | 62 | <ReturnClause> |
| 1786 | 52 | <ValueIndexEntryBuilderIterator> | 63 | <ForVarIterator varname="$$dot"/> |
| 1773 | 53 | <ForVarIterator varname="$$opt_temp_2"/> | ||
| 1774 | 54 | <CastIterator type="xs:string"> | ||
| 1775 | 55 | <PromoteIterator type="xs:anyAtomicType"> | ||
| 1776 | 56 | <FnDataIterator> | ||
| 1777 | 57 | <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0"> | ||
| 1778 | 58 | <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*"> | ||
| 1779 | 59 | <ForVarIterator varname="$$opt_temp_2"/> | ||
| 1780 | 60 | </TreatIterator> | ||
| 1781 | 61 | </ChildAxisIterator> | ||
| 1782 | 62 | </FnDataIterator> | ||
| 1783 | 63 | </PromoteIterator> | ||
| 1784 | 64 | </CastIterator> | ||
| 1785 | 65 | </ValueIndexEntryBuilderIterator> | ||
| 1787 | 66 | </ReturnClause> | 64 | </ReturnClause> |
| 1788 | 67 | </flwor::FLWORIterator> | 65 | </flwor::FLWORIterator> |
| 1790 | 68 | </CreateInternalIndexIterator> | 66 | </HoistIterator> |
| 1791 | 67 | </LetVariable> | ||
| 1792 | 68 | <ForVariable name="test"> | ||
| 1793 | 69 | <CtxVarIterator varid="2" varname="tests" varkind="global"/> | ||
| 1794 | 70 | </ForVariable> | ||
| 1795 | 71 | <LetVariable name="$$opt_temp_0" materialize="true"> | ||
| 1796 | 72 | <HoistIterator> | ||
| 1797 | 73 | <CastIterator type="xs:string"> | ||
| 1798 | 74 | <PromoteIterator type="xs:anyAtomicType"> | ||
| 1799 | 75 | <FnDataIterator> | ||
| 1800 | 76 | <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0"> | ||
| 1801 | 77 | <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*"> | ||
| 1802 | 78 | <ForVarIterator varname="test"/> | ||
| 1803 | 79 | </TreatIterator> | ||
| 1804 | 80 | </ChildAxisIterator> | ||
| 1805 | 81 | </FnDataIterator> | ||
| 1806 | 82 | </PromoteIterator> | ||
| 1807 | 83 | </CastIterator> | ||
| 1808 | 84 | </HoistIterator> | ||
| 1809 | 85 | </LetVariable> | ||
| 1810 | 86 | <LetVariable name="test_old" materialize="true"> | ||
| 1811 | 69 | <flwor::FLWORIterator> | 87 | <flwor::FLWORIterator> |
| 1814 | 70 | <ForVariable name="test"> | 88 | <ForVariable name="$$dot"> |
| 1815 | 71 | <CtxVarIterator varid="2" varname="tests" varkind="global"/> | 89 | <ProbeIndexPointValueIterator> |
| 1816 | 90 | <SingletonIterator value="xs:QName(,,tempIndex0)"/> | ||
| 1817 | 91 | <UnhoistIterator> | ||
| 1818 | 92 | <LetVarIterator varname="$$opt_temp_0"/> | ||
| 1819 | 93 | </UnhoistIterator> | ||
| 1820 | 94 | </ProbeIndexPointValueIterator> | ||
| 1821 | 72 | </ForVariable> | 95 | </ForVariable> |
| 1822 | 73 | <LetVariable name="$$opt_temp_0" materialize="true"> | ||
| 1823 | 74 | <HoistIterator> | ||
| 1824 | 75 | <CastIterator type="xs:string"> | ||
| 1825 | 76 | <PromoteIterator type="xs:anyAtomicType"> | ||
| 1826 | 77 | <FnDataIterator> | ||
| 1827 | 78 | <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0"> | ||
| 1828 | 79 | <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*"> | ||
| 1829 | 80 | <ForVarIterator varname="test"/> | ||
| 1830 | 81 | </TreatIterator> | ||
| 1831 | 82 | </ChildAxisIterator> | ||
| 1832 | 83 | </FnDataIterator> | ||
| 1833 | 84 | </PromoteIterator> | ||
| 1834 | 85 | </CastIterator> | ||
| 1835 | 86 | </HoistIterator> | ||
| 1836 | 87 | </LetVariable> | ||
| 1837 | 88 | <LetVariable name="test_old" materialize="true"> | ||
| 1838 | 89 | <flwor::FLWORIterator> | ||
| 1839 | 90 | <ForVariable name="$$dot"> | ||
| 1840 | 91 | <ProbeIndexPointValueIterator> | ||
| 1841 | 92 | <SingletonIterator value="xs:QName(,,tempIndex0)"/> | ||
| 1842 | 93 | <UnhoistIterator> | ||
| 1843 | 94 | <LetVarIterator varname="$$opt_temp_0"/> | ||
| 1844 | 95 | </UnhoistIterator> | ||
| 1845 | 96 | </ProbeIndexPointValueIterator> | ||
| 1846 | 97 | </ForVariable> | ||
| 1847 | 98 | <ReturnClause> | ||
| 1848 | 99 | <ForVarIterator varname="$$dot"/> | ||
| 1849 | 100 | </ReturnClause> | ||
| 1850 | 101 | </flwor::FLWORIterator> | ||
| 1851 | 102 | </LetVariable> | ||
| 1852 | 103 | <LetVariable name="qt_old" materialize="true"> | ||
| 1853 | 104 | <UnhoistIterator> | ||
| 1854 | 105 | <LetVarIterator varname="$$opt_temp_1"/> | ||
| 1855 | 106 | </UnhoistIterator> | ||
| 1856 | 107 | </LetVariable> | ||
| 1857 | 108 | <ReturnClause> | 96 | <ReturnClause> |
| 1859 | 109 | <SingletonIterator value="xs:integer(1)"/> | 97 | <ForVarIterator varname="$$dot"/> |
| 1860 | 110 | </ReturnClause> | 98 | </ReturnClause> |
| 1861 | 111 | </flwor::FLWORIterator> | 99 | </flwor::FLWORIterator> |
| 1865 | 112 | </SequentialIterator> | 100 | </LetVariable> |
| 1866 | 113 | </ReturnClause> | 101 | <LetVariable name="qt_old" materialize="true"> |
| 1867 | 114 | </flwor::FLWORIterator> | 102 | <UnhoistIterator> |
| 1868 | 103 | <LetVarIterator varname="$$opt_temp_1"/> | ||
| 1869 | 104 | </UnhoistIterator> | ||
| 1870 | 105 | </LetVariable> | ||
| 1871 | 106 | <ReturnClause> | ||
| 1872 | 107 | <SingletonIterator value="xs:integer(1)"/> | ||
| 1873 | 108 | </ReturnClause> | ||
| 1874 | 109 | </flwor::FLWORIterator> | ||
| 1875 | 110 | </SequentialIterator> | ||
| 1876 | 115 | </SequentialIterator> | 111 | </SequentialIterator> |
| 1877 | 116 | 112 | ||
| 1878 | 117 | 113 | ||
| 1879 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/misc/hoist4.iter' | |||
| 1880 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/misc/hoist4.iter 2012-05-03 12:31:51 +0000 | |||
| 1881 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/misc/hoist4.iter 2012-06-14 14:31:26 +0000 | |||
| 1882 | @@ -83,27 +83,23 @@ | |||
| 1883 | 83 | </GenericArithIterator_AddOperation> | 83 | </GenericArithIterator_AddOperation> |
| 1884 | 84 | </HoistIterator> | 84 | </HoistIterator> |
| 1885 | 85 | </LetVariable> | 85 | </LetVariable> |
| 1886 | 86 | <ForVariable name="c"> | ||
| 1887 | 87 | <OpToIterator> | ||
| 1888 | 88 | <SingletonIterator value="xs:integer(1)"/> | ||
| 1889 | 89 | <PromoteIterator type="xs:integer"> | ||
| 1890 | 90 | <FnDataIterator> | ||
| 1891 | 91 | <CtxVarIterator varid="2" varname="x" varkind="local"/> | ||
| 1892 | 92 | </FnDataIterator> | ||
| 1893 | 93 | </PromoteIterator> | ||
| 1894 | 94 | </OpToIterator> | ||
| 1895 | 95 | </ForVariable> | ||
| 1896 | 86 | <ReturnClause> | 96 | <ReturnClause> |
| 1917 | 87 | <flwor::FLWORIterator> | 97 | <GenericArithIterator_AddOperation> |
| 1918 | 88 | <ForVariable name="c"> | 98 | <UnhoistIterator> |
| 1919 | 89 | <OpToIterator> | 99 | <LetVarIterator varname="$$opt_temp_0"/> |
| 1920 | 90 | <SingletonIterator value="xs:integer(1)"/> | 100 | </UnhoistIterator> |
| 1921 | 91 | <PromoteIterator type="xs:integer"> | 101 | <ForVarIterator varname="c"/> |
| 1922 | 92 | <FnDataIterator> | 102 | </GenericArithIterator_AddOperation> |
| 1903 | 93 | <CtxVarIterator varid="2" varname="x" varkind="local"/> | ||
| 1904 | 94 | </FnDataIterator> | ||
| 1905 | 95 | </PromoteIterator> | ||
| 1906 | 96 | </OpToIterator> | ||
| 1907 | 97 | </ForVariable> | ||
| 1908 | 98 | <ReturnClause> | ||
| 1909 | 99 | <GenericArithIterator_AddOperation> | ||
| 1910 | 100 | <UnhoistIterator> | ||
| 1911 | 101 | <LetVarIterator varname="$$opt_temp_0"/> | ||
| 1912 | 102 | </UnhoistIterator> | ||
| 1913 | 103 | <ForVarIterator varname="c"/> | ||
| 1914 | 104 | </GenericArithIterator_AddOperation> | ||
| 1915 | 105 | </ReturnClause> | ||
| 1916 | 106 | </flwor::FLWORIterator> | ||
| 1923 | 107 | </ReturnClause> | 103 | </ReturnClause> |
| 1924 | 108 | </flwor::FLWORIterator> | 104 | </flwor::FLWORIterator> |
| 1925 | 109 | </SequentialIterator> | 105 | </SequentialIterator> |
| 1926 | 110 | 106 | ||
| 1927 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9198.iter' | |||
| 1928 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9198.iter 2012-05-03 12:31:51 +0000 | |||
| 1929 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9198.iter 2012-06-14 14:31:26 +0000 | |||
| 1930 | @@ -1,33 +1,33 @@ | |||
| 1931 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 1961 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator copyInputNodes="false"> |
| 1962 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 1963 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 1964 | 5 | <OpToIterator> | 5 | <flwor::FLWORIterator> |
| 1965 | 6 | <SingletonIterator value="xs:integer(1)"/> | 6 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 1966 | 7 | <SingletonIterator value="xs:integer(2)"/> | 7 | <HoistIterator> |
| 1967 | 8 | </OpToIterator> | 8 | <OpToIterator> |
| 1968 | 9 | </HoistIterator> | 9 | <SingletonIterator value="xs:integer(1)"/> |
| 1969 | 10 | </LetVariable> | 10 | <SingletonIterator value="xs:integer(2)"/> |
| 1970 | 11 | <ReturnClause> | 11 | </OpToIterator> |
| 1971 | 12 | <SequentialIterator> | 12 | </HoistIterator> |
| 1972 | 13 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 13 | </LetVariable> |
| 1973 | 14 | <flwor::FLWORIterator> | 14 | <ReturnClause> |
| 1974 | 15 | <ForVariable name="$$opt_temp_2"> | 15 | <SequentialIterator> |
| 1975 | 16 | <UnhoistIterator> | 16 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 1976 | 17 | <LetVarIterator varname="$$opt_temp_0"/> | 17 | <flwor::FLWORIterator> |
| 1977 | 18 | </UnhoistIterator> | 18 | <ForVariable name="$$opt_temp_2"> |
| 1978 | 19 | </ForVariable> | 19 | <UnhoistIterator> |
| 1979 | 20 | <ReturnClause> | 20 | <LetVarIterator varname="$$opt_temp_0"/> |
| 1980 | 21 | <ValueIndexEntryBuilderIterator> | 21 | </UnhoistIterator> |
| 1981 | 22 | <ForVarIterator varname="$$opt_temp_2"/> | 22 | </ForVariable> |
| 1982 | 23 | <ForVarIterator varname="$$opt_temp_2"/> | 23 | <ReturnClause> |
| 1983 | 24 | </ValueIndexEntryBuilderIterator> | 24 | <ValueIndexEntryBuilderIterator> |
| 1984 | 25 | </ReturnClause> | 25 | <ForVarIterator varname="$$opt_temp_2"/> |
| 1985 | 26 | </flwor::FLWORIterator> | 26 | <ForVarIterator varname="$$opt_temp_2"/> |
| 1986 | 27 | </CreateInternalIndexIterator> | 27 | </ValueIndexEntryBuilderIterator> |
| 1987 | 28 | <ElementIterator copyInputNodes="false"> | 28 | </ReturnClause> |
| 1988 | 29 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 29 | </flwor::FLWORIterator> |
| 1989 | 30 | <EnclosedIterator attr_cont="false"> | 30 | </CreateInternalIndexIterator> |
| 1990 | 31 | <flwor::FLWORIterator> | 31 | <flwor::FLWORIterator> |
| 1991 | 32 | <ForVariable name="book"> | 32 | <ForVariable name="book"> |
| 1992 | 33 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 33 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 1993 | @@ -67,9 +67,9 @@ | |||
| 1994 | 67 | </ElementIterator> | 67 | </ElementIterator> |
| 1995 | 68 | </ReturnClause> | 68 | </ReturnClause> |
| 1996 | 69 | </flwor::FLWORIterator> | 69 | </flwor::FLWORIterator> |
| 2002 | 70 | </EnclosedIterator> | 70 | </SequentialIterator> |
| 2003 | 71 | </ElementIterator> | 71 | </ReturnClause> |
| 2004 | 72 | </SequentialIterator> | 72 | </flwor::FLWORIterator> |
| 2005 | 73 | </ReturnClause> | 73 | </EnclosedIterator> |
| 2006 | 74 | </flwor::FLWORIterator> | 74 | </ElementIterator> |
| 2007 | 75 | 75 | ||
| 2008 | 76 | 76 | ||
| 2009 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9199.iter' | |||
| 2010 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9199.iter 2012-05-03 12:31:51 +0000 | |||
| 2011 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9199.iter 2012-06-14 14:31:26 +0000 | |||
| 2012 | @@ -1,33 +1,33 @@ | |||
| 2013 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 2043 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator copyInputNodes="false"> |
| 2044 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 2045 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 2046 | 5 | <OpToIterator> | 5 | <flwor::FLWORIterator> |
| 2047 | 6 | <SingletonIterator value="xs:integer(1)"/> | 6 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 2048 | 7 | <SingletonIterator value="xs:integer(2)"/> | 7 | <HoistIterator> |
| 2049 | 8 | </OpToIterator> | 8 | <OpToIterator> |
| 2050 | 9 | </HoistIterator> | 9 | <SingletonIterator value="xs:integer(1)"/> |
| 2051 | 10 | </LetVariable> | 10 | <SingletonIterator value="xs:integer(2)"/> |
| 2052 | 11 | <ReturnClause> | 11 | </OpToIterator> |
| 2053 | 12 | <SequentialIterator> | 12 | </HoistIterator> |
| 2054 | 13 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 13 | </LetVariable> |
| 2055 | 14 | <flwor::FLWORIterator> | 14 | <ReturnClause> |
| 2056 | 15 | <ForVariable name="$$opt_temp_2"> | 15 | <SequentialIterator> |
| 2057 | 16 | <UnhoistIterator> | 16 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 2058 | 17 | <LetVarIterator varname="$$opt_temp_0"/> | 17 | <flwor::FLWORIterator> |
| 2059 | 18 | </UnhoistIterator> | 18 | <ForVariable name="$$opt_temp_2"> |
| 2060 | 19 | </ForVariable> | 19 | <UnhoistIterator> |
| 2061 | 20 | <ReturnClause> | 20 | <LetVarIterator varname="$$opt_temp_0"/> |
| 2062 | 21 | <ValueIndexEntryBuilderIterator> | 21 | </UnhoistIterator> |
| 2063 | 22 | <ForVarIterator varname="$$opt_temp_2"/> | 22 | </ForVariable> |
| 2064 | 23 | <ForVarIterator varname="$$opt_temp_2"/> | 23 | <ReturnClause> |
| 2065 | 24 | </ValueIndexEntryBuilderIterator> | 24 | <ValueIndexEntryBuilderIterator> |
| 2066 | 25 | </ReturnClause> | 25 | <ForVarIterator varname="$$opt_temp_2"/> |
| 2067 | 26 | </flwor::FLWORIterator> | 26 | <ForVarIterator varname="$$opt_temp_2"/> |
| 2068 | 27 | </CreateInternalIndexIterator> | 27 | </ValueIndexEntryBuilderIterator> |
| 2069 | 28 | <ElementIterator copyInputNodes="false"> | 28 | </ReturnClause> |
| 2070 | 29 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 29 | </flwor::FLWORIterator> |
| 2071 | 30 | <EnclosedIterator attr_cont="false"> | 30 | </CreateInternalIndexIterator> |
| 2072 | 31 | <flwor::FLWORIterator> | 31 | <flwor::FLWORIterator> |
| 2073 | 32 | <ForVariable name="book"> | 32 | <ForVariable name="book"> |
| 2074 | 33 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 33 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 2075 | @@ -67,9 +67,9 @@ | |||
| 2076 | 67 | </ElementIterator> | 67 | </ElementIterator> |
| 2077 | 68 | </ReturnClause> | 68 | </ReturnClause> |
| 2078 | 69 | </flwor::FLWORIterator> | 69 | </flwor::FLWORIterator> |
| 2084 | 70 | </EnclosedIterator> | 70 | </SequentialIterator> |
| 2085 | 71 | </ElementIterator> | 71 | </ReturnClause> |
| 2086 | 72 | </SequentialIterator> | 72 | </flwor::FLWORIterator> |
| 2087 | 73 | </ReturnClause> | 73 | </EnclosedIterator> |
| 2088 | 74 | </flwor::FLWORIterator> | 74 | </ElementIterator> |
| 2089 | 75 | 75 | ||
| 2090 | 76 | 76 | ||
| 2091 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9212.iter' | |||
| 2092 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9212.iter 2012-05-03 12:31:51 +0000 | |||
| 2093 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9212.iter 2012-06-14 14:31:26 +0000 | |||
| 2094 | @@ -1,38 +1,38 @@ | |||
| 2095 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 2120 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator copyInputNodes="false"> |
| 2121 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 2122 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 2123 | 5 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 5 | <flwor::FLWORIterator> |
| 2124 | 6 | <FnDocIterator> | 6 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 2125 | 7 | <SingletonIterator value="xs:string(books.xml)"/> | 7 | <HoistIterator> |
| 2126 | 8 | </FnDocIterator> | 8 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 2127 | 9 | </DescendantAxisIterator> | 9 | <FnDocIterator> |
| 2128 | 10 | </HoistIterator> | 10 | <SingletonIterator value="xs:string(books.xml)"/> |
| 2129 | 11 | </LetVariable> | 11 | </FnDocIterator> |
| 2130 | 12 | <ReturnClause> | 12 | </DescendantAxisIterator> |
| 2131 | 13 | <SequentialIterator> | 13 | </HoistIterator> |
| 2132 | 14 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 14 | </LetVariable> |
| 2133 | 15 | <flwor::FLWORIterator> | 15 | <ReturnClause> |
| 2134 | 16 | <ForVariable name="$$opt_temp_1"> | 16 | <SequentialIterator> |
| 2135 | 17 | <UnhoistIterator> | 17 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 2136 | 18 | <LetVarIterator varname="$$opt_temp_0"/> | 18 | <flwor::FLWORIterator> |
| 2137 | 19 | </UnhoistIterator> | 19 | <ForVariable name="$$opt_temp_1"> |
| 2138 | 20 | </ForVariable> | 20 | <UnhoistIterator> |
| 2139 | 21 | <ReturnClause> | 21 | <LetVarIterator varname="$$opt_temp_0"/> |
| 2140 | 22 | <ValueIndexEntryBuilderIterator> | 22 | </UnhoistIterator> |
| 2141 | 23 | <ForVarIterator varname="$$opt_temp_1"/> | 23 | </ForVariable> |
| 2142 | 24 | <FnCountIterator> | 24 | <ReturnClause> |
| 2143 | 25 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> | 25 | <ValueIndexEntryBuilderIterator> |
| 2144 | 26 | <ForVarIterator varname="$$opt_temp_1"/> | 26 | <ForVarIterator varname="$$opt_temp_1"/> |
| 2154 | 27 | </ChildAxisIterator> | 27 | <FnCountIterator> |
| 2155 | 28 | </FnCountIterator> | 28 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> |
| 2156 | 29 | </ValueIndexEntryBuilderIterator> | 29 | <ForVarIterator varname="$$opt_temp_1"/> |
| 2157 | 30 | </ReturnClause> | 30 | </ChildAxisIterator> |
| 2158 | 31 | </flwor::FLWORIterator> | 31 | </FnCountIterator> |
| 2159 | 32 | </CreateInternalIndexIterator> | 32 | </ValueIndexEntryBuilderIterator> |
| 2160 | 33 | <ElementIterator copyInputNodes="false"> | 33 | </ReturnClause> |
| 2161 | 34 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 34 | </flwor::FLWORIterator> |
| 2162 | 35 | <EnclosedIterator attr_cont="false"> | 35 | </CreateInternalIndexIterator> |
| 2163 | 36 | <flwor::FLWORIterator> | 36 | <flwor::FLWORIterator> |
| 2164 | 37 | <ForVariable name="book"> | 37 | <ForVariable name="book"> |
| 2165 | 38 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 38 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 2166 | @@ -75,9 +75,9 @@ | |||
| 2167 | 75 | </ElementIterator> | 75 | </ElementIterator> |
| 2168 | 76 | </ReturnClause> | 76 | </ReturnClause> |
| 2169 | 77 | </flwor::FLWORIterator> | 77 | </flwor::FLWORIterator> |
| 2175 | 78 | </EnclosedIterator> | 78 | </SequentialIterator> |
| 2176 | 79 | </ElementIterator> | 79 | </ReturnClause> |
| 2177 | 80 | </SequentialIterator> | 80 | </flwor::FLWORIterator> |
| 2178 | 81 | </ReturnClause> | 81 | </EnclosedIterator> |
| 2179 | 82 | </flwor::FLWORIterator> | 82 | </ElementIterator> |
| 2180 | 83 | 83 | ||
| 2181 | 84 | 84 | ||
| 2182 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9389.iter' | |||
| 2183 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9389.iter 2012-05-03 12:31:51 +0000 | |||
| 2184 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9389.iter 2012-06-14 14:31:26 +0000 | |||
| 2185 | @@ -1,38 +1,38 @@ | |||
| 2186 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 2211 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator copyInputNodes="false"> |
| 2212 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 2213 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 2214 | 5 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 5 | <flwor::FLWORIterator> |
| 2215 | 6 | <FnDocIterator> | 6 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 2216 | 7 | <SingletonIterator value="xs:string(books.xml)"/> | 7 | <HoistIterator> |
| 2217 | 8 | </FnDocIterator> | 8 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 2218 | 9 | </DescendantAxisIterator> | 9 | <FnDocIterator> |
| 2219 | 10 | </HoistIterator> | 10 | <SingletonIterator value="xs:string(books.xml)"/> |
| 2220 | 11 | </LetVariable> | 11 | </FnDocIterator> |
| 2221 | 12 | <ReturnClause> | 12 | </DescendantAxisIterator> |
| 2222 | 13 | <SequentialIterator> | 13 | </HoistIterator> |
| 2223 | 14 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 14 | </LetVariable> |
| 2224 | 15 | <flwor::FLWORIterator> | 15 | <ReturnClause> |
| 2225 | 16 | <ForVariable name="$$opt_temp_1"> | 16 | <SequentialIterator> |
| 2226 | 17 | <UnhoistIterator> | 17 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 2227 | 18 | <LetVarIterator varname="$$opt_temp_0"/> | 18 | <flwor::FLWORIterator> |
| 2228 | 19 | </UnhoistIterator> | 19 | <ForVariable name="$$opt_temp_1"> |
| 2229 | 20 | </ForVariable> | 20 | <UnhoistIterator> |
| 2230 | 21 | <ReturnClause> | 21 | <LetVarIterator varname="$$opt_temp_0"/> |
| 2231 | 22 | <ValueIndexEntryBuilderIterator> | 22 | </UnhoistIterator> |
| 2232 | 23 | <ForVarIterator varname="$$opt_temp_1"/> | 23 | </ForVariable> |
| 2233 | 24 | <FnCountIterator> | 24 | <ReturnClause> |
| 2234 | 25 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> | 25 | <ValueIndexEntryBuilderIterator> |
| 2235 | 26 | <ForVarIterator varname="$$opt_temp_1"/> | 26 | <ForVarIterator varname="$$opt_temp_1"/> |
| 2245 | 27 | </ChildAxisIterator> | 27 | <FnCountIterator> |
| 2246 | 28 | </FnCountIterator> | 28 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> |
| 2247 | 29 | </ValueIndexEntryBuilderIterator> | 29 | <ForVarIterator varname="$$opt_temp_1"/> |
| 2248 | 30 | </ReturnClause> | 30 | </ChildAxisIterator> |
| 2249 | 31 | </flwor::FLWORIterator> | 31 | </FnCountIterator> |
| 2250 | 32 | </CreateInternalIndexIterator> | 32 | </ValueIndexEntryBuilderIterator> |
| 2251 | 33 | <ElementIterator copyInputNodes="false"> | 33 | </ReturnClause> |
| 2252 | 34 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 34 | </flwor::FLWORIterator> |
| 2253 | 35 | <EnclosedIterator attr_cont="false"> | 35 | </CreateInternalIndexIterator> |
| 2254 | 36 | <flwor::FLWORIterator> | 36 | <flwor::FLWORIterator> |
| 2255 | 37 | <ForVariable name="anzahl"> | 37 | <ForVariable name="anzahl"> |
| 2256 | 38 | <OpToIterator> | 38 | <OpToIterator> |
| 2257 | @@ -62,9 +62,9 @@ | |||
| 2258 | 62 | </ElementIterator> | 62 | </ElementIterator> |
| 2259 | 63 | </ReturnClause> | 63 | </ReturnClause> |
| 2260 | 64 | </flwor::FLWORIterator> | 64 | </flwor::FLWORIterator> |
| 2266 | 65 | </EnclosedIterator> | 65 | </SequentialIterator> |
| 2267 | 66 | </ElementIterator> | 66 | </ReturnClause> |
| 2268 | 67 | </SequentialIterator> | 67 | </flwor::FLWORIterator> |
| 2269 | 68 | </ReturnClause> | 68 | </EnclosedIterator> |
| 2270 | 69 | </flwor::FLWORIterator> | 69 | </ElementIterator> |
| 2271 | 70 | 70 | ||
| 2272 | 71 | 71 | ||
| 2273 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9392.iter' | |||
| 2274 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9392.iter 2012-05-03 12:31:51 +0000 | |||
| 2275 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9392.iter 2012-06-14 14:31:26 +0000 | |||
| 2276 | @@ -1,45 +1,45 @@ | |||
| 2277 | 1 | Iterator tree for main query: | 1 | Iterator tree for main query: |
| 2319 | 2 | <flwor::FLWORIterator> | 2 | <ElementIterator copyInputNodes="false"> |
| 2320 | 3 | <LetVariable name="$$opt_temp_0" materialize="true"> | 3 | <SingletonIterator value="xs:QName(,,karteikasten)"/> |
| 2321 | 4 | <HoistIterator> | 4 | <EnclosedIterator attr_cont="false"> |
| 2322 | 5 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> | 5 | <ElementIterator copyInputNodes="false"> |
| 2323 | 6 | <FnDocIterator> | 6 | <SingletonIterator value="xs:QName(,,gruppe)"/> |
| 2324 | 7 | <SingletonIterator value="xs:string(books.xml)"/> | 7 | <AttributeIterator qname="xs:QName(,,anzahl)"> |
| 2325 | 8 | </FnDocIterator> | 8 | <FnDataIterator> |
| 2326 | 9 | </DescendantAxisIterator> | 9 | <FnConcatIterator> |
| 2327 | 10 | </HoistIterator> | 10 | <SingletonIterator value="xs:string( )"/> |
| 2328 | 11 | </LetVariable> | 11 | <EnclosedIterator attr_cont="true"> |
| 2329 | 12 | <ReturnClause> | 12 | <flwor::FLWORIterator> |
| 2330 | 13 | <SequentialIterator> | 13 | <LetVariable name="$$opt_temp_0" materialize="true"> |
| 2331 | 14 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> | 14 | <HoistIterator> |
| 2332 | 15 | <flwor::FLWORIterator> | 15 | <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0"> |
| 2333 | 16 | <ForVariable name="$$opt_temp_1"> | 16 | <FnDocIterator> |
| 2334 | 17 | <UnhoistIterator> | 17 | <SingletonIterator value="xs:string(books.xml)"/> |
| 2335 | 18 | <LetVarIterator varname="$$opt_temp_0"/> | 18 | </FnDocIterator> |
| 2336 | 19 | </UnhoistIterator> | 19 | </DescendantAxisIterator> |
| 2337 | 20 | </ForVariable> | 20 | </HoistIterator> |
| 2338 | 21 | <ReturnClause> | 21 | </LetVariable> |
| 2339 | 22 | <ValueIndexEntryBuilderIterator> | 22 | <ReturnClause> |
| 2340 | 23 | <ForVarIterator varname="$$opt_temp_1"/> | 23 | <SequentialIterator> |
| 2341 | 24 | <FnCountIterator> | 24 | <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)"> |
| 2342 | 25 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> | 25 | <flwor::FLWORIterator> |
| 2343 | 26 | <ForVarIterator varname="$$opt_temp_1"/> | 26 | <ForVariable name="$$opt_temp_1"> |
| 2344 | 27 | </ChildAxisIterator> | 27 | <UnhoistIterator> |
| 2345 | 28 | </FnCountIterator> | 28 | <LetVarIterator varname="$$opt_temp_0"/> |
| 2346 | 29 | </ValueIndexEntryBuilderIterator> | 29 | </UnhoistIterator> |
| 2347 | 30 | </ReturnClause> | 30 | </ForVariable> |
| 2348 | 31 | </flwor::FLWORIterator> | 31 | <ReturnClause> |
| 2349 | 32 | </CreateInternalIndexIterator> | 32 | <ValueIndexEntryBuilderIterator> |
| 2350 | 33 | <ElementIterator copyInputNodes="false"> | 33 | <ForVarIterator varname="$$opt_temp_1"/> |
| 2351 | 34 | <SingletonIterator value="xs:QName(,,karteikasten)"/> | 34 | <FnCountIterator> |
| 2352 | 35 | <EnclosedIterator attr_cont="false"> | 35 | <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0"> |
| 2353 | 36 | <ElementIterator copyInputNodes="false"> | 36 | <ForVarIterator varname="$$opt_temp_1"/> |
| 2354 | 37 | <SingletonIterator value="xs:QName(,,gruppe)"/> | 37 | </ChildAxisIterator> |
| 2355 | 38 | <AttributeIterator qname="xs:QName(,,anzahl)"> | 38 | </FnCountIterator> |
| 2356 | 39 | <FnDataIterator> | 39 | </ValueIndexEntryBuilderIterator> |
| 2357 | 40 | <FnConcatIterator> | 40 | </ReturnClause> |
| 2358 | 41 | <SingletonIterator value="xs:string( )"/> | 41 | </flwor::FLWORIterator> |
| 2359 | 42 | <EnclosedIterator attr_cont="true"> | 42 | </CreateInternalIndexIterator> |
| 2360 | 43 | <flwor::FLWORIterator> | 43 | <flwor::FLWORIterator> |
| 2361 | 44 | <ForVariable name="anzahl"> | 44 | <ForVariable name="anzahl"> |
| 2362 | 45 | <OpToIterator> | 45 | <OpToIterator> |
| 2363 | @@ -57,15 +57,15 @@ | |||
| 2364 | 57 | <ForVarIterator varname="anzahl"/> | 57 | <ForVarIterator varname="anzahl"/> |
| 2365 | 58 | </ReturnClause> | 58 | </ReturnClause> |
| 2366 | 59 | </flwor::FLWORIterator> | 59 | </flwor::FLWORIterator> |
| 2378 | 60 | </EnclosedIterator> | 60 | </SequentialIterator> |
| 2379 | 61 | </FnConcatIterator> | 61 | </ReturnClause> |
| 2380 | 62 | </FnDataIterator> | 62 | </flwor::FLWORIterator> |
| 2381 | 63 | </AttributeIterator> | 63 | </EnclosedIterator> |
| 2382 | 64 | <FnConcatIterator/> | 64 | </FnConcatIterator> |
| 2383 | 65 | </ElementIterator> | 65 | </FnDataIterator> |
| 2384 | 66 | </EnclosedIterator> | 66 | </AttributeIterator> |
| 2385 | 67 | </ElementIterator> | 67 | <FnConcatIterator/> |
| 2386 | 68 | </SequentialIterator> | 68 | </ElementIterator> |
| 2387 | 69 | </ReturnClause> | 69 | </EnclosedIterator> |
| 2388 | 70 | </flwor::FLWORIterator> | 70 | </ElementIterator> |
| 2389 | 71 | 71 | ||
| 2390 | 72 | 72 | ||
| 2391 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-idx4.iter' | |||
| 2392 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-idx4.iter 2012-05-03 12:31:51 +0000 | |||
| 2393 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-idx4.iter 2012-06-14 14:31:26 +0000 | |||
| 2394 | @@ -76,89 +76,85 @@ | |||
| 2395 | 76 | </TreatIterator> | 76 | </TreatIterator> |
| 2396 | 77 | </HoistIterator> | 77 | </HoistIterator> |
| 2397 | 78 | </LetVariable> | 78 | </LetVariable> |
| 2398 | 79 | <ForVariable name="prefix"> | ||
| 2399 | 80 | <flwor::FLWORIterator> | ||
| 2400 | 81 | <ForVariable name="prefixE"> | ||
| 2401 | 82 | <InScopePrefixesIterator> | ||
| 2402 | 83 | <TreatIterator quant=""> | ||
| 2403 | 84 | <LetVarIterator varname="e"/> | ||
| 2404 | 85 | </TreatIterator> | ||
| 2405 | 86 | </InScopePrefixesIterator> | ||
| 2406 | 87 | </ForVariable> | ||
| 2407 | 88 | <LetVariable name="$$opt_temp_1" materialize="true"> | ||
| 2408 | 89 | <HoistIterator> | ||
| 2409 | 90 | <NamespaceUriForPrefixIterator> | ||
| 2410 | 91 | <ForVarIterator varname="prefixE"/> | ||
| 2411 | 92 | <UnhoistIterator> | ||
| 2412 | 93 | <LetVarIterator varname="$$opt_temp_0"/> | ||
| 2413 | 94 | </UnhoistIterator> | ||
| 2414 | 95 | </NamespaceUriForPrefixIterator> | ||
| 2415 | 96 | </HoistIterator> | ||
| 2416 | 97 | </LetVariable> | ||
| 2417 | 98 | <ForVariable name="prefixP"> | ||
| 2418 | 99 | <ProbeIndexPointValueIterator> | ||
| 2419 | 100 | <SingletonIterator value="xs:QName(,,tempIndex0)"/> | ||
| 2420 | 101 | <ForVarIterator varname="prefixE"/> | ||
| 2421 | 102 | </ProbeIndexPointValueIterator> | ||
| 2422 | 103 | </ForVariable> | ||
| 2423 | 104 | <WhereClause> | ||
| 2424 | 105 | <FnBooleanIterator> | ||
| 2425 | 106 | <CompareIterator> | ||
| 2426 | 107 | <UnhoistIterator> | ||
| 2427 | 108 | <LetVarIterator varname="$$opt_temp_1"/> | ||
| 2428 | 109 | </UnhoistIterator> | ||
| 2429 | 110 | <NamespaceUriForPrefixIterator> | ||
| 2430 | 111 | <ForVarIterator varname="prefixP"/> | ||
| 2431 | 112 | <UnhoistIterator> | ||
| 2432 | 113 | <ForVarIterator varname="$$opt_temp_2"/> | ||
| 2433 | 114 | </UnhoistIterator> | ||
| 2434 | 115 | </NamespaceUriForPrefixIterator> | ||
| 2435 | 116 | </CompareIterator> | ||
| 2436 | 117 | </FnBooleanIterator> | ||
| 2437 | 118 | </WhereClause> | ||
| 2438 | 119 | <ReturnClause> | ||
| 2439 | 120 | <ForVarIterator varname="prefixE"/> | ||
| 2440 | 121 | </ReturnClause> | ||
| 2441 | 122 | </flwor::FLWORIterator> | ||
| 2442 | 123 | </ForVariable> | ||
| 2443 | 79 | <ReturnClause> | 124 | <ReturnClause> |
| 2476 | 80 | <flwor::FLWORIterator> | 125 | <FnConcatIterator> |
| 2477 | 81 | <ForVariable name="prefix"> | 126 | <SingletonIterator value="xs:string( )"/> |
| 2478 | 82 | <flwor::FLWORIterator> | 127 | <ElementIterator copyInputNodes="false"> |
| 2479 | 83 | <ForVariable name="prefixE"> | 128 | <SingletonIterator value="xs:QName(,,span)"/> |
| 2480 | 84 | <InScopePrefixesIterator> | 129 | <AttributeIterator qname="xs:QName(,,class)"> |
| 2481 | 85 | <TreatIterator quant=""> | 130 | <SingletonIterator value="xs:string(ns)"/> |
| 2482 | 86 | <LetVarIterator varname="e"/> | 131 | </AttributeIterator> |
| 2483 | 87 | </TreatIterator> | 132 | <EnclosedIterator attr_cont="false"> |
| 2484 | 88 | </InScopePrefixesIterator> | 133 | <FnConcatIterator> |
| 2485 | 89 | </ForVariable> | 134 | <ConcatStrIterator> |
| 2486 | 90 | <LetVariable name="$$opt_temp_1" materialize="true"> | 135 | <SingletonIterator value="xs:string(xmlns:)"/> |
| 2487 | 91 | <HoistIterator> | 136 | <ForVarIterator varname="prefix"/> |
| 2488 | 92 | <NamespaceUriForPrefixIterator> | 137 | <SingletonIterator value="xs:string(=")"/> |
| 2489 | 93 | <ForVarIterator varname="prefixE"/> | 138 | </ConcatStrIterator> |
| 2490 | 94 | <UnhoistIterator> | 139 | <ElementIterator copyInputNodes="false"> |
| 2491 | 95 | <LetVarIterator varname="$$opt_temp_0"/> | 140 | <SingletonIterator value="xs:QName(,,span)"/> |
| 2492 | 96 | </UnhoistIterator> | 141 | <AttributeIterator qname="xs:QName(,,class)"> |
| 2493 | 97 | </NamespaceUriForPrefixIterator> | 142 | <SingletonIterator value="xs:string(nsUri)"/> |
| 2494 | 98 | </HoistIterator> | 143 | </AttributeIterator> |
| 2495 | 99 | </LetVariable> | 144 | <EnclosedIterator attr_cont="false"> |
| 2464 | 100 | <ForVariable name="prefixP"> | ||
| 2465 | 101 | <ProbeIndexPointValueIterator> | ||
| 2466 | 102 | <SingletonIterator value="xs:QName(,,tempIndex0)"/> | ||
| 2467 | 103 | <ForVarIterator varname="prefixE"/> | ||
| 2468 | 104 | </ProbeIndexPointValueIterator> | ||
| 2469 | 105 | </ForVariable> | ||
| 2470 | 106 | <WhereClause> | ||
| 2471 | 107 | <FnBooleanIterator> | ||
| 2472 | 108 | <CompareIterator> | ||
| 2473 | 109 | <UnhoistIterator> | ||
| 2474 | 110 | <LetVarIterator varname="$$opt_temp_1"/> | ||
| 2475 | 111 | </UnhoistIterator> | ||
| 2496 | 112 | <NamespaceUriForPrefixIterator> | 145 | <NamespaceUriForPrefixIterator> |
| 2498 | 113 | <ForVarIterator varname="prefixP"/> | 146 | <ForVarIterator varname="prefix"/> |
| 2499 | 114 | <UnhoistIterator> | 147 | <UnhoistIterator> |
| 2501 | 115 | <ForVarIterator varname="$$opt_temp_2"/> | 148 | <ForVarIterator varname="$$opt_temp_3"/> |
| 2502 | 116 | </UnhoistIterator> | 149 | </UnhoistIterator> |
| 2503 | 117 | </NamespaceUriForPrefixIterator> | 150 | </NamespaceUriForPrefixIterator> |
| 2548 | 118 | </CompareIterator> | 151 | </EnclosedIterator> |
| 2549 | 119 | </FnBooleanIterator> | 152 | </ElementIterator> |
| 2550 | 120 | </WhereClause> | 153 | <SingletonIterator value="xs:string(")"/> |
| 2551 | 121 | <ReturnClause> | 154 | </FnConcatIterator> |
| 2552 | 122 | <ForVarIterator varname="prefixE"/> | 155 | </EnclosedIterator> |
| 2553 | 123 | </ReturnClause> | 156 | </ElementIterator> |
| 2554 | 124 | </flwor::FLWORIterator> | 157 | </FnConcatIterator> |
| 2511 | 125 | </ForVariable> | ||
| 2512 | 126 | <ReturnClause> | ||
| 2513 | 127 | <FnConcatIterator> | ||
| 2514 | 128 | <SingletonIterator value="xs:string( )"/> | ||
| 2515 | 129 | <ElementIterator copyInputNodes="false"> | ||
| 2516 | 130 | <SingletonIterator value="xs:QName(,,span)"/> | ||
| 2517 | 131 | <AttributeIterator qname="xs:QName(,,class)"> | ||
| 2518 | 132 | <SingletonIterator value="xs:string(ns)"/> | ||
| 2519 | 133 | </AttributeIterator> | ||
| 2520 | 134 | <EnclosedIterator attr_cont="false"> | ||
| 2521 | 135 | <FnConcatIterator> | ||
| 2522 | 136 | <ConcatStrIterator> | ||
| 2523 | 137 | <SingletonIterator value="xs:string(xmlns:)"/> | ||
| 2524 | 138 | <ForVarIterator varname="prefix"/> | ||
| 2525 | 139 | <SingletonIterator value="xs:string(=")"/> | ||
| 2526 | 140 | </ConcatStrIterator> | ||
| 2527 | 141 | <ElementIterator copyInputNodes="false"> | ||
| 2528 | 142 | <SingletonIterator value="xs:QName(,,span)"/> | ||
| 2529 | 143 | <AttributeIterator qname="xs:QName(,,class)"> | ||
| 2530 | 144 | <SingletonIterator value="xs:string(nsUri)"/> | ||
| 2531 | 145 | </AttributeIterator> | ||
| 2532 | 146 | <EnclosedIterator attr_cont="false"> | ||
| 2533 | 147 | <NamespaceUriForPrefixIterator> | ||
| 2534 | 148 | <ForVarIterator varname="prefix"/> | ||
| 2535 | 149 | <UnhoistIterator> | ||
| 2536 | 150 | <ForVarIterator varname="$$opt_temp_3"/> | ||
| 2537 | 151 | </UnhoistIterator> | ||
| 2538 | 152 | </NamespaceUriForPrefixIterator> | ||
| 2539 | 153 | </EnclosedIterator> | ||
| 2540 | 154 | </ElementIterator> | ||
| 2541 | 155 | <SingletonIterator value="xs:string(")"/> | ||
| 2542 | 156 | </FnConcatIterator> | ||
| 2543 | 157 | </EnclosedIterator> | ||
| 2544 | 158 | </ElementIterator> | ||
| 2545 | 159 | </FnConcatIterator> | ||
| 2546 | 160 | </ReturnClause> | ||
| 2547 | 161 | </flwor::FLWORIterator> | ||
| 2555 | 162 | </ReturnClause> | 158 | </ReturnClause> |
| 2556 | 163 | </flwor::FLWORIterator> | 159 | </flwor::FLWORIterator> |
| 2557 | 164 | </SequentialIterator> | 160 | </SequentialIterator> |
| 2558 | 165 | 161 | ||
| 2559 | === modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xray/ppm_10.iter' | |||
| 2560 | --- test/rbkt/ExpCompilerResults/IterPlan/zorba/xray/ppm_10.iter 2012-05-03 12:31:51 +0000 | |||
| 2561 | +++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xray/ppm_10.iter 2012-06-14 14:31:26 +0000 | |||
| 2562 | @@ -354,124 +354,120 @@ | |||
| 2563 | 354 | </TreatIterator> | 354 | </TreatIterator> |
| 2564 | 355 | </UDFunctionCallIterator> | 355 | </UDFunctionCallIterator> |
| 2565 | 356 | </CtxVarDeclareIterator> | 356 | </CtxVarDeclareIterator> |
| 2583 | 357 | <flwor::FLWORIterator> | 357 | <FnConcatIterator> |
| 2584 | 358 | <LetVariable name="$$opt_temp_0" materialize="true"> | 358 | <StringJoinIterator> |
| 2568 | 359 | <HoistIterator> | ||
| 2569 | 360 | <OpToIterator> | ||
| 2570 | 361 | <SingletonIterator value="xs:integer(1)"/> | ||
| 2571 | 362 | <CtxVarIterator varid="2" varname="width" varkind="global"/> | ||
| 2572 | 363 | </OpToIterator> | ||
| 2573 | 364 | </HoistIterator> | ||
| 2574 | 365 | </LetVariable> | ||
| 2575 | 366 | <LetVariable name="$$opt_temp_1" materialize="true"> | ||
| 2576 | 367 | <HoistIterator> | ||
| 2577 | 368 | <TreatIterator type="[NodeXQType elementNode content=[XQType ANY_TYPE_KIND*]]" quant=""> | ||
| 2578 | 369 | <CtxVarIterator varid="4" varname="scene" varkind="global"/> | ||
| 2579 | 370 | </TreatIterator> | ||
| 2580 | 371 | </HoistIterator> | ||
| 2581 | 372 | </LetVariable> | ||
| 2582 | 373 | <ReturnClause> | ||
| 2585 | 374 | <FnConcatIterator> | 359 | <FnConcatIterator> |
| 2586 | 360 | <SingletonIterator value="xs:string(P3)"/> | ||
| 2587 | 375 | <StringJoinIterator> | 361 | <StringJoinIterator> |
| 2588 | 376 | <FnConcatIterator> | 362 | <FnConcatIterator> |
| 2590 | 377 | <SingletonIterator value="xs:string(P3)"/> | 363 | <FnStringIterator> |
| 2591 | 364 | <CtxVarIterator varid="2" varname="width" varkind="global"/> | ||
| 2592 | 365 | </FnStringIterator> | ||
| 2593 | 366 | <FnStringIterator> | ||
| 2594 | 367 | <CtxVarIterator varid="3" varname="height" varkind="global"/> | ||
| 2595 | 368 | </FnStringIterator> | ||
| 2596 | 369 | </FnConcatIterator> | ||
| 2597 | 370 | <SingletonIterator value="xs:string( )"/> | ||
| 2598 | 371 | </StringJoinIterator> | ||
| 2599 | 372 | <SingletonIterator value="xs:string(255)"/> | ||
| 2600 | 373 | <flwor::FLWORIterator> | ||
| 2601 | 374 | <LetVariable name="$$opt_temp_1" materialize="true"> | ||
| 2602 | 375 | <HoistIterator> | ||
| 2603 | 376 | <TreatIterator type="[NodeXQType elementNode content=[XQType ANY_TYPE_KIND*]]" quant=""> | ||
| 2604 | 377 | <CtxVarIterator varid="4" varname="scene" varkind="global"/> | ||
| 2605 | 378 | </TreatIterator> | ||
| 2606 | 379 | </HoistIterator> | ||
| 2607 | 380 | </LetVariable> | ||
| 2608 | 381 | <LetVariable name="$$opt_temp_0" materialize="true"> | ||
| 2609 | 382 | <HoistIterator> | ||
| 2610 | 383 | <OpToIterator> | ||
| 2611 | 384 | <SingletonIterator value="xs:integer(1)"/> | ||
| 2612 | 385 | <CtxVarIterator varid="2" varname="width" varkind="global"/> | ||
| 2613 | 386 | </OpToIterator> | ||
| 2614 | 387 | </HoistIterator> | ||
| 2615 | 388 | </LetVariable> | ||
| 2616 | 389 | <ForVariable name="aspect-ratio"> | ||
| 2617 | 390 | <SpecificNumArithIterator_DivideOperation_DECIMAL> | ||
| 2618 | 391 | <CtxVarIterator varid="2" varname="width" varkind="global"/> | ||
| 2619 | 392 | <CtxVarIterator varid="3" varname="height" varkind="global"/> | ||
| 2620 | 393 | </SpecificNumArithIterator_DivideOperation_DECIMAL> | ||
| 2621 | 394 | </ForVariable> | ||
| 2622 | 395 | <ForVariable name="y"> | ||
| 2623 | 396 | <OpToIterator> | ||
| 2624 | 397 | <SingletonIterator value="xs:integer(1)"/> | ||
| 2625 | 398 | <CtxVarIterator varid="3" varname="height" varkind="global"/> | ||
| 2626 | 399 | </OpToIterator> | ||
| 2627 | 400 | </ForVariable> | ||
| 2628 | 401 | <ForVariable name="y-recentered"> | ||
| 2629 | 402 | <SpecificNumArithIterator_AddOperation_DECIMAL> | ||
| 2630 | 403 | <SpecificNumArithIterator_DivideOperation_DECIMAL> | ||
| 2631 | 404 | <OpNumericUnaryIterator> | ||
| 2632 | 405 | <ForVarIterator varname="y"/> | ||
| 2633 | 406 | </OpNumericUnaryIterator> | ||
| 2634 | 407 | <CtxVarIterator varid="3" varname="height" varkind="global"/> | ||
| 2635 | 408 | </SpecificNumArithIterator_DivideOperation_DECIMAL> | ||
| 2636 | 409 | <SingletonIterator value="xs:decimal(0.5)"/> | ||
| 2637 | 410 | </SpecificNumArithIterator_AddOperation_DECIMAL> | ||
| 2638 | 411 | </ForVariable> | ||
| 2639 | 412 | <LetVariable name="$$opt_temp_2" materialize="true"> | ||
| 2640 | 413 | <HoistIterator> | ||
| 2641 | 414 | <PromoteIterator type="xs:double"> | ||
| 2642 | 415 | <ForVarIterator varname="y-recentered"/> | ||
| 2643 | 416 | </PromoteIterator> | ||
| 2644 | 417 | </HoistIterator> | ||
| 2645 | 418 | </LetVariable> | ||
| 2646 | 419 | <ForVariable name="x"> | ||
| 2647 | 420 | <UnhoistIterator> | ||
| 2648 | 421 | <LetVarIterator varname="$$opt_temp_0"/> | ||
| 2649 | 422 | </UnhoistIterator> | ||
| 2650 | 423 | </ForVariable> | ||
| 2651 | 424 | <ReturnClause> | ||
| 2652 | 378 | <StringJoinIterator> | 425 | <StringJoinIterator> |
| 2661 | 379 | <FnConcatIterator> | 426 | <flwor::FLWORIterator> |
| 2662 | 380 | <FnStringIterator> | 427 | <ForVariable name="channel"> |
| 2663 | 381 | <CtxVarIterator varid="2" varname="width" varkind="global"/> | 428 | <UDFunctionCallIterator> |
| 2664 | 382 | </FnStringIterator> | 429 | <UnhoistIterator> |
| 2665 | 383 | <FnStringIterator> | 430 | <LetVarIterator varname="$$opt_temp_1"/> |
| 2666 | 384 | <CtxVarIterator varid="3" varname="height" varkind="global"/> | 431 | </UnhoistIterator> |
| 2667 | 385 | </FnStringIterator> | 432 | <PromoteIterator type="xs:double"> |
| 2668 | 386 | </FnConcatIterator> | 433 | <SpecificNumArithIterator_MultiplyOperation_DECIMAL> |
| 2669 | 434 | <SpecificNumArithIterator_SubtractOperation_DECIMAL> | ||
| 2670 | 435 | <SpecificNumArithIterator_DivideOperation_DECIMAL> | ||
| 2671 | 436 | <ForVarIterator varname="x"/> | ||
| 2672 | 437 | <CtxVarIterator varid="2" varname="width" varkind="global"/> | ||
| 2673 | 438 | </SpecificNumArithIterator_DivideOperation_DECIMAL> | ||
| 2674 | 439 | <SingletonIterator value="xs:decimal(0.5)"/> | ||
| 2675 | 440 | </SpecificNumArithIterator_SubtractOperation_DECIMAL> | ||
| 2676 | 441 | <ForVarIterator varname="aspect-ratio"/> | ||
| 2677 | 442 | </SpecificNumArithIterator_MultiplyOperation_DECIMAL> | ||
| 2678 | 443 | </PromoteIterator> | ||
| 2679 | 444 | <UnhoistIterator> | ||
| 2680 | 445 | <LetVarIterator varname="$$opt_temp_2"/> | ||
| 2681 | 446 | </UnhoistIterator> | ||
| 2682 | 447 | </UDFunctionCallIterator> | ||
| 2683 | 448 | </ForVariable> | ||
| 2684 | 449 | <ReturnClause> | ||
| 2685 | 450 | <FnStringIterator> | ||
| 2686 | 451 | <FloorIterator> | ||
| 2687 | 452 | <SpecificNumArithIterator_MultiplyOperation_DOUBLE> | ||
| 2688 | 453 | <ForVarIterator varname="channel"/> | ||
| 2689 | 454 | <SingletonIterator value="xs:double(255)"/> | ||
| 2690 | 455 | </SpecificNumArithIterator_MultiplyOperation_DOUBLE> | ||
| 2691 | 456 | </FloorIterator> | ||
| 2692 | 457 | </FnStringIterator> | ||
| 2693 | 458 | </ReturnClause> | ||
| 2694 | 459 | </flwor::FLWORIterator> | ||
| 2695 | 387 | <SingletonIterator value="xs:string( )"/> | 460 | <SingletonIterator value="xs:string( )"/> |
| 2696 | 388 | </StringJoinIterator> | 461 | </StringJoinIterator> |
| 2780 | 389 | <SingletonIterator value="xs:string(255)"/> | 462 | </ReturnClause> |
| 2781 | 390 | <flwor::FLWORIterator> | 463 | </flwor::FLWORIterator> |
| 2699 | 391 | <ForVariable name="aspect-ratio"> | ||
| 2700 | 392 | <SpecificNumArithIterator_DivideOperation_DECIMAL> | ||
| 2701 | 393 | <CtxVarIterator varid="2" varname="width" varkind="global"/> | ||
| 2702 | 394 | <CtxVarIterator varid="3" varname="height" varkind="global"/> | ||
| 2703 | 395 | </SpecificNumArithIterator_DivideOperation_DECIMAL> | ||
| 2704 | 396 | </ForVariable> | ||
| 2705 | 397 | <ForVariable name="y"> | ||
| 2706 | 398 | <OpToIterator> | ||
| 2707 | 399 | <SingletonIterator value="xs:integer(1)"/> | ||
| 2708 | 400 | <CtxVarIterator varid="3" varname="height" varkind="global"/> | ||
| 2709 | 401 | </OpToIterator> | ||
| 2710 | 402 | </ForVariable> | ||
| 2711 | 403 | <ForVariable name="y-recentered"> | ||
| 2712 | 404 | <SpecificNumArithIterator_AddOperation_DECIMAL> | ||
| 2713 | 405 | <SpecificNumArithIterator_DivideOperation_DECIMAL> | ||
| 2714 | 406 | <OpNumericUnaryIterator> | ||
| 2715 | 407 | <ForVarIterator varname="y"/> | ||
| 2716 | 408 | </OpNumericUnaryIterator> | ||
| 2717 | 409 | <CtxVarIterator varid="3" varname="height" varkind="global"/> | ||
| 2718 | 410 | </SpecificNumArithIterator_DivideOperation_DECIMAL> | ||
| 2719 | 411 | <SingletonIterator value="xs:decimal(0.5)"/> | ||
| 2720 | 412 | </SpecificNumArithIterator_AddOperation_DECIMAL> | ||
| 2721 | 413 | </ForVariable> | ||
| 2722 | 414 | <LetVariable name="$$opt_temp_2" materialize="true"> | ||
| 2723 | 415 | <HoistIterator> | ||
| 2724 | 416 | <PromoteIterator type="xs:double"> | ||
| 2725 | 417 | <ForVarIterator varname="y-recentered"/> | ||
| 2726 | 418 | </PromoteIterator> | ||
| 2727 | 419 | </HoistIterator> | ||
| 2728 | 420 | </LetVariable> | ||
| 2729 | 421 | <ForVariable name="x"> | ||
| 2730 | 422 | <UnhoistIterator> | ||
| 2731 | 423 | <LetVarIterator varname="$$opt_temp_0"/> | ||
| 2732 | 424 | </UnhoistIterator> | ||
| 2733 | 425 | </ForVariable> | ||
| 2734 | 426 | <ReturnClause> | ||
| 2735 | 427 | <StringJoinIterator> | ||
| 2736 | 428 | <flwor::FLWORIterator> | ||
| 2737 | 429 | <ForVariable name="channel"> | ||
| 2738 | 430 | <UDFunctionCallIterator> | ||
| 2739 | 431 | <UnhoistIterator> | ||
| 2740 | 432 | <LetVarIterator varname="$$opt_temp_1"/> | ||
| 2741 | 433 | </UnhoistIterator> | ||
| 2742 | 434 | <PromoteIterator type="xs:double"> | ||
| 2743 | 435 | <SpecificNumArithIterator_MultiplyOperation_DECIMAL> | ||
| 2744 | 436 | <SpecificNumArithIterator_SubtractOperation_DECIMAL> | ||
| 2745 | 437 | <SpecificNumArithIterator_DivideOperation_DECIMAL> | ||
| 2746 | 438 | <ForVarIterator varname="x"/> | ||
| 2747 | 439 | <CtxVarIterator varid="2" varname="width" varkind="global"/> | ||
| 2748 | 440 | </SpecificNumArithIterator_DivideOperation_DECIMAL> | ||
| 2749 | 441 | <SingletonIterator value="xs:decimal(0.5)"/> | ||
| 2750 | 442 | </SpecificNumArithIterator_SubtractOperation_DECIMAL> | ||
| 2751 | 443 | <ForVarIterator varname="aspect-ratio"/> | ||
| 2752 | 444 | </SpecificNumArithIterator_MultiplyOperation_DECIMAL> | ||
| 2753 | 445 | </PromoteIterator> | ||
| 2754 | 446 | <UnhoistIterator> | ||
| 2755 | 447 | <LetVarIterator varname="$$opt_temp_2"/> | ||
| 2756 | 448 | </UnhoistIterator> | ||
| 2757 | 449 | </UDFunctionCallIterator> | ||
| 2758 | 450 | </ForVariable> | ||
| 2759 | 451 | <ReturnClause> | ||
| 2760 | 452 | <FnStringIterator> | ||
| 2761 | 453 | <FloorIterator> | ||
| 2762 | 454 | <SpecificNumArithIterator_MultiplyOperation_DOUBLE> | ||
| 2763 | 455 | <ForVarIterator varname="channel"/> | ||
| 2764 | 456 | <SingletonIterator value="xs:double(255)"/> | ||
| 2765 | 457 | </SpecificNumArithIterator_MultiplyOperation_DOUBLE> | ||
| 2766 | 458 | </FloorIterator> | ||
| 2767 | 459 | </FnStringIterator> | ||
| 2768 | 460 | </ReturnClause> | ||
| 2769 | 461 | </flwor::FLWORIterator> | ||
| 2770 | 462 | <SingletonIterator value="xs:string( )"/> | ||
| 2771 | 463 | </StringJoinIterator> | ||
| 2772 | 464 | </ReturnClause> | ||
| 2773 | 465 | </flwor::FLWORIterator> | ||
| 2774 | 466 | </FnConcatIterator> | ||
| 2775 | 467 | <SingletonIterator value="xs:string( | ||
| 2776 | 468 | )"/> | ||
| 2777 | 469 | </StringJoinIterator> | ||
| 2778 | 470 | <SingletonIterator value="xs:string( | ||
| 2779 | 471 | )"/> | ||
| 2782 | 472 | </FnConcatIterator> | 464 | </FnConcatIterator> |
| 2785 | 473 | </ReturnClause> | 465 | <SingletonIterator value="xs:string( |
| 2786 | 474 | </flwor::FLWORIterator> | 466 | )"/> |
| 2787 | 467 | </StringJoinIterator> | ||
| 2788 | 468 | <SingletonIterator value="xs:string( | ||
| 2789 | 469 | )"/> | ||
| 2790 | 470 | </FnConcatIterator> | ||
| 2791 | 475 | </SequentialIterator> | 471 | </SequentialIterator> |
| 2792 | 476 | 472 | ||
| 2793 | 477 | Iterator tree for scene:prepare-scene: | 473 | Iterator tree for scene:prepare-scene: |
| 2794 | 478 | 474 | ||
| 2795 | === modified file 'test/rbkt/Queries/zorba/hashjoins/idx10.xq' | |||
| 2796 | --- test/rbkt/Queries/zorba/hashjoins/idx10.xq 2012-03-29 21:13:41 +0000 | |||
| 2797 | +++ test/rbkt/Queries/zorba/hashjoins/idx10.xq 2012-06-14 14:31:26 +0000 | |||
| 2798 | @@ -16,7 +16,7 @@ | |||
| 2799 | 16 | { | 16 | { |
| 2800 | 17 | for $i in local:bar()/@id | 17 | for $i in local:bar()/@id |
| 2801 | 18 | for $j in local:foo()/@id | 18 | for $j in local:foo()/@id |
| 2803 | 19 | where xs:string($i) eq xs:string($j) | 19 | where xs:string($i) eq xs:string($j) |
| 2804 | 20 | return $i | 20 | return $i |
| 2805 | 21 | } | 21 | } |
| 2806 | 22 | catch * | 22 | catch * |
| 2807 | @@ -25,3 +25,136 @@ | |||
| 2808 | 25 | } | 25 | } |
| 2809 | 26 | 26 | ||
| 2810 | 27 | 27 | ||
| 2811 | 28 | (: | ||
| 2812 | 29 | |||
| 2813 | 30 | Expression tree after optimization for main query | ||
| 2814 | 31 | flwor_expr (0x8d66cd0) | ||
| 2815 | 32 | [ | ||
| 2816 | 33 | LET (0x8d66c88) $$opt_temp_0 (0x8d66e40) | ||
| 2817 | 34 | [ | ||
| 2818 | 35 | hoist/1 (0x8d66c28) [ hoist/1 (0x8d6b298) [ error/0 (0x8d6ae08) [ ] ] ] | ||
| 2819 | 36 | ] | ||
| 2820 | 37 | LET (0x8d66f20) $$opt_temp_1 (0x8d670d8) | ||
| 2821 | 38 | [ | ||
| 2822 | 39 | hoist/1 (0x8d66ec0) [ | ||
| 2823 | 40 | to/2 (0x8d6afa8) [ | ||
| 2824 | 41 | const_expr (0x8d6b008) [ xs:integer [ xs:integer(1) ] ] | ||
| 2825 | 42 | const_expr (0x8d68c48) [ xs:integer [ xs:integer(10) ] ] | ||
| 2826 | 43 | ] | ||
| 2827 | 44 | ] | ||
| 2828 | 45 | ] | ||
| 2829 | 46 | RETURN | ||
| 2830 | 47 | trycatch_expr (0x8d6f258) | ||
| 2831 | 48 | [ | ||
| 2832 | 49 | flwor_expr (0x8d6fca8) | ||
| 2833 | 50 | [ | ||
| 2834 | 51 | FOR (0x8d6b2f8) i (0x8d6e7f8) | ||
| 2835 | 52 | [ | ||
| 2836 | 53 | sort-distinct-nodes-asc/1 (0x8d6e690) [ | ||
| 2837 | 54 | relpath_expr (0x8d6b238) [ | ||
| 2838 | 55 | function_trace_expr (0x8d6f530) [ | ||
| 2839 | 56 | flwor_expr (0x8d6b510) | ||
| 2840 | 57 | [ | ||
| 2841 | 58 | FOR (0x8d6e7b0) i (0x8d6f5f0) | ||
| 2842 | 59 | [ | ||
| 2843 | 60 | to/2 (0x8d6b578) [ | ||
| 2844 | 61 | const_expr (0x8d6e6f0) [ xs:integer [ xs:integer(1) ] ] | ||
| 2845 | 62 | const_expr (0x8d6e748) [ xs:integer [ xs:integer(10) ] ] | ||
| 2846 | 63 | ] | ||
| 2847 | 64 | ] | ||
| 2848 | 65 | RETURN | ||
| 2849 | 66 | elem_expr (0x8d6f4c8) [ | ||
| 2850 | 67 | copy nodes = 1 | ||
| 2851 | 68 | const_expr (0x8d6f690) [ xs:QName [ xs:QName(,,b) ] ] | ||
| 2852 | 69 | attr_expr (0x8d6f470) [ | ||
| 2853 | 70 | const_expr (0x8d6dd28) [ xs:QName [ xs:QName(,,id) ] ] | ||
| 2854 | 71 | = | ||
| 2855 | 72 | enclosed-expr/1 (0x8d6dd80) [ | ||
| 2856 | 73 | var_ref (0x8d6dde0) [ i (0x8d6f5f0) ] | ||
| 2857 | 74 | ] | ||
| 2858 | 75 | ] | ||
| 2859 | 76 | ] | ||
| 2860 | 77 | ] | ||
| 2861 | 78 | ] | ||
| 2862 | 79 | REL STEP attribute::match_expr [name_test(id)] | ||
| 2863 | 80 | ] | ||
| 2864 | 81 | ] | ||
| 2865 | 82 | ] | ||
| 2866 | 83 | LET (0x8d671c8) $$opt_temp_2 (0x8d67030) | ||
| 2867 | 84 | [ | ||
| 2868 | 85 | hoist/1 (0x8d67158) [ | ||
| 2869 | 86 | cast_expr xs:string? (0x8d6f8a8) [ | ||
| 2870 | 87 | data/1 (0x8d6f848) [ var_ref (0x8d6f7b8) [ i (0x8d6e7f8) ] ] | ||
| 2871 | 88 | ] | ||
| 2872 | 89 | ] | ||
| 2873 | 90 | ] | ||
| 2874 | 91 | FOR (0x8d6f770) j (0x8d6f360) | ||
| 2875 | 92 | [ | ||
| 2876 | 93 | sort-distinct-nodes-asc/1 (0x8d6f1f8) [ | ||
| 2877 | 94 | relpath_expr (0x8d6e8d0) [ | ||
| 2878 | 95 | function_trace_expr (0x8d692e0) [ | ||
| 2879 | 96 | flwor_expr (0x8d6ada0) | ||
| 2880 | 97 | [ | ||
| 2881 | 98 | FOR (0x8d69590) $$opt_temp_0 (0x8d69510) | ||
| 2882 | 99 | [ | ||
| 2883 | 100 | unhoist (0x8d66d90) [ vref(0x8d66d38) [ $$opt_temp_0 (0x8d66e40) ] ] | ||
| 2884 | 101 | ] | ||
| 2885 | 102 | FOR (0x8d68d50) i (0x8d68cb0) | ||
| 2886 | 103 | [ | ||
| 2887 | 104 | unhoist (0x8d66fd0) [ vref (0x8d66f78) [ $$opt_temp_1 (0x8d670d8) ] ] | ||
| 2888 | 105 | ] | ||
| 2889 | 106 | RETURN | ||
| 2890 | 107 | if_expr (0x8d69280) [ | ||
| 2891 | 108 | value-equal-integer/2 (0x8d68d98) [ | ||
| 2892 | 109 | numeric-mod/2 (0x8d68df8) [ | ||
| 2893 | 110 | var_ref (0x8d68e58) [ i (0x8d68cb0) ] | ||
| 2894 | 111 | const_expr (0x8d68ec0) [ xs:integer [ xs:integer(2) ] ] | ||
| 2895 | 112 | ] | ||
| 2896 | 113 | const_expr (0x8d68f28) [ xs:integer [ xs:integer(0) ] ] | ||
| 2897 | 114 | ] | ||
| 2898 | 115 | THEN | ||
| 2899 | 116 | elem_expr (0x8d69150) [ | ||
| 2900 | 117 | copy nodes = 1 | ||
| 2901 | 118 | const_expr (0x8d68f90) [ xs:QName [ xs:QName(,,a) ] ] | ||
| 2902 | 119 | attr_expr (0x8d690f8) [ | ||
| 2903 | 120 | const_expr (0x8d68fe8) [ xs:QName [ xs:QName(,,id) ] ] | ||
| 2904 | 121 | = | ||
| 2905 | 122 | enclosed-expr/1 (0x8d69040) [ | ||
| 2906 | 123 | var_ref (0x8d690a0) [ i (0x8d68cb0) ] | ||
| 2907 | 124 | ] | ||
| 2908 | 125 | ] | ||
| 2909 | 126 | ] | ||
| 2910 | 127 | ELSE | ||
| 2911 | 128 | unhoist/1 (0x8d691b8) [ | ||
| 2912 | 129 | var_ref (0x8d69218) [ $$opt_temp_0 (0x8d69510) ] | ||
| 2913 | 130 | ] | ||
| 2914 | 131 | ] | ||
| 2915 | 132 | ] | ||
| 2916 | 133 | ] | ||
| 2917 | 134 | REL STEP attribute::match_expr [name_test(id)] | ||
| 2918 | 135 | ] | ||
| 2919 | 136 | ] | ||
| 2920 | 137 | ] | ||
| 2921 | 138 | WHERE | ||
| 2922 | 139 | boolean/1 (0x8d6fbf0) [ | ||
| 2923 | 140 | value-equal-string/2 (0x8d6fa10) [ | ||
| 2924 | 141 | unhoist/1 (0x8d67268) [ | ||
| 2925 | 142 | var_ref (0x8d67210) [ $$opt_temp_2 (0x8d67030) ] | ||
| 2926 | 143 | ] | ||
| 2927 | 144 | cast_expr xs:string? (0x8d6f9b8) [ | ||
| 2928 | 145 | data/1 (0x8d6f958) [ | ||
| 2929 | 146 | var_ref (0x8d6f900) [ j (0x8d6f360) ] | ||
| 2930 | 147 | ] | ||
| 2931 | 148 | ] | ||
| 2932 | 149 | ] | ||
| 2933 | 150 | ] | ||
| 2934 | 151 | RETURN | ||
| 2935 | 152 | var_ref (0x8d6fc50) [ i (0x8d6e7f8) ] | ||
| 2936 | 153 | ] | ||
| 2937 | 154 | CATCH | ||
| 2938 | 155 | const_expr (0x8d6ff10) [ xs:string [ xs:string(caught) ] ] | ||
| 2939 | 156 | ] | ||
| 2940 | 157 | ] | ||
| 2941 | 158 | |||
| 2942 | 159 | |||
| 2943 | 160 | :) | ||
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.