Merge lp:~zorba-coders/zorba/feature-profile into lp:zorba
- feature-profile
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Paul J. Lucas |
Approved revision: | 11732 |
Merged at revision: | 11703 |
Proposed branch: | lp:~zorba-coders/zorba/feature-profile |
Merge into: | lp:zorba |
Diff against target: |
10562 lines (+3051/-99) 168 files modified
bin/zorbacmd_args.cpp (+5/-0) include/zorba/properties.h (+19/-0) src/api/properties.cpp (+1/-0) src/api/xqueryimpl.cpp (+25/-21) src/api/xqueryimpl.h (+2/-0) src/functions/udf.h (+1/-0) src/runtime/accessors/pregenerated/accessors.cpp (+28/-0) src/runtime/accessors/pregenerated/accessors.h (+14/-0) src/runtime/any_uri/pregenerated/any_uri.cpp (+4/-0) src/runtime/any_uri/pregenerated/any_uri.h (+2/-0) src/runtime/api/plan_wrapper.cpp (+14/-1) src/runtime/api/plan_wrapper.h (+2/-0) src/runtime/base/binarybase.h (+1/-1) src/runtime/base/narybase.h (+1/-1) src/runtime/base/noarybase.h (+1/-1) src/runtime/base/plan_iterator.cpp (+12/-4) src/runtime/base/plan_iterator.h (+81/-5) src/runtime/base/unarybase.h (+7/-7) src/runtime/base64/pregenerated/base64.cpp (+8/-0) src/runtime/base64/pregenerated/base64.h (+4/-0) src/runtime/booleans/BooleanImpl.cpp (+15/-0) src/runtime/booleans/BooleanImpl.h (+12/-0) src/runtime/booleans/pregenerated/booleans.cpp (+12/-0) src/runtime/booleans/pregenerated/booleans.h (+6/-0) src/runtime/collections/pregenerated/collections.cpp (+136/-0) src/runtime/collections/pregenerated/collections.h (+68/-0) src/runtime/context/pregenerated/context.cpp (+20/-0) src/runtime/context/pregenerated/context.h (+10/-0) src/runtime/core/apply_updates.cpp (+1/-0) src/runtime/core/apply_updates.h (+2/-0) src/runtime/core/constructors.cpp (+9/-0) src/runtime/core/constructors.h (+18/-0) src/runtime/core/flwor_iterator.cpp (+5/-0) src/runtime/core/flwor_iterator.h (+2/-0) src/runtime/core/fncall_iterator.cpp (+52/-5) src/runtime/core/fncall_iterator.h (+4/-0) src/runtime/core/gflwor/count_iterator.cpp (+1/-0) src/runtime/core/gflwor/count_iterator.h (+2/-0) src/runtime/core/gflwor/for_iterator.cpp (+5/-0) src/runtime/core/gflwor/for_iterator.h (+2/-0) src/runtime/core/gflwor/groupby_iterator.cpp (+5/-0) src/runtime/core/gflwor/groupby_iterator.h (+2/-0) src/runtime/core/gflwor/let_iterator.cpp (+4/-0) src/runtime/core/gflwor/let_iterator.h (+2/-0) src/runtime/core/gflwor/orderby_iterator.cpp (+5/-0) src/runtime/core/gflwor/orderby_iterator.h (+2/-0) src/runtime/core/gflwor/outerfor_iterator.cpp (+1/-0) src/runtime/core/gflwor/outerfor_iterator.h (+2/-0) src/runtime/core/gflwor/tuplesource_iterator.cpp (+1/-0) src/runtime/core/gflwor/tuplestream_iterator.cpp (+1/-0) src/runtime/core/gflwor/tuplestream_iterator.h (+2/-0) src/runtime/core/gflwor/where_iterator.cpp (+1/-0) src/runtime/core/gflwor/window_iterator.cpp (+5/-0) src/runtime/core/gflwor/window_iterator.h (+2/-0) src/runtime/core/internal_operators.cpp (+2/-0) src/runtime/core/item_iterator.cpp (+3/-0) src/runtime/core/item_iterator.h (+4/-0) src/runtime/core/nodeid_iterators.cpp (+2/-0) src/runtime/core/nodeid_iterators.h (+4/-0) src/runtime/core/path_iterators.cpp (+16/-0) src/runtime/core/path_iterators.h (+32/-0) src/runtime/core/sequencetypes.cpp (+7/-0) src/runtime/core/sequencetypes.h (+10/-0) src/runtime/core/trycatch.cpp (+6/-0) src/runtime/core/trycatch.h (+2/-0) src/runtime/core/var_iterators.cpp (+6/-0) src/runtime/core/var_iterators.h (+12/-0) src/runtime/csv/pregenerated/csv.cpp (+8/-0) src/runtime/csv/pregenerated/csv.h (+4/-0) src/runtime/datetime/pregenerated/datetime.cpp (+36/-0) src/runtime/datetime/pregenerated/datetime.h (+18/-0) src/runtime/debug/pregenerated/debug_iterator.cpp (+4/-0) src/runtime/debug/pregenerated/debug_iterator.h (+2/-0) src/runtime/durations_dates_times/DurationsDatesTimesImpl.cpp (+3/-0) src/runtime/durations_dates_times/format_dateTime.cpp (+1/-0) src/runtime/durations_dates_times/format_dateTime.h (+2/-0) src/runtime/durations_dates_times/pregenerated/durations_dates_times.cpp (+84/-0) src/runtime/durations_dates_times/pregenerated/durations_dates_times.h (+42/-0) src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.cpp (+8/-0) src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.h (+4/-0) src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.cpp (+12/-0) src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.h (+6/-0) src/runtime/eval/eval.cpp (+1/-0) src/runtime/eval/eval.h (+2/-0) src/runtime/fetch/pregenerated/fetch.cpp (+12/-0) src/runtime/fetch/pregenerated/fetch.h (+6/-0) src/runtime/fnput/pregenerated/fnput.cpp (+4/-0) src/runtime/fnput/pregenerated/fnput.h (+2/-0) src/runtime/full_text/pregenerated/ft_module.cpp (+60/-0) src/runtime/full_text/pregenerated/ft_module.h (+30/-0) src/runtime/hof/dynamic_fncall_iterator.cpp (+2/-0) src/runtime/hof/dynamic_fncall_iterator.h (+4/-0) src/runtime/hof/function_item_iter.cpp (+1/-0) src/runtime/hof/function_item_iter.h (+2/-0) src/runtime/hof/pregenerated/fn_hof_functions.cpp (+20/-0) src/runtime/hof/pregenerated/fn_hof_functions.h (+10/-0) src/runtime/indexing/index_ddl.cpp (+10/-0) src/runtime/indexing/index_ddl.h (+20/-0) src/runtime/indexing/pregenerated/ic_ddl.cpp (+12/-0) src/runtime/indexing/pregenerated/ic_ddl.h (+6/-0) src/runtime/indexing/pregenerated/index_func.cpp (+4/-0) src/runtime/indexing/pregenerated/index_func.h (+2/-0) src/runtime/item/pregenerated/item.cpp (+4/-0) src/runtime/item/pregenerated/item.h (+2/-0) src/runtime/json/json_constructors.cpp (+3/-0) src/runtime/json/json_constructors.h (+9/-2) src/runtime/json/pregenerated/json.cpp (+8/-0) src/runtime/json/pregenerated/json.h (+4/-0) src/runtime/json/pregenerated/jsoniq_functions.cpp (+92/-0) src/runtime/json/pregenerated/jsoniq_functions.h (+46/-0) src/runtime/jsound/pregenerated/jsound.cpp (+8/-0) src/runtime/jsound/pregenerated/jsound.h (+4/-0) src/runtime/maths/pregenerated/maths.cpp (+104/-0) src/runtime/maths/pregenerated/maths.h (+52/-0) src/runtime/misc/materialize.cpp (+1/-0) src/runtime/misc/materialize.h (+2/-0) src/runtime/nodes/pregenerated/node_position.cpp (+96/-0) src/runtime/nodes/pregenerated/node_position.h (+48/-0) src/runtime/nodes/pregenerated/nodes.cpp (+76/-0) src/runtime/nodes/pregenerated/nodes.h (+38/-0) src/runtime/numerics/NumericsImpl.cpp (+54/-0) src/runtime/numerics/NumericsImpl.h (+8/-0) src/runtime/numerics/pregenerated/numerics.cpp (+28/-0) src/runtime/numerics/pregenerated/numerics.h (+14/-0) src/runtime/parsing_and_serializing/pregenerated/parse_fragment.cpp (+12/-0) src/runtime/parsing_and_serializing/pregenerated/parse_fragment.h (+6/-0) src/runtime/parsing_and_serializing/pregenerated/parsing_and_serializing.cpp (+8/-0) src/runtime/parsing_and_serializing/pregenerated/parsing_and_serializing.h (+4/-0) src/runtime/qnames/pregenerated/qnames.cpp (+32/-0) src/runtime/qnames/pregenerated/qnames.h (+16/-0) src/runtime/random/pregenerated/random.cpp (+12/-0) src/runtime/random/pregenerated/random.h (+6/-0) src/runtime/reference/pregenerated/reference.cpp (+16/-0) src/runtime/reference/pregenerated/reference.h (+8/-0) src/runtime/schema/pregenerated/schema.cpp (+16/-0) src/runtime/schema/pregenerated/schema.h (+8/-0) src/runtime/scripting/scripting.cpp (+5/-0) src/runtime/scripting/scripting.h (+10/-0) src/runtime/sctx/pregenerated/sctx.cpp (+104/-0) src/runtime/sctx/pregenerated/sctx.h (+52/-0) src/runtime/seq/pregenerated/seq.cpp (+12/-0) src/runtime/seq/pregenerated/seq.h (+6/-0) src/runtime/sequences/SequencesImpl.cpp (+1/-0) src/runtime/sequences/SequencesImpl.h (+2/-0) src/runtime/sequences/pregenerated/sequences.cpp (+140/-0) src/runtime/sequences/pregenerated/sequences.h (+70/-0) src/runtime/spec/iterator_cpp.xq (+20/-0) src/runtime/spec/iterator_h.xq (+10/-0) src/runtime/spec/printer_visitor_h.xq (+11/-4) src/runtime/store/pregenerated/documents.cpp (+20/-0) src/runtime/store/pregenerated/documents.h (+10/-0) src/runtime/store/pregenerated/maps.cpp (+36/-0) src/runtime/store/pregenerated/maps.h (+18/-0) src/runtime/strings/pregenerated/strings.cpp (+124/-0) src/runtime/strings/pregenerated/strings.h (+62/-0) src/runtime/update/update.cpp (+5/-0) src/runtime/update/update.h (+8/-0) src/runtime/uris/pregenerated/uris.cpp (+12/-0) src/runtime/uris/pregenerated/uris.h (+6/-0) src/runtime/visitors/iterprinter.cpp (+9/-9) src/runtime/visitors/iterprinter.h (+18/-12) src/runtime/visitors/pregenerated/printer_visitor.h (+7/-2) src/runtime/visitors/printer_visitor_api.cpp (+2/-3) src/runtime/visitors/printer_visitor_api.h (+10/-7) src/runtime/visitors/printer_visitor_impl.cpp (+38/-14) src/runtime/xqdoc/pregenerated/xqdoc.cpp (+4/-0) src/runtime/xqdoc/pregenerated/xqdoc.h (+2/-0) src/util/time_util.h (+173/-0) |
To merge this branch: | bzr merge lp:~zorba-coders/zorba/feature-profile |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matthias Brantner | Approve | ||
Paul J. Lucas | Approve | ||
Review via email: mp+208042@code.launchpad.net |
Commit message
Added a profiling feature.
Description of the change
Added a profiling feature.
- 11727. By Paul J. Lucas
-
Intermediate check-in.
- 11728. By Paul J. Lucas
-
Removed ProfileVisitor.
- 11729. By Paul J. Lucas
-
Cosmetic changes.
- 11730. By Paul J. Lucas
-
Intermediate check-in.
- 11731. By Paul J. Lucas
-
Merge from trunk.
- 11732. By Paul J. Lucas
-
Intermediate check-in.
Paul J. Lucas (paul-lucas) : | # |
Matthias Brantner (matthias-brantner) wrote : | # |
Paul J. Lucas (paul-lucas) wrote : | # |
> What about showing elapsed time which seems more useful if making calls to the
> outside world (e.g. http).
Do you mean in addition to CPU time? Or instead of CPU time?
If in addition to, then there are 2 Timer objects that have to be updated and checked making calls to produceNext() just a tiny bit slower.
Matthias Brantner (matthias-brantner) wrote : | # |
In addition. The timers would only be updated and checked if the query is in profile mode, right?
Paul J. Lucas (paul-lucas) wrote : | # |
> The timers would only be updated and checked if the query is in
> profile mode, right?
Yes.
- 11733. By Paul J. Lucas
-
Intedmediate check-in.
- 11734. By Paul J. Lucas
-
Now using char const *.
- 11735. By Paul J. Lucas
-
Merge from trunk.
Matthias Brantner (matthias-brantner) wrote : | # |
./bin/zorba -h
Error: No value given for "--debug-host" option
Use -h for help.
- 11736. By Paul J. Lucas
-
Merge from trunk.
Paul J. Lucas (paul-lucas) wrote : | # |
The "Needs Fixing" was fixed on the pjl-misc branch.
- 11737. By Paul J. Lucas
-
Merge from trunk.
Matthias Brantner (matthias-brantner) : | # |
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for the following merge proposals:
https:/
Progress dashboard at http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue succeeded - proposal merged!
Preview Diff
1 | === modified file 'bin/zorbacmd_args.cpp' | |||
2 | --- bin/zorbacmd_args.cpp 2014-03-01 15:34:04 +0000 | |||
3 | +++ bin/zorbacmd_args.cpp 2014-03-04 03:22:54 +0000 | |||
4 | @@ -261,6 +261,9 @@ | |||
5 | 261 | HELP_OPT( "--print-translated" ) | 261 | HELP_OPT( "--print-translated" ) |
6 | 262 | "Print the normalized expression tree.\n\n" | 262 | "Print the normalized expression tree.\n\n" |
7 | 263 | 263 | ||
8 | 264 | HELP_OPT( "--profile" ) | ||
9 | 265 | "Enable profiling.\n\n" | ||
10 | 266 | |||
11 | 264 | ////////// q ////////////////////////////////////////////////////////////// | 267 | ////////// q ////////////////////////////////////////////////////////////// |
12 | 265 | 268 | ||
13 | 266 | HELP_OPT( "--query, -q" ) | 269 | HELP_OPT( "--query, -q" ) |
14 | @@ -685,6 +688,8 @@ | |||
15 | 685 | z_props.setPrintStaticTypes( true ); | 688 | z_props.setPrintStaticTypes( true ); |
16 | 686 | else if ( IS_LONG_OPT( "--print-translated" ) ) | 689 | else if ( IS_LONG_OPT( "--print-translated" ) ) |
17 | 687 | z_props.setPrintTranslated( true ); | 690 | z_props.setPrintTranslated( true ); |
18 | 691 | else if ( IS_LONG_OPT( "--profile" ) ) | ||
19 | 692 | z_props.setProfile( true ); | ||
20 | 688 | 693 | ||
21 | 689 | ////////// q ////////////////////////////////////////////////////////////// | 694 | ////////// q ////////////////////////////////////////////////////////////// |
22 | 690 | 695 | ||
23 | 691 | 696 | ||
24 | === modified file 'include/zorba/properties.h' | |||
25 | --- include/zorba/properties.h 2014-02-19 00:43:31 +0000 | |||
26 | +++ include/zorba/properties.h 2014-03-04 03:22:54 +0000 | |||
27 | @@ -288,6 +288,24 @@ | |||
28 | 288 | print_translated_ = b; | 288 | print_translated_ = b; |
29 | 289 | } | 289 | } |
30 | 290 | 290 | ||
31 | 291 | /** | ||
32 | 292 | * Gets whether profiling has been enabled. | ||
33 | 293 | * | ||
34 | 294 | * @return Returns whether profiling has been enabled. | ||
35 | 295 | */ | ||
36 | 296 | bool getProfile() const { | ||
37 | 297 | return profile_; | ||
38 | 298 | } | ||
39 | 299 | |||
40 | 300 | /** | ||
41 | 301 | * Enables or disables profiling. | ||
42 | 302 | * | ||
43 | 303 | * @param profile If \c true, profiling is enabled. | ||
44 | 304 | */ | ||
45 | 305 | void setProfile( bool profile ) { | ||
46 | 306 | profile_ = profile; | ||
47 | 307 | } | ||
48 | 308 | |||
49 | 291 | bool getStableIteratorIDs() const { | 309 | bool getStableIteratorIDs() const { |
50 | 292 | return stable_iterator_ids_; | 310 | return stable_iterator_ids_; |
51 | 293 | } | 311 | } |
52 | @@ -375,6 +393,7 @@ | |||
53 | 375 | bool print_optimized_; | 393 | bool print_optimized_; |
54 | 376 | bool print_static_types_; | 394 | bool print_static_types_; |
55 | 377 | bool print_translated_; | 395 | bool print_translated_; |
56 | 396 | bool profile_; | ||
57 | 378 | bool stable_iterator_ids_; | 397 | bool stable_iterator_ids_; |
58 | 379 | bool trace_codegen_; | 398 | bool trace_codegen_; |
59 | 380 | #ifndef ZORBA_NO_FULL_TEXT | 399 | #ifndef ZORBA_NO_FULL_TEXT |
60 | 381 | 400 | ||
61 | === modified file 'src/api/properties.cpp' | |||
62 | --- src/api/properties.cpp 2014-02-19 00:43:31 +0000 | |||
63 | +++ src/api/properties.cpp 2014-03-04 03:22:54 +0000 | |||
64 | @@ -55,6 +55,7 @@ | |||
65 | 55 | print_optimized_ = false; | 55 | print_optimized_ = false; |
66 | 56 | print_static_types_ = true; | 56 | print_static_types_ = true; |
67 | 57 | print_translated_ = false; | 57 | print_translated_ = false; |
68 | 58 | profile_ = false; | ||
69 | 58 | stable_iterator_ids_ = false; | 59 | stable_iterator_ids_ = false; |
70 | 59 | trace_codegen_ = false; | 60 | trace_codegen_ = false; |
71 | 60 | #ifndef ZORBA_NO_FULL_TEXT | 61 | #ifndef ZORBA_NO_FULL_TEXT |
72 | 61 | 62 | ||
73 | === modified file 'src/api/xqueryimpl.cpp' | |||
74 | --- src/api/xqueryimpl.cpp 2014-02-19 00:43:31 +0000 | |||
75 | +++ src/api/xqueryimpl.cpp 2014-03-04 03:22:54 +0000 | |||
76 | @@ -22,17 +22,18 @@ | |||
77 | 22 | #include <algorithm> | 22 | #include <algorithm> |
78 | 23 | #include "zorbatypes/schema_types.h" | 23 | #include "zorbatypes/schema_types.h" |
79 | 24 | 24 | ||
80 | 25 | #include <zorba/audit_scoped.h> | ||
81 | 25 | #include <zorba/diagnostic_handler.h> | 26 | #include <zorba/diagnostic_handler.h> |
82 | 27 | #include <zorba/diagnostic_list.h> | ||
83 | 26 | #include <zorba/error.h> | 28 | #include <zorba/error.h> |
85 | 27 | #include <zorba/diagnostic_list.h> | 29 | #include <zorba/internal/unique_ptr.h> |
86 | 30 | #include <zorba/module_info.h> | ||
87 | 31 | #include <zorba/properties.h> | ||
88 | 28 | #include <zorba/sax2.h> | 32 | #include <zorba/sax2.h> |
89 | 29 | #include <zorba/audit_scoped.h> | ||
90 | 30 | #include <zorba/module_info.h> | ||
91 | 31 | #include <zorba/internal/unique_ptr.h> | ||
92 | 32 | 33 | ||
93 | 33 | #include <zorbatypes/URI.h> | ||
94 | 34 | 34 | ||
95 | 35 | #include "diagnostics/xquery_diagnostics.h" | 35 | #include "diagnostics/xquery_diagnostics.h" |
96 | 36 | #include "zorbatypes/URI.h" | ||
97 | 36 | #include "zorbatypes/zstring.h" | 37 | #include "zorbatypes/zstring.h" |
98 | 37 | #include "zorbautils/lock.h" | 38 | #include "zorbautils/lock.h" |
99 | 38 | 39 | ||
100 | @@ -716,6 +717,17 @@ | |||
101 | 716 | 717 | ||
102 | 717 | /******************************************************************************* | 718 | /******************************************************************************* |
103 | 718 | 719 | ||
104 | 720 | ******************************************************************************/ | ||
105 | 721 | |||
106 | 722 | void XQueryImpl::dispose( PlanWrapper_t const &plan ) { | ||
107 | 723 | theExecuting = false; | ||
108 | 724 | if ( Properties::instance().getProfile() ) | ||
109 | 725 | plan->profile(); | ||
110 | 726 | plan->close(); | ||
111 | 727 | } | ||
112 | 728 | |||
113 | 729 | /******************************************************************************* | ||
114 | 730 | |||
115 | 719 | ********************************************************************************/ | 731 | ********************************************************************************/ |
116 | 720 | StaticCollectionManager* | 732 | StaticCollectionManager* |
117 | 721 | XQueryImpl::getStaticCollectionManager() const | 733 | XQueryImpl::getStaticCollectionManager() const |
118 | @@ -1084,13 +1096,11 @@ | |||
119 | 1084 | } | 1096 | } |
120 | 1085 | catch (...) | 1097 | catch (...) |
121 | 1086 | { | 1098 | { |
124 | 1087 | lPlan->close(); | 1099 | dispose( lPlan ); |
123 | 1088 | theExecuting = false; | ||
125 | 1089 | throw; | 1100 | throw; |
126 | 1090 | } | 1101 | } |
127 | 1091 | 1102 | ||
130 | 1092 | lPlan->close(); | 1103 | dispose( lPlan ); |
129 | 1093 | theExecuting = false; | ||
131 | 1094 | 1104 | ||
132 | 1095 | theDocLoadingUserTime = theDynamicContext->theDocLoadingUserTime; | 1105 | theDocLoadingUserTime = theDynamicContext->theDocLoadingUserTime; |
133 | 1096 | theDocLoadingTime = theDynamicContext->theDocLoadingTime; | 1106 | theDocLoadingTime = theDynamicContext->theDocLoadingTime; |
134 | @@ -1128,13 +1138,11 @@ | |||
135 | 1128 | } | 1138 | } |
136 | 1129 | catch (...) | 1139 | catch (...) |
137 | 1130 | { | 1140 | { |
140 | 1131 | lPlan->close(); | 1141 | dispose( lPlan ); |
139 | 1132 | theExecuting = false; | ||
141 | 1133 | throw; | 1142 | throw; |
142 | 1134 | } | 1143 | } |
143 | 1135 | 1144 | ||
146 | 1136 | lPlan->close(); | 1145 | dispose( lPlan ); |
145 | 1137 | theExecuting = false; | ||
147 | 1138 | 1146 | ||
148 | 1139 | theDocLoadingUserTime = theDynamicContext->theDocLoadingUserTime; | 1147 | theDocLoadingUserTime = theDynamicContext->theDocLoadingUserTime; |
149 | 1140 | theDocLoadingTime = theDynamicContext->theDocLoadingTime; | 1148 | theDocLoadingTime = theDynamicContext->theDocLoadingTime; |
150 | @@ -1174,13 +1182,11 @@ | |||
151 | 1174 | } | 1182 | } |
152 | 1175 | catch (...) | 1183 | catch (...) |
153 | 1176 | { | 1184 | { |
156 | 1177 | lPlan->close(); | 1185 | dispose( lPlan ); |
155 | 1178 | theExecuting = false; | ||
157 | 1179 | throw; | 1186 | throw; |
158 | 1180 | } | 1187 | } |
159 | 1181 | 1188 | ||
162 | 1182 | lPlan->close(); | 1189 | dispose( lPlan ); |
161 | 1183 | theExecuting = false; | ||
163 | 1184 | 1190 | ||
164 | 1185 | theDocLoadingUserTime = theDynamicContext->theDocLoadingUserTime; | 1191 | theDocLoadingUserTime = theDynamicContext->theDocLoadingUserTime; |
165 | 1186 | theDocLoadingTime = theDynamicContext->theDocLoadingTime; | 1192 | theDocLoadingTime = theDynamicContext->theDocLoadingTime; |
166 | @@ -1223,13 +1229,11 @@ | |||
167 | 1223 | } | 1229 | } |
168 | 1224 | catch (...) | 1230 | catch (...) |
169 | 1225 | { | 1231 | { |
172 | 1226 | lPlan->close(); | 1232 | dispose( lPlan ); |
171 | 1227 | theExecuting = false; | ||
173 | 1228 | throw; | 1233 | throw; |
174 | 1229 | } | 1234 | } |
175 | 1230 | 1235 | ||
178 | 1231 | lPlan->close(); | 1236 | dispose( lPlan ); |
177 | 1232 | theExecuting = false; | ||
179 | 1233 | 1237 | ||
180 | 1234 | theDocLoadingUserTime = theDynamicContext->theDocLoadingUserTime; | 1238 | theDocLoadingUserTime = theDynamicContext->theDocLoadingUserTime; |
181 | 1235 | theDocLoadingTime = theDynamicContext->theDocLoadingTime; | 1239 | theDocLoadingTime = theDynamicContext->theDocLoadingTime; |
182 | 1236 | 1240 | ||
183 | === modified file 'src/api/xqueryimpl.h' | |||
184 | --- src/api/xqueryimpl.h 2014-02-18 19:52:39 +0000 | |||
185 | +++ src/api/xqueryimpl.h 2014-03-04 03:22:54 +0000 | |||
186 | @@ -370,6 +370,8 @@ | |||
187 | 370 | void* aHandlerData, | 370 | void* aHandlerData, |
188 | 371 | const Zorba_SerializerOptions_t* = NULL); | 371 | const Zorba_SerializerOptions_t* = NULL); |
189 | 372 | 372 | ||
190 | 373 | void dispose( PlanWrapper_t const& ); | ||
191 | 374 | |||
192 | 373 | void removeResultIterator(const ResultIteratorImpl* iter); | 375 | void removeResultIterator(const ResultIteratorImpl* iter); |
193 | 374 | 376 | ||
194 | 375 | void checkNotClosed() const; | 377 | void checkNotClosed() const; |
195 | 376 | 378 | ||
196 | === modified file 'src/functions/udf.h' | |||
197 | --- src/functions/udf.h 2013-04-24 01:35:58 +0000 | |||
198 | +++ src/functions/udf.h 2014-03-04 03:22:54 +0000 | |||
199 | @@ -202,6 +202,7 @@ | |||
200 | 202 | void optimize(); | 202 | void optimize(); |
201 | 203 | 203 | ||
202 | 204 | PlanIter_t getPlan(uint32_t& planStateSize, ulong nextVarId); | 204 | PlanIter_t getPlan(uint32_t& planStateSize, ulong nextVarId); |
203 | 205 | PlanIter_t const& getPlan() const { return thePlan; } | ||
204 | 205 | 206 | ||
205 | 206 | void invalidatePlan(); | 207 | void invalidatePlan(); |
206 | 207 | 208 | ||
207 | 208 | 209 | ||
208 | === modified file 'src/runtime/accessors/pregenerated/accessors.cpp' | |||
209 | --- src/runtime/accessors/pregenerated/accessors.cpp 2014-01-31 01:39:38 +0000 | |||
210 | +++ src/runtime/accessors/pregenerated/accessors.cpp 2014-03-04 03:22:54 +0000 | |||
211 | @@ -59,6 +59,10 @@ | |||
212 | 59 | 59 | ||
213 | 60 | NodeNameIterator::~NodeNameIterator() {} | 60 | NodeNameIterator::~NodeNameIterator() {} |
214 | 61 | 61 | ||
215 | 62 | |||
216 | 63 | zstring NodeNameIterator::getNameAsString() const { | ||
217 | 64 | return "fn:node-name"; | ||
218 | 65 | } | ||
219 | 62 | // </NodeNameIterator> | 66 | // </NodeNameIterator> |
220 | 63 | 67 | ||
221 | 64 | 68 | ||
222 | @@ -87,6 +91,10 @@ | |||
223 | 87 | 91 | ||
224 | 88 | NilledIterator::~NilledIterator() {} | 92 | NilledIterator::~NilledIterator() {} |
225 | 89 | 93 | ||
226 | 94 | |||
227 | 95 | zstring NilledIterator::getNameAsString() const { | ||
228 | 96 | return "fn:nilled"; | ||
229 | 97 | } | ||
230 | 90 | // </NilledIterator> | 98 | // </NilledIterator> |
231 | 91 | 99 | ||
232 | 92 | 100 | ||
233 | @@ -131,6 +139,10 @@ | |||
234 | 131 | PlanIteratorState::reset(planState); | 139 | PlanIteratorState::reset(planState); |
235 | 132 | hasOutput = false; | 140 | hasOutput = false; |
236 | 133 | } | 141 | } |
237 | 142 | |||
238 | 143 | zstring FnStringIterator::getNameAsString() const { | ||
239 | 144 | return "fn:string"; | ||
240 | 145 | } | ||
241 | 134 | // </FnStringIterator> | 146 | // </FnStringIterator> |
242 | 135 | 147 | ||
243 | 136 | 148 | ||
244 | @@ -173,6 +185,10 @@ | |||
245 | 173 | PlanIteratorState::reset(planState); | 185 | PlanIteratorState::reset(planState); |
246 | 174 | theTypedValueIter = NULL; | 186 | theTypedValueIter = NULL; |
247 | 175 | } | 187 | } |
248 | 188 | |||
249 | 189 | zstring FnDataIterator::getNameAsString() const { | ||
250 | 190 | return "fn:data"; | ||
251 | 191 | } | ||
252 | 176 | // </FnDataIterator> | 192 | // </FnDataIterator> |
253 | 177 | 193 | ||
254 | 178 | 194 | ||
255 | @@ -201,6 +217,10 @@ | |||
256 | 201 | 217 | ||
257 | 202 | BaseUriIterator::~BaseUriIterator() {} | 218 | BaseUriIterator::~BaseUriIterator() {} |
258 | 203 | 219 | ||
259 | 220 | |||
260 | 221 | zstring BaseUriIterator::getNameAsString() const { | ||
261 | 222 | return "fn:base-uri"; | ||
262 | 223 | } | ||
263 | 204 | // </BaseUriIterator> | 224 | // </BaseUriIterator> |
264 | 205 | 225 | ||
265 | 206 | 226 | ||
266 | @@ -229,6 +249,10 @@ | |||
267 | 229 | 249 | ||
268 | 230 | DocumentUriIterator::~DocumentUriIterator() {} | 250 | DocumentUriIterator::~DocumentUriIterator() {} |
269 | 231 | 251 | ||
270 | 252 | |||
271 | 253 | zstring DocumentUriIterator::getNameAsString() const { | ||
272 | 254 | return "fn:document-uri"; | ||
273 | 255 | } | ||
274 | 232 | // </DocumentUriIterator> | 256 | // </DocumentUriIterator> |
275 | 233 | 257 | ||
276 | 234 | 258 | ||
277 | @@ -257,6 +281,10 @@ | |||
278 | 257 | 281 | ||
279 | 258 | RootIterator::~RootIterator() {} | 282 | RootIterator::~RootIterator() {} |
280 | 259 | 283 | ||
281 | 284 | |||
282 | 285 | zstring RootIterator::getNameAsString() const { | ||
283 | 286 | return "fn:root"; | ||
284 | 287 | } | ||
285 | 260 | // </RootIterator> | 288 | // </RootIterator> |
286 | 261 | 289 | ||
287 | 262 | 290 | ||
288 | 263 | 291 | ||
289 | === modified file 'src/runtime/accessors/pregenerated/accessors.h' | |||
290 | --- src/runtime/accessors/pregenerated/accessors.h 2014-01-31 01:39:38 +0000 | |||
291 | +++ src/runtime/accessors/pregenerated/accessors.h 2014-03-04 03:22:54 +0000 | |||
292 | @@ -58,6 +58,8 @@ | |||
293 | 58 | 58 | ||
294 | 59 | virtual ~NodeNameIterator(); | 59 | virtual ~NodeNameIterator(); |
295 | 60 | 60 | ||
296 | 61 | zstring getNameAsString() const; | ||
297 | 62 | |||
298 | 61 | void accept(PlanIterVisitor& v) const; | 63 | void accept(PlanIterVisitor& v) const; |
299 | 62 | 64 | ||
300 | 63 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 65 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
301 | @@ -88,6 +90,8 @@ | |||
302 | 88 | 90 | ||
303 | 89 | virtual ~NilledIterator(); | 91 | virtual ~NilledIterator(); |
304 | 90 | 92 | ||
305 | 93 | zstring getNameAsString() const; | ||
306 | 94 | |||
307 | 91 | void accept(PlanIterVisitor& v) const; | 95 | void accept(PlanIterVisitor& v) const; |
308 | 92 | 96 | ||
309 | 93 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 97 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
310 | @@ -137,6 +141,8 @@ | |||
311 | 137 | 141 | ||
312 | 138 | bool isUpdating() const { return theEmptyStringOnNULL; } | 142 | bool isUpdating() const { return theEmptyStringOnNULL; } |
313 | 139 | 143 | ||
314 | 144 | zstring getNameAsString() const; | ||
315 | 145 | |||
316 | 140 | void accept(PlanIterVisitor& v) const; | 146 | void accept(PlanIterVisitor& v) const; |
317 | 141 | 147 | ||
318 | 142 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 148 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
319 | @@ -180,6 +186,8 @@ | |||
320 | 180 | 186 | ||
321 | 181 | virtual ~FnDataIterator(); | 187 | virtual ~FnDataIterator(); |
322 | 182 | 188 | ||
323 | 189 | zstring getNameAsString() const; | ||
324 | 190 | |||
325 | 183 | void accept(PlanIterVisitor& v) const; | 191 | void accept(PlanIterVisitor& v) const; |
326 | 184 | 192 | ||
327 | 185 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 193 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
328 | @@ -210,6 +218,8 @@ | |||
329 | 210 | 218 | ||
330 | 211 | virtual ~BaseUriIterator(); | 219 | virtual ~BaseUriIterator(); |
331 | 212 | 220 | ||
332 | 221 | zstring getNameAsString() const; | ||
333 | 222 | |||
334 | 213 | void accept(PlanIterVisitor& v) const; | 223 | void accept(PlanIterVisitor& v) const; |
335 | 214 | 224 | ||
336 | 215 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 225 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
337 | @@ -240,6 +250,8 @@ | |||
338 | 240 | 250 | ||
339 | 241 | virtual ~DocumentUriIterator(); | 251 | virtual ~DocumentUriIterator(); |
340 | 242 | 252 | ||
341 | 253 | zstring getNameAsString() const; | ||
342 | 254 | |||
343 | 243 | void accept(PlanIterVisitor& v) const; | 255 | void accept(PlanIterVisitor& v) const; |
344 | 244 | 256 | ||
345 | 245 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 257 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
346 | @@ -270,6 +282,8 @@ | |||
347 | 270 | 282 | ||
348 | 271 | virtual ~RootIterator(); | 283 | virtual ~RootIterator(); |
349 | 272 | 284 | ||
350 | 285 | zstring getNameAsString() const; | ||
351 | 286 | |||
352 | 273 | void accept(PlanIterVisitor& v) const; | 287 | void accept(PlanIterVisitor& v) const; |
353 | 274 | 288 | ||
354 | 275 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 289 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
355 | 276 | 290 | ||
356 | === modified file 'src/runtime/any_uri/pregenerated/any_uri.cpp' | |||
357 | --- src/runtime/any_uri/pregenerated/any_uri.cpp 2014-01-31 01:39:38 +0000 | |||
358 | +++ src/runtime/any_uri/pregenerated/any_uri.cpp 2014-03-04 03:22:54 +0000 | |||
359 | @@ -58,6 +58,10 @@ | |||
360 | 58 | 58 | ||
361 | 59 | ResolveUriIterator::~ResolveUriIterator() {} | 59 | ResolveUriIterator::~ResolveUriIterator() {} |
362 | 60 | 60 | ||
363 | 61 | |||
364 | 62 | zstring ResolveUriIterator::getNameAsString() const { | ||
365 | 63 | return "fn:resolve-uri"; | ||
366 | 64 | } | ||
367 | 61 | // </ResolveUriIterator> | 65 | // </ResolveUriIterator> |
368 | 62 | 66 | ||
369 | 63 | 67 | ||
370 | 64 | 68 | ||
371 | === modified file 'src/runtime/any_uri/pregenerated/any_uri.h' | |||
372 | --- src/runtime/any_uri/pregenerated/any_uri.h 2014-01-31 01:39:38 +0000 | |||
373 | +++ src/runtime/any_uri/pregenerated/any_uri.h 2014-03-04 03:22:54 +0000 | |||
374 | @@ -58,6 +58,8 @@ | |||
375 | 58 | 58 | ||
376 | 59 | virtual ~ResolveUriIterator(); | 59 | virtual ~ResolveUriIterator(); |
377 | 60 | 60 | ||
378 | 61 | zstring getNameAsString() const; | ||
379 | 62 | |||
380 | 61 | void accept(PlanIterVisitor& v) const; | 63 | void accept(PlanIterVisitor& v) const; |
381 | 62 | 64 | ||
382 | 63 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 65 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
383 | 64 | 66 | ||
384 | === modified file 'src/runtime/api/plan_wrapper.cpp' | |||
385 | --- src/runtime/api/plan_wrapper.cpp 2014-02-10 00:44:55 +0000 | |||
386 | +++ src/runtime/api/plan_wrapper.cpp 2014-03-04 03:22:54 +0000 | |||
387 | @@ -15,6 +15,8 @@ | |||
388 | 15 | */ | 15 | */ |
389 | 16 | #include "stdafx.h" | 16 | #include "stdafx.h" |
390 | 17 | 17 | ||
391 | 18 | #include <zorba/properties.h> | ||
392 | 19 | |||
393 | 18 | #include "context/static_context.h" | 20 | #include "context/static_context.h" |
394 | 19 | #include "context/dynamic_context.h" | 21 | #include "context/dynamic_context.h" |
395 | 20 | 22 | ||
396 | @@ -23,8 +25,10 @@ | |||
397 | 23 | #include "runtime/api/plan_wrapper.h" | 25 | #include "runtime/api/plan_wrapper.h" |
398 | 24 | #include "runtime/base/plan_iterator.h" | 26 | #include "runtime/base/plan_iterator.h" |
399 | 25 | #include "runtime/util/timeout.h" | 27 | #include "runtime/util/timeout.h" |
401 | 26 | #include <zorba/properties.h> | 28 | #include "runtime/visitors/iterprinter.h" |
402 | 29 | #include "runtime/visitors/printer_visitor_api.h" | ||
403 | 27 | 30 | ||
404 | 31 | using namespace std; | ||
405 | 28 | 32 | ||
406 | 29 | namespace zorba { | 33 | namespace zorba { |
407 | 30 | 34 | ||
408 | @@ -205,6 +209,15 @@ | |||
409 | 205 | } | 209 | } |
410 | 206 | 210 | ||
411 | 207 | 211 | ||
412 | 212 | /****************************************************************************** | ||
413 | 213 | |||
414 | 214 | ******************************************************************************/ | ||
415 | 215 | |||
416 | 216 | void PlanWrapper::profile() const { | ||
417 | 217 | XMLIterPrinter p( Properties::instance().getDebugStream() ); | ||
418 | 218 | print_iter_plan( p, theIterator, thePlanState ); | ||
419 | 219 | } | ||
420 | 220 | |||
421 | 208 | /******************************************************************************* | 221 | /******************************************************************************* |
422 | 209 | 222 | ||
423 | 210 | ********************************************************************************/ | 223 | ********************************************************************************/ |
424 | 211 | 224 | ||
425 | === modified file 'src/runtime/api/plan_wrapper.h' | |||
426 | --- src/runtime/api/plan_wrapper.h 2013-07-25 14:09:47 +0000 | |||
427 | +++ src/runtime/api/plan_wrapper.h 2014-03-04 03:22:54 +0000 | |||
428 | @@ -107,6 +107,8 @@ | |||
429 | 107 | 107 | ||
430 | 108 | dynamic_context* dctx() { return theDynamicContext; } | 108 | dynamic_context* dctx() { return theDynamicContext; } |
431 | 109 | 109 | ||
432 | 110 | void profile() const; | ||
433 | 111 | |||
434 | 110 | #ifndef NDEBUG | 112 | #ifndef NDEBUG |
435 | 111 | virtual std::string toString() const; | 113 | virtual std::string toString() const; |
436 | 112 | #endif | 114 | #endif |
437 | 113 | 115 | ||
438 | === modified file 'src/runtime/base/binarybase.h' | |||
439 | --- src/runtime/base/binarybase.h 2013-05-28 18:20:54 +0000 | |||
440 | +++ src/runtime/base/binarybase.h 2014-03-04 03:22:54 +0000 | |||
441 | @@ -189,7 +189,7 @@ | |||
442 | 189 | { } \ | 189 | { } \ |
443 | 190 | \ | 190 | \ |
444 | 191 | void accept(PlanIterVisitor& v) const; \ | 191 | void accept(PlanIterVisitor& v) const; \ |
446 | 192 | \ | 192 | zstring getNameAsString() const; \ |
447 | 193 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; \ | 193 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; \ |
448 | 194 | }; | 194 | }; |
449 | 195 | 195 | ||
450 | 196 | 196 | ||
451 | === modified file 'src/runtime/base/narybase.h' | |||
452 | --- src/runtime/base/narybase.h 2013-05-28 18:20:54 +0000 | |||
453 | +++ src/runtime/base/narybase.h 2014-03-04 03:22:54 +0000 | |||
454 | @@ -213,7 +213,7 @@ | |||
455 | 213 | { } \ | 213 | { } \ |
456 | 214 | \ | 214 | \ |
457 | 215 | void accept(PlanIterVisitor& v) const; \ | 215 | void accept(PlanIterVisitor& v) const; \ |
459 | 216 | \ | 216 | zstring getNameAsString() const; \ |
460 | 217 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; \ | 217 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; \ |
461 | 218 | }; | 218 | }; |
462 | 219 | 219 | ||
463 | 220 | 220 | ||
464 | === modified file 'src/runtime/base/noarybase.h' | |||
465 | --- src/runtime/base/noarybase.h 2013-05-28 18:20:54 +0000 | |||
466 | +++ src/runtime/base/noarybase.h 2014-03-04 03:22:54 +0000 | |||
467 | @@ -142,7 +142,7 @@ | |||
468 | 142 | { } \ | 142 | { } \ |
469 | 143 | \ | 143 | \ |
470 | 144 | void accept(PlanIterVisitor& v) const; \ | 144 | void accept(PlanIterVisitor& v) const; \ |
472 | 145 | \ | 145 | zstring getNameAsString() const; \ |
473 | 146 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; \ | 146 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; \ |
474 | 147 | }; | 147 | }; |
475 | 148 | 148 | ||
476 | 149 | 149 | ||
477 | === modified file 'src/runtime/base/plan_iterator.cpp' | |||
478 | --- src/runtime/base/plan_iterator.cpp 2014-02-10 00:44:55 +0000 | |||
479 | +++ src/runtime/base/plan_iterator.cpp 2014-03-04 03:22:54 +0000 | |||
480 | @@ -15,6 +15,10 @@ | |||
481 | 15 | */ | 15 | */ |
482 | 16 | #include "stdafx.h" | 16 | #include "stdafx.h" |
483 | 17 | 17 | ||
484 | 18 | #include <typeinfo> | ||
485 | 19 | |||
486 | 20 | #include <zorba/properties.h> | ||
487 | 21 | |||
488 | 18 | #include "compiler/api/compilercb.h" | 22 | #include "compiler/api/compilercb.h" |
489 | 19 | 23 | ||
490 | 20 | #include "context/static_context.h" | 24 | #include "context/static_context.h" |
491 | @@ -31,9 +35,6 @@ | |||
492 | 31 | 35 | ||
493 | 32 | #include "diagnostics/util_macros.h" | 36 | #include "diagnostics/util_macros.h" |
494 | 33 | 37 | ||
495 | 34 | #ifndef NDEBUG | ||
496 | 35 | #include <zorba/properties.h> | ||
497 | 36 | #endif | ||
498 | 37 | 38 | ||
499 | 38 | namespace zorba | 39 | namespace zorba |
500 | 39 | { | 40 | { |
501 | @@ -70,7 +71,8 @@ | |||
502 | 70 | theQuery(0), | 71 | theQuery(0), |
503 | 71 | theGlobalDynCtx(globalDctx), | 72 | theGlobalDynCtx(globalDctx), |
504 | 72 | theLocalDynCtx(localDctx), | 73 | theLocalDynCtx(localDctx), |
506 | 73 | theHasToQuit(false) | 74 | theHasToQuit(false), |
507 | 75 | profile_( Properties::instance().getProfile() ) | ||
508 | 74 | { | 76 | { |
509 | 75 | assert(globalDctx != NULL && localDctx != NULL); | 77 | assert(globalDctx != NULL && localDctx != NULL); |
510 | 76 | theBlock = new int8_t[theBlockSize]; | 78 | theBlock = new int8_t[theBlockSize]; |
511 | @@ -132,9 +134,15 @@ | |||
512 | 132 | { | 134 | { |
513 | 133 | } | 135 | } |
514 | 134 | 136 | ||
515 | 137 | PlanIterator::~PlanIterator() { | ||
516 | 138 | // out-of-line since it's virtual | ||
517 | 139 | } | ||
518 | 135 | 140 | ||
519 | 136 | SERIALIZE_INTERNAL_METHOD(PlanIterator) | 141 | SERIALIZE_INTERNAL_METHOD(PlanIterator) |
520 | 137 | 142 | ||
521 | 143 | zstring PlanIterator::getNameAsString() const { | ||
522 | 144 | return typeid( *this ).name(); // default name (should be overridden) | ||
523 | 145 | } | ||
524 | 138 | 146 | ||
525 | 139 | void PlanIterator::serialize(::zorba::serialization::Archiver& ar) | 147 | void PlanIterator::serialize(::zorba::serialization::Archiver& ar) |
526 | 140 | { | 148 | { |
527 | 141 | 149 | ||
528 | === modified file 'src/runtime/base/plan_iterator.h' | |||
529 | --- src/runtime/base/plan_iterator.h 2014-01-31 01:39:38 +0000 | |||
530 | +++ src/runtime/base/plan_iterator.h 2014-03-04 03:22:54 +0000 | |||
531 | @@ -27,6 +27,7 @@ | |||
532 | 27 | 27 | ||
533 | 28 | #include "compiler/parser/query_loc.h" | 28 | #include "compiler/parser/query_loc.h" |
534 | 29 | 29 | ||
535 | 30 | #include "util/time_util.h" | ||
536 | 30 | #include "zorbaserialization/class_serializer.h" | 31 | #include "zorbaserialization/class_serializer.h" |
537 | 31 | #include "zorbaserialization/serialize_template_types.h" | 32 | #include "zorbaserialization/serialize_template_types.h" |
538 | 32 | #include "zorbaserialization/serialize_zorba_types.h" | 33 | #include "zorbaserialization/serialize_zorba_types.h" |
539 | @@ -138,6 +139,8 @@ | |||
540 | 138 | 139 | ||
541 | 139 | bool theHasToQuit; | 140 | bool theHasToQuit; |
542 | 140 | 141 | ||
543 | 142 | bool const profile_; // cache Properties::getProfile() | ||
544 | 143 | |||
545 | 141 | public: | 144 | public: |
546 | 142 | PlanState( | 145 | PlanState( |
547 | 143 | dynamic_context* globalDctx, | 146 | dynamic_context* globalDctx, |
548 | @@ -153,6 +156,48 @@ | |||
549 | 153 | 156 | ||
550 | 154 | 157 | ||
551 | 155 | /******************************************************************************* | 158 | /******************************************************************************* |
552 | 159 | |||
553 | 160 | ******************************************************************************/ | ||
554 | 161 | |||
555 | 162 | /** | ||
556 | 163 | * Contains all profiling data for an iterator. | ||
557 | 164 | * | ||
558 | 165 | * An init() member function is used rather than a constructor so | ||
559 | 166 | * initialization is done only when profileing is enabled. | ||
560 | 167 | */ | ||
561 | 168 | struct profile_data { | ||
562 | 169 | /** | ||
563 | 170 | * Contains per-member-function profiling data. | ||
564 | 171 | * | ||
565 | 172 | * An init() member function is used rather than a constructor so | ||
566 | 173 | * initialization is done only when profileing is enabled. | ||
567 | 174 | */ | ||
568 | 175 | struct mbr_fn { | ||
569 | 176 | unsigned call_count_; | ||
570 | 177 | time::msec_type cpu_time_; | ||
571 | 178 | time::msec_type wall_time_; | ||
572 | 179 | |||
573 | 180 | void init() { | ||
574 | 181 | call_count_ = 0; | ||
575 | 182 | cpu_time_ = 0; | ||
576 | 183 | wall_time_ = 0; | ||
577 | 184 | } | ||
578 | 185 | |||
579 | 186 | void add( time::msec_type cpu, time::msec_type wall ) { | ||
580 | 187 | ++call_count_; | ||
581 | 188 | cpu_time_ += cpu; | ||
582 | 189 | wall_time_ += wall; | ||
583 | 190 | } | ||
584 | 191 | }; | ||
585 | 192 | |||
586 | 193 | mbr_fn next_; // for nextImpl() | ||
587 | 194 | |||
588 | 195 | void init() { | ||
589 | 196 | next_.init(); | ||
590 | 197 | } | ||
591 | 198 | }; | ||
592 | 199 | |||
593 | 200 | /******************************************************************************* | ||
594 | 156 | Base class for all iterator state objects. | 201 | Base class for all iterator state objects. |
595 | 157 | ********************************************************************************/ | 202 | ********************************************************************************/ |
596 | 158 | class PlanIteratorState | 203 | class PlanIteratorState |
597 | @@ -163,6 +208,9 @@ | |||
598 | 163 | private: | 208 | private: |
599 | 164 | uint32_t theDuffsLine; | 209 | uint32_t theDuffsLine; |
600 | 165 | 210 | ||
601 | 211 | profile_data profile_data_; | ||
602 | 212 | friend class PlanIterator; | ||
603 | 213 | |||
604 | 166 | #ifndef NDEBUG | 214 | #ifndef NDEBUG |
605 | 167 | public: | 215 | public: |
606 | 168 | bool theIsOpened; | 216 | bool theIsOpened; |
607 | @@ -194,9 +242,11 @@ | |||
608 | 194 | * Each subclass implementation of this method must call the init() method of | 242 | * Each subclass implementation of this method must call the init() method of |
609 | 195 | * their parent class explicitly in order to guarantee proper initialization. | 243 | * their parent class explicitly in order to guarantee proper initialization. |
610 | 196 | */ | 244 | */ |
612 | 197 | void init(PlanState&) | 245 | void init(PlanState &planState) |
613 | 198 | { | 246 | { |
614 | 199 | theDuffsLine = DUFFS_ALLOCATE_RESOURCES; | 247 | theDuffsLine = DUFFS_ALLOCATE_RESOURCES; |
615 | 248 | if ( planState.profile_ ) | ||
616 | 249 | profile_data_.init(); | ||
617 | 200 | } | 250 | } |
618 | 201 | 251 | ||
619 | 202 | /* | 252 | /* |
620 | @@ -215,6 +265,10 @@ | |||
621 | 215 | { | 265 | { |
622 | 216 | theDuffsLine = DUFFS_ALLOCATE_RESOURCES; | 266 | theDuffsLine = DUFFS_ALLOCATE_RESOURCES; |
623 | 217 | } | 267 | } |
624 | 268 | |||
625 | 269 | profile_data const& get_profile_data() const { | ||
626 | 270 | return profile_data_; | ||
627 | 271 | } | ||
628 | 218 | }; | 272 | }; |
629 | 219 | 273 | ||
630 | 220 | 274 | ||
631 | @@ -299,12 +353,14 @@ | |||
632 | 299 | 353 | ||
633 | 300 | PlanIterator(const PlanIterator& it); | 354 | PlanIterator(const PlanIterator& it); |
634 | 301 | 355 | ||
636 | 302 | virtual ~PlanIterator() {} | 356 | ~PlanIterator(); |
637 | 303 | 357 | ||
638 | 304 | void setLocation(const QueryLoc& loc_) { loc = loc_; } | 358 | void setLocation(const QueryLoc& loc_) { loc = loc_; } |
639 | 305 | 359 | ||
640 | 306 | const QueryLoc& getLocation() const { return loc; } | 360 | const QueryLoc& getLocation() const { return loc; } |
641 | 307 | 361 | ||
642 | 362 | virtual zstring getNameAsString() const; | ||
643 | 363 | |||
644 | 308 | uint32_t getStateOffset() const { return theStateOffset; } | 364 | uint32_t getStateOffset() const { return theStateOffset; } |
645 | 309 | 365 | ||
646 | 310 | static_context* getStaticContext() const { return theSctx; } | 366 | static_context* getStaticContext() const { return theSctx; } |
647 | @@ -420,12 +476,29 @@ | |||
648 | 420 | */ | 476 | */ |
649 | 421 | bool produceNext(store::Item_t& result, PlanState& planState) const | 477 | bool produceNext(store::Item_t& result, PlanState& planState) const |
650 | 422 | { | 478 | { |
651 | 479 | PlanIteratorState *const state = | ||
652 | 480 | StateTraitsImpl<PlanIteratorState>::getState(planState, theStateOffset); | ||
653 | 423 | #ifndef NDEBUG | 481 | #ifndef NDEBUG |
654 | 424 | PlanIteratorState* state = | ||
655 | 425 | StateTraitsImpl<PlanIteratorState>::getState(planState, theStateOffset); | ||
656 | 426 | ZORBA_ASSERT(state->theIsOpened); | 482 | ZORBA_ASSERT(state->theIsOpened); |
657 | 427 | #endif | 483 | #endif |
659 | 428 | return nextImpl(result, planState); | 484 | time::cpu::timer c; |
660 | 485 | time::wall::timer w; | ||
661 | 486 | if ( planState.profile_ ) { | ||
662 | 487 | c.start(); | ||
663 | 488 | w.start(); | ||
664 | 489 | } | ||
665 | 490 | bool const ret_val = nextImpl(result, planState); | ||
666 | 491 | if ( planState.profile_ ) { | ||
667 | 492 | // | ||
668 | 493 | // Temporaries are used here to guarantee the order in which the timers | ||
669 | 494 | // are stopped. (If the expressions were passed as functio arguments, | ||
670 | 495 | // the order is platform/compiler-dependent.) | ||
671 | 496 | // | ||
672 | 497 | time::msec_type const ce( c.elapsed() ); | ||
673 | 498 | time::msec_type const we( w.elapsed() ); | ||
674 | 499 | state->profile_data_.next_.add( ce, we ); | ||
675 | 500 | } | ||
676 | 501 | return ret_val; | ||
677 | 429 | } | 502 | } |
678 | 430 | 503 | ||
679 | 431 | virtual bool nextImpl(store::Item_t& result, PlanState& planState) const = 0; | 504 | virtual bool nextImpl(store::Item_t& result, PlanState& planState) const = 0; |
680 | @@ -467,6 +540,9 @@ | |||
681 | 467 | 540 | ||
682 | 468 | } /* namespace zorba */ | 541 | } /* namespace zorba */ |
683 | 469 | 542 | ||
684 | 543 | #define DEF_GET_NAME_AS_STRING(...) \ | ||
685 | 544 | zstring __VA_ARGS__::getNameAsString() const { return #__VA_ARGS__; } | ||
686 | 545 | |||
687 | 470 | #endif /* ZORBA_ITERATOR_H */ | 546 | #endif /* ZORBA_ITERATOR_H */ |
688 | 471 | 547 | ||
689 | 472 | /* | 548 | /* |
690 | 473 | 549 | ||
691 | === modified file 'src/runtime/base/unarybase.h' | |||
692 | --- src/runtime/base/unarybase.h 2013-05-28 18:20:54 +0000 | |||
693 | +++ src/runtime/base/unarybase.h 2014-03-04 03:22:54 +0000 | |||
694 | @@ -128,12 +128,12 @@ | |||
695 | 128 | } | 128 | } |
696 | 129 | 129 | ||
697 | 130 | 130 | ||
704 | 131 | #define UNARY_ACCEPT(IterType) \ | 131 | #define UNARY_ACCEPT(IterType) \ |
705 | 132 | void IterType::accept(PlanIterVisitor& v) const \ | 132 | void IterType::accept(PlanIterVisitor& v) const \ |
706 | 133 | { \ | 133 | { \ |
707 | 134 | v.beginVisit(*this); \ | 134 | v.beginVisit(*this); \ |
708 | 135 | theChild->accept(v); \ | 135 | theChild->accept(v); \ |
709 | 136 | v.endVisit(*this); \ | 136 | v.endVisit(*this); \ |
710 | 137 | } | 137 | } |
711 | 138 | 138 | ||
712 | 139 | 139 | ||
713 | @@ -162,7 +162,7 @@ | |||
714 | 162 | { } \ | 162 | { } \ |
715 | 163 | \ | 163 | \ |
716 | 164 | void accept(PlanIterVisitor& v) const; \ | 164 | void accept(PlanIterVisitor& v) const; \ |
718 | 165 | \ | 165 | zstring getNameAsString() const; \ |
719 | 166 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; \ | 166 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; \ |
720 | 167 | }; | 167 | }; |
721 | 168 | 168 | ||
722 | 169 | 169 | ||
723 | === modified file 'src/runtime/base64/pregenerated/base64.cpp' | |||
724 | --- src/runtime/base64/pregenerated/base64.cpp 2014-01-31 01:39:38 +0000 | |||
725 | +++ src/runtime/base64/pregenerated/base64.cpp 2014-03-04 03:22:54 +0000 | |||
726 | @@ -58,6 +58,10 @@ | |||
727 | 58 | 58 | ||
728 | 59 | Base64DecodeIterator::~Base64DecodeIterator() {} | 59 | Base64DecodeIterator::~Base64DecodeIterator() {} |
729 | 60 | 60 | ||
730 | 61 | |||
731 | 62 | zstring Base64DecodeIterator::getNameAsString() const { | ||
732 | 63 | return "fn-zorba-base64:decode"; | ||
733 | 64 | } | ||
734 | 61 | // </Base64DecodeIterator> | 65 | // </Base64DecodeIterator> |
735 | 62 | 66 | ||
736 | 63 | 67 | ||
737 | @@ -86,6 +90,10 @@ | |||
738 | 86 | 90 | ||
739 | 87 | Base64EncodeIterator::~Base64EncodeIterator() {} | 91 | Base64EncodeIterator::~Base64EncodeIterator() {} |
740 | 88 | 92 | ||
741 | 93 | |||
742 | 94 | zstring Base64EncodeIterator::getNameAsString() const { | ||
743 | 95 | return "fn-zorba-base64:encode"; | ||
744 | 96 | } | ||
745 | 89 | // </Base64EncodeIterator> | 97 | // </Base64EncodeIterator> |
746 | 90 | 98 | ||
747 | 91 | 99 | ||
748 | 92 | 100 | ||
749 | === modified file 'src/runtime/base64/pregenerated/base64.h' | |||
750 | --- src/runtime/base64/pregenerated/base64.h 2014-01-31 01:39:38 +0000 | |||
751 | +++ src/runtime/base64/pregenerated/base64.h 2014-03-04 03:22:54 +0000 | |||
752 | @@ -58,6 +58,8 @@ | |||
753 | 58 | 58 | ||
754 | 59 | virtual ~Base64DecodeIterator(); | 59 | virtual ~Base64DecodeIterator(); |
755 | 60 | 60 | ||
756 | 61 | zstring getNameAsString() const; | ||
757 | 62 | |||
758 | 61 | void accept(PlanIterVisitor& v) const; | 63 | void accept(PlanIterVisitor& v) const; |
759 | 62 | 64 | ||
760 | 63 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 65 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
761 | @@ -88,6 +90,8 @@ | |||
762 | 88 | 90 | ||
763 | 89 | virtual ~Base64EncodeIterator(); | 91 | virtual ~Base64EncodeIterator(); |
764 | 90 | 92 | ||
765 | 93 | zstring getNameAsString() const; | ||
766 | 94 | |||
767 | 91 | void accept(PlanIterVisitor& v) const; | 95 | void accept(PlanIterVisitor& v) const; |
768 | 92 | 96 | ||
769 | 93 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 97 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
770 | 94 | 98 | ||
771 | === modified file 'src/runtime/booleans/BooleanImpl.cpp' | |||
772 | --- src/runtime/booleans/BooleanImpl.cpp 2013-08-14 15:16:42 +0000 | |||
773 | +++ src/runtime/booleans/BooleanImpl.cpp 2014-03-04 03:22:54 +0000 | |||
774 | @@ -45,34 +45,49 @@ | |||
775 | 45 | namespace zorba { | 45 | namespace zorba { |
776 | 46 | 46 | ||
777 | 47 | SERIALIZABLE_CLASS_VERSIONS(FnBooleanIterator) | 47 | SERIALIZABLE_CLASS_VERSIONS(FnBooleanIterator) |
778 | 48 | DEF_GET_NAME_AS_STRING(FnBooleanIterator) | ||
779 | 48 | 49 | ||
780 | 49 | SERIALIZABLE_CLASS_VERSIONS(OrIterator) | 50 | SERIALIZABLE_CLASS_VERSIONS(OrIterator) |
781 | 51 | DEF_GET_NAME_AS_STRING(OrIterator) | ||
782 | 50 | 52 | ||
783 | 51 | SERIALIZABLE_CLASS_VERSIONS(AndIterator) | 53 | SERIALIZABLE_CLASS_VERSIONS(AndIterator) |
784 | 54 | DEF_GET_NAME_AS_STRING(AndIterator) | ||
785 | 52 | 55 | ||
786 | 53 | SERIALIZABLE_CLASS_VERSIONS(CompareIterator) | 56 | SERIALIZABLE_CLASS_VERSIONS(CompareIterator) |
787 | 57 | DEF_GET_NAME_AS_STRING(CompareIterator) | ||
788 | 54 | 58 | ||
789 | 55 | SERIALIZABLE_TEMPLATE_INSTANCE(TypedValueCompareIterator, | 59 | SERIALIZABLE_TEMPLATE_INSTANCE(TypedValueCompareIterator, |
790 | 56 | TypedValueCompareIterator<store::XS_DOUBLE>, | 60 | TypedValueCompareIterator<store::XS_DOUBLE>, |
791 | 57 | 1) | 61 | 1) |
792 | 62 | template<> | ||
793 | 63 | DEF_GET_NAME_AS_STRING(TypedValueCompareIterator<store::XS_DOUBLE>) | ||
794 | 58 | 64 | ||
795 | 59 | SERIALIZABLE_TEMPLATE_INSTANCE(TypedValueCompareIterator, | 65 | SERIALIZABLE_TEMPLATE_INSTANCE(TypedValueCompareIterator, |
796 | 60 | TypedValueCompareIterator<store::XS_FLOAT>, | 66 | TypedValueCompareIterator<store::XS_FLOAT>, |
797 | 61 | 2) | 67 | 2) |
798 | 68 | template<> | ||
799 | 69 | DEF_GET_NAME_AS_STRING(TypedValueCompareIterator<store::XS_FLOAT>) | ||
800 | 62 | 70 | ||
801 | 63 | SERIALIZABLE_TEMPLATE_INSTANCE(TypedValueCompareIterator, | 71 | SERIALIZABLE_TEMPLATE_INSTANCE(TypedValueCompareIterator, |
802 | 64 | TypedValueCompareIterator<store::XS_DECIMAL>, | 72 | TypedValueCompareIterator<store::XS_DECIMAL>, |
803 | 65 | 3) | 73 | 3) |
804 | 74 | template<> | ||
805 | 75 | DEF_GET_NAME_AS_STRING(TypedValueCompareIterator<store::XS_DECIMAL>) | ||
806 | 66 | 76 | ||
807 | 67 | SERIALIZABLE_TEMPLATE_INSTANCE(TypedValueCompareIterator, | 77 | SERIALIZABLE_TEMPLATE_INSTANCE(TypedValueCompareIterator, |
808 | 68 | TypedValueCompareIterator<store::XS_INTEGER>, | 78 | TypedValueCompareIterator<store::XS_INTEGER>, |
809 | 69 | 4) | 79 | 4) |
810 | 80 | template<> | ||
811 | 81 | DEF_GET_NAME_AS_STRING(TypedValueCompareIterator<store::XS_INTEGER>) | ||
812 | 70 | 82 | ||
813 | 71 | SERIALIZABLE_TEMPLATE_INSTANCE(TypedValueCompareIterator, | 83 | SERIALIZABLE_TEMPLATE_INSTANCE(TypedValueCompareIterator, |
814 | 72 | TypedValueCompareIterator<store::XS_STRING>, | 84 | TypedValueCompareIterator<store::XS_STRING>, |
815 | 73 | 5) | 85 | 5) |
816 | 86 | template<> | ||
817 | 87 | DEF_GET_NAME_AS_STRING(TypedValueCompareIterator<store::XS_STRING>) | ||
818 | 74 | 88 | ||
819 | 75 | SERIALIZABLE_CLASS_VERSIONS(AtomicValuesEquivalenceIterator) | 89 | SERIALIZABLE_CLASS_VERSIONS(AtomicValuesEquivalenceIterator) |
820 | 90 | DEF_GET_NAME_AS_STRING(AtomicValuesEquivalenceIterator) | ||
821 | 76 | 91 | ||
822 | 77 | 92 | ||
823 | 78 | /******************************************************************************* | 93 | /******************************************************************************* |
824 | 79 | 94 | ||
825 | === modified file 'src/runtime/booleans/BooleanImpl.h' | |||
826 | --- src/runtime/booleans/BooleanImpl.h 2013-02-07 17:24:36 +0000 | |||
827 | +++ src/runtime/booleans/BooleanImpl.h 2014-03-04 03:22:54 +0000 | |||
828 | @@ -65,6 +65,8 @@ | |||
829 | 65 | 65 | ||
830 | 66 | void accept(PlanIterVisitor& v) const; | 66 | void accept(PlanIterVisitor& v) const; |
831 | 67 | 67 | ||
832 | 68 | zstring getNameAsString() const; | ||
833 | 69 | |||
834 | 68 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 70 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
835 | 69 | 71 | ||
836 | 70 | public: | 72 | public: |
837 | @@ -105,6 +107,8 @@ | |||
838 | 105 | 107 | ||
839 | 106 | void accept(PlanIterVisitor& v) const; | 108 | void accept(PlanIterVisitor& v) const; |
840 | 107 | 109 | ||
841 | 110 | zstring getNameAsString() const; | ||
842 | 111 | |||
843 | 108 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 112 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
844 | 109 | }; | 113 | }; |
845 | 110 | 114 | ||
846 | @@ -129,6 +133,8 @@ | |||
847 | 129 | 133 | ||
848 | 130 | void accept(PlanIterVisitor& v) const; | 134 | void accept(PlanIterVisitor& v) const; |
849 | 131 | 135 | ||
850 | 136 | zstring getNameAsString() const; | ||
851 | 137 | |||
852 | 132 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 138 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
853 | 133 | }; | 139 | }; |
854 | 134 | 140 | ||
855 | @@ -162,6 +168,8 @@ | |||
856 | 162 | 168 | ||
857 | 163 | void openImpl(PlanState& planState, uint32_t& offset); | 169 | void openImpl(PlanState& planState, uint32_t& offset); |
858 | 164 | 170 | ||
859 | 171 | zstring getNameAsString() const; | ||
860 | 172 | |||
861 | 165 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 173 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
862 | 166 | 174 | ||
863 | 167 | public: | 175 | public: |
864 | @@ -288,6 +296,8 @@ | |||
865 | 288 | 296 | ||
866 | 289 | void openImpl(PlanState& planState, uint32_t& offset); | 297 | void openImpl(PlanState& planState, uint32_t& offset); |
867 | 290 | 298 | ||
868 | 299 | zstring getNameAsString() const; | ||
869 | 300 | |||
870 | 291 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 301 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
871 | 292 | }; | 302 | }; |
872 | 293 | 303 | ||
873 | @@ -321,6 +331,8 @@ | |||
874 | 321 | 331 | ||
875 | 322 | void openImpl(PlanState& planState, uint32_t& offset); | 332 | void openImpl(PlanState& planState, uint32_t& offset); |
876 | 323 | 333 | ||
877 | 334 | zstring getNameAsString() const; | ||
878 | 335 | |||
879 | 324 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 336 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
880 | 325 | 337 | ||
881 | 326 | }; | 338 | }; |
882 | 327 | 339 | ||
883 | === modified file 'src/runtime/booleans/pregenerated/booleans.cpp' | |||
884 | --- src/runtime/booleans/pregenerated/booleans.cpp 2014-01-31 01:39:38 +0000 | |||
885 | +++ src/runtime/booleans/pregenerated/booleans.cpp 2014-03-04 03:22:54 +0000 | |||
886 | @@ -58,6 +58,10 @@ | |||
887 | 58 | 58 | ||
888 | 59 | IsSameNodeIterator::~IsSameNodeIterator() {} | 59 | IsSameNodeIterator::~IsSameNodeIterator() {} |
889 | 60 | 60 | ||
890 | 61 | |||
891 | 62 | zstring IsSameNodeIterator::getNameAsString() const { | ||
892 | 63 | return "op:is-same-node"; | ||
893 | 64 | } | ||
894 | 61 | // </IsSameNodeIterator> | 65 | // </IsSameNodeIterator> |
895 | 62 | 66 | ||
896 | 63 | 67 | ||
897 | @@ -86,6 +90,10 @@ | |||
898 | 86 | 90 | ||
899 | 87 | NodeBeforeIterator::~NodeBeforeIterator() {} | 91 | NodeBeforeIterator::~NodeBeforeIterator() {} |
900 | 88 | 92 | ||
901 | 93 | |||
902 | 94 | zstring NodeBeforeIterator::getNameAsString() const { | ||
903 | 95 | return "op:node-before"; | ||
904 | 96 | } | ||
905 | 89 | // </NodeBeforeIterator> | 97 | // </NodeBeforeIterator> |
906 | 90 | 98 | ||
907 | 91 | 99 | ||
908 | @@ -114,6 +122,10 @@ | |||
909 | 114 | 122 | ||
910 | 115 | NodeAfterIterator::~NodeAfterIterator() {} | 123 | NodeAfterIterator::~NodeAfterIterator() {} |
911 | 116 | 124 | ||
912 | 125 | |||
913 | 126 | zstring NodeAfterIterator::getNameAsString() const { | ||
914 | 127 | return "op:node-after"; | ||
915 | 128 | } | ||
916 | 117 | // </NodeAfterIterator> | 129 | // </NodeAfterIterator> |
917 | 118 | 130 | ||
918 | 119 | 131 | ||
919 | 120 | 132 | ||
920 | === modified file 'src/runtime/booleans/pregenerated/booleans.h' | |||
921 | --- src/runtime/booleans/pregenerated/booleans.h 2014-01-31 01:39:38 +0000 | |||
922 | +++ src/runtime/booleans/pregenerated/booleans.h 2014-03-04 03:22:54 +0000 | |||
923 | @@ -58,6 +58,8 @@ | |||
924 | 58 | 58 | ||
925 | 59 | virtual ~IsSameNodeIterator(); | 59 | virtual ~IsSameNodeIterator(); |
926 | 60 | 60 | ||
927 | 61 | zstring getNameAsString() const; | ||
928 | 62 | |||
929 | 61 | void accept(PlanIterVisitor& v) const; | 63 | void accept(PlanIterVisitor& v) const; |
930 | 62 | 64 | ||
931 | 63 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 65 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
932 | @@ -88,6 +90,8 @@ | |||
933 | 88 | 90 | ||
934 | 89 | virtual ~NodeBeforeIterator(); | 91 | virtual ~NodeBeforeIterator(); |
935 | 90 | 92 | ||
936 | 93 | zstring getNameAsString() const; | ||
937 | 94 | |||
938 | 91 | void accept(PlanIterVisitor& v) const; | 95 | void accept(PlanIterVisitor& v) const; |
939 | 92 | 96 | ||
940 | 93 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 97 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
941 | @@ -118,6 +122,8 @@ | |||
942 | 118 | 122 | ||
943 | 119 | virtual ~NodeAfterIterator(); | 123 | virtual ~NodeAfterIterator(); |
944 | 120 | 124 | ||
945 | 125 | zstring getNameAsString() const; | ||
946 | 126 | |||
947 | 121 | void accept(PlanIterVisitor& v) const; | 127 | void accept(PlanIterVisitor& v) const; |
948 | 122 | 128 | ||
949 | 123 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 129 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
950 | 124 | 130 | ||
951 | === modified file 'src/runtime/collections/pregenerated/collections.cpp' | |||
952 | --- src/runtime/collections/pregenerated/collections.cpp 2014-01-31 01:39:38 +0000 | |||
953 | +++ src/runtime/collections/pregenerated/collections.cpp 2014-03-04 03:22:54 +0000 | |||
954 | @@ -61,6 +61,10 @@ | |||
955 | 61 | 61 | ||
956 | 62 | ZorbaCreateCollectionIterator::~ZorbaCreateCollectionIterator() {} | 62 | ZorbaCreateCollectionIterator::~ZorbaCreateCollectionIterator() {} |
957 | 63 | 63 | ||
958 | 64 | |||
959 | 65 | zstring ZorbaCreateCollectionIterator::getNameAsString() const { | ||
960 | 66 | return "zorba-store-static-collections-ddl:create"; | ||
961 | 67 | } | ||
962 | 64 | // </ZorbaCreateCollectionIterator> | 68 | // </ZorbaCreateCollectionIterator> |
963 | 65 | 69 | ||
964 | 66 | 70 | ||
965 | @@ -91,6 +95,10 @@ | |||
966 | 91 | 95 | ||
967 | 92 | ZorbaDeleteCollectionIterator::~ZorbaDeleteCollectionIterator() {} | 96 | ZorbaDeleteCollectionIterator::~ZorbaDeleteCollectionIterator() {} |
968 | 93 | 97 | ||
969 | 98 | |||
970 | 99 | zstring ZorbaDeleteCollectionIterator::getNameAsString() const { | ||
971 | 100 | return "zorba-store-static-collections-ddl:delete"; | ||
972 | 101 | } | ||
973 | 94 | // </ZorbaDeleteCollectionIterator> | 102 | // </ZorbaDeleteCollectionIterator> |
974 | 95 | 103 | ||
975 | 96 | 104 | ||
976 | @@ -121,6 +129,10 @@ | |||
977 | 121 | 129 | ||
978 | 122 | IsAvailableCollectionIterator::~IsAvailableCollectionIterator() {} | 130 | IsAvailableCollectionIterator::~IsAvailableCollectionIterator() {} |
979 | 123 | 131 | ||
980 | 132 | |||
981 | 133 | zstring IsAvailableCollectionIterator::getNameAsString() const { | ||
982 | 134 | return "zorba-store-static-collections-ddl:is-available-collection"; | ||
983 | 135 | } | ||
984 | 124 | // </IsAvailableCollectionIterator> | 136 | // </IsAvailableCollectionIterator> |
985 | 125 | 137 | ||
986 | 126 | 138 | ||
987 | @@ -153,6 +165,10 @@ | |||
988 | 153 | 165 | ||
989 | 154 | AvailableCollectionsIteratorState::AvailableCollectionsIteratorState() {} | 166 | AvailableCollectionsIteratorState::AvailableCollectionsIteratorState() {} |
990 | 155 | 167 | ||
991 | 168 | |||
992 | 169 | zstring AvailableCollectionsIterator::getNameAsString() const { | ||
993 | 170 | return "zorba-store-static-collections-ddl:available-collections"; | ||
994 | 171 | } | ||
995 | 156 | // </AvailableCollectionsIterator> | 172 | // </AvailableCollectionsIterator> |
996 | 157 | 173 | ||
997 | 158 | 174 | ||
998 | @@ -183,6 +199,10 @@ | |||
999 | 183 | 199 | ||
1000 | 184 | FnCollectionIteratorState::FnCollectionIteratorState() {} | 200 | FnCollectionIteratorState::FnCollectionIteratorState() {} |
1001 | 185 | 201 | ||
1002 | 202 | |||
1003 | 203 | zstring FnCollectionIterator::getNameAsString() const { | ||
1004 | 204 | return "fn:collection"; | ||
1005 | 205 | } | ||
1006 | 186 | // </FnCollectionIterator> | 206 | // </FnCollectionIterator> |
1007 | 187 | 207 | ||
1008 | 188 | 208 | ||
1009 | @@ -215,6 +235,10 @@ | |||
1010 | 215 | 235 | ||
1011 | 216 | ZorbaCollectionIteratorState::ZorbaCollectionIteratorState() {} | 236 | ZorbaCollectionIteratorState::ZorbaCollectionIteratorState() {} |
1012 | 217 | 237 | ||
1013 | 238 | |||
1014 | 239 | zstring ZorbaCollectionIterator::getNameAsString() const { | ||
1015 | 240 | return "zorba-store-static-collections-dml:collection"; | ||
1016 | 241 | } | ||
1017 | 218 | // </ZorbaCollectionIterator> | 242 | // </ZorbaCollectionIterator> |
1018 | 219 | 243 | ||
1019 | 220 | 244 | ||
1020 | @@ -243,6 +267,10 @@ | |||
1021 | 243 | 267 | ||
1022 | 244 | ZorbaCollectionNameIterator::~ZorbaCollectionNameIterator() {} | 268 | ZorbaCollectionNameIterator::~ZorbaCollectionNameIterator() {} |
1023 | 245 | 269 | ||
1024 | 270 | |||
1025 | 271 | zstring ZorbaCollectionNameIterator::getNameAsString() const { | ||
1026 | 272 | return "zorba-store-static-collections-dml:collection-name"; | ||
1027 | 273 | } | ||
1028 | 246 | // </ZorbaCollectionNameIterator> | 274 | // </ZorbaCollectionNameIterator> |
1029 | 247 | 275 | ||
1030 | 248 | 276 | ||
1031 | @@ -273,6 +301,10 @@ | |||
1032 | 273 | 301 | ||
1033 | 274 | ZorbaIndexOfIterator::~ZorbaIndexOfIterator() {} | 302 | ZorbaIndexOfIterator::~ZorbaIndexOfIterator() {} |
1034 | 275 | 303 | ||
1035 | 304 | |||
1036 | 305 | zstring ZorbaIndexOfIterator::getNameAsString() const { | ||
1037 | 306 | return "zorba-store-static-collections-dml:index-of"; | ||
1038 | 307 | } | ||
1039 | 276 | // </ZorbaIndexOfIterator> | 308 | // </ZorbaIndexOfIterator> |
1040 | 277 | 309 | ||
1041 | 278 | 310 | ||
1042 | @@ -303,6 +335,10 @@ | |||
1043 | 303 | 335 | ||
1044 | 304 | ZorbaApplyInsertIteratorState::ZorbaApplyInsertIteratorState() {} | 336 | ZorbaApplyInsertIteratorState::ZorbaApplyInsertIteratorState() {} |
1045 | 305 | 337 | ||
1046 | 338 | |||
1047 | 339 | zstring ZorbaApplyInsertIterator::getNameAsString() const { | ||
1048 | 340 | return "zorba-store-static-collections-dml:apply-insert"; | ||
1049 | 341 | } | ||
1050 | 306 | // </ZorbaApplyInsertIterator> | 342 | // </ZorbaApplyInsertIterator> |
1051 | 307 | 343 | ||
1052 | 308 | 344 | ||
1053 | @@ -333,6 +369,10 @@ | |||
1054 | 333 | 369 | ||
1055 | 334 | ZorbaInsertAfterIterator::~ZorbaInsertAfterIterator() {} | 370 | ZorbaInsertAfterIterator::~ZorbaInsertAfterIterator() {} |
1056 | 335 | 371 | ||
1057 | 372 | |||
1058 | 373 | zstring ZorbaInsertAfterIterator::getNameAsString() const { | ||
1059 | 374 | return "zorba-store-static-collections-dml:insert-after"; | ||
1060 | 375 | } | ||
1061 | 336 | // </ZorbaInsertAfterIterator> | 376 | // </ZorbaInsertAfterIterator> |
1062 | 337 | 377 | ||
1063 | 338 | 378 | ||
1064 | @@ -361,6 +401,10 @@ | |||
1065 | 361 | 401 | ||
1066 | 362 | ZorbaInsertBeforeIterator::~ZorbaInsertBeforeIterator() {} | 402 | ZorbaInsertBeforeIterator::~ZorbaInsertBeforeIterator() {} |
1067 | 363 | 403 | ||
1068 | 404 | |||
1069 | 405 | zstring ZorbaInsertBeforeIterator::getNameAsString() const { | ||
1070 | 406 | return "zorba-store-static-collections-dml:insert-before"; | ||
1071 | 407 | } | ||
1072 | 364 | // </ZorbaInsertBeforeIterator> | 408 | // </ZorbaInsertBeforeIterator> |
1073 | 365 | 409 | ||
1074 | 366 | 410 | ||
1075 | @@ -389,6 +433,10 @@ | |||
1076 | 389 | 433 | ||
1077 | 390 | ZorbaInsertFirstIterator::~ZorbaInsertFirstIterator() {} | 434 | ZorbaInsertFirstIterator::~ZorbaInsertFirstIterator() {} |
1078 | 391 | 435 | ||
1079 | 436 | |||
1080 | 437 | zstring ZorbaInsertFirstIterator::getNameAsString() const { | ||
1081 | 438 | return "zorba-store-static-collections-dml:insert-first"; | ||
1082 | 439 | } | ||
1083 | 392 | // </ZorbaInsertFirstIterator> | 440 | // </ZorbaInsertFirstIterator> |
1084 | 393 | 441 | ||
1085 | 394 | 442 | ||
1086 | @@ -417,6 +465,10 @@ | |||
1087 | 417 | 465 | ||
1088 | 418 | ZorbaInsertLastIterator::~ZorbaInsertLastIterator() {} | 466 | ZorbaInsertLastIterator::~ZorbaInsertLastIterator() {} |
1089 | 419 | 467 | ||
1090 | 468 | |||
1091 | 469 | zstring ZorbaInsertLastIterator::getNameAsString() const { | ||
1092 | 470 | return "zorba-store-static-collections-dml:insert-last"; | ||
1093 | 471 | } | ||
1094 | 420 | // </ZorbaInsertLastIterator> | 472 | // </ZorbaInsertLastIterator> |
1095 | 421 | 473 | ||
1096 | 422 | 474 | ||
1097 | @@ -447,6 +499,10 @@ | |||
1098 | 447 | 499 | ||
1099 | 448 | ZorbaApplyInsertFirstIteratorState::ZorbaApplyInsertFirstIteratorState() {} | 500 | ZorbaApplyInsertFirstIteratorState::ZorbaApplyInsertFirstIteratorState() {} |
1100 | 449 | 501 | ||
1101 | 502 | |||
1102 | 503 | zstring ZorbaApplyInsertFirstIterator::getNameAsString() const { | ||
1103 | 504 | return "zorba-store-static-collections-dml:apply-insert-first"; | ||
1104 | 505 | } | ||
1105 | 450 | // </ZorbaApplyInsertFirstIterator> | 506 | // </ZorbaApplyInsertFirstIterator> |
1106 | 451 | 507 | ||
1107 | 452 | 508 | ||
1108 | @@ -477,6 +533,10 @@ | |||
1109 | 477 | 533 | ||
1110 | 478 | ZorbaApplyInsertLastIteratorState::ZorbaApplyInsertLastIteratorState() {} | 534 | ZorbaApplyInsertLastIteratorState::ZorbaApplyInsertLastIteratorState() {} |
1111 | 479 | 535 | ||
1112 | 536 | |||
1113 | 537 | zstring ZorbaApplyInsertLastIterator::getNameAsString() const { | ||
1114 | 538 | return "zorba-store-static-collections-dml:apply-insert-last"; | ||
1115 | 539 | } | ||
1116 | 480 | // </ZorbaApplyInsertLastIterator> | 540 | // </ZorbaApplyInsertLastIterator> |
1117 | 481 | 541 | ||
1118 | 482 | 542 | ||
1119 | @@ -507,6 +567,10 @@ | |||
1120 | 507 | 567 | ||
1121 | 508 | ZorbaApplyInsertBeforeIteratorState::ZorbaApplyInsertBeforeIteratorState() {} | 568 | ZorbaApplyInsertBeforeIteratorState::ZorbaApplyInsertBeforeIteratorState() {} |
1122 | 509 | 569 | ||
1123 | 570 | |||
1124 | 571 | zstring ZorbaApplyInsertBeforeIterator::getNameAsString() const { | ||
1125 | 572 | return "zorba-store-static-collections-dml:apply-insert-before"; | ||
1126 | 573 | } | ||
1127 | 510 | // </ZorbaApplyInsertBeforeIterator> | 574 | // </ZorbaApplyInsertBeforeIterator> |
1128 | 511 | 575 | ||
1129 | 512 | 576 | ||
1130 | @@ -537,6 +601,10 @@ | |||
1131 | 537 | 601 | ||
1132 | 538 | ZorbaApplyInsertAfterIteratorState::ZorbaApplyInsertAfterIteratorState() {} | 602 | ZorbaApplyInsertAfterIteratorState::ZorbaApplyInsertAfterIteratorState() {} |
1133 | 539 | 603 | ||
1134 | 604 | |||
1135 | 605 | zstring ZorbaApplyInsertAfterIterator::getNameAsString() const { | ||
1136 | 606 | return "zorba-store-static-collections-dml:apply-insert-after"; | ||
1137 | 607 | } | ||
1138 | 540 | // </ZorbaApplyInsertAfterIterator> | 608 | // </ZorbaApplyInsertAfterIterator> |
1139 | 541 | 609 | ||
1140 | 542 | 610 | ||
1141 | @@ -567,6 +635,10 @@ | |||
1142 | 567 | 635 | ||
1143 | 568 | ZorbaDeleteIterator::~ZorbaDeleteIterator() {} | 636 | ZorbaDeleteIterator::~ZorbaDeleteIterator() {} |
1144 | 569 | 637 | ||
1145 | 638 | |||
1146 | 639 | zstring ZorbaDeleteIterator::getNameAsString() const { | ||
1147 | 640 | return "zorba-store-static-collections-dml:delete"; | ||
1148 | 641 | } | ||
1149 | 570 | // </ZorbaDeleteIterator> | 642 | // </ZorbaDeleteIterator> |
1150 | 571 | 643 | ||
1151 | 572 | 644 | ||
1152 | @@ -597,6 +669,10 @@ | |||
1153 | 597 | 669 | ||
1154 | 598 | ZorbaDeleteFirstIterator::~ZorbaDeleteFirstIterator() {} | 670 | ZorbaDeleteFirstIterator::~ZorbaDeleteFirstIterator() {} |
1155 | 599 | 671 | ||
1156 | 672 | |||
1157 | 673 | zstring ZorbaDeleteFirstIterator::getNameAsString() const { | ||
1158 | 674 | return "zorba-store-static-collections-dml:delete-first"; | ||
1159 | 675 | } | ||
1160 | 600 | // </ZorbaDeleteFirstIterator> | 676 | // </ZorbaDeleteFirstIterator> |
1161 | 601 | 677 | ||
1162 | 602 | 678 | ||
1163 | @@ -627,6 +703,10 @@ | |||
1164 | 627 | 703 | ||
1165 | 628 | ZorbaDeleteLastIterator::~ZorbaDeleteLastIterator() {} | 704 | ZorbaDeleteLastIterator::~ZorbaDeleteLastIterator() {} |
1166 | 629 | 705 | ||
1167 | 706 | |||
1168 | 707 | zstring ZorbaDeleteLastIterator::getNameAsString() const { | ||
1169 | 708 | return "zorba-store-static-collections-dml:delete-last"; | ||
1170 | 709 | } | ||
1171 | 630 | // </ZorbaDeleteLastIterator> | 710 | // </ZorbaDeleteLastIterator> |
1172 | 631 | 711 | ||
1173 | 632 | 712 | ||
1174 | @@ -658,6 +738,10 @@ | |||
1175 | 658 | 738 | ||
1176 | 659 | ZorbaEditIterator::~ZorbaEditIterator() {} | 739 | ZorbaEditIterator::~ZorbaEditIterator() {} |
1177 | 660 | 740 | ||
1178 | 741 | |||
1179 | 742 | zstring ZorbaEditIterator::getNameAsString() const { | ||
1180 | 743 | return "zorba-store-static-collections-dml:edit"; | ||
1181 | 744 | } | ||
1182 | 661 | // </ZorbaEditIterator> | 745 | // </ZorbaEditIterator> |
1183 | 662 | 746 | ||
1184 | 663 | 747 | ||
1185 | @@ -686,6 +770,10 @@ | |||
1186 | 686 | 770 | ||
1187 | 687 | ZorbaInsertIterator::~ZorbaInsertIterator() {} | 771 | ZorbaInsertIterator::~ZorbaInsertIterator() {} |
1188 | 688 | 772 | ||
1189 | 773 | |||
1190 | 774 | zstring ZorbaInsertIterator::getNameAsString() const { | ||
1191 | 775 | return "zorba-store-static-collections-dml:insert"; | ||
1192 | 776 | } | ||
1193 | 689 | // </ZorbaInsertIterator> | 777 | // </ZorbaInsertIterator> |
1194 | 690 | 778 | ||
1195 | 691 | 779 | ||
1196 | @@ -716,6 +804,10 @@ | |||
1197 | 716 | 804 | ||
1198 | 717 | ZorbaTruncateCollectionIterator::~ZorbaTruncateCollectionIterator() {} | 805 | ZorbaTruncateCollectionIterator::~ZorbaTruncateCollectionIterator() {} |
1199 | 718 | 806 | ||
1200 | 807 | |||
1201 | 808 | zstring ZorbaTruncateCollectionIterator::getNameAsString() const { | ||
1202 | 809 | return "zorba-store-static-collections-dml:truncate"; | ||
1203 | 810 | } | ||
1204 | 719 | // </ZorbaTruncateCollectionIterator> | 811 | // </ZorbaTruncateCollectionIterator> |
1205 | 720 | 812 | ||
1206 | 721 | 813 | ||
1207 | @@ -744,6 +836,10 @@ | |||
1208 | 744 | 836 | ||
1209 | 745 | IsAvailableIndexIterator::~IsAvailableIndexIterator() {} | 837 | IsAvailableIndexIterator::~IsAvailableIndexIterator() {} |
1210 | 746 | 838 | ||
1211 | 839 | |||
1212 | 840 | zstring IsAvailableIndexIterator::getNameAsString() const { | ||
1213 | 841 | return "zorba-store-indexes-static-ddl:is-available-index"; | ||
1214 | 842 | } | ||
1215 | 747 | // </IsAvailableIndexIterator> | 843 | // </IsAvailableIndexIterator> |
1216 | 748 | 844 | ||
1217 | 749 | 845 | ||
1218 | @@ -774,6 +870,10 @@ | |||
1219 | 774 | 870 | ||
1220 | 775 | AvailableIndexesIteratorState::AvailableIndexesIteratorState() {} | 871 | AvailableIndexesIteratorState::AvailableIndexesIteratorState() {} |
1221 | 776 | 872 | ||
1222 | 873 | |||
1223 | 874 | zstring AvailableIndexesIterator::getNameAsString() const { | ||
1224 | 875 | return "zorba-store-indexes-static-ddl:available-indexes"; | ||
1225 | 876 | } | ||
1226 | 777 | // </AvailableIndexesIterator> | 877 | // </AvailableIndexesIterator> |
1227 | 778 | 878 | ||
1228 | 779 | 879 | ||
1229 | @@ -802,6 +902,10 @@ | |||
1230 | 802 | 902 | ||
1231 | 803 | IsActivatedICIterator::~IsActivatedICIterator() {} | 903 | IsActivatedICIterator::~IsActivatedICIterator() {} |
1232 | 804 | 904 | ||
1233 | 905 | |||
1234 | 906 | zstring IsActivatedICIterator::getNameAsString() const { | ||
1235 | 907 | return "zorba-store-static-integrity-constraints-ddl:is-activated-integrity-constraint"; | ||
1236 | 908 | } | ||
1237 | 805 | // </IsActivatedICIterator> | 909 | // </IsActivatedICIterator> |
1238 | 806 | 910 | ||
1239 | 807 | 911 | ||
1240 | @@ -832,6 +936,10 @@ | |||
1241 | 832 | 936 | ||
1242 | 833 | ActivatedICsIteratorState::ActivatedICsIteratorState() {} | 937 | ActivatedICsIteratorState::ActivatedICsIteratorState() {} |
1243 | 834 | 938 | ||
1244 | 939 | |||
1245 | 940 | zstring ActivatedICsIterator::getNameAsString() const { | ||
1246 | 941 | return "zorba-store-static-integrity-constraints-ddl:activated-integrity-constraints"; | ||
1247 | 942 | } | ||
1248 | 835 | // </ActivatedICsIterator> | 943 | // </ActivatedICsIterator> |
1249 | 836 | 944 | ||
1250 | 837 | 945 | ||
1251 | @@ -860,6 +968,10 @@ | |||
1252 | 860 | 968 | ||
1253 | 861 | IsDeclaredCollectionIterator::~IsDeclaredCollectionIterator() {} | 969 | IsDeclaredCollectionIterator::~IsDeclaredCollectionIterator() {} |
1254 | 862 | 970 | ||
1255 | 971 | |||
1256 | 972 | zstring IsDeclaredCollectionIterator::getNameAsString() const { | ||
1257 | 973 | return "zorba-store-static-collections-ddl:is-declared-collection"; | ||
1258 | 974 | } | ||
1259 | 863 | // </IsDeclaredCollectionIterator> | 975 | // </IsDeclaredCollectionIterator> |
1260 | 864 | 976 | ||
1261 | 865 | 977 | ||
1262 | @@ -890,6 +1002,10 @@ | |||
1263 | 890 | 1002 | ||
1264 | 891 | DeclaredCollectionsIteratorState::DeclaredCollectionsIteratorState() {} | 1003 | DeclaredCollectionsIteratorState::DeclaredCollectionsIteratorState() {} |
1265 | 892 | 1004 | ||
1266 | 1005 | |||
1267 | 1006 | zstring DeclaredCollectionsIterator::getNameAsString() const { | ||
1268 | 1007 | return "zorba-store-static-collections-ddl:declared-collections"; | ||
1269 | 1008 | } | ||
1270 | 893 | // </DeclaredCollectionsIterator> | 1009 | // </DeclaredCollectionsIterator> |
1271 | 894 | 1010 | ||
1272 | 895 | 1011 | ||
1273 | @@ -918,6 +1034,10 @@ | |||
1274 | 918 | 1034 | ||
1275 | 919 | IsDeclaredIndexIterator::~IsDeclaredIndexIterator() {} | 1035 | IsDeclaredIndexIterator::~IsDeclaredIndexIterator() {} |
1276 | 920 | 1036 | ||
1277 | 1037 | |||
1278 | 1038 | zstring IsDeclaredIndexIterator::getNameAsString() const { | ||
1279 | 1039 | return "zorba-store-indexes-static-ddl:is-declared-index"; | ||
1280 | 1040 | } | ||
1281 | 921 | // </IsDeclaredIndexIterator> | 1041 | // </IsDeclaredIndexIterator> |
1282 | 922 | 1042 | ||
1283 | 923 | 1043 | ||
1284 | @@ -953,6 +1073,10 @@ | |||
1285 | 953 | PlanIteratorState::init(planState); | 1073 | PlanIteratorState::init(planState); |
1286 | 954 | nameItState = NULL; | 1074 | nameItState = NULL; |
1287 | 955 | } | 1075 | } |
1288 | 1076 | |||
1289 | 1077 | zstring DeclaredIndexesIterator::getNameAsString() const { | ||
1290 | 1078 | return "zorba-store-indexes-static-ddl:declared-indexes"; | ||
1291 | 1079 | } | ||
1292 | 956 | // </DeclaredIndexesIterator> | 1080 | // </DeclaredIndexesIterator> |
1293 | 957 | 1081 | ||
1294 | 958 | 1082 | ||
1295 | @@ -981,6 +1105,10 @@ | |||
1296 | 981 | 1105 | ||
1297 | 982 | IsDeclaredICIterator::~IsDeclaredICIterator() {} | 1106 | IsDeclaredICIterator::~IsDeclaredICIterator() {} |
1298 | 983 | 1107 | ||
1299 | 1108 | |||
1300 | 1109 | zstring IsDeclaredICIterator::getNameAsString() const { | ||
1301 | 1110 | return "zorba-store-static-integrity-constraints-ddl:is-declared-integrity-constraint"; | ||
1302 | 1111 | } | ||
1303 | 984 | // </IsDeclaredICIterator> | 1112 | // </IsDeclaredICIterator> |
1304 | 985 | 1113 | ||
1305 | 986 | 1114 | ||
1306 | @@ -1016,6 +1144,10 @@ | |||
1307 | 1016 | PlanIteratorState::init(planState); | 1144 | PlanIteratorState::init(planState); |
1308 | 1017 | nameItState = NULL; | 1145 | nameItState = NULL; |
1309 | 1018 | } | 1146 | } |
1310 | 1147 | |||
1311 | 1148 | zstring DeclaredICsIterator::getNameAsString() const { | ||
1312 | 1149 | return "zorba-store-static-integrity-constraints-ddl:declared-integrity-constraints"; | ||
1313 | 1150 | } | ||
1314 | 1019 | // </DeclaredICsIterator> | 1151 | // </DeclaredICsIterator> |
1315 | 1020 | 1152 | ||
1316 | 1021 | 1153 | ||
1317 | @@ -1046,6 +1178,10 @@ | |||
1318 | 1046 | 1178 | ||
1319 | 1047 | FnURICollectionIteratorState::FnURICollectionIteratorState() {} | 1179 | FnURICollectionIteratorState::FnURICollectionIteratorState() {} |
1320 | 1048 | 1180 | ||
1321 | 1181 | |||
1322 | 1182 | zstring FnURICollectionIterator::getNameAsString() const { | ||
1323 | 1183 | return "fn:uri-collection"; | ||
1324 | 1184 | } | ||
1325 | 1049 | // </FnURICollectionIterator> | 1185 | // </FnURICollectionIterator> |
1326 | 1050 | 1186 | ||
1327 | 1051 | 1187 | ||
1328 | 1052 | 1188 | ||
1329 | === modified file 'src/runtime/collections/pregenerated/collections.h' | |||
1330 | --- src/runtime/collections/pregenerated/collections.h 2014-01-31 01:39:38 +0000 | |||
1331 | +++ src/runtime/collections/pregenerated/collections.h 2014-03-04 03:22:54 +0000 | |||
1332 | @@ -63,6 +63,8 @@ | |||
1333 | 63 | 63 | ||
1334 | 64 | virtual ~ZorbaCreateCollectionIterator(); | 64 | virtual ~ZorbaCreateCollectionIterator(); |
1335 | 65 | 65 | ||
1336 | 66 | zstring getNameAsString() const; | ||
1337 | 67 | |||
1338 | 66 | public: | 68 | public: |
1339 | 67 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; | 69 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; |
1340 | 68 | void accept(PlanIterVisitor& v) const; | 70 | void accept(PlanIterVisitor& v) const; |
1341 | @@ -99,6 +101,8 @@ | |||
1342 | 99 | 101 | ||
1343 | 100 | virtual ~ZorbaDeleteCollectionIterator(); | 102 | virtual ~ZorbaDeleteCollectionIterator(); |
1344 | 101 | 103 | ||
1345 | 104 | zstring getNameAsString() const; | ||
1346 | 105 | |||
1347 | 102 | void accept(PlanIterVisitor& v) const; | 106 | void accept(PlanIterVisitor& v) const; |
1348 | 103 | 107 | ||
1349 | 104 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 108 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1350 | @@ -133,6 +137,8 @@ | |||
1351 | 133 | 137 | ||
1352 | 134 | virtual ~IsAvailableCollectionIterator(); | 138 | virtual ~IsAvailableCollectionIterator(); |
1353 | 135 | 139 | ||
1354 | 140 | zstring getNameAsString() const; | ||
1355 | 141 | |||
1356 | 136 | void accept(PlanIterVisitor& v) const; | 142 | void accept(PlanIterVisitor& v) const; |
1357 | 137 | 143 | ||
1358 | 138 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 144 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1359 | @@ -180,6 +186,8 @@ | |||
1360 | 180 | 186 | ||
1361 | 181 | virtual ~AvailableCollectionsIterator(); | 187 | virtual ~AvailableCollectionsIterator(); |
1362 | 182 | 188 | ||
1363 | 189 | zstring getNameAsString() const; | ||
1364 | 190 | |||
1365 | 183 | void accept(PlanIterVisitor& v) const; | 191 | void accept(PlanIterVisitor& v) const; |
1366 | 184 | 192 | ||
1367 | 185 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 193 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1368 | @@ -224,6 +232,8 @@ | |||
1369 | 224 | 232 | ||
1370 | 225 | virtual ~FnCollectionIterator(); | 233 | virtual ~FnCollectionIterator(); |
1371 | 226 | 234 | ||
1372 | 235 | zstring getNameAsString() const; | ||
1373 | 236 | |||
1374 | 227 | public: | 237 | public: |
1375 | 228 | bool count(store::Item_t& result, PlanState& planState) const; | 238 | bool count(store::Item_t& result, PlanState& planState) const; |
1376 | 229 | store::Collection_t getCollection(PlanState& planState) const; | 239 | store::Collection_t getCollection(PlanState& planState) const; |
1377 | @@ -277,6 +287,8 @@ | |||
1378 | 277 | 287 | ||
1379 | 278 | bool isDynamic() const { return theIsDynamic; } | 288 | bool isDynamic() const { return theIsDynamic; } |
1380 | 279 | 289 | ||
1381 | 290 | zstring getNameAsString() const; | ||
1382 | 291 | |||
1383 | 280 | public: | 292 | public: |
1384 | 281 | bool isCountOptimizable() const; | 293 | bool isCountOptimizable() const; |
1385 | 282 | bool count(store::Item_t& result, PlanState& planState) const; | 294 | bool count(store::Item_t& result, PlanState& planState) const; |
1386 | @@ -312,6 +324,8 @@ | |||
1387 | 312 | 324 | ||
1388 | 313 | virtual ~ZorbaCollectionNameIterator(); | 325 | virtual ~ZorbaCollectionNameIterator(); |
1389 | 314 | 326 | ||
1390 | 327 | zstring getNameAsString() const; | ||
1391 | 328 | |||
1392 | 315 | void accept(PlanIterVisitor& v) const; | 329 | void accept(PlanIterVisitor& v) const; |
1393 | 316 | 330 | ||
1394 | 317 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 331 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1395 | @@ -346,6 +360,8 @@ | |||
1396 | 346 | 360 | ||
1397 | 347 | virtual ~ZorbaIndexOfIterator(); | 361 | virtual ~ZorbaIndexOfIterator(); |
1398 | 348 | 362 | ||
1399 | 363 | zstring getNameAsString() const; | ||
1400 | 364 | |||
1401 | 349 | void accept(PlanIterVisitor& v) const; | 365 | void accept(PlanIterVisitor& v) const; |
1402 | 350 | 366 | ||
1403 | 351 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 367 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1404 | @@ -392,6 +408,8 @@ | |||
1405 | 392 | 408 | ||
1406 | 393 | virtual ~ZorbaApplyInsertIterator(); | 409 | virtual ~ZorbaApplyInsertIterator(); |
1407 | 394 | 410 | ||
1408 | 411 | zstring getNameAsString() const; | ||
1409 | 412 | |||
1410 | 395 | public: | 413 | public: |
1411 | 396 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; | 414 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; |
1412 | 397 | void accept(PlanIterVisitor& v) const; | 415 | void accept(PlanIterVisitor& v) const; |
1413 | @@ -429,6 +447,8 @@ | |||
1414 | 429 | 447 | ||
1415 | 430 | virtual ~ZorbaInsertAfterIterator(); | 448 | virtual ~ZorbaInsertAfterIterator(); |
1416 | 431 | 449 | ||
1417 | 450 | zstring getNameAsString() const; | ||
1418 | 451 | |||
1419 | 432 | public: | 452 | public: |
1420 | 433 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; | 453 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; |
1421 | 434 | void accept(PlanIterVisitor& v) const; | 454 | void accept(PlanIterVisitor& v) const; |
1422 | @@ -463,6 +483,8 @@ | |||
1423 | 463 | 483 | ||
1424 | 464 | virtual ~ZorbaInsertBeforeIterator(); | 484 | virtual ~ZorbaInsertBeforeIterator(); |
1425 | 465 | 485 | ||
1426 | 486 | zstring getNameAsString() const; | ||
1427 | 487 | |||
1428 | 466 | public: | 488 | public: |
1429 | 467 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; | 489 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; |
1430 | 468 | void accept(PlanIterVisitor& v) const; | 490 | void accept(PlanIterVisitor& v) const; |
1431 | @@ -497,6 +519,8 @@ | |||
1432 | 497 | 519 | ||
1433 | 498 | virtual ~ZorbaInsertFirstIterator(); | 520 | virtual ~ZorbaInsertFirstIterator(); |
1434 | 499 | 521 | ||
1435 | 522 | zstring getNameAsString() const; | ||
1436 | 523 | |||
1437 | 500 | public: | 524 | public: |
1438 | 501 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; | 525 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; |
1439 | 502 | void accept(PlanIterVisitor& v) const; | 526 | void accept(PlanIterVisitor& v) const; |
1440 | @@ -531,6 +555,8 @@ | |||
1441 | 531 | 555 | ||
1442 | 532 | virtual ~ZorbaInsertLastIterator(); | 556 | virtual ~ZorbaInsertLastIterator(); |
1443 | 533 | 557 | ||
1444 | 558 | zstring getNameAsString() const; | ||
1445 | 559 | |||
1446 | 534 | public: | 560 | public: |
1447 | 535 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; | 561 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; |
1448 | 536 | void accept(PlanIterVisitor& v) const; | 562 | void accept(PlanIterVisitor& v) const; |
1449 | @@ -579,6 +605,8 @@ | |||
1450 | 579 | 605 | ||
1451 | 580 | virtual ~ZorbaApplyInsertFirstIterator(); | 606 | virtual ~ZorbaApplyInsertFirstIterator(); |
1452 | 581 | 607 | ||
1453 | 608 | zstring getNameAsString() const; | ||
1454 | 609 | |||
1455 | 582 | public: | 610 | public: |
1456 | 583 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; | 611 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; |
1457 | 584 | void accept(PlanIterVisitor& v) const; | 612 | void accept(PlanIterVisitor& v) const; |
1458 | @@ -627,6 +655,8 @@ | |||
1459 | 627 | 655 | ||
1460 | 628 | virtual ~ZorbaApplyInsertLastIterator(); | 656 | virtual ~ZorbaApplyInsertLastIterator(); |
1461 | 629 | 657 | ||
1462 | 658 | zstring getNameAsString() const; | ||
1463 | 659 | |||
1464 | 630 | public: | 660 | public: |
1465 | 631 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; | 661 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; |
1466 | 632 | void accept(PlanIterVisitor& v) const; | 662 | void accept(PlanIterVisitor& v) const; |
1467 | @@ -675,6 +705,8 @@ | |||
1468 | 675 | 705 | ||
1469 | 676 | virtual ~ZorbaApplyInsertBeforeIterator(); | 706 | virtual ~ZorbaApplyInsertBeforeIterator(); |
1470 | 677 | 707 | ||
1471 | 708 | zstring getNameAsString() const; | ||
1472 | 709 | |||
1473 | 678 | public: | 710 | public: |
1474 | 679 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; | 711 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; |
1475 | 680 | void accept(PlanIterVisitor& v) const; | 712 | void accept(PlanIterVisitor& v) const; |
1476 | @@ -723,6 +755,8 @@ | |||
1477 | 723 | 755 | ||
1478 | 724 | virtual ~ZorbaApplyInsertAfterIterator(); | 756 | virtual ~ZorbaApplyInsertAfterIterator(); |
1479 | 725 | 757 | ||
1480 | 758 | zstring getNameAsString() const; | ||
1481 | 759 | |||
1482 | 726 | public: | 760 | public: |
1483 | 727 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; | 761 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; |
1484 | 728 | void accept(PlanIterVisitor& v) const; | 762 | void accept(PlanIterVisitor& v) const; |
1485 | @@ -759,6 +793,8 @@ | |||
1486 | 759 | 793 | ||
1487 | 760 | virtual ~ZorbaDeleteIterator(); | 794 | virtual ~ZorbaDeleteIterator(); |
1488 | 761 | 795 | ||
1489 | 796 | zstring getNameAsString() const; | ||
1490 | 797 | |||
1491 | 762 | public: | 798 | public: |
1492 | 763 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; | 799 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; |
1493 | 764 | void accept(PlanIterVisitor& v) const; | 800 | void accept(PlanIterVisitor& v) const; |
1494 | @@ -795,6 +831,8 @@ | |||
1495 | 795 | 831 | ||
1496 | 796 | virtual ~ZorbaDeleteFirstIterator(); | 832 | virtual ~ZorbaDeleteFirstIterator(); |
1497 | 797 | 833 | ||
1498 | 834 | zstring getNameAsString() const; | ||
1499 | 835 | |||
1500 | 798 | public: | 836 | public: |
1501 | 799 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; | 837 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; |
1502 | 800 | void accept(PlanIterVisitor& v) const; | 838 | void accept(PlanIterVisitor& v) const; |
1503 | @@ -831,6 +869,8 @@ | |||
1504 | 831 | 869 | ||
1505 | 832 | virtual ~ZorbaDeleteLastIterator(); | 870 | virtual ~ZorbaDeleteLastIterator(); |
1506 | 833 | 871 | ||
1507 | 872 | zstring getNameAsString() const; | ||
1508 | 873 | |||
1509 | 834 | public: | 874 | public: |
1510 | 835 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; | 875 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; |
1511 | 836 | void accept(PlanIterVisitor& v) const; | 876 | void accept(PlanIterVisitor& v) const; |
1512 | @@ -870,6 +910,8 @@ | |||
1513 | 870 | 910 | ||
1514 | 871 | virtual ~ZorbaEditIterator(); | 911 | virtual ~ZorbaEditIterator(); |
1515 | 872 | 912 | ||
1516 | 913 | zstring getNameAsString() const; | ||
1517 | 914 | |||
1518 | 873 | public: | 915 | public: |
1519 | 874 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; | 916 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; |
1520 | 875 | void accept(PlanIterVisitor& v) const; | 917 | void accept(PlanIterVisitor& v) const; |
1521 | @@ -904,6 +946,8 @@ | |||
1522 | 904 | 946 | ||
1523 | 905 | virtual ~ZorbaInsertIterator(); | 947 | virtual ~ZorbaInsertIterator(); |
1524 | 906 | 948 | ||
1525 | 949 | zstring getNameAsString() const; | ||
1526 | 950 | |||
1527 | 907 | public: | 951 | public: |
1528 | 908 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; | 952 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; |
1529 | 909 | void accept(PlanIterVisitor& v) const; | 953 | void accept(PlanIterVisitor& v) const; |
1530 | @@ -940,6 +984,8 @@ | |||
1531 | 940 | 984 | ||
1532 | 941 | virtual ~ZorbaTruncateCollectionIterator(); | 985 | virtual ~ZorbaTruncateCollectionIterator(); |
1533 | 942 | 986 | ||
1534 | 987 | zstring getNameAsString() const; | ||
1535 | 988 | |||
1536 | 943 | public: | 989 | public: |
1537 | 944 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; | 990 | const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const; |
1538 | 945 | void accept(PlanIterVisitor& v) const; | 991 | void accept(PlanIterVisitor& v) const; |
1539 | @@ -972,6 +1018,8 @@ | |||
1540 | 972 | 1018 | ||
1541 | 973 | virtual ~IsAvailableIndexIterator(); | 1019 | virtual ~IsAvailableIndexIterator(); |
1542 | 974 | 1020 | ||
1543 | 1021 | zstring getNameAsString() const; | ||
1544 | 1022 | |||
1545 | 975 | void accept(PlanIterVisitor& v) const; | 1023 | void accept(PlanIterVisitor& v) const; |
1546 | 976 | 1024 | ||
1547 | 977 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 1025 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1548 | @@ -1015,6 +1063,8 @@ | |||
1549 | 1015 | 1063 | ||
1550 | 1016 | virtual ~AvailableIndexesIterator(); | 1064 | virtual ~AvailableIndexesIterator(); |
1551 | 1017 | 1065 | ||
1552 | 1066 | zstring getNameAsString() const; | ||
1553 | 1067 | |||
1554 | 1018 | void accept(PlanIterVisitor& v) const; | 1068 | void accept(PlanIterVisitor& v) const; |
1555 | 1019 | 1069 | ||
1556 | 1020 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 1070 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1557 | @@ -1045,6 +1095,8 @@ | |||
1558 | 1045 | 1095 | ||
1559 | 1046 | virtual ~IsActivatedICIterator(); | 1096 | virtual ~IsActivatedICIterator(); |
1560 | 1047 | 1097 | ||
1561 | 1098 | zstring getNameAsString() const; | ||
1562 | 1099 | |||
1563 | 1048 | void accept(PlanIterVisitor& v) const; | 1100 | void accept(PlanIterVisitor& v) const; |
1564 | 1049 | 1101 | ||
1565 | 1050 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 1102 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1566 | @@ -1088,6 +1140,8 @@ | |||
1567 | 1088 | 1140 | ||
1568 | 1089 | virtual ~ActivatedICsIterator(); | 1141 | virtual ~ActivatedICsIterator(); |
1569 | 1090 | 1142 | ||
1570 | 1143 | zstring getNameAsString() const; | ||
1571 | 1144 | |||
1572 | 1091 | void accept(PlanIterVisitor& v) const; | 1145 | void accept(PlanIterVisitor& v) const; |
1573 | 1092 | 1146 | ||
1574 | 1093 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 1147 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1575 | @@ -1118,6 +1172,8 @@ | |||
1576 | 1118 | 1172 | ||
1577 | 1119 | virtual ~IsDeclaredCollectionIterator(); | 1173 | virtual ~IsDeclaredCollectionIterator(); |
1578 | 1120 | 1174 | ||
1579 | 1175 | zstring getNameAsString() const; | ||
1580 | 1176 | |||
1581 | 1121 | void accept(PlanIterVisitor& v) const; | 1177 | void accept(PlanIterVisitor& v) const; |
1582 | 1122 | 1178 | ||
1583 | 1123 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 1179 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1584 | @@ -1161,6 +1217,8 @@ | |||
1585 | 1161 | 1217 | ||
1586 | 1162 | virtual ~DeclaredCollectionsIterator(); | 1218 | virtual ~DeclaredCollectionsIterator(); |
1587 | 1163 | 1219 | ||
1588 | 1220 | zstring getNameAsString() const; | ||
1589 | 1221 | |||
1590 | 1164 | void accept(PlanIterVisitor& v) const; | 1222 | void accept(PlanIterVisitor& v) const; |
1591 | 1165 | 1223 | ||
1592 | 1166 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 1224 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1593 | @@ -1191,6 +1249,8 @@ | |||
1594 | 1191 | 1249 | ||
1595 | 1192 | virtual ~IsDeclaredIndexIterator(); | 1250 | virtual ~IsDeclaredIndexIterator(); |
1596 | 1193 | 1251 | ||
1597 | 1252 | zstring getNameAsString() const; | ||
1598 | 1253 | |||
1599 | 1194 | void accept(PlanIterVisitor& v) const; | 1254 | void accept(PlanIterVisitor& v) const; |
1600 | 1195 | 1255 | ||
1601 | 1196 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 1256 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1602 | @@ -1234,6 +1294,8 @@ | |||
1603 | 1234 | 1294 | ||
1604 | 1235 | virtual ~DeclaredIndexesIterator(); | 1295 | virtual ~DeclaredIndexesIterator(); |
1605 | 1236 | 1296 | ||
1606 | 1297 | zstring getNameAsString() const; | ||
1607 | 1298 | |||
1608 | 1237 | void accept(PlanIterVisitor& v) const; | 1299 | void accept(PlanIterVisitor& v) const; |
1609 | 1238 | 1300 | ||
1610 | 1239 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 1301 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1611 | @@ -1264,6 +1326,8 @@ | |||
1612 | 1264 | 1326 | ||
1613 | 1265 | virtual ~IsDeclaredICIterator(); | 1327 | virtual ~IsDeclaredICIterator(); |
1614 | 1266 | 1328 | ||
1615 | 1329 | zstring getNameAsString() const; | ||
1616 | 1330 | |||
1617 | 1267 | void accept(PlanIterVisitor& v) const; | 1331 | void accept(PlanIterVisitor& v) const; |
1618 | 1268 | 1332 | ||
1619 | 1269 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 1333 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1620 | @@ -1307,6 +1371,8 @@ | |||
1621 | 1307 | 1371 | ||
1622 | 1308 | virtual ~DeclaredICsIterator(); | 1372 | virtual ~DeclaredICsIterator(); |
1623 | 1309 | 1373 | ||
1624 | 1374 | zstring getNameAsString() const; | ||
1625 | 1375 | |||
1626 | 1310 | void accept(PlanIterVisitor& v) const; | 1376 | void accept(PlanIterVisitor& v) const; |
1627 | 1311 | 1377 | ||
1628 | 1312 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 1378 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1629 | @@ -1351,6 +1417,8 @@ | |||
1630 | 1351 | 1417 | ||
1631 | 1352 | virtual ~FnURICollectionIterator(); | 1418 | virtual ~FnURICollectionIterator(); |
1632 | 1353 | 1419 | ||
1633 | 1420 | zstring getNameAsString() const; | ||
1634 | 1421 | |||
1635 | 1354 | void accept(PlanIterVisitor& v) const; | 1422 | void accept(PlanIterVisitor& v) const; |
1636 | 1355 | 1423 | ||
1637 | 1356 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 1424 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1638 | 1357 | 1425 | ||
1639 | === modified file 'src/runtime/context/pregenerated/context.cpp' | |||
1640 | --- src/runtime/context/pregenerated/context.cpp 2014-01-31 01:39:38 +0000 | |||
1641 | +++ src/runtime/context/pregenerated/context.cpp 2014-03-04 03:22:54 +0000 | |||
1642 | @@ -58,6 +58,10 @@ | |||
1643 | 58 | 58 | ||
1644 | 59 | CurrentDateTimeIterator::~CurrentDateTimeIterator() {} | 59 | CurrentDateTimeIterator::~CurrentDateTimeIterator() {} |
1645 | 60 | 60 | ||
1646 | 61 | |||
1647 | 62 | zstring CurrentDateTimeIterator::getNameAsString() const { | ||
1648 | 63 | return "fn:current-dateTime"; | ||
1649 | 64 | } | ||
1650 | 61 | // </CurrentDateTimeIterator> | 65 | // </CurrentDateTimeIterator> |
1651 | 62 | 66 | ||
1652 | 63 | 67 | ||
1653 | @@ -86,6 +90,10 @@ | |||
1654 | 86 | 90 | ||
1655 | 87 | CurrentDateIterator::~CurrentDateIterator() {} | 91 | CurrentDateIterator::~CurrentDateIterator() {} |
1656 | 88 | 92 | ||
1657 | 93 | |||
1658 | 94 | zstring CurrentDateIterator::getNameAsString() const { | ||
1659 | 95 | return "fn:current-date"; | ||
1660 | 96 | } | ||
1661 | 89 | // </CurrentDateIterator> | 97 | // </CurrentDateIterator> |
1662 | 90 | 98 | ||
1663 | 91 | 99 | ||
1664 | @@ -114,6 +122,10 @@ | |||
1665 | 114 | 122 | ||
1666 | 115 | CurrentTimeIterator::~CurrentTimeIterator() {} | 123 | CurrentTimeIterator::~CurrentTimeIterator() {} |
1667 | 116 | 124 | ||
1668 | 125 | |||
1669 | 126 | zstring CurrentTimeIterator::getNameAsString() const { | ||
1670 | 127 | return "fn:current-time"; | ||
1671 | 128 | } | ||
1672 | 117 | // </CurrentTimeIterator> | 129 | // </CurrentTimeIterator> |
1673 | 118 | 130 | ||
1674 | 119 | 131 | ||
1675 | @@ -142,6 +154,10 @@ | |||
1676 | 142 | 154 | ||
1677 | 143 | ImplicitTimezoneIterator::~ImplicitTimezoneIterator() {} | 155 | ImplicitTimezoneIterator::~ImplicitTimezoneIterator() {} |
1678 | 144 | 156 | ||
1679 | 157 | |||
1680 | 158 | zstring ImplicitTimezoneIterator::getNameAsString() const { | ||
1681 | 159 | return "fn:implicit-timezone"; | ||
1682 | 160 | } | ||
1683 | 145 | // </ImplicitTimezoneIterator> | 161 | // </ImplicitTimezoneIterator> |
1684 | 146 | 162 | ||
1685 | 147 | 163 | ||
1686 | @@ -170,6 +186,10 @@ | |||
1687 | 170 | 186 | ||
1688 | 171 | DefaultCollationIterator::~DefaultCollationIterator() {} | 187 | DefaultCollationIterator::~DefaultCollationIterator() {} |
1689 | 172 | 188 | ||
1690 | 189 | |||
1691 | 190 | zstring DefaultCollationIterator::getNameAsString() const { | ||
1692 | 191 | return "fn:default-collation"; | ||
1693 | 192 | } | ||
1694 | 173 | // </DefaultCollationIterator> | 193 | // </DefaultCollationIterator> |
1695 | 174 | 194 | ||
1696 | 175 | 195 | ||
1697 | 176 | 196 | ||
1698 | === modified file 'src/runtime/context/pregenerated/context.h' | |||
1699 | --- src/runtime/context/pregenerated/context.h 2014-01-31 01:39:38 +0000 | |||
1700 | +++ src/runtime/context/pregenerated/context.h 2014-03-04 03:22:54 +0000 | |||
1701 | @@ -58,6 +58,8 @@ | |||
1702 | 58 | 58 | ||
1703 | 59 | virtual ~CurrentDateTimeIterator(); | 59 | virtual ~CurrentDateTimeIterator(); |
1704 | 60 | 60 | ||
1705 | 61 | zstring getNameAsString() const; | ||
1706 | 62 | |||
1707 | 61 | void accept(PlanIterVisitor& v) const; | 63 | void accept(PlanIterVisitor& v) const; |
1708 | 62 | 64 | ||
1709 | 63 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 65 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1710 | @@ -88,6 +90,8 @@ | |||
1711 | 88 | 90 | ||
1712 | 89 | virtual ~CurrentDateIterator(); | 91 | virtual ~CurrentDateIterator(); |
1713 | 90 | 92 | ||
1714 | 93 | zstring getNameAsString() const; | ||
1715 | 94 | |||
1716 | 91 | void accept(PlanIterVisitor& v) const; | 95 | void accept(PlanIterVisitor& v) const; |
1717 | 92 | 96 | ||
1718 | 93 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 97 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1719 | @@ -118,6 +122,8 @@ | |||
1720 | 118 | 122 | ||
1721 | 119 | virtual ~CurrentTimeIterator(); | 123 | virtual ~CurrentTimeIterator(); |
1722 | 120 | 124 | ||
1723 | 125 | zstring getNameAsString() const; | ||
1724 | 126 | |||
1725 | 121 | void accept(PlanIterVisitor& v) const; | 127 | void accept(PlanIterVisitor& v) const; |
1726 | 122 | 128 | ||
1727 | 123 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 129 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1728 | @@ -148,6 +154,8 @@ | |||
1729 | 148 | 154 | ||
1730 | 149 | virtual ~ImplicitTimezoneIterator(); | 155 | virtual ~ImplicitTimezoneIterator(); |
1731 | 150 | 156 | ||
1732 | 157 | zstring getNameAsString() const; | ||
1733 | 158 | |||
1734 | 151 | void accept(PlanIterVisitor& v) const; | 159 | void accept(PlanIterVisitor& v) const; |
1735 | 152 | 160 | ||
1736 | 153 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 161 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1737 | @@ -178,6 +186,8 @@ | |||
1738 | 178 | 186 | ||
1739 | 179 | virtual ~DefaultCollationIterator(); | 187 | virtual ~DefaultCollationIterator(); |
1740 | 180 | 188 | ||
1741 | 189 | zstring getNameAsString() const; | ||
1742 | 190 | |||
1743 | 181 | void accept(PlanIterVisitor& v) const; | 191 | void accept(PlanIterVisitor& v) const; |
1744 | 182 | 192 | ||
1745 | 183 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 193 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
1746 | 184 | 194 | ||
1747 | === modified file 'src/runtime/core/apply_updates.cpp' | |||
1748 | --- src/runtime/core/apply_updates.cpp 2013-02-07 17:24:36 +0000 | |||
1749 | +++ src/runtime/core/apply_updates.cpp 2014-03-04 03:22:54 +0000 | |||
1750 | @@ -46,6 +46,7 @@ | |||
1751 | 46 | { | 46 | { |
1752 | 47 | 47 | ||
1753 | 48 | SERIALIZABLE_CLASS_VERSIONS(ApplyIterator) | 48 | SERIALIZABLE_CLASS_VERSIONS(ApplyIterator) |
1754 | 49 | DEF_GET_NAME_AS_STRING(ApplyIterator) | ||
1755 | 49 | 50 | ||
1756 | 50 | 51 | ||
1757 | 51 | /******************************************************************************* | 52 | /******************************************************************************* |
1758 | 52 | 53 | ||
1759 | === modified file 'src/runtime/core/apply_updates.h' | |||
1760 | --- src/runtime/core/apply_updates.h 2013-02-07 17:24:36 +0000 | |||
1761 | +++ src/runtime/core/apply_updates.h 2014-03-04 03:22:54 +0000 | |||
1762 | @@ -66,6 +66,8 @@ | |||
1763 | 66 | 66 | ||
1764 | 67 | void accept(PlanIterVisitor& v) const; | 67 | void accept(PlanIterVisitor& v) const; |
1765 | 68 | 68 | ||
1766 | 69 | zstring getNameAsString() const; | ||
1767 | 70 | |||
1768 | 69 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 71 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
1769 | 70 | }; | 72 | }; |
1770 | 71 | 73 | ||
1771 | 72 | 74 | ||
1772 | === modified file 'src/runtime/core/constructors.cpp' | |||
1773 | --- src/runtime/core/constructors.cpp 2013-06-22 10:59:44 +0000 | |||
1774 | +++ src/runtime/core/constructors.cpp 2014-03-04 03:22:54 +0000 | |||
1775 | @@ -50,22 +50,31 @@ | |||
1776 | 50 | { | 50 | { |
1777 | 51 | 51 | ||
1778 | 52 | SERIALIZABLE_CLASS_VERSIONS(DocumentIterator) | 52 | SERIALIZABLE_CLASS_VERSIONS(DocumentIterator) |
1779 | 53 | DEF_GET_NAME_AS_STRING(DocumentIterator) | ||
1780 | 53 | 54 | ||
1781 | 54 | SERIALIZABLE_CLASS_VERSIONS(ElementIterator) | 55 | SERIALIZABLE_CLASS_VERSIONS(ElementIterator) |
1782 | 56 | DEF_GET_NAME_AS_STRING(ElementIterator) | ||
1783 | 55 | 57 | ||
1784 | 56 | SERIALIZABLE_CLASS_VERSIONS(AttributeIterator) | 58 | SERIALIZABLE_CLASS_VERSIONS(AttributeIterator) |
1785 | 59 | DEF_GET_NAME_AS_STRING(AttributeIterator) | ||
1786 | 57 | 60 | ||
1787 | 58 | SERIALIZABLE_CLASS_VERSIONS(NameCastIterator) | 61 | SERIALIZABLE_CLASS_VERSIONS(NameCastIterator) |
1788 | 62 | DEF_GET_NAME_AS_STRING(NameCastIterator) | ||
1789 | 59 | 63 | ||
1790 | 60 | SERIALIZABLE_CLASS_VERSIONS(CommentIterator) | 64 | SERIALIZABLE_CLASS_VERSIONS(CommentIterator) |
1791 | 65 | DEF_GET_NAME_AS_STRING(CommentIterator) | ||
1792 | 61 | 66 | ||
1793 | 62 | SERIALIZABLE_CLASS_VERSIONS(PiIterator) | 67 | SERIALIZABLE_CLASS_VERSIONS(PiIterator) |
1794 | 68 | DEF_GET_NAME_AS_STRING(PiIterator) | ||
1795 | 63 | 69 | ||
1796 | 64 | SERIALIZABLE_CLASS_VERSIONS(TextIterator) | 70 | SERIALIZABLE_CLASS_VERSIONS(TextIterator) |
1797 | 71 | DEF_GET_NAME_AS_STRING(TextIterator) | ||
1798 | 65 | 72 | ||
1799 | 66 | SERIALIZABLE_CLASS_VERSIONS(NamespaceIterator) | 73 | SERIALIZABLE_CLASS_VERSIONS(NamespaceIterator) |
1800 | 74 | DEF_GET_NAME_AS_STRING(NamespaceIterator) | ||
1801 | 67 | 75 | ||
1802 | 68 | SERIALIZABLE_CLASS_VERSIONS(EnclosedIterator) | 76 | SERIALIZABLE_CLASS_VERSIONS(EnclosedIterator) |
1803 | 77 | DEF_GET_NAME_AS_STRING(EnclosedIterator) | ||
1804 | 69 | 78 | ||
1805 | 70 | /******************************************************************************* | 79 | /******************************************************************************* |
1806 | 71 | 80 | ||
1807 | 72 | 81 | ||
1808 | === modified file 'src/runtime/core/constructors.h' | |||
1809 | --- src/runtime/core/constructors.h 2013-03-05 12:34:19 +0000 | |||
1810 | +++ src/runtime/core/constructors.h 2014-03-04 03:22:54 +0000 | |||
1811 | @@ -73,6 +73,8 @@ | |||
1812 | 73 | 73 | ||
1813 | 74 | void openImpl(PlanState& planState, uint32_t& offset); | 74 | void openImpl(PlanState& planState, uint32_t& offset); |
1814 | 75 | 75 | ||
1815 | 76 | zstring getNameAsString() const; | ||
1816 | 77 | |||
1817 | 76 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 78 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
1818 | 77 | }; | 79 | }; |
1819 | 78 | 80 | ||
1820 | @@ -151,6 +153,8 @@ | |||
1821 | 151 | 153 | ||
1822 | 152 | void openImpl(PlanState& planState, uint32_t& offset); | 154 | void openImpl(PlanState& planState, uint32_t& offset); |
1823 | 153 | 155 | ||
1824 | 156 | zstring getNameAsString() const; | ||
1825 | 157 | |||
1826 | 154 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 158 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
1827 | 155 | 159 | ||
1828 | 156 | void resetImpl(PlanState& planState) const; | 160 | void resetImpl(PlanState& planState) const; |
1829 | @@ -201,6 +205,8 @@ | |||
1830 | 201 | 205 | ||
1831 | 202 | void accept(PlanIterVisitor& v) const; | 206 | void accept(PlanIterVisitor& v) const; |
1832 | 203 | 207 | ||
1833 | 208 | zstring getNameAsString() const; | ||
1834 | 209 | |||
1835 | 204 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 210 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
1836 | 205 | }; | 211 | }; |
1837 | 206 | 212 | ||
1838 | @@ -244,6 +250,8 @@ | |||
1839 | 244 | 250 | ||
1840 | 245 | void accept(PlanIterVisitor& v) const; | 251 | void accept(PlanIterVisitor& v) const; |
1841 | 246 | 252 | ||
1842 | 253 | zstring getNameAsString() const; | ||
1843 | 254 | |||
1844 | 247 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 255 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
1845 | 248 | }; | 256 | }; |
1846 | 249 | 257 | ||
1847 | @@ -287,6 +295,8 @@ | |||
1848 | 287 | 295 | ||
1849 | 288 | void accept(PlanIterVisitor& v) const; | 296 | void accept(PlanIterVisitor& v) const; |
1850 | 289 | 297 | ||
1851 | 298 | zstring getNameAsString() const; | ||
1852 | 299 | |||
1853 | 290 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 300 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
1854 | 291 | }; | 301 | }; |
1855 | 292 | 302 | ||
1856 | @@ -317,6 +327,8 @@ | |||
1857 | 317 | 327 | ||
1858 | 318 | void accept(PlanIterVisitor& v) const; | 328 | void accept(PlanIterVisitor& v) const; |
1859 | 319 | 329 | ||
1860 | 330 | zstring getNameAsString() const; | ||
1861 | 331 | |||
1862 | 320 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 332 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
1863 | 321 | }; | 333 | }; |
1864 | 322 | 334 | ||
1865 | @@ -344,6 +356,8 @@ | |||
1866 | 344 | 356 | ||
1867 | 345 | void accept(PlanIterVisitor& v) const; | 357 | void accept(PlanIterVisitor& v) const; |
1868 | 346 | 358 | ||
1869 | 359 | zstring getNameAsString() const; | ||
1870 | 360 | |||
1871 | 347 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 361 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
1872 | 348 | }; | 362 | }; |
1873 | 349 | 363 | ||
1874 | @@ -401,6 +415,8 @@ | |||
1875 | 401 | 415 | ||
1876 | 402 | void accept(PlanIterVisitor& v) const; | 416 | void accept(PlanIterVisitor& v) const; |
1877 | 403 | 417 | ||
1878 | 418 | zstring getNameAsString() const; | ||
1879 | 419 | |||
1880 | 404 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 420 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
1881 | 405 | }; | 421 | }; |
1882 | 406 | 422 | ||
1883 | @@ -435,6 +451,8 @@ | |||
1884 | 435 | 451 | ||
1885 | 436 | void accept(PlanIterVisitor& v) const; | 452 | void accept(PlanIterVisitor& v) const; |
1886 | 437 | 453 | ||
1887 | 454 | zstring getNameAsString() const; | ||
1888 | 455 | |||
1889 | 438 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 456 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
1890 | 439 | }; | 457 | }; |
1891 | 440 | 458 | ||
1892 | 441 | 459 | ||
1893 | === modified file 'src/runtime/core/flwor_iterator.cpp' | |||
1894 | --- src/runtime/core/flwor_iterator.cpp 2013-10-10 03:54:10 +0000 | |||
1895 | +++ src/runtime/core/flwor_iterator.cpp 2014-03-04 03:22:54 +0000 | |||
1896 | @@ -1801,6 +1801,11 @@ | |||
1897 | 1801 | /******************************************************************************* | 1801 | /******************************************************************************* |
1898 | 1802 | 1802 | ||
1899 | 1803 | ********************************************************************************/ | 1803 | ********************************************************************************/ |
1900 | 1804 | zstring FLWORIterator::getNameAsString() const { | ||
1901 | 1805 | return "FLWORIterator"; | ||
1902 | 1806 | } | ||
1903 | 1807 | |||
1904 | 1808 | |||
1905 | 1804 | uint32_t FLWORIterator::getStateSize() const | 1809 | uint32_t FLWORIterator::getStateSize() const |
1906 | 1805 | { | 1810 | { |
1907 | 1806 | return sizeof(FlworState); | 1811 | return sizeof(FlworState); |
1908 | 1807 | 1812 | ||
1909 | === modified file 'src/runtime/core/flwor_iterator.h' | |||
1910 | --- src/runtime/core/flwor_iterator.h 2013-05-28 18:20:54 +0000 | |||
1911 | +++ src/runtime/core/flwor_iterator.h 2014-03-04 03:22:54 +0000 | |||
1912 | @@ -471,6 +471,8 @@ | |||
1913 | 471 | void resetImpl(PlanState& planState) const; | 471 | void resetImpl(PlanState& planState) const; |
1914 | 472 | void closeImpl(PlanState& planState); | 472 | void closeImpl(PlanState& planState); |
1915 | 473 | 473 | ||
1916 | 474 | zstring getNameAsString() const; | ||
1917 | 475 | |||
1918 | 474 | uint32_t getStateSize() const; | 476 | uint32_t getStateSize() const; |
1919 | 475 | 477 | ||
1920 | 476 | uint32_t getStateSizeOfSubtree() const; | 478 | uint32_t getStateSizeOfSubtree() const; |
1921 | 477 | 479 | ||
1922 | === modified file 'src/runtime/core/fncall_iterator.cpp' | |||
1923 | --- src/runtime/core/fncall_iterator.cpp 2014-01-15 03:02:39 +0000 | |||
1924 | +++ src/runtime/core/fncall_iterator.cpp 2014-03-04 03:22:54 +0000 | |||
1925 | @@ -40,6 +40,7 @@ | |||
1926 | 40 | #include "runtime/util/flowctl_exception.h" // for ExitException | 40 | #include "runtime/util/flowctl_exception.h" // for ExitException |
1927 | 41 | #include "runtime/api/plan_iterator_wrapper.h" | 41 | #include "runtime/api/plan_iterator_wrapper.h" |
1928 | 42 | #include "runtime/visitors/planiter_visitor.h" | 42 | #include "runtime/visitors/planiter_visitor.h" |
1929 | 43 | #include "runtime/visitors/printer_visitor.h" | ||
1930 | 43 | 44 | ||
1931 | 44 | #include "api/unmarshaller.h" | 45 | #include "api/unmarshaller.h" |
1932 | 45 | #include "api/xqueryimpl.h" | 46 | #include "api/xqueryimpl.h" |
1933 | @@ -119,11 +120,8 @@ | |||
1934 | 119 | { | 120 | { |
1935 | 120 | if (thePlanOpen) | 121 | if (thePlanOpen) |
1936 | 121 | thePlan->close(*thePlanState); | 122 | thePlan->close(*thePlanState); |
1942 | 122 | 123 | delete thePlanState; | |
1943 | 123 | if (thePlanState != NULL) | 124 | if (theIsLocalDCtxOwner) |
1939 | 124 | delete thePlanState; | ||
1940 | 125 | |||
1941 | 126 | if (theLocalDCtx != NULL && theIsLocalDCtxOwner) | ||
1944 | 127 | delete theLocalDCtx; | 125 | delete theLocalDCtx; |
1945 | 128 | } | 126 | } |
1946 | 129 | 127 | ||
1947 | @@ -243,6 +241,15 @@ | |||
1948 | 243 | /******************************************************************************* | 241 | /******************************************************************************* |
1949 | 244 | 242 | ||
1950 | 245 | ********************************************************************************/ | 243 | ********************************************************************************/ |
1951 | 244 | zstring UDFunctionCallIterator::getNameAsString() const | ||
1952 | 245 | { | ||
1953 | 246 | return theUDF->getName()->getStringValue(); | ||
1954 | 247 | } | ||
1955 | 248 | |||
1956 | 249 | |||
1957 | 250 | /******************************************************************************* | ||
1958 | 251 | |||
1959 | 252 | ********************************************************************************/ | ||
1960 | 246 | bool UDFunctionCallIterator::isUpdating() const | 253 | bool UDFunctionCallIterator::isUpdating() const |
1961 | 247 | { | 254 | { |
1962 | 248 | return theUDF->isUpdating(); | 255 | return theUDF->isUpdating(); |
1963 | @@ -640,7 +647,38 @@ | |||
1964 | 640 | } | 647 | } |
1965 | 641 | 648 | ||
1966 | 642 | 649 | ||
1967 | 650 | #if 0 | ||
1968 | 643 | NARY_ACCEPT(UDFunctionCallIterator); | 651 | NARY_ACCEPT(UDFunctionCallIterator); |
1969 | 652 | #else | ||
1970 | 653 | // | ||
1971 | 654 | // We specialize accept() to descend into the separate plan for the UDF, but | ||
1972 | 655 | // only for a PrinterVisitor and no other kind of visitor. | ||
1973 | 656 | // | ||
1974 | 657 | void UDFunctionCallIterator::accept( PlanIterVisitor &v ) const { | ||
1975 | 658 | v.beginVisit( *this ); | ||
1976 | 659 | std::vector<PlanIter_t>::const_iterator i( theChildren.begin() ); | ||
1977 | 660 | std::vector<PlanIter_t>::const_iterator const end( theChildren.end() ); | ||
1978 | 661 | for ( ; i != end; ++i ) | ||
1979 | 662 | (*i)->accept( v ); | ||
1980 | 663 | if ( PrinterVisitor *const pv = dynamic_cast<PrinterVisitor*>( &v ) ) { | ||
1981 | 664 | PlanState *const state = pv->getPlanState(); | ||
1982 | 665 | if ( state && Properties::instance().getProfile() ) { | ||
1983 | 666 | UDFunctionCallIteratorState *const udf_state = | ||
1984 | 667 | StateTraitsImpl<UDFunctionCallIteratorState>::getState( | ||
1985 | 668 | *state, getStateOffset() | ||
1986 | 669 | ); | ||
1987 | 670 | if ( udf_state->thePlanOpen ) { | ||
1988 | 671 | if ( PlanIterator *const udf_pi = udf_state->thePlan.getp() ) { | ||
1989 | 672 | pv->setPlanState( udf_state->thePlanState ); | ||
1990 | 673 | udf_pi->accept( *pv ); | ||
1991 | 674 | pv->setPlanState( state ); | ||
1992 | 675 | } | ||
1993 | 676 | } | ||
1994 | 677 | } | ||
1995 | 678 | } | ||
1996 | 679 | v.endVisit( *this ); | ||
1997 | 680 | } | ||
1998 | 681 | #endif | ||
1999 | 644 | 682 | ||
2000 | 645 | 683 | ||
2001 | 646 | ///////////////////////////////////////////////////////////////////////////////// | 684 | ///////////////////////////////////////////////////////////////////////////////// |
2002 | @@ -788,6 +826,15 @@ | |||
2003 | 788 | } | 826 | } |
2004 | 789 | 827 | ||
2005 | 790 | 828 | ||
2006 | 829 | zstring ExtFunctionCallIterator::getNameAsString() const { | ||
2007 | 830 | String const uri( theFunction->getURI() ); | ||
2008 | 831 | String const local( theFunction->getLocalName() ); | ||
2009 | 832 | |||
2010 | 833 | zstring name( '{' + Unmarshaller::getInternalString( uri ) + '}' + Unmarshaller::getInternalString( local ) ); | ||
2011 | 834 | return name; | ||
2012 | 835 | } | ||
2013 | 836 | |||
2014 | 837 | |||
2015 | 791 | void ExtFunctionCallIterator::serialize(serialization::Archiver& ar) | 838 | void ExtFunctionCallIterator::serialize(serialization::Archiver& ar) |
2016 | 792 | { | 839 | { |
2017 | 793 | ar.dont_allow_delay_for_plan_sctx = true; | 840 | ar.dont_allow_delay_for_plan_sctx = true; |
2018 | 794 | 841 | ||
2019 | === modified file 'src/runtime/core/fncall_iterator.h' | |||
2020 | --- src/runtime/core/fncall_iterator.h 2014-01-15 00:58:24 +0000 | |||
2021 | +++ src/runtime/core/fncall_iterator.h 2014-03-04 03:22:54 +0000 | |||
2022 | @@ -168,6 +168,8 @@ | |||
2023 | 168 | 168 | ||
2024 | 169 | virtual ~UDFunctionCallIterator(); | 169 | virtual ~UDFunctionCallIterator(); |
2025 | 170 | 170 | ||
2026 | 171 | zstring getNameAsString() const; | ||
2027 | 172 | |||
2028 | 171 | bool isUpdating() const; | 173 | bool isUpdating() const; |
2029 | 172 | 174 | ||
2030 | 173 | void setDynamic() { theIsDynamic = true; } | 175 | void setDynamic() { theIsDynamic = true; } |
2031 | @@ -252,6 +254,8 @@ | |||
2032 | 252 | 254 | ||
2033 | 253 | virtual ~ExtFunctionCallIterator(); | 255 | virtual ~ExtFunctionCallIterator(); |
2034 | 254 | 256 | ||
2035 | 257 | zstring getNameAsString() const; | ||
2036 | 258 | |||
2037 | 255 | virtual bool isUpdating() const { return theIsUpdating; } | 259 | virtual bool isUpdating() const { return theIsUpdating; } |
2038 | 256 | 260 | ||
2039 | 257 | void accept(PlanIterVisitor& v) const; | 261 | void accept(PlanIterVisitor& v) const; |
2040 | 258 | 262 | ||
2041 | === modified file 'src/runtime/core/gflwor/count_iterator.cpp' | |||
2042 | --- src/runtime/core/gflwor/count_iterator.cpp 2013-02-07 17:24:36 +0000 | |||
2043 | +++ src/runtime/core/gflwor/count_iterator.cpp 2014-03-04 03:22:54 +0000 | |||
2044 | @@ -31,6 +31,7 @@ | |||
2045 | 31 | namespace flwor | 31 | namespace flwor |
2046 | 32 | { | 32 | { |
2047 | 33 | SERIALIZABLE_CLASS_VERSIONS(CountIterator) | 33 | SERIALIZABLE_CLASS_VERSIONS(CountIterator) |
2048 | 34 | DEF_GET_NAME_AS_STRING(CountIterator) | ||
2049 | 34 | 35 | ||
2050 | 35 | 36 | ||
2051 | 36 | ///////////////////////////////////////////////////////////////////////////////// | 37 | ///////////////////////////////////////////////////////////////////////////////// |
2052 | 37 | 38 | ||
2053 | === modified file 'src/runtime/core/gflwor/count_iterator.h' | |||
2054 | --- src/runtime/core/gflwor/count_iterator.h 2013-02-07 17:24:36 +0000 | |||
2055 | +++ src/runtime/core/gflwor/count_iterator.h 2014-03-04 03:22:54 +0000 | |||
2056 | @@ -70,6 +70,8 @@ | |||
2057 | 70 | 70 | ||
2058 | 71 | void accept(PlanIterVisitor& v) const; | 71 | void accept(PlanIterVisitor& v) const; |
2059 | 72 | 72 | ||
2060 | 73 | zstring getNameAsString() const; | ||
2061 | 74 | |||
2062 | 73 | bool nextImpl ( store::Item_t& result, PlanState& planState ) const; | 75 | bool nextImpl ( store::Item_t& result, PlanState& planState ) const; |
2063 | 74 | }; | 76 | }; |
2064 | 75 | 77 | ||
2065 | 76 | 78 | ||
2066 | === modified file 'src/runtime/core/gflwor/for_iterator.cpp' | |||
2067 | --- src/runtime/core/gflwor/for_iterator.cpp 2013-02-07 17:24:36 +0000 | |||
2068 | +++ src/runtime/core/gflwor/for_iterator.cpp 2014-03-04 03:22:54 +0000 | |||
2069 | @@ -109,6 +109,11 @@ | |||
2070 | 109 | } | 109 | } |
2071 | 110 | 110 | ||
2072 | 111 | 111 | ||
2073 | 112 | zstring ForIterator::getNameAsString() const { | ||
2074 | 113 | return "ForIterator"; | ||
2075 | 114 | } | ||
2076 | 115 | |||
2077 | 116 | |||
2078 | 112 | bool ForIterator::nextImpl(store::Item_t& aResult, PlanState& aPlanState) const | 117 | bool ForIterator::nextImpl(store::Item_t& aResult, PlanState& aPlanState) const |
2079 | 113 | { | 118 | { |
2080 | 114 | ForState* lState; | 119 | ForState* lState; |
2081 | 115 | 120 | ||
2082 | === modified file 'src/runtime/core/gflwor/for_iterator.h' | |||
2083 | --- src/runtime/core/gflwor/for_iterator.h 2013-02-07 17:24:36 +0000 | |||
2084 | +++ src/runtime/core/gflwor/for_iterator.h 2014-03-04 03:22:54 +0000 | |||
2085 | @@ -105,6 +105,8 @@ | |||
2086 | 105 | 105 | ||
2087 | 106 | void accept(PlanIterVisitor& v) const; | 106 | void accept(PlanIterVisitor& v) const; |
2088 | 107 | 107 | ||
2089 | 108 | zstring getNameAsString() const; | ||
2090 | 109 | |||
2091 | 108 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 110 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2092 | 109 | }; | 111 | }; |
2093 | 110 | 112 | ||
2094 | 111 | 113 | ||
2095 | === modified file 'src/runtime/core/gflwor/groupby_iterator.cpp' | |||
2096 | --- src/runtime/core/gflwor/groupby_iterator.cpp 2013-10-10 03:54:10 +0000 | |||
2097 | +++ src/runtime/core/gflwor/groupby_iterator.cpp 2014-03-04 03:22:54 +0000 | |||
2098 | @@ -161,6 +161,11 @@ | |||
2099 | 161 | /***************************************************************************//** | 161 | /***************************************************************************//** |
2100 | 162 | 162 | ||
2101 | 163 | ********************************************************************************/ | 163 | ********************************************************************************/ |
2102 | 164 | zstring GroupByIterator::getNameAsString() const { | ||
2103 | 165 | return "GroupByIterator"; | ||
2104 | 166 | } | ||
2105 | 167 | |||
2106 | 168 | |||
2107 | 164 | uint32_t GroupByIterator::getStateSize() const | 169 | uint32_t GroupByIterator::getStateSize() const |
2108 | 165 | { | 170 | { |
2109 | 166 | return StateTraitsImpl<GroupByState>::getStateSize(); | 171 | return StateTraitsImpl<GroupByState>::getStateSize(); |
2110 | 167 | 172 | ||
2111 | === modified file 'src/runtime/core/gflwor/groupby_iterator.h' | |||
2112 | --- src/runtime/core/gflwor/groupby_iterator.h 2013-05-28 18:20:54 +0000 | |||
2113 | +++ src/runtime/core/gflwor/groupby_iterator.h 2014-03-04 03:22:54 +0000 | |||
2114 | @@ -83,6 +83,8 @@ | |||
2115 | 83 | 83 | ||
2116 | 84 | ~GroupByIterator(); | 84 | ~GroupByIterator(); |
2117 | 85 | 85 | ||
2118 | 86 | zstring getNameAsString() const; | ||
2119 | 87 | |||
2120 | 86 | uint32_t getStateSize() const; | 88 | uint32_t getStateSize() const; |
2121 | 87 | 89 | ||
2122 | 88 | uint32_t getStateSizeOfSubtree() const; | 90 | uint32_t getStateSizeOfSubtree() const; |
2123 | 89 | 91 | ||
2124 | === modified file 'src/runtime/core/gflwor/let_iterator.cpp' | |||
2125 | --- src/runtime/core/gflwor/let_iterator.cpp 2013-02-26 04:12:43 +0000 | |||
2126 | +++ src/runtime/core/gflwor/let_iterator.cpp 2014-03-04 03:22:54 +0000 | |||
2127 | @@ -84,6 +84,10 @@ | |||
2128 | 84 | } | 84 | } |
2129 | 85 | 85 | ||
2130 | 86 | 86 | ||
2131 | 87 | zstring LetIterator::getNameAsString() const { | ||
2132 | 88 | return "LetIterator"; | ||
2133 | 89 | } | ||
2134 | 90 | |||
2135 | 87 | 91 | ||
2136 | 88 | bool LetIterator::nextImpl(store::Item_t& result, PlanState& planState) const | 92 | bool LetIterator::nextImpl(store::Item_t& result, PlanState& planState) const |
2137 | 89 | { | 93 | { |
2138 | 90 | 94 | ||
2139 | === modified file 'src/runtime/core/gflwor/let_iterator.h' | |||
2140 | --- src/runtime/core/gflwor/let_iterator.h 2013-02-26 04:12:43 +0000 | |||
2141 | +++ src/runtime/core/gflwor/let_iterator.h 2014-03-04 03:22:54 +0000 | |||
2142 | @@ -69,6 +69,8 @@ | |||
2143 | 69 | 69 | ||
2144 | 70 | ~LetIterator(); | 70 | ~LetIterator(); |
2145 | 71 | 71 | ||
2146 | 72 | zstring getNameAsString() const; | ||
2147 | 73 | |||
2148 | 72 | store::Item* getVarName() const { return theVarName.getp(); } | 74 | store::Item* getVarName() const { return theVarName.getp(); } |
2149 | 73 | 75 | ||
2150 | 74 | void setSingleItem() { theSingleItemLETVar = true; } | 76 | void setSingleItem() { theSingleItemLETVar = true; } |
2151 | 75 | 77 | ||
2152 | === modified file 'src/runtime/core/gflwor/orderby_iterator.cpp' | |||
2153 | --- src/runtime/core/gflwor/orderby_iterator.cpp 2013-05-28 18:20:54 +0000 | |||
2154 | +++ src/runtime/core/gflwor/orderby_iterator.cpp 2014-03-04 03:22:54 +0000 | |||
2155 | @@ -220,6 +220,11 @@ | |||
2156 | 220 | } | 220 | } |
2157 | 221 | 221 | ||
2158 | 222 | 222 | ||
2159 | 223 | zstring OrderByIterator::getNameAsString() const { | ||
2160 | 224 | return "OrderByIterator"; | ||
2161 | 225 | } | ||
2162 | 226 | |||
2163 | 227 | |||
2164 | 223 | uint32_t OrderByIterator::getStateSize() const | 228 | uint32_t OrderByIterator::getStateSize() const |
2165 | 224 | { | 229 | { |
2166 | 225 | return sizeof(OrderByState); | 230 | return sizeof(OrderByState); |
2167 | 226 | 231 | ||
2168 | === modified file 'src/runtime/core/gflwor/orderby_iterator.h' | |||
2169 | --- src/runtime/core/gflwor/orderby_iterator.h 2013-05-28 18:20:54 +0000 | |||
2170 | +++ src/runtime/core/gflwor/orderby_iterator.h 2014-03-04 03:22:54 +0000 | |||
2171 | @@ -216,6 +216,8 @@ | |||
2172 | 216 | void resetImpl(PlanState& planState) const; | 216 | void resetImpl(PlanState& planState) const; |
2173 | 217 | void closeImpl(PlanState& planState); | 217 | void closeImpl(PlanState& planState); |
2174 | 218 | 218 | ||
2175 | 219 | zstring getNameAsString() const; | ||
2176 | 220 | |||
2177 | 219 | virtual uint32_t getStateSize() const; | 221 | virtual uint32_t getStateSize() const; |
2178 | 220 | virtual uint32_t getStateSizeOfSubtree() const; | 222 | virtual uint32_t getStateSizeOfSubtree() const; |
2179 | 221 | 223 | ||
2180 | 222 | 224 | ||
2181 | === modified file 'src/runtime/core/gflwor/outerfor_iterator.cpp' | |||
2182 | --- src/runtime/core/gflwor/outerfor_iterator.cpp 2013-02-07 17:24:36 +0000 | |||
2183 | +++ src/runtime/core/gflwor/outerfor_iterator.cpp 2014-03-04 03:22:54 +0000 | |||
2184 | @@ -33,6 +33,7 @@ | |||
2185 | 33 | namespace flwor | 33 | namespace flwor |
2186 | 34 | { | 34 | { |
2187 | 35 | SERIALIZABLE_CLASS_VERSIONS(OuterForIterator) | 35 | SERIALIZABLE_CLASS_VERSIONS(OuterForIterator) |
2188 | 36 | DEF_GET_NAME_AS_STRING(OuterForIterator) | ||
2189 | 36 | 37 | ||
2190 | 37 | 38 | ||
2191 | 38 | ///////////////////////////////////////////////////////////////////////////////// | 39 | ///////////////////////////////////////////////////////////////////////////////// |
2192 | 39 | 40 | ||
2193 | === modified file 'src/runtime/core/gflwor/outerfor_iterator.h' | |||
2194 | --- src/runtime/core/gflwor/outerfor_iterator.h 2013-02-07 17:24:36 +0000 | |||
2195 | +++ src/runtime/core/gflwor/outerfor_iterator.h 2014-03-04 03:22:54 +0000 | |||
2196 | @@ -75,6 +75,8 @@ | |||
2197 | 75 | 75 | ||
2198 | 76 | void accept(PlanIterVisitor& v) const; | 76 | void accept(PlanIterVisitor& v) const; |
2199 | 77 | 77 | ||
2200 | 78 | zstring getNameAsString() const; | ||
2201 | 79 | |||
2202 | 78 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 80 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2203 | 79 | }; | 81 | }; |
2204 | 80 | 82 | ||
2205 | 81 | 83 | ||
2206 | === modified file 'src/runtime/core/gflwor/tuplesource_iterator.cpp' | |||
2207 | --- src/runtime/core/gflwor/tuplesource_iterator.cpp 2013-02-07 17:24:36 +0000 | |||
2208 | +++ src/runtime/core/gflwor/tuplesource_iterator.cpp 2014-03-04 03:22:54 +0000 | |||
2209 | @@ -36,6 +36,7 @@ | |||
2210 | 36 | { | 36 | { |
2211 | 37 | 37 | ||
2212 | 38 | SERIALIZABLE_CLASS_VERSIONS(TupleSourceIterator) | 38 | SERIALIZABLE_CLASS_VERSIONS(TupleSourceIterator) |
2213 | 39 | DEF_GET_NAME_AS_STRING(TupleSourceIterator) | ||
2214 | 39 | 40 | ||
2215 | 40 | 41 | ||
2216 | 41 | bool TupleSourceIterator::nextImpl(store::Item_t& aResult, PlanState& aPlanState) const | 42 | bool TupleSourceIterator::nextImpl(store::Item_t& aResult, PlanState& aPlanState) const |
2217 | 42 | 43 | ||
2218 | === modified file 'src/runtime/core/gflwor/tuplestream_iterator.cpp' | |||
2219 | --- src/runtime/core/gflwor/tuplestream_iterator.cpp 2013-09-17 21:12:49 +0000 | |||
2220 | +++ src/runtime/core/gflwor/tuplestream_iterator.cpp 2014-03-04 03:22:54 +0000 | |||
2221 | @@ -35,6 +35,7 @@ | |||
2222 | 35 | namespace flwor | 35 | namespace flwor |
2223 | 36 | { | 36 | { |
2224 | 37 | SERIALIZABLE_CLASS_VERSIONS(TupleStreamIterator) | 37 | SERIALIZABLE_CLASS_VERSIONS(TupleStreamIterator) |
2225 | 38 | DEF_GET_NAME_AS_STRING(TupleStreamIterator) | ||
2226 | 38 | 39 | ||
2227 | 39 | 40 | ||
2228 | 40 | TupleStreamIterator::TupleStreamIterator( | 41 | TupleStreamIterator::TupleStreamIterator( |
2229 | 41 | 42 | ||
2230 | === modified file 'src/runtime/core/gflwor/tuplestream_iterator.h' | |||
2231 | --- src/runtime/core/gflwor/tuplestream_iterator.h 2013-02-07 17:24:36 +0000 | |||
2232 | +++ src/runtime/core/gflwor/tuplestream_iterator.h 2014-03-04 03:22:54 +0000 | |||
2233 | @@ -67,6 +67,8 @@ | |||
2234 | 67 | 67 | ||
2235 | 68 | void accept(PlanIterVisitor& v) const; | 68 | void accept(PlanIterVisitor& v) const; |
2236 | 69 | 69 | ||
2237 | 70 | zstring getNameAsString() const; | ||
2238 | 71 | |||
2239 | 70 | bool nextImpl ( store::Item_t& result, PlanState& planState ) const; | 72 | bool nextImpl ( store::Item_t& result, PlanState& planState ) const; |
2240 | 71 | }; | 73 | }; |
2241 | 72 | 74 | ||
2242 | 73 | 75 | ||
2243 | === modified file 'src/runtime/core/gflwor/where_iterator.cpp' | |||
2244 | --- src/runtime/core/gflwor/where_iterator.cpp 2013-02-07 17:24:36 +0000 | |||
2245 | +++ src/runtime/core/gflwor/where_iterator.cpp 2014-03-04 03:22:54 +0000 | |||
2246 | @@ -28,6 +28,7 @@ | |||
2247 | 28 | { | 28 | { |
2248 | 29 | 29 | ||
2249 | 30 | SERIALIZABLE_CLASS_VERSIONS(WhereIterator) | 30 | SERIALIZABLE_CLASS_VERSIONS(WhereIterator) |
2250 | 31 | DEF_GET_NAME_AS_STRING(WhereIterator) | ||
2251 | 31 | 32 | ||
2252 | 32 | 33 | ||
2253 | 33 | ///////////////////////////////////////////////////////////////////////////////// | 34 | ///////////////////////////////////////////////////////////////////////////////// |
2254 | 34 | 35 | ||
2255 | === modified file 'src/runtime/core/gflwor/window_iterator.cpp' | |||
2256 | --- src/runtime/core/gflwor/window_iterator.cpp 2013-05-28 18:20:54 +0000 | |||
2257 | +++ src/runtime/core/gflwor/window_iterator.cpp 2014-03-04 03:22:54 +0000 | |||
2258 | @@ -669,6 +669,11 @@ | |||
2259 | 669 | /***************************************************************************//** | 669 | /***************************************************************************//** |
2260 | 670 | 670 | ||
2261 | 671 | ********************************************************************************/ | 671 | ********************************************************************************/ |
2262 | 672 | zstring WindowIterator::getNameAsString() const { | ||
2263 | 673 | return "WindowIterator"; | ||
2264 | 674 | } | ||
2265 | 675 | |||
2266 | 676 | |||
2267 | 672 | uint32_t WindowIterator::getStateSize() const | 677 | uint32_t WindowIterator::getStateSize() const |
2268 | 673 | { | 678 | { |
2269 | 674 | return StateTraitsImpl<WindowState>::getStateSize(); | 679 | return StateTraitsImpl<WindowState>::getStateSize(); |
2270 | 675 | 680 | ||
2271 | === modified file 'src/runtime/core/gflwor/window_iterator.h' | |||
2272 | --- src/runtime/core/gflwor/window_iterator.h 2013-05-28 18:20:54 +0000 | |||
2273 | +++ src/runtime/core/gflwor/window_iterator.h 2014-03-04 03:22:54 +0000 | |||
2274 | @@ -368,6 +368,8 @@ | |||
2275 | 368 | 368 | ||
2276 | 369 | ~WindowIterator(); | 369 | ~WindowIterator(); |
2277 | 370 | 370 | ||
2278 | 371 | zstring getNameAsString() const; | ||
2279 | 372 | |||
2280 | 371 | uint32_t getStateSize() const; | 373 | uint32_t getStateSize() const; |
2281 | 372 | 374 | ||
2282 | 373 | uint32_t getStateSizeOfSubtree() const; | 375 | uint32_t getStateSizeOfSubtree() const; |
2283 | 374 | 376 | ||
2284 | === modified file 'src/runtime/core/internal_operators.cpp' | |||
2285 | --- src/runtime/core/internal_operators.cpp 2013-10-10 03:54:10 +0000 | |||
2286 | +++ src/runtime/core/internal_operators.cpp 2014-03-04 03:22:54 +0000 | |||
2287 | @@ -30,8 +30,10 @@ | |||
2288 | 30 | namespace zorba { | 30 | namespace zorba { |
2289 | 31 | 31 | ||
2290 | 32 | SERIALIZABLE_CLASS_VERSIONS(HoistIterator) | 32 | SERIALIZABLE_CLASS_VERSIONS(HoistIterator) |
2291 | 33 | DEF_GET_NAME_AS_STRING(HoistIterator) | ||
2292 | 33 | 34 | ||
2293 | 34 | SERIALIZABLE_CLASS_VERSIONS(UnhoistIterator) | 35 | SERIALIZABLE_CLASS_VERSIONS(UnhoistIterator) |
2294 | 36 | DEF_GET_NAME_AS_STRING(UnhoistIterator) | ||
2295 | 35 | 37 | ||
2296 | 36 | 38 | ||
2297 | 37 | 39 | ||
2298 | 38 | 40 | ||
2299 | === modified file 'src/runtime/core/item_iterator.cpp' | |||
2300 | --- src/runtime/core/item_iterator.cpp 2013-05-28 18:20:54 +0000 | |||
2301 | +++ src/runtime/core/item_iterator.cpp 2014-03-04 03:22:54 +0000 | |||
2302 | @@ -28,10 +28,13 @@ | |||
2303 | 28 | namespace zorba | 28 | namespace zorba |
2304 | 29 | { | 29 | { |
2305 | 30 | SERIALIZABLE_CLASS_VERSIONS(EmptyIterator) | 30 | SERIALIZABLE_CLASS_VERSIONS(EmptyIterator) |
2306 | 31 | DEF_GET_NAME_AS_STRING(EmptyIterator) | ||
2307 | 31 | 32 | ||
2308 | 32 | SERIALIZABLE_CLASS_VERSIONS(SingletonIterator) | 33 | SERIALIZABLE_CLASS_VERSIONS(SingletonIterator) |
2309 | 34 | DEF_GET_NAME_AS_STRING(SingletonIterator) | ||
2310 | 33 | 35 | ||
2311 | 34 | SERIALIZABLE_CLASS_VERSIONS(IfThenElseIterator) | 36 | SERIALIZABLE_CLASS_VERSIONS(IfThenElseIterator) |
2312 | 37 | DEF_GET_NAME_AS_STRING(IfThenElseIterator) | ||
2313 | 35 | 38 | ||
2314 | 36 | 39 | ||
2315 | 37 | /******************************************************************************* | 40 | /******************************************************************************* |
2316 | 38 | 41 | ||
2317 | === modified file 'src/runtime/core/item_iterator.h' | |||
2318 | --- src/runtime/core/item_iterator.h 2013-05-28 18:20:54 +0000 | |||
2319 | +++ src/runtime/core/item_iterator.h 2014-03-04 03:22:54 +0000 | |||
2320 | @@ -63,6 +63,8 @@ | |||
2321 | 63 | 63 | ||
2322 | 64 | virtual ~SingletonIterator() {} | 64 | virtual ~SingletonIterator() {} |
2323 | 65 | 65 | ||
2324 | 66 | zstring getNameAsString() const; | ||
2325 | 67 | |||
2326 | 66 | const store::Item_t& getValue() const { return theValue; } | 68 | const store::Item_t& getValue() const { return theValue; } |
2327 | 67 | 69 | ||
2328 | 68 | void accept(PlanIterVisitor& v) const; | 70 | void accept(PlanIterVisitor& v) const; |
2329 | @@ -115,6 +117,8 @@ | |||
2330 | 115 | PlanIter_t& aElseIter, | 117 | PlanIter_t& aElseIter, |
2331 | 116 | bool aIsBooleanIter = false); | 118 | bool aIsBooleanIter = false); |
2332 | 117 | 119 | ||
2333 | 120 | zstring getNameAsString() const; | ||
2334 | 121 | |||
2335 | 118 | virtual uint32_t getStateSize() const { return sizeof(IfThenElseIteratorState); } | 122 | virtual uint32_t getStateSize() const { return sizeof(IfThenElseIteratorState); } |
2336 | 119 | 123 | ||
2337 | 120 | virtual uint32_t getStateSizeOfSubtree() const; | 124 | virtual uint32_t getStateSizeOfSubtree() const; |
2338 | 121 | 125 | ||
2339 | === modified file 'src/runtime/core/nodeid_iterators.cpp' | |||
2340 | --- src/runtime/core/nodeid_iterators.cpp 2013-02-07 17:24:36 +0000 | |||
2341 | +++ src/runtime/core/nodeid_iterators.cpp 2014-03-04 03:22:54 +0000 | |||
2342 | @@ -30,8 +30,10 @@ | |||
2343 | 30 | namespace zorba | 30 | namespace zorba |
2344 | 31 | { | 31 | { |
2345 | 32 | SERIALIZABLE_CLASS_VERSIONS(NodeDistinctIterator) | 32 | SERIALIZABLE_CLASS_VERSIONS(NodeDistinctIterator) |
2346 | 33 | DEF_GET_NAME_AS_STRING(NodeDistinctIterator) | ||
2347 | 33 | 34 | ||
2348 | 34 | SERIALIZABLE_CLASS_VERSIONS(NodeSortIterator) | 35 | SERIALIZABLE_CLASS_VERSIONS(NodeSortIterator) |
2349 | 36 | DEF_GET_NAME_AS_STRING(NodeSortIterator) | ||
2350 | 35 | 37 | ||
2351 | 36 | 38 | ||
2352 | 37 | /******************************************************************************* | 39 | /******************************************************************************* |
2353 | 38 | 40 | ||
2354 | === modified file 'src/runtime/core/nodeid_iterators.h' | |||
2355 | --- src/runtime/core/nodeid_iterators.h 2013-02-07 17:24:36 +0000 | |||
2356 | +++ src/runtime/core/nodeid_iterators.h 2014-03-04 03:22:54 +0000 | |||
2357 | @@ -81,6 +81,8 @@ | |||
2358 | 81 | 81 | ||
2359 | 82 | void openImpl(PlanState& planState, uint32_t& offset); | 82 | void openImpl(PlanState& planState, uint32_t& offset); |
2360 | 83 | 83 | ||
2361 | 84 | zstring getNameAsString() const; | ||
2362 | 85 | |||
2363 | 84 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 86 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2364 | 85 | }; | 87 | }; |
2365 | 86 | 88 | ||
2366 | @@ -142,6 +144,8 @@ | |||
2367 | 142 | 144 | ||
2368 | 143 | void openImpl(PlanState& planState, uint32_t& offset); | 145 | void openImpl(PlanState& planState, uint32_t& offset); |
2369 | 144 | 146 | ||
2370 | 147 | zstring getNameAsString() const; | ||
2371 | 148 | |||
2372 | 145 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 149 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2373 | 146 | }; | 150 | }; |
2374 | 147 | 151 | ||
2375 | 148 | 152 | ||
2376 | === modified file 'src/runtime/core/path_iterators.cpp' | |||
2377 | --- src/runtime/core/path_iterators.cpp 2013-06-13 14:54:50 +0000 | |||
2378 | +++ src/runtime/core/path_iterators.cpp 2014-03-04 03:22:54 +0000 | |||
2379 | @@ -143,36 +143,52 @@ | |||
2380 | 143 | 143 | ||
2381 | 144 | 144 | ||
2382 | 145 | UNARY_ACCEPT(SelfAxisIterator); | 145 | UNARY_ACCEPT(SelfAxisIterator); |
2383 | 146 | DEF_GET_NAME_AS_STRING(SelfAxisIterator) | ||
2384 | 146 | 147 | ||
2385 | 147 | UNARY_ACCEPT(AttributeAxisIterator); | 148 | UNARY_ACCEPT(AttributeAxisIterator); |
2386 | 149 | DEF_GET_NAME_AS_STRING(AttributeAxisIterator) | ||
2387 | 148 | 150 | ||
2388 | 149 | UNARY_ACCEPT(ParentAxisIterator); | 151 | UNARY_ACCEPT(ParentAxisIterator); |
2389 | 152 | DEF_GET_NAME_AS_STRING(ParentAxisIterator) | ||
2390 | 150 | 153 | ||
2391 | 151 | UNARY_ACCEPT(AncestorAxisIterator); | 154 | UNARY_ACCEPT(AncestorAxisIterator); |
2392 | 155 | DEF_GET_NAME_AS_STRING(AncestorAxisIterator) | ||
2393 | 152 | 156 | ||
2394 | 153 | UNARY_ACCEPT(AncestorReverseAxisIterator); | 157 | UNARY_ACCEPT(AncestorReverseAxisIterator); |
2395 | 158 | DEF_GET_NAME_AS_STRING(AncestorReverseAxisIterator) | ||
2396 | 154 | 159 | ||
2397 | 155 | UNARY_ACCEPT(AncestorSelfAxisIterator); | 160 | UNARY_ACCEPT(AncestorSelfAxisIterator); |
2398 | 161 | DEF_GET_NAME_AS_STRING(AncestorSelfAxisIterator) | ||
2399 | 156 | 162 | ||
2400 | 157 | UNARY_ACCEPT(AncestorSelfReverseAxisIterator); | 163 | UNARY_ACCEPT(AncestorSelfReverseAxisIterator); |
2401 | 164 | DEF_GET_NAME_AS_STRING(AncestorSelfReverseAxisIterator) | ||
2402 | 158 | 165 | ||
2403 | 159 | UNARY_ACCEPT(RSiblingAxisIterator); | 166 | UNARY_ACCEPT(RSiblingAxisIterator); |
2404 | 167 | DEF_GET_NAME_AS_STRING(RSiblingAxisIterator) | ||
2405 | 160 | 168 | ||
2406 | 161 | UNARY_ACCEPT(LSiblingAxisIterator); | 169 | UNARY_ACCEPT(LSiblingAxisIterator); |
2407 | 170 | DEF_GET_NAME_AS_STRING(LSiblingAxisIterator) | ||
2408 | 162 | 171 | ||
2409 | 163 | UNARY_ACCEPT(LSiblingReverseAxisIterator); | 172 | UNARY_ACCEPT(LSiblingReverseAxisIterator); |
2410 | 173 | DEF_GET_NAME_AS_STRING(LSiblingReverseAxisIterator) | ||
2411 | 164 | 174 | ||
2412 | 165 | UNARY_ACCEPT(ChildAxisIterator); | 175 | UNARY_ACCEPT(ChildAxisIterator); |
2413 | 176 | DEF_GET_NAME_AS_STRING(ChildAxisIterator) | ||
2414 | 166 | 177 | ||
2415 | 167 | UNARY_ACCEPT(DescendantAxisIterator); | 178 | UNARY_ACCEPT(DescendantAxisIterator); |
2416 | 179 | DEF_GET_NAME_AS_STRING(DescendantAxisIterator) | ||
2417 | 168 | 180 | ||
2418 | 169 | UNARY_ACCEPT(DescendantSelfAxisIterator); | 181 | UNARY_ACCEPT(DescendantSelfAxisIterator); |
2419 | 182 | DEF_GET_NAME_AS_STRING(DescendantSelfAxisIterator) | ||
2420 | 170 | 183 | ||
2421 | 171 | UNARY_ACCEPT(PrecedingAxisIterator); | 184 | UNARY_ACCEPT(PrecedingAxisIterator); |
2422 | 185 | DEF_GET_NAME_AS_STRING(PrecedingAxisIterator) | ||
2423 | 172 | 186 | ||
2424 | 173 | UNARY_ACCEPT(PrecedingReverseAxisIterator); | 187 | UNARY_ACCEPT(PrecedingReverseAxisIterator); |
2425 | 188 | DEF_GET_NAME_AS_STRING(PrecedingReverseAxisIterator) | ||
2426 | 174 | 189 | ||
2427 | 175 | UNARY_ACCEPT(FollowingAxisIterator); | 190 | UNARY_ACCEPT(FollowingAxisIterator); |
2428 | 191 | DEF_GET_NAME_AS_STRING(FollowingAxisIterator) | ||
2429 | 176 | 192 | ||
2430 | 177 | 193 | ||
2431 | 178 | 194 | ||
2432 | 179 | 195 | ||
2433 | === modified file 'src/runtime/core/path_iterators.h' | |||
2434 | --- src/runtime/core/path_iterators.h 2013-02-07 17:24:36 +0000 | |||
2435 | +++ src/runtime/core/path_iterators.h 2014-03-04 03:22:54 +0000 | |||
2436 | @@ -205,6 +205,8 @@ | |||
2437 | 205 | 205 | ||
2438 | 206 | void accept(PlanIterVisitor& v) const; | 206 | void accept(PlanIterVisitor& v) const; |
2439 | 207 | 207 | ||
2440 | 208 | zstring getNameAsString() const; | ||
2441 | 209 | |||
2442 | 208 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 210 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2443 | 209 | }; | 211 | }; |
2444 | 210 | 212 | ||
2445 | @@ -248,6 +250,8 @@ | |||
2446 | 248 | 250 | ||
2447 | 249 | void accept(PlanIterVisitor& v) const; | 251 | void accept(PlanIterVisitor& v) const; |
2448 | 250 | 252 | ||
2449 | 253 | zstring getNameAsString() const; | ||
2450 | 254 | |||
2451 | 251 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 255 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2452 | 252 | }; | 256 | }; |
2453 | 253 | 257 | ||
2454 | @@ -280,6 +284,8 @@ | |||
2455 | 280 | 284 | ||
2456 | 281 | void accept(PlanIterVisitor& v) const; | 285 | void accept(PlanIterVisitor& v) const; |
2457 | 282 | 286 | ||
2458 | 287 | zstring getNameAsString() const; | ||
2459 | 288 | |||
2460 | 283 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 289 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2461 | 284 | }; | 290 | }; |
2462 | 285 | 291 | ||
2463 | @@ -316,6 +322,8 @@ | |||
2464 | 316 | 322 | ||
2465 | 317 | void accept(PlanIterVisitor& v) const; | 323 | void accept(PlanIterVisitor& v) const; |
2466 | 318 | 324 | ||
2467 | 325 | zstring getNameAsString() const; | ||
2468 | 326 | |||
2469 | 319 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 327 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2470 | 320 | }; | 328 | }; |
2471 | 321 | 329 | ||
2472 | @@ -354,6 +362,8 @@ | |||
2473 | 354 | 362 | ||
2474 | 355 | void accept(PlanIterVisitor& v) const; | 363 | void accept(PlanIterVisitor& v) const; |
2475 | 356 | 364 | ||
2476 | 365 | zstring getNameAsString() const; | ||
2477 | 366 | |||
2478 | 357 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 367 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2479 | 358 | }; | 368 | }; |
2480 | 359 | 369 | ||
2481 | @@ -383,6 +393,8 @@ | |||
2482 | 383 | 393 | ||
2483 | 384 | void accept(PlanIterVisitor& v) const; | 394 | void accept(PlanIterVisitor& v) const; |
2484 | 385 | 395 | ||
2485 | 396 | zstring getNameAsString() const; | ||
2486 | 397 | |||
2487 | 386 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 398 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2488 | 387 | }; | 399 | }; |
2489 | 388 | 400 | ||
2490 | @@ -417,6 +429,8 @@ | |||
2491 | 417 | 429 | ||
2492 | 418 | void accept(PlanIterVisitor& v) const; | 430 | void accept(PlanIterVisitor& v) const; |
2493 | 419 | 431 | ||
2494 | 432 | zstring getNameAsString() const; | ||
2495 | 433 | |||
2496 | 420 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 434 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2497 | 421 | }; | 435 | }; |
2498 | 422 | 436 | ||
2499 | @@ -465,6 +479,8 @@ | |||
2500 | 465 | 479 | ||
2501 | 466 | void accept(PlanIterVisitor& v) const; | 480 | void accept(PlanIterVisitor& v) const; |
2502 | 467 | 481 | ||
2503 | 482 | zstring getNameAsString() const; | ||
2504 | 483 | |||
2505 | 468 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 484 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2506 | 469 | }; | 485 | }; |
2507 | 470 | 486 | ||
2508 | @@ -497,6 +513,8 @@ | |||
2509 | 497 | 513 | ||
2510 | 498 | void accept(PlanIterVisitor& v) const; | 514 | void accept(PlanIterVisitor& v) const; |
2511 | 499 | 515 | ||
2512 | 516 | zstring getNameAsString() const; | ||
2513 | 517 | |||
2514 | 500 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 518 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2515 | 501 | }; | 519 | }; |
2516 | 502 | 520 | ||
2517 | @@ -547,6 +565,8 @@ | |||
2518 | 547 | 565 | ||
2519 | 548 | void accept(PlanIterVisitor& v) const; | 566 | void accept(PlanIterVisitor& v) const; |
2520 | 549 | 567 | ||
2521 | 568 | zstring getNameAsString() const; | ||
2522 | 569 | |||
2523 | 550 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 570 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2524 | 551 | }; | 571 | }; |
2525 | 552 | 572 | ||
2526 | @@ -590,6 +610,8 @@ | |||
2527 | 590 | 610 | ||
2528 | 591 | void accept(PlanIterVisitor& v) const; | 611 | void accept(PlanIterVisitor& v) const; |
2529 | 592 | 612 | ||
2530 | 613 | zstring getNameAsString() const; | ||
2531 | 614 | |||
2532 | 593 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 615 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2533 | 594 | }; | 616 | }; |
2534 | 595 | 617 | ||
2535 | @@ -675,6 +697,8 @@ | |||
2536 | 675 | 697 | ||
2537 | 676 | void accept(PlanIterVisitor& v) const; | 698 | void accept(PlanIterVisitor& v) const; |
2538 | 677 | 699 | ||
2539 | 700 | zstring getNameAsString() const; | ||
2540 | 701 | |||
2541 | 678 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 702 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2542 | 679 | }; | 703 | }; |
2543 | 680 | 704 | ||
2544 | @@ -709,6 +733,8 @@ | |||
2545 | 709 | 733 | ||
2546 | 710 | void accept(PlanIterVisitor& v) const; | 734 | void accept(PlanIterVisitor& v) const; |
2547 | 711 | 735 | ||
2548 | 736 | zstring getNameAsString() const; | ||
2549 | 737 | |||
2550 | 712 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 738 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2551 | 713 | }; | 739 | }; |
2552 | 714 | 740 | ||
2553 | @@ -760,6 +786,8 @@ | |||
2554 | 760 | 786 | ||
2555 | 761 | void accept(PlanIterVisitor& v) const; | 787 | void accept(PlanIterVisitor& v) const; |
2556 | 762 | 788 | ||
2557 | 789 | zstring getNameAsString() const; | ||
2558 | 790 | |||
2559 | 763 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 791 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2560 | 764 | }; | 792 | }; |
2561 | 765 | 793 | ||
2562 | @@ -849,6 +877,8 @@ | |||
2563 | 849 | 877 | ||
2564 | 850 | void accept(PlanIterVisitor& v) const; | 878 | void accept(PlanIterVisitor& v) const; |
2565 | 851 | 879 | ||
2566 | 880 | zstring getNameAsString() const; | ||
2567 | 881 | |||
2568 | 852 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 882 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2569 | 853 | }; | 883 | }; |
2570 | 854 | 884 | ||
2571 | @@ -903,6 +933,8 @@ | |||
2572 | 903 | 933 | ||
2573 | 904 | void accept(PlanIterVisitor& v) const; | 934 | void accept(PlanIterVisitor& v) const; |
2574 | 905 | 935 | ||
2575 | 936 | zstring getNameAsString() const; | ||
2576 | 937 | |||
2577 | 906 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 938 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2578 | 907 | }; | 939 | }; |
2579 | 908 | 940 | ||
2580 | 909 | 941 | ||
2581 | === modified file 'src/runtime/core/sequencetypes.cpp' | |||
2582 | --- src/runtime/core/sequencetypes.cpp 2014-01-17 20:07:49 +0000 | |||
2583 | +++ src/runtime/core/sequencetypes.cpp 2014-03-04 03:22:54 +0000 | |||
2584 | @@ -39,16 +39,22 @@ | |||
2585 | 39 | { | 39 | { |
2586 | 40 | 40 | ||
2587 | 41 | SERIALIZABLE_CLASS_VERSIONS(InstanceOfIterator) | 41 | SERIALIZABLE_CLASS_VERSIONS(InstanceOfIterator) |
2588 | 42 | DEF_GET_NAME_AS_STRING(InstanceOfIterator) | ||
2589 | 42 | 43 | ||
2590 | 43 | SERIALIZABLE_CLASS_VERSIONS(CastIterator) | 44 | SERIALIZABLE_CLASS_VERSIONS(CastIterator) |
2591 | 45 | DEF_GET_NAME_AS_STRING(CastIterator) | ||
2592 | 44 | 46 | ||
2593 | 45 | SERIALIZABLE_CLASS_VERSIONS(CastableIterator) | 47 | SERIALIZABLE_CLASS_VERSIONS(CastableIterator) |
2594 | 48 | DEF_GET_NAME_AS_STRING(CastableIterator) | ||
2595 | 46 | 49 | ||
2596 | 47 | SERIALIZABLE_CLASS_VERSIONS(PromoteIterator) | 50 | SERIALIZABLE_CLASS_VERSIONS(PromoteIterator) |
2597 | 51 | DEF_GET_NAME_AS_STRING(PromoteIterator) | ||
2598 | 48 | 52 | ||
2599 | 49 | SERIALIZABLE_CLASS_VERSIONS(TreatIterator) | 53 | SERIALIZABLE_CLASS_VERSIONS(TreatIterator) |
2600 | 54 | DEF_GET_NAME_AS_STRING(TreatIterator) | ||
2601 | 50 | 55 | ||
2602 | 51 | SERIALIZABLE_CLASS_VERSIONS(EitherNodesOrAtomicsIterator) | 56 | SERIALIZABLE_CLASS_VERSIONS(EitherNodesOrAtomicsIterator) |
2603 | 57 | DEF_GET_NAME_AS_STRING(EitherNodesOrAtomicsIterator) | ||
2604 | 52 | 58 | ||
2605 | 53 | 59 | ||
2606 | 54 | /******************************************************************************* | 60 | /******************************************************************************* |
2607 | @@ -628,6 +634,7 @@ | |||
2608 | 628 | } | 634 | } |
2609 | 629 | } | 635 | } |
2610 | 630 | 636 | ||
2611 | 637 | |||
2612 | 631 | bool TreatIterator::nextImpl(store::Item_t& result, PlanState& planState) const | 638 | bool TreatIterator::nextImpl(store::Item_t& result, PlanState& planState) const |
2613 | 632 | { | 639 | { |
2614 | 633 | store::Item_t temp; | 640 | store::Item_t temp; |
2615 | 634 | 641 | ||
2616 | === modified file 'src/runtime/core/sequencetypes.h' | |||
2617 | --- src/runtime/core/sequencetypes.h 2014-01-17 20:07:49 +0000 | |||
2618 | +++ src/runtime/core/sequencetypes.h 2014-03-04 03:22:54 +0000 | |||
2619 | @@ -64,6 +64,8 @@ | |||
2620 | 64 | ~InstanceOfIterator(); | 64 | ~InstanceOfIterator(); |
2621 | 65 | 65 | ||
2622 | 66 | void accept(PlanIterVisitor& v) const; | 66 | void accept(PlanIterVisitor& v) const; |
2623 | 67 | |||
2624 | 68 | zstring getNameAsString() const; | ||
2625 | 67 | 69 | ||
2626 | 68 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 70 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2627 | 69 | }; | 71 | }; |
2628 | @@ -114,6 +116,8 @@ | |||
2629 | 114 | 116 | ||
2630 | 115 | void accept(PlanIterVisitor& v) const; | 117 | void accept(PlanIterVisitor& v) const; |
2631 | 116 | 118 | ||
2632 | 119 | zstring getNameAsString() const; | ||
2633 | 120 | |||
2634 | 117 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 121 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
2635 | 118 | }; | 122 | }; |
2636 | 119 | 123 | ||
2637 | @@ -151,6 +155,8 @@ | |||
2638 | 151 | 155 | ||
2639 | 152 | void accept(PlanIterVisitor& v) const; | 156 | void accept(PlanIterVisitor& v) const; |
2640 | 153 | 157 | ||
2641 | 158 | zstring getNameAsString() const; | ||
2642 | 159 | |||
2643 | 154 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 160 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
2644 | 155 | }; | 161 | }; |
2645 | 156 | 162 | ||
2646 | @@ -192,6 +198,8 @@ | |||
2647 | 192 | 198 | ||
2648 | 193 | void accept(PlanIterVisitor& v) const; | 199 | void accept(PlanIterVisitor& v) const; |
2649 | 194 | 200 | ||
2650 | 201 | zstring getNameAsString() const; | ||
2651 | 202 | |||
2652 | 195 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 203 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
2653 | 196 | 204 | ||
2654 | 197 | protected: | 205 | protected: |
2655 | @@ -241,6 +249,8 @@ | |||
2656 | 241 | 249 | ||
2657 | 242 | void accept(PlanIterVisitor& v) const; | 250 | void accept(PlanIterVisitor& v) const; |
2658 | 243 | 251 | ||
2659 | 252 | zstring getNameAsString() const; | ||
2660 | 253 | |||
2661 | 244 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 254 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
2662 | 245 | 255 | ||
2663 | 246 | bool count(store::Item_t& result, PlanState& planState) const; | 256 | bool count(store::Item_t& result, PlanState& planState) const; |
2664 | 247 | 257 | ||
2665 | === modified file 'src/runtime/core/trycatch.cpp' | |||
2666 | --- src/runtime/core/trycatch.cpp 2013-03-07 13:18:55 +0000 | |||
2667 | +++ src/runtime/core/trycatch.cpp 2014-03-04 03:22:54 +0000 | |||
2668 | @@ -140,6 +140,12 @@ | |||
2669 | 140 | 140 | ||
2670 | 141 | } | 141 | } |
2671 | 142 | 142 | ||
2672 | 143 | |||
2673 | 144 | zstring TryCatchIterator::getNameAsString() const { | ||
2674 | 145 | return "TryCatchIterator"; | ||
2675 | 146 | } | ||
2676 | 147 | |||
2677 | 148 | |||
2678 | 143 | uint32_t | 149 | uint32_t |
2679 | 144 | TryCatchIterator::getStateSizeOfSubtree() const | 150 | TryCatchIterator::getStateSizeOfSubtree() const |
2680 | 145 | { | 151 | { |
2681 | 146 | 152 | ||
2682 | === modified file 'src/runtime/core/trycatch.h' | |||
2683 | --- src/runtime/core/trycatch.h 2013-03-07 13:18:55 +0000 | |||
2684 | +++ src/runtime/core/trycatch.h 2014-03-04 03:22:54 +0000 | |||
2685 | @@ -128,6 +128,8 @@ | |||
2686 | 128 | 128 | ||
2687 | 129 | void accept(PlanIterVisitor& v) const; | 129 | void accept(PlanIterVisitor& v) const; |
2688 | 130 | 130 | ||
2689 | 131 | zstring getNameAsString() const; | ||
2690 | 132 | |||
2691 | 131 | uint32_t getStateSizeOfSubtree() const; | 133 | uint32_t getStateSizeOfSubtree() const; |
2692 | 132 | 134 | ||
2693 | 133 | protected: | 135 | protected: |
2694 | 134 | 136 | ||
2695 | === modified file 'src/runtime/core/var_iterators.cpp' | |||
2696 | --- src/runtime/core/var_iterators.cpp 2014-01-17 01:22:32 +0000 | |||
2697 | +++ src/runtime/core/var_iterators.cpp 2014-03-04 03:22:54 +0000 | |||
2698 | @@ -41,16 +41,22 @@ | |||
2699 | 41 | { | 41 | { |
2700 | 42 | 42 | ||
2701 | 43 | SERIALIZABLE_CLASS_VERSIONS(CtxVarIterator) | 43 | SERIALIZABLE_CLASS_VERSIONS(CtxVarIterator) |
2702 | 44 | DEF_GET_NAME_AS_STRING(CtxVarIterator) | ||
2703 | 44 | 45 | ||
2704 | 45 | SERIALIZABLE_CLASS_VERSIONS(CtxVarDeclareIterator) | 46 | SERIALIZABLE_CLASS_VERSIONS(CtxVarDeclareIterator) |
2705 | 47 | DEF_GET_NAME_AS_STRING(CtxVarDeclareIterator) | ||
2706 | 46 | 48 | ||
2707 | 47 | SERIALIZABLE_CLASS_VERSIONS(CtxVarAssignIterator) | 49 | SERIALIZABLE_CLASS_VERSIONS(CtxVarAssignIterator) |
2708 | 50 | DEF_GET_NAME_AS_STRING(CtxVarAssignIterator) | ||
2709 | 48 | 51 | ||
2710 | 49 | SERIALIZABLE_CLASS_VERSIONS(CtxVarIsSetIterator) | 52 | SERIALIZABLE_CLASS_VERSIONS(CtxVarIsSetIterator) |
2711 | 53 | DEF_GET_NAME_AS_STRING(CtxVarIsSetIterator) | ||
2712 | 50 | 54 | ||
2713 | 51 | SERIALIZABLE_CLASS_VERSIONS(ForVarIterator) | 55 | SERIALIZABLE_CLASS_VERSIONS(ForVarIterator) |
2714 | 56 | DEF_GET_NAME_AS_STRING(ForVarIterator) | ||
2715 | 52 | 57 | ||
2716 | 53 | SERIALIZABLE_CLASS_VERSIONS(LetVarIterator) | 58 | SERIALIZABLE_CLASS_VERSIONS(LetVarIterator) |
2717 | 59 | DEF_GET_NAME_AS_STRING(LetVarIterator) | ||
2718 | 54 | 60 | ||
2719 | 55 | 61 | ||
2720 | 56 | ///////////////////////////////////////////////////////////////////////////////// | 62 | ///////////////////////////////////////////////////////////////////////////////// |
2721 | 57 | 63 | ||
2722 | === modified file 'src/runtime/core/var_iterators.h' | |||
2723 | --- src/runtime/core/var_iterators.h 2013-05-08 20:14:47 +0000 | |||
2724 | +++ src/runtime/core/var_iterators.h 2014-03-04 03:22:54 +0000 | |||
2725 | @@ -93,6 +93,8 @@ | |||
2726 | 93 | 93 | ||
2727 | 94 | void accept(PlanIterVisitor& v) const; | 94 | void accept(PlanIterVisitor& v) const; |
2728 | 95 | 95 | ||
2729 | 96 | zstring getNameAsString() const; | ||
2730 | 97 | |||
2731 | 96 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 98 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2732 | 97 | }; | 99 | }; |
2733 | 98 | 100 | ||
2734 | @@ -152,6 +154,8 @@ | |||
2735 | 152 | 154 | ||
2736 | 153 | void accept(PlanIterVisitor& v) const; | 155 | void accept(PlanIterVisitor& v) const; |
2737 | 154 | 156 | ||
2738 | 157 | zstring getNameAsString() const; | ||
2739 | 158 | |||
2740 | 155 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 159 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2741 | 156 | }; | 160 | }; |
2742 | 157 | 161 | ||
2743 | @@ -196,6 +200,8 @@ | |||
2744 | 196 | 200 | ||
2745 | 197 | void accept(PlanIterVisitor& v) const; | 201 | void accept(PlanIterVisitor& v) const; |
2746 | 198 | 202 | ||
2747 | 203 | zstring getNameAsString() const; | ||
2748 | 204 | |||
2749 | 199 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 205 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2750 | 200 | }; | 206 | }; |
2751 | 201 | 207 | ||
2752 | @@ -301,6 +307,8 @@ | |||
2753 | 301 | 307 | ||
2754 | 302 | void closeImpl(PlanState& planState); | 308 | void closeImpl(PlanState& planState); |
2755 | 303 | 309 | ||
2756 | 310 | zstring getNameAsString() const; | ||
2757 | 311 | |||
2758 | 304 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 312 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2759 | 305 | }; | 313 | }; |
2760 | 306 | 314 | ||
2761 | @@ -357,6 +365,8 @@ | |||
2762 | 357 | 365 | ||
2763 | 358 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 366 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2764 | 359 | 367 | ||
2765 | 368 | zstring getNameAsString() const; | ||
2766 | 369 | |||
2767 | 360 | void bind(store::Item* value, PlanState& planState); | 370 | void bind(store::Item* value, PlanState& planState); |
2768 | 361 | }; | 371 | }; |
2769 | 362 | 372 | ||
2770 | @@ -472,6 +482,8 @@ | |||
2771 | 472 | 482 | ||
2772 | 473 | void closeImpl(PlanState& planState); | 483 | void closeImpl(PlanState& planState); |
2773 | 474 | 484 | ||
2774 | 485 | zstring getNameAsString() const; | ||
2775 | 486 | |||
2776 | 475 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 487 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
2777 | 476 | }; | 488 | }; |
2778 | 477 | 489 | ||
2779 | 478 | 490 | ||
2780 | === modified file 'src/runtime/csv/pregenerated/csv.cpp' | |||
2781 | --- src/runtime/csv/pregenerated/csv.cpp 2014-02-28 01:46:12 +0000 | |||
2782 | +++ src/runtime/csv/pregenerated/csv.cpp 2014-03-04 03:22:54 +0000 | |||
2783 | @@ -79,6 +79,10 @@ | |||
2784 | 79 | missing_ = missing::null; | 79 | missing_ = missing::null; |
2785 | 80 | skip_called_ = false; | 80 | skip_called_ = false; |
2786 | 81 | } | 81 | } |
2787 | 82 | |||
2788 | 83 | zstring CsvParseIterator::getNameAsString() const { | ||
2789 | 84 | return "fn-zorba-csv:parse"; | ||
2790 | 85 | } | ||
2791 | 82 | // </CsvParseIterator> | 86 | // </CsvParseIterator> |
2792 | 83 | 87 | ||
2793 | 84 | 88 | ||
2794 | @@ -111,6 +115,10 @@ | |||
2795 | 111 | 115 | ||
2796 | 112 | CsvSerializeIteratorState::~CsvSerializeIteratorState() {} | 116 | CsvSerializeIteratorState::~CsvSerializeIteratorState() {} |
2797 | 113 | 117 | ||
2798 | 118 | |||
2799 | 119 | zstring CsvSerializeIterator::getNameAsString() const { | ||
2800 | 120 | return "fn-zorba-csv:serialize"; | ||
2801 | 121 | } | ||
2802 | 114 | // </CsvSerializeIterator> | 122 | // </CsvSerializeIterator> |
2803 | 115 | 123 | ||
2804 | 116 | 124 | ||
2805 | 117 | 125 | ||
2806 | === modified file 'src/runtime/csv/pregenerated/csv.h' | |||
2807 | --- src/runtime/csv/pregenerated/csv.h 2014-01-31 01:39:38 +0000 | |||
2808 | +++ src/runtime/csv/pregenerated/csv.h 2014-03-04 03:22:54 +0000 | |||
2809 | @@ -86,6 +86,8 @@ | |||
2810 | 86 | 86 | ||
2811 | 87 | virtual ~CsvParseIterator(); | 87 | virtual ~CsvParseIterator(); |
2812 | 88 | 88 | ||
2813 | 89 | zstring getNameAsString() const; | ||
2814 | 90 | |||
2815 | 89 | public: | 91 | public: |
2816 | 90 | bool count(store::Item_t& result, PlanState& planState) const; | 92 | bool count(store::Item_t& result, PlanState& planState) const; |
2817 | 91 | bool skip(int64_t count, PlanState& planState) const; | 93 | bool skip(int64_t count, PlanState& planState) const; |
2818 | @@ -140,6 +142,8 @@ | |||
2819 | 140 | 142 | ||
2820 | 141 | virtual ~CsvSerializeIterator(); | 143 | virtual ~CsvSerializeIterator(); |
2821 | 142 | 144 | ||
2822 | 145 | zstring getNameAsString() const; | ||
2823 | 146 | |||
2824 | 143 | void accept(PlanIterVisitor& v) const; | 147 | void accept(PlanIterVisitor& v) const; |
2825 | 144 | 148 | ||
2826 | 145 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 149 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
2827 | 146 | 150 | ||
2828 | === modified file 'src/runtime/datetime/pregenerated/datetime.cpp' | |||
2829 | --- src/runtime/datetime/pregenerated/datetime.cpp 2014-01-31 01:39:38 +0000 | |||
2830 | +++ src/runtime/datetime/pregenerated/datetime.cpp 2014-03-04 03:22:54 +0000 | |||
2831 | @@ -58,6 +58,10 @@ | |||
2832 | 58 | 58 | ||
2833 | 59 | CurrentDate::~CurrentDate() {} | 59 | CurrentDate::~CurrentDate() {} |
2834 | 60 | 60 | ||
2835 | 61 | |||
2836 | 62 | zstring CurrentDate::getNameAsString() const { | ||
2837 | 63 | return "fn-zorba-dateTime:current-date"; | ||
2838 | 64 | } | ||
2839 | 61 | // </CurrentDate> | 65 | // </CurrentDate> |
2840 | 62 | 66 | ||
2841 | 63 | 67 | ||
2842 | @@ -86,6 +90,10 @@ | |||
2843 | 86 | 90 | ||
2844 | 87 | CurrentDateTime::~CurrentDateTime() {} | 91 | CurrentDateTime::~CurrentDateTime() {} |
2845 | 88 | 92 | ||
2846 | 93 | |||
2847 | 94 | zstring CurrentDateTime::getNameAsString() const { | ||
2848 | 95 | return "fn-zorba-dateTime:current-dateTime"; | ||
2849 | 96 | } | ||
2850 | 89 | // </CurrentDateTime> | 97 | // </CurrentDateTime> |
2851 | 90 | 98 | ||
2852 | 91 | 99 | ||
2853 | @@ -114,6 +122,10 @@ | |||
2854 | 114 | 122 | ||
2855 | 115 | CurrentTime::~CurrentTime() {} | 123 | CurrentTime::~CurrentTime() {} |
2856 | 116 | 124 | ||
2857 | 125 | |||
2858 | 126 | zstring CurrentTime::getNameAsString() const { | ||
2859 | 127 | return "fn-zorba-dateTime:current-time"; | ||
2860 | 128 | } | ||
2861 | 117 | // </CurrentTime> | 129 | // </CurrentTime> |
2862 | 118 | 130 | ||
2863 | 119 | 131 | ||
2864 | @@ -142,6 +154,10 @@ | |||
2865 | 142 | 154 | ||
2866 | 143 | MillisToDateTime::~MillisToDateTime() {} | 155 | MillisToDateTime::~MillisToDateTime() {} |
2867 | 144 | 156 | ||
2868 | 157 | |||
2869 | 158 | zstring MillisToDateTime::getNameAsString() const { | ||
2870 | 159 | return "fn-zorba-dateTime:millis-to-dateTime"; | ||
2871 | 160 | } | ||
2872 | 145 | // </MillisToDateTime> | 161 | // </MillisToDateTime> |
2873 | 146 | 162 | ||
2874 | 147 | 163 | ||
2875 | @@ -170,6 +186,10 @@ | |||
2876 | 170 | 186 | ||
2877 | 171 | ParseDate::~ParseDate() {} | 187 | ParseDate::~ParseDate() {} |
2878 | 172 | 188 | ||
2879 | 189 | |||
2880 | 190 | zstring ParseDate::getNameAsString() const { | ||
2881 | 191 | return "fn-zorba-dateTime:parse-date"; | ||
2882 | 192 | } | ||
2883 | 173 | // </ParseDate> | 193 | // </ParseDate> |
2884 | 174 | 194 | ||
2885 | 175 | 195 | ||
2886 | @@ -198,6 +218,10 @@ | |||
2887 | 198 | 218 | ||
2888 | 199 | ParseDateTime::~ParseDateTime() {} | 219 | ParseDateTime::~ParseDateTime() {} |
2889 | 200 | 220 | ||
2890 | 221 | |||
2891 | 222 | zstring ParseDateTime::getNameAsString() const { | ||
2892 | 223 | return "fn-zorba-dateTime:parse-dateTime"; | ||
2893 | 224 | } | ||
2894 | 201 | // </ParseDateTime> | 225 | // </ParseDateTime> |
2895 | 202 | 226 | ||
2896 | 203 | 227 | ||
2897 | @@ -226,6 +250,10 @@ | |||
2898 | 226 | 250 | ||
2899 | 227 | ParseTime::~ParseTime() {} | 251 | ParseTime::~ParseTime() {} |
2900 | 228 | 252 | ||
2901 | 253 | |||
2902 | 254 | zstring ParseTime::getNameAsString() const { | ||
2903 | 255 | return "fn-zorba-dateTime:parse-time"; | ||
2904 | 256 | } | ||
2905 | 229 | // </ParseTime> | 257 | // </ParseTime> |
2906 | 230 | 258 | ||
2907 | 231 | 259 | ||
2908 | @@ -254,6 +282,10 @@ | |||
2909 | 254 | 282 | ||
2910 | 255 | Timestamp::~Timestamp() {} | 283 | Timestamp::~Timestamp() {} |
2911 | 256 | 284 | ||
2912 | 285 | |||
2913 | 286 | zstring Timestamp::getNameAsString() const { | ||
2914 | 287 | return "fn-zorba-dateTime:timestamp"; | ||
2915 | 288 | } | ||
2916 | 257 | // </Timestamp> | 289 | // </Timestamp> |
2917 | 258 | 290 | ||
2918 | 259 | 291 | ||
2919 | @@ -282,6 +314,10 @@ | |||
2920 | 282 | 314 | ||
2921 | 283 | UTCOffset::~UTCOffset() {} | 315 | UTCOffset::~UTCOffset() {} |
2922 | 284 | 316 | ||
2923 | 317 | |||
2924 | 318 | zstring UTCOffset::getNameAsString() const { | ||
2925 | 319 | return "fn-zorba-dateTime:utc-offset"; | ||
2926 | 320 | } | ||
2927 | 285 | // </UTCOffset> | 321 | // </UTCOffset> |
2928 | 286 | 322 | ||
2929 | 287 | 323 | ||
2930 | 288 | 324 | ||
2931 | === modified file 'src/runtime/datetime/pregenerated/datetime.h' | |||
2932 | --- src/runtime/datetime/pregenerated/datetime.h 2014-01-31 01:39:38 +0000 | |||
2933 | +++ src/runtime/datetime/pregenerated/datetime.h 2014-03-04 03:22:54 +0000 | |||
2934 | @@ -61,6 +61,8 @@ | |||
2935 | 61 | 61 | ||
2936 | 62 | virtual ~CurrentDate(); | 62 | virtual ~CurrentDate(); |
2937 | 63 | 63 | ||
2938 | 64 | zstring getNameAsString() const; | ||
2939 | 65 | |||
2940 | 64 | void accept(PlanIterVisitor& v) const; | 66 | void accept(PlanIterVisitor& v) const; |
2941 | 65 | 67 | ||
2942 | 66 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 68 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
2943 | @@ -93,6 +95,8 @@ | |||
2944 | 93 | 95 | ||
2945 | 94 | virtual ~CurrentDateTime(); | 96 | virtual ~CurrentDateTime(); |
2946 | 95 | 97 | ||
2947 | 98 | zstring getNameAsString() const; | ||
2948 | 99 | |||
2949 | 96 | void accept(PlanIterVisitor& v) const; | 100 | void accept(PlanIterVisitor& v) const; |
2950 | 97 | 101 | ||
2951 | 98 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 102 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
2952 | @@ -125,6 +129,8 @@ | |||
2953 | 125 | 129 | ||
2954 | 126 | virtual ~CurrentTime(); | 130 | virtual ~CurrentTime(); |
2955 | 127 | 131 | ||
2956 | 132 | zstring getNameAsString() const; | ||
2957 | 133 | |||
2958 | 128 | void accept(PlanIterVisitor& v) const; | 134 | void accept(PlanIterVisitor& v) const; |
2959 | 129 | 135 | ||
2960 | 130 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 136 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
2961 | @@ -157,6 +163,8 @@ | |||
2962 | 157 | 163 | ||
2963 | 158 | virtual ~MillisToDateTime(); | 164 | virtual ~MillisToDateTime(); |
2964 | 159 | 165 | ||
2965 | 166 | zstring getNameAsString() const; | ||
2966 | 167 | |||
2967 | 160 | void accept(PlanIterVisitor& v) const; | 168 | void accept(PlanIterVisitor& v) const; |
2968 | 161 | 169 | ||
2969 | 162 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 170 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
2970 | @@ -189,6 +197,8 @@ | |||
2971 | 189 | 197 | ||
2972 | 190 | virtual ~ParseDate(); | 198 | virtual ~ParseDate(); |
2973 | 191 | 199 | ||
2974 | 200 | zstring getNameAsString() const; | ||
2975 | 201 | |||
2976 | 192 | void accept(PlanIterVisitor& v) const; | 202 | void accept(PlanIterVisitor& v) const; |
2977 | 193 | 203 | ||
2978 | 194 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 204 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
2979 | @@ -221,6 +231,8 @@ | |||
2980 | 221 | 231 | ||
2981 | 222 | virtual ~ParseDateTime(); | 232 | virtual ~ParseDateTime(); |
2982 | 223 | 233 | ||
2983 | 234 | zstring getNameAsString() const; | ||
2984 | 235 | |||
2985 | 224 | void accept(PlanIterVisitor& v) const; | 236 | void accept(PlanIterVisitor& v) const; |
2986 | 225 | 237 | ||
2987 | 226 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 238 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
2988 | @@ -253,6 +265,8 @@ | |||
2989 | 253 | 265 | ||
2990 | 254 | virtual ~ParseTime(); | 266 | virtual ~ParseTime(); |
2991 | 255 | 267 | ||
2992 | 268 | zstring getNameAsString() const; | ||
2993 | 269 | |||
2994 | 256 | void accept(PlanIterVisitor& v) const; | 270 | void accept(PlanIterVisitor& v) const; |
2995 | 257 | 271 | ||
2996 | 258 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 272 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
2997 | @@ -285,6 +299,8 @@ | |||
2998 | 285 | 299 | ||
2999 | 286 | virtual ~Timestamp(); | 300 | virtual ~Timestamp(); |
3000 | 287 | 301 | ||
3001 | 302 | zstring getNameAsString() const; | ||
3002 | 303 | |||
3003 | 288 | void accept(PlanIterVisitor& v) const; | 304 | void accept(PlanIterVisitor& v) const; |
3004 | 289 | 305 | ||
3005 | 290 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 306 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3006 | @@ -317,6 +333,8 @@ | |||
3007 | 317 | 333 | ||
3008 | 318 | virtual ~UTCOffset(); | 334 | virtual ~UTCOffset(); |
3009 | 319 | 335 | ||
3010 | 336 | zstring getNameAsString() const; | ||
3011 | 337 | |||
3012 | 320 | void accept(PlanIterVisitor& v) const; | 338 | void accept(PlanIterVisitor& v) const; |
3013 | 321 | 339 | ||
3014 | 322 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 340 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3015 | 323 | 341 | ||
3016 | === modified file 'src/runtime/debug/pregenerated/debug_iterator.cpp' | |||
3017 | --- src/runtime/debug/pregenerated/debug_iterator.cpp 2014-01-31 01:39:38 +0000 | |||
3018 | +++ src/runtime/debug/pregenerated/debug_iterator.cpp 2014-03-04 03:22:54 +0000 | |||
3019 | @@ -79,6 +79,10 @@ | |||
3020 | 79 | PlanIteratorState::reset(planState); | 79 | PlanIteratorState::reset(planState); |
3021 | 80 | notEmptySequence = false; | 80 | notEmptySequence = false; |
3022 | 81 | } | 81 | } |
3023 | 82 | |||
3024 | 83 | zstring DebugIterator::getNameAsString() const { | ||
3025 | 84 | return "DebugIterator"; | ||
3026 | 85 | } | ||
3027 | 82 | // </DebugIterator> | 86 | // </DebugIterator> |
3028 | 83 | 87 | ||
3029 | 84 | #endif | 88 | #endif |
3030 | 85 | 89 | ||
3031 | === modified file 'src/runtime/debug/pregenerated/debug_iterator.h' | |||
3032 | --- src/runtime/debug/pregenerated/debug_iterator.h 2014-01-31 01:39:38 +0000 | |||
3033 | +++ src/runtime/debug/pregenerated/debug_iterator.h 2014-03-04 03:22:54 +0000 | |||
3034 | @@ -99,6 +99,8 @@ | |||
3035 | 99 | 99 | ||
3036 | 100 | void setVarDeclaration(bool aValue) { theIsVarDeclaration= aValue; } | 100 | void setVarDeclaration(bool aValue) { theIsVarDeclaration= aValue; } |
3037 | 101 | 101 | ||
3038 | 102 | zstring getNameAsString() const; | ||
3039 | 103 | |||
3040 | 102 | public: | 104 | public: |
3041 | 103 | const DebugIterator* getDebuggerParent() const; | 105 | const DebugIterator* getDebuggerParent() const; |
3042 | 104 | std::vector<DebugIterator*> getDebuggerChildren() const; | 106 | std::vector<DebugIterator*> getDebuggerChildren() const; |
3043 | 105 | 107 | ||
3044 | === modified file 'src/runtime/durations_dates_times/DurationsDatesTimesImpl.cpp' | |||
3045 | --- src/runtime/durations_dates_times/DurationsDatesTimesImpl.cpp 2013-09-17 21:12:49 +0000 | |||
3046 | +++ src/runtime/durations_dates_times/DurationsDatesTimesImpl.cpp 2014-03-04 03:22:54 +0000 | |||
3047 | @@ -52,10 +52,13 @@ | |||
3048 | 52 | 52 | ||
3049 | 53 | 53 | ||
3050 | 54 | BINARY_ACCEPT(FnDateTimeConstructorIterator); | 54 | BINARY_ACCEPT(FnDateTimeConstructorIterator); |
3051 | 55 | DEF_GET_NAME_AS_STRING(FnDateTimeConstructorIterator) | ||
3052 | 55 | 56 | ||
3053 | 56 | UNARY_ACCEPT(FnAdjustToTimeZoneIterator_1); | 57 | UNARY_ACCEPT(FnAdjustToTimeZoneIterator_1); |
3054 | 58 | DEF_GET_NAME_AS_STRING(FnAdjustToTimeZoneIterator_1) | ||
3055 | 57 | 59 | ||
3056 | 58 | BINARY_ACCEPT(FnAdjustToTimeZoneIterator_2); | 60 | BINARY_ACCEPT(FnAdjustToTimeZoneIterator_2); |
3057 | 61 | DEF_GET_NAME_AS_STRING(FnAdjustToTimeZoneIterator_2) | ||
3058 | 59 | 62 | ||
3059 | 60 | 63 | ||
3060 | 61 | bool FnDateTimeConstructorIterator::nextImpl(store::Item_t& result, PlanState& planState) const | 64 | bool FnDateTimeConstructorIterator::nextImpl(store::Item_t& result, PlanState& planState) const |
3061 | 62 | 65 | ||
3062 | === modified file 'src/runtime/durations_dates_times/format_dateTime.cpp' | |||
3063 | --- src/runtime/durations_dates_times/format_dateTime.cpp 2013-08-02 18:34:08 +0000 | |||
3064 | +++ src/runtime/durations_dates_times/format_dateTime.cpp 2014-03-04 03:22:54 +0000 | |||
3065 | @@ -57,6 +57,7 @@ | |||
3066 | 57 | 57 | ||
3067 | 58 | SERIALIZABLE_CLASS_VERSIONS(FnFormatDateTimeIterator) | 58 | SERIALIZABLE_CLASS_VERSIONS(FnFormatDateTimeIterator) |
3068 | 59 | NARY_ACCEPT(FnFormatDateTimeIterator); | 59 | NARY_ACCEPT(FnFormatDateTimeIterator); |
3069 | 60 | DEF_GET_NAME_AS_STRING(FnFormatDateTimeIterator) | ||
3070 | 60 | 61 | ||
3071 | 61 | /////////////////////////////////////////////////////////////////////////////// | 62 | /////////////////////////////////////////////////////////////////////////////// |
3072 | 62 | 63 | ||
3073 | 63 | 64 | ||
3074 | === modified file 'src/runtime/durations_dates_times/format_dateTime.h' | |||
3075 | --- src/runtime/durations_dates_times/format_dateTime.h 2013-03-03 15:28:41 +0000 | |||
3076 | +++ src/runtime/durations_dates_times/format_dateTime.h 2014-03-04 03:22:54 +0000 | |||
3077 | @@ -62,6 +62,8 @@ | |||
3078 | 62 | 62 | ||
3079 | 63 | void accept( PlanIterVisitor& ) const; | 63 | void accept( PlanIterVisitor& ) const; |
3080 | 64 | 64 | ||
3081 | 65 | zstring getNameAsString() const; | ||
3082 | 66 | |||
3083 | 65 | bool nextImpl( store::Item_t&, PlanState& ) const; | 67 | bool nextImpl( store::Item_t&, PlanState& ) const; |
3084 | 66 | 68 | ||
3085 | 67 | private: | 69 | private: |
3086 | 68 | 70 | ||
3087 | === modified file 'src/runtime/durations_dates_times/pregenerated/durations_dates_times.cpp' | |||
3088 | --- src/runtime/durations_dates_times/pregenerated/durations_dates_times.cpp 2014-01-31 01:39:38 +0000 | |||
3089 | +++ src/runtime/durations_dates_times/pregenerated/durations_dates_times.cpp 2014-03-04 03:22:54 +0000 | |||
3090 | @@ -58,6 +58,10 @@ | |||
3091 | 58 | 58 | ||
3092 | 59 | YearsFromDurationIterator::~YearsFromDurationIterator() {} | 59 | YearsFromDurationIterator::~YearsFromDurationIterator() {} |
3093 | 60 | 60 | ||
3094 | 61 | |||
3095 | 62 | zstring YearsFromDurationIterator::getNameAsString() const { | ||
3096 | 63 | return "fn:years-from-duration"; | ||
3097 | 64 | } | ||
3098 | 61 | // </YearsFromDurationIterator> | 65 | // </YearsFromDurationIterator> |
3099 | 62 | 66 | ||
3100 | 63 | 67 | ||
3101 | @@ -86,6 +90,10 @@ | |||
3102 | 86 | 90 | ||
3103 | 87 | MonthsFromDurationIterator::~MonthsFromDurationIterator() {} | 91 | MonthsFromDurationIterator::~MonthsFromDurationIterator() {} |
3104 | 88 | 92 | ||
3105 | 93 | |||
3106 | 94 | zstring MonthsFromDurationIterator::getNameAsString() const { | ||
3107 | 95 | return "fn:months-from-duration"; | ||
3108 | 96 | } | ||
3109 | 89 | // </MonthsFromDurationIterator> | 97 | // </MonthsFromDurationIterator> |
3110 | 90 | 98 | ||
3111 | 91 | 99 | ||
3112 | @@ -114,6 +122,10 @@ | |||
3113 | 114 | 122 | ||
3114 | 115 | DaysFromDurationIterator::~DaysFromDurationIterator() {} | 123 | DaysFromDurationIterator::~DaysFromDurationIterator() {} |
3115 | 116 | 124 | ||
3116 | 125 | |||
3117 | 126 | zstring DaysFromDurationIterator::getNameAsString() const { | ||
3118 | 127 | return "fn:days-from-duration"; | ||
3119 | 128 | } | ||
3120 | 117 | // </DaysFromDurationIterator> | 129 | // </DaysFromDurationIterator> |
3121 | 118 | 130 | ||
3122 | 119 | 131 | ||
3123 | @@ -142,6 +154,10 @@ | |||
3124 | 142 | 154 | ||
3125 | 143 | HoursFromDurationIterator::~HoursFromDurationIterator() {} | 155 | HoursFromDurationIterator::~HoursFromDurationIterator() {} |
3126 | 144 | 156 | ||
3127 | 157 | |||
3128 | 158 | zstring HoursFromDurationIterator::getNameAsString() const { | ||
3129 | 159 | return "fn:hours-from-duration"; | ||
3130 | 160 | } | ||
3131 | 145 | // </HoursFromDurationIterator> | 161 | // </HoursFromDurationIterator> |
3132 | 146 | 162 | ||
3133 | 147 | 163 | ||
3134 | @@ -170,6 +186,10 @@ | |||
3135 | 170 | 186 | ||
3136 | 171 | MinutesFromDurationIterator::~MinutesFromDurationIterator() {} | 187 | MinutesFromDurationIterator::~MinutesFromDurationIterator() {} |
3137 | 172 | 188 | ||
3138 | 189 | |||
3139 | 190 | zstring MinutesFromDurationIterator::getNameAsString() const { | ||
3140 | 191 | return "fn:minutes-from-duration"; | ||
3141 | 192 | } | ||
3142 | 173 | // </MinutesFromDurationIterator> | 193 | // </MinutesFromDurationIterator> |
3143 | 174 | 194 | ||
3144 | 175 | 195 | ||
3145 | @@ -198,6 +218,10 @@ | |||
3146 | 198 | 218 | ||
3147 | 199 | SecondsFromDurationIterator::~SecondsFromDurationIterator() {} | 219 | SecondsFromDurationIterator::~SecondsFromDurationIterator() {} |
3148 | 200 | 220 | ||
3149 | 221 | |||
3150 | 222 | zstring SecondsFromDurationIterator::getNameAsString() const { | ||
3151 | 223 | return "fn:seconds-from-duration"; | ||
3152 | 224 | } | ||
3153 | 201 | // </SecondsFromDurationIterator> | 225 | // </SecondsFromDurationIterator> |
3154 | 202 | 226 | ||
3155 | 203 | 227 | ||
3156 | @@ -226,6 +250,10 @@ | |||
3157 | 226 | 250 | ||
3158 | 227 | YearFromDatetimeIterator::~YearFromDatetimeIterator() {} | 251 | YearFromDatetimeIterator::~YearFromDatetimeIterator() {} |
3159 | 228 | 252 | ||
3160 | 253 | |||
3161 | 254 | zstring YearFromDatetimeIterator::getNameAsString() const { | ||
3162 | 255 | return "fn:year-from-dateTime"; | ||
3163 | 256 | } | ||
3164 | 229 | // </YearFromDatetimeIterator> | 257 | // </YearFromDatetimeIterator> |
3165 | 230 | 258 | ||
3166 | 231 | 259 | ||
3167 | @@ -254,6 +282,10 @@ | |||
3168 | 254 | 282 | ||
3169 | 255 | MonthFromDatetimeIterator::~MonthFromDatetimeIterator() {} | 283 | MonthFromDatetimeIterator::~MonthFromDatetimeIterator() {} |
3170 | 256 | 284 | ||
3171 | 285 | |||
3172 | 286 | zstring MonthFromDatetimeIterator::getNameAsString() const { | ||
3173 | 287 | return "fn:month-from-dateTime"; | ||
3174 | 288 | } | ||
3175 | 257 | // </MonthFromDatetimeIterator> | 289 | // </MonthFromDatetimeIterator> |
3176 | 258 | 290 | ||
3177 | 259 | 291 | ||
3178 | @@ -282,6 +314,10 @@ | |||
3179 | 282 | 314 | ||
3180 | 283 | DayFromDatetimeIterator::~DayFromDatetimeIterator() {} | 315 | DayFromDatetimeIterator::~DayFromDatetimeIterator() {} |
3181 | 284 | 316 | ||
3182 | 317 | |||
3183 | 318 | zstring DayFromDatetimeIterator::getNameAsString() const { | ||
3184 | 319 | return "fn:day-from-dateTime"; | ||
3185 | 320 | } | ||
3186 | 285 | // </DayFromDatetimeIterator> | 321 | // </DayFromDatetimeIterator> |
3187 | 286 | 322 | ||
3188 | 287 | 323 | ||
3189 | @@ -310,6 +346,10 @@ | |||
3190 | 310 | 346 | ||
3191 | 311 | HoursFromDatetimeIterator::~HoursFromDatetimeIterator() {} | 347 | HoursFromDatetimeIterator::~HoursFromDatetimeIterator() {} |
3192 | 312 | 348 | ||
3193 | 349 | |||
3194 | 350 | zstring HoursFromDatetimeIterator::getNameAsString() const { | ||
3195 | 351 | return "fn:hours-from-dateTime"; | ||
3196 | 352 | } | ||
3197 | 313 | // </HoursFromDatetimeIterator> | 353 | // </HoursFromDatetimeIterator> |
3198 | 314 | 354 | ||
3199 | 315 | 355 | ||
3200 | @@ -338,6 +378,10 @@ | |||
3201 | 338 | 378 | ||
3202 | 339 | MinutesFromDatetimeIterator::~MinutesFromDatetimeIterator() {} | 379 | MinutesFromDatetimeIterator::~MinutesFromDatetimeIterator() {} |
3203 | 340 | 380 | ||
3204 | 381 | |||
3205 | 382 | zstring MinutesFromDatetimeIterator::getNameAsString() const { | ||
3206 | 383 | return "fn:minutes-from-dateTime"; | ||
3207 | 384 | } | ||
3208 | 341 | // </MinutesFromDatetimeIterator> | 385 | // </MinutesFromDatetimeIterator> |
3209 | 342 | 386 | ||
3210 | 343 | 387 | ||
3211 | @@ -366,6 +410,10 @@ | |||
3212 | 366 | 410 | ||
3213 | 367 | SecondsFromDatetimeIterator::~SecondsFromDatetimeIterator() {} | 411 | SecondsFromDatetimeIterator::~SecondsFromDatetimeIterator() {} |
3214 | 368 | 412 | ||
3215 | 413 | |||
3216 | 414 | zstring SecondsFromDatetimeIterator::getNameAsString() const { | ||
3217 | 415 | return "fn:seconds-from-dateTime"; | ||
3218 | 416 | } | ||
3219 | 369 | // </SecondsFromDatetimeIterator> | 417 | // </SecondsFromDatetimeIterator> |
3220 | 370 | 418 | ||
3221 | 371 | 419 | ||
3222 | @@ -394,6 +442,10 @@ | |||
3223 | 394 | 442 | ||
3224 | 395 | TimezoneFromDatetimeIterator::~TimezoneFromDatetimeIterator() {} | 443 | TimezoneFromDatetimeIterator::~TimezoneFromDatetimeIterator() {} |
3225 | 396 | 444 | ||
3226 | 445 | |||
3227 | 446 | zstring TimezoneFromDatetimeIterator::getNameAsString() const { | ||
3228 | 447 | return "fn:timezone-from-dateTime"; | ||
3229 | 448 | } | ||
3230 | 397 | // </TimezoneFromDatetimeIterator> | 449 | // </TimezoneFromDatetimeIterator> |
3231 | 398 | 450 | ||
3232 | 399 | 451 | ||
3233 | @@ -422,6 +474,10 @@ | |||
3234 | 422 | 474 | ||
3235 | 423 | YearFromDateIterator::~YearFromDateIterator() {} | 475 | YearFromDateIterator::~YearFromDateIterator() {} |
3236 | 424 | 476 | ||
3237 | 477 | |||
3238 | 478 | zstring YearFromDateIterator::getNameAsString() const { | ||
3239 | 479 | return "fn:year-from-date"; | ||
3240 | 480 | } | ||
3241 | 425 | // </YearFromDateIterator> | 481 | // </YearFromDateIterator> |
3242 | 426 | 482 | ||
3243 | 427 | 483 | ||
3244 | @@ -450,6 +506,10 @@ | |||
3245 | 450 | 506 | ||
3246 | 451 | MonthFromDateIterator::~MonthFromDateIterator() {} | 507 | MonthFromDateIterator::~MonthFromDateIterator() {} |
3247 | 452 | 508 | ||
3248 | 509 | |||
3249 | 510 | zstring MonthFromDateIterator::getNameAsString() const { | ||
3250 | 511 | return "fn:month-from-date"; | ||
3251 | 512 | } | ||
3252 | 453 | // </MonthFromDateIterator> | 513 | // </MonthFromDateIterator> |
3253 | 454 | 514 | ||
3254 | 455 | 515 | ||
3255 | @@ -478,6 +538,10 @@ | |||
3256 | 478 | 538 | ||
3257 | 479 | DayFromDateIterator::~DayFromDateIterator() {} | 539 | DayFromDateIterator::~DayFromDateIterator() {} |
3258 | 480 | 540 | ||
3259 | 541 | |||
3260 | 542 | zstring DayFromDateIterator::getNameAsString() const { | ||
3261 | 543 | return "fn:day-from-date"; | ||
3262 | 544 | } | ||
3263 | 481 | // </DayFromDateIterator> | 545 | // </DayFromDateIterator> |
3264 | 482 | 546 | ||
3265 | 483 | 547 | ||
3266 | @@ -506,6 +570,10 @@ | |||
3267 | 506 | 570 | ||
3268 | 507 | TimezoneFromDateIterator::~TimezoneFromDateIterator() {} | 571 | TimezoneFromDateIterator::~TimezoneFromDateIterator() {} |
3269 | 508 | 572 | ||
3270 | 573 | |||
3271 | 574 | zstring TimezoneFromDateIterator::getNameAsString() const { | ||
3272 | 575 | return "fn:timezone-from-date"; | ||
3273 | 576 | } | ||
3274 | 509 | // </TimezoneFromDateIterator> | 577 | // </TimezoneFromDateIterator> |
3275 | 510 | 578 | ||
3276 | 511 | 579 | ||
3277 | @@ -534,6 +602,10 @@ | |||
3278 | 534 | 602 | ||
3279 | 535 | HoursFromTimeIterator::~HoursFromTimeIterator() {} | 603 | HoursFromTimeIterator::~HoursFromTimeIterator() {} |
3280 | 536 | 604 | ||
3281 | 605 | |||
3282 | 606 | zstring HoursFromTimeIterator::getNameAsString() const { | ||
3283 | 607 | return "fn:hours-from-time"; | ||
3284 | 608 | } | ||
3285 | 537 | // </HoursFromTimeIterator> | 609 | // </HoursFromTimeIterator> |
3286 | 538 | 610 | ||
3287 | 539 | 611 | ||
3288 | @@ -562,6 +634,10 @@ | |||
3289 | 562 | 634 | ||
3290 | 563 | MinutesFromTimeIterator::~MinutesFromTimeIterator() {} | 635 | MinutesFromTimeIterator::~MinutesFromTimeIterator() {} |
3291 | 564 | 636 | ||
3292 | 637 | |||
3293 | 638 | zstring MinutesFromTimeIterator::getNameAsString() const { | ||
3294 | 639 | return "fn:minutes-from-time"; | ||
3295 | 640 | } | ||
3296 | 565 | // </MinutesFromTimeIterator> | 641 | // </MinutesFromTimeIterator> |
3297 | 566 | 642 | ||
3298 | 567 | 643 | ||
3299 | @@ -590,6 +666,10 @@ | |||
3300 | 590 | 666 | ||
3301 | 591 | SecondsFromTimeIterator::~SecondsFromTimeIterator() {} | 667 | SecondsFromTimeIterator::~SecondsFromTimeIterator() {} |
3302 | 592 | 668 | ||
3303 | 669 | |||
3304 | 670 | zstring SecondsFromTimeIterator::getNameAsString() const { | ||
3305 | 671 | return "fn:seconds-from-time"; | ||
3306 | 672 | } | ||
3307 | 593 | // </SecondsFromTimeIterator> | 673 | // </SecondsFromTimeIterator> |
3308 | 594 | 674 | ||
3309 | 595 | 675 | ||
3310 | @@ -618,6 +698,10 @@ | |||
3311 | 618 | 698 | ||
3312 | 619 | TimezoneFromTimeIterator::~TimezoneFromTimeIterator() {} | 699 | TimezoneFromTimeIterator::~TimezoneFromTimeIterator() {} |
3313 | 620 | 700 | ||
3314 | 701 | |||
3315 | 702 | zstring TimezoneFromTimeIterator::getNameAsString() const { | ||
3316 | 703 | return "fn:timezone-from-time"; | ||
3317 | 704 | } | ||
3318 | 621 | // </TimezoneFromTimeIterator> | 705 | // </TimezoneFromTimeIterator> |
3319 | 622 | 706 | ||
3320 | 623 | 707 | ||
3321 | 624 | 708 | ||
3322 | === modified file 'src/runtime/durations_dates_times/pregenerated/durations_dates_times.h' | |||
3323 | --- src/runtime/durations_dates_times/pregenerated/durations_dates_times.h 2014-01-31 01:39:38 +0000 | |||
3324 | +++ src/runtime/durations_dates_times/pregenerated/durations_dates_times.h 2014-03-04 03:22:54 +0000 | |||
3325 | @@ -58,6 +58,8 @@ | |||
3326 | 58 | 58 | ||
3327 | 59 | virtual ~YearsFromDurationIterator(); | 59 | virtual ~YearsFromDurationIterator(); |
3328 | 60 | 60 | ||
3329 | 61 | zstring getNameAsString() const; | ||
3330 | 62 | |||
3331 | 61 | void accept(PlanIterVisitor& v) const; | 63 | void accept(PlanIterVisitor& v) const; |
3332 | 62 | 64 | ||
3333 | 63 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 65 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3334 | @@ -88,6 +90,8 @@ | |||
3335 | 88 | 90 | ||
3336 | 89 | virtual ~MonthsFromDurationIterator(); | 91 | virtual ~MonthsFromDurationIterator(); |
3337 | 90 | 92 | ||
3338 | 93 | zstring getNameAsString() const; | ||
3339 | 94 | |||
3340 | 91 | void accept(PlanIterVisitor& v) const; | 95 | void accept(PlanIterVisitor& v) const; |
3341 | 92 | 96 | ||
3342 | 93 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 97 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3343 | @@ -118,6 +122,8 @@ | |||
3344 | 118 | 122 | ||
3345 | 119 | virtual ~DaysFromDurationIterator(); | 123 | virtual ~DaysFromDurationIterator(); |
3346 | 120 | 124 | ||
3347 | 125 | zstring getNameAsString() const; | ||
3348 | 126 | |||
3349 | 121 | void accept(PlanIterVisitor& v) const; | 127 | void accept(PlanIterVisitor& v) const; |
3350 | 122 | 128 | ||
3351 | 123 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 129 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3352 | @@ -148,6 +154,8 @@ | |||
3353 | 148 | 154 | ||
3354 | 149 | virtual ~HoursFromDurationIterator(); | 155 | virtual ~HoursFromDurationIterator(); |
3355 | 150 | 156 | ||
3356 | 157 | zstring getNameAsString() const; | ||
3357 | 158 | |||
3358 | 151 | void accept(PlanIterVisitor& v) const; | 159 | void accept(PlanIterVisitor& v) const; |
3359 | 152 | 160 | ||
3360 | 153 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 161 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3361 | @@ -178,6 +186,8 @@ | |||
3362 | 178 | 186 | ||
3363 | 179 | virtual ~MinutesFromDurationIterator(); | 187 | virtual ~MinutesFromDurationIterator(); |
3364 | 180 | 188 | ||
3365 | 189 | zstring getNameAsString() const; | ||
3366 | 190 | |||
3367 | 181 | void accept(PlanIterVisitor& v) const; | 191 | void accept(PlanIterVisitor& v) const; |
3368 | 182 | 192 | ||
3369 | 183 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 193 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3370 | @@ -208,6 +218,8 @@ | |||
3371 | 208 | 218 | ||
3372 | 209 | virtual ~SecondsFromDurationIterator(); | 219 | virtual ~SecondsFromDurationIterator(); |
3373 | 210 | 220 | ||
3374 | 221 | zstring getNameAsString() const; | ||
3375 | 222 | |||
3376 | 211 | void accept(PlanIterVisitor& v) const; | 223 | void accept(PlanIterVisitor& v) const; |
3377 | 212 | 224 | ||
3378 | 213 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 225 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3379 | @@ -238,6 +250,8 @@ | |||
3380 | 238 | 250 | ||
3381 | 239 | virtual ~YearFromDatetimeIterator(); | 251 | virtual ~YearFromDatetimeIterator(); |
3382 | 240 | 252 | ||
3383 | 253 | zstring getNameAsString() const; | ||
3384 | 254 | |||
3385 | 241 | void accept(PlanIterVisitor& v) const; | 255 | void accept(PlanIterVisitor& v) const; |
3386 | 242 | 256 | ||
3387 | 243 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 257 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3388 | @@ -268,6 +282,8 @@ | |||
3389 | 268 | 282 | ||
3390 | 269 | virtual ~MonthFromDatetimeIterator(); | 283 | virtual ~MonthFromDatetimeIterator(); |
3391 | 270 | 284 | ||
3392 | 285 | zstring getNameAsString() const; | ||
3393 | 286 | |||
3394 | 271 | void accept(PlanIterVisitor& v) const; | 287 | void accept(PlanIterVisitor& v) const; |
3395 | 272 | 288 | ||
3396 | 273 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 289 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3397 | @@ -298,6 +314,8 @@ | |||
3398 | 298 | 314 | ||
3399 | 299 | virtual ~DayFromDatetimeIterator(); | 315 | virtual ~DayFromDatetimeIterator(); |
3400 | 300 | 316 | ||
3401 | 317 | zstring getNameAsString() const; | ||
3402 | 318 | |||
3403 | 301 | void accept(PlanIterVisitor& v) const; | 319 | void accept(PlanIterVisitor& v) const; |
3404 | 302 | 320 | ||
3405 | 303 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 321 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3406 | @@ -328,6 +346,8 @@ | |||
3407 | 328 | 346 | ||
3408 | 329 | virtual ~HoursFromDatetimeIterator(); | 347 | virtual ~HoursFromDatetimeIterator(); |
3409 | 330 | 348 | ||
3410 | 349 | zstring getNameAsString() const; | ||
3411 | 350 | |||
3412 | 331 | void accept(PlanIterVisitor& v) const; | 351 | void accept(PlanIterVisitor& v) const; |
3413 | 332 | 352 | ||
3414 | 333 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 353 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3415 | @@ -358,6 +378,8 @@ | |||
3416 | 358 | 378 | ||
3417 | 359 | virtual ~MinutesFromDatetimeIterator(); | 379 | virtual ~MinutesFromDatetimeIterator(); |
3418 | 360 | 380 | ||
3419 | 381 | zstring getNameAsString() const; | ||
3420 | 382 | |||
3421 | 361 | void accept(PlanIterVisitor& v) const; | 383 | void accept(PlanIterVisitor& v) const; |
3422 | 362 | 384 | ||
3423 | 363 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 385 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3424 | @@ -388,6 +410,8 @@ | |||
3425 | 388 | 410 | ||
3426 | 389 | virtual ~SecondsFromDatetimeIterator(); | 411 | virtual ~SecondsFromDatetimeIterator(); |
3427 | 390 | 412 | ||
3428 | 413 | zstring getNameAsString() const; | ||
3429 | 414 | |||
3430 | 391 | void accept(PlanIterVisitor& v) const; | 415 | void accept(PlanIterVisitor& v) const; |
3431 | 392 | 416 | ||
3432 | 393 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 417 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3433 | @@ -418,6 +442,8 @@ | |||
3434 | 418 | 442 | ||
3435 | 419 | virtual ~TimezoneFromDatetimeIterator(); | 443 | virtual ~TimezoneFromDatetimeIterator(); |
3436 | 420 | 444 | ||
3437 | 445 | zstring getNameAsString() const; | ||
3438 | 446 | |||
3439 | 421 | void accept(PlanIterVisitor& v) const; | 447 | void accept(PlanIterVisitor& v) const; |
3440 | 422 | 448 | ||
3441 | 423 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 449 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3442 | @@ -448,6 +474,8 @@ | |||
3443 | 448 | 474 | ||
3444 | 449 | virtual ~YearFromDateIterator(); | 475 | virtual ~YearFromDateIterator(); |
3445 | 450 | 476 | ||
3446 | 477 | zstring getNameAsString() const; | ||
3447 | 478 | |||
3448 | 451 | void accept(PlanIterVisitor& v) const; | 479 | void accept(PlanIterVisitor& v) const; |
3449 | 452 | 480 | ||
3450 | 453 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 481 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3451 | @@ -478,6 +506,8 @@ | |||
3452 | 478 | 506 | ||
3453 | 479 | virtual ~MonthFromDateIterator(); | 507 | virtual ~MonthFromDateIterator(); |
3454 | 480 | 508 | ||
3455 | 509 | zstring getNameAsString() const; | ||
3456 | 510 | |||
3457 | 481 | void accept(PlanIterVisitor& v) const; | 511 | void accept(PlanIterVisitor& v) const; |
3458 | 482 | 512 | ||
3459 | 483 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 513 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3460 | @@ -508,6 +538,8 @@ | |||
3461 | 508 | 538 | ||
3462 | 509 | virtual ~DayFromDateIterator(); | 539 | virtual ~DayFromDateIterator(); |
3463 | 510 | 540 | ||
3464 | 541 | zstring getNameAsString() const; | ||
3465 | 542 | |||
3466 | 511 | void accept(PlanIterVisitor& v) const; | 543 | void accept(PlanIterVisitor& v) const; |
3467 | 512 | 544 | ||
3468 | 513 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 545 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3469 | @@ -538,6 +570,8 @@ | |||
3470 | 538 | 570 | ||
3471 | 539 | virtual ~TimezoneFromDateIterator(); | 571 | virtual ~TimezoneFromDateIterator(); |
3472 | 540 | 572 | ||
3473 | 573 | zstring getNameAsString() const; | ||
3474 | 574 | |||
3475 | 541 | void accept(PlanIterVisitor& v) const; | 575 | void accept(PlanIterVisitor& v) const; |
3476 | 542 | 576 | ||
3477 | 543 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 577 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3478 | @@ -568,6 +602,8 @@ | |||
3479 | 568 | 602 | ||
3480 | 569 | virtual ~HoursFromTimeIterator(); | 603 | virtual ~HoursFromTimeIterator(); |
3481 | 570 | 604 | ||
3482 | 605 | zstring getNameAsString() const; | ||
3483 | 606 | |||
3484 | 571 | void accept(PlanIterVisitor& v) const; | 607 | void accept(PlanIterVisitor& v) const; |
3485 | 572 | 608 | ||
3486 | 573 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 609 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3487 | @@ -598,6 +634,8 @@ | |||
3488 | 598 | 634 | ||
3489 | 599 | virtual ~MinutesFromTimeIterator(); | 635 | virtual ~MinutesFromTimeIterator(); |
3490 | 600 | 636 | ||
3491 | 637 | zstring getNameAsString() const; | ||
3492 | 638 | |||
3493 | 601 | void accept(PlanIterVisitor& v) const; | 639 | void accept(PlanIterVisitor& v) const; |
3494 | 602 | 640 | ||
3495 | 603 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 641 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3496 | @@ -628,6 +666,8 @@ | |||
3497 | 628 | 666 | ||
3498 | 629 | virtual ~SecondsFromTimeIterator(); | 667 | virtual ~SecondsFromTimeIterator(); |
3499 | 630 | 668 | ||
3500 | 669 | zstring getNameAsString() const; | ||
3501 | 670 | |||
3502 | 631 | void accept(PlanIterVisitor& v) const; | 671 | void accept(PlanIterVisitor& v) const; |
3503 | 632 | 672 | ||
3504 | 633 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 673 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3505 | @@ -658,6 +698,8 @@ | |||
3506 | 658 | 698 | ||
3507 | 659 | virtual ~TimezoneFromTimeIterator(); | 699 | virtual ~TimezoneFromTimeIterator(); |
3508 | 660 | 700 | ||
3509 | 701 | zstring getNameAsString() const; | ||
3510 | 702 | |||
3511 | 661 | void accept(PlanIterVisitor& v) const; | 703 | void accept(PlanIterVisitor& v) const; |
3512 | 662 | 704 | ||
3513 | 663 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 705 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3514 | 664 | 706 | ||
3515 | === modified file 'src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.cpp' | |||
3516 | --- src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.cpp 2014-01-31 01:39:38 +0000 | |||
3517 | +++ src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.cpp 2014-03-04 03:22:54 +0000 | |||
3518 | @@ -59,6 +59,10 @@ | |||
3519 | 59 | 59 | ||
3520 | 60 | ErrorIterator::~ErrorIterator() {} | 60 | ErrorIterator::~ErrorIterator() {} |
3521 | 61 | 61 | ||
3522 | 62 | |||
3523 | 63 | zstring ErrorIterator::getNameAsString() const { | ||
3524 | 64 | return "fn:error"; | ||
3525 | 65 | } | ||
3526 | 62 | // </ErrorIterator> | 66 | // </ErrorIterator> |
3527 | 63 | 67 | ||
3528 | 64 | 68 | ||
3529 | @@ -107,6 +111,10 @@ | |||
3530 | 107 | theOS = 0; | 111 | theOS = 0; |
3531 | 108 | theSerializer = NULL; | 112 | theSerializer = NULL; |
3532 | 109 | } | 113 | } |
3533 | 114 | |||
3534 | 115 | zstring TraceIterator::getNameAsString() const { | ||
3535 | 116 | return "fn:trace"; | ||
3536 | 117 | } | ||
3537 | 110 | // </TraceIterator> | 118 | // </TraceIterator> |
3538 | 111 | 119 | ||
3539 | 112 | 120 | ||
3540 | 113 | 121 | ||
3541 | === modified file 'src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.h' | |||
3542 | --- src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.h 2014-01-31 01:39:38 +0000 | |||
3543 | +++ src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.h 2014-03-04 03:22:54 +0000 | |||
3544 | @@ -58,6 +58,8 @@ | |||
3545 | 58 | 58 | ||
3546 | 59 | virtual ~ErrorIterator(); | 59 | virtual ~ErrorIterator(); |
3547 | 60 | 60 | ||
3548 | 61 | zstring getNameAsString() const; | ||
3549 | 62 | |||
3550 | 61 | void accept(PlanIterVisitor& v) const; | 63 | void accept(PlanIterVisitor& v) const; |
3551 | 62 | 64 | ||
3552 | 63 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 65 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3553 | @@ -104,6 +106,8 @@ | |||
3554 | 104 | 106 | ||
3555 | 105 | virtual ~TraceIterator(); | 107 | virtual ~TraceIterator(); |
3556 | 106 | 108 | ||
3557 | 109 | zstring getNameAsString() const; | ||
3558 | 110 | |||
3559 | 107 | void accept(PlanIterVisitor& v) const; | 111 | void accept(PlanIterVisitor& v) const; |
3560 | 108 | 112 | ||
3561 | 109 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 113 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3562 | 110 | 114 | ||
3563 | === modified file 'src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.cpp' | |||
3564 | --- src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.cpp 2014-01-31 01:39:38 +0000 | |||
3565 | +++ src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.cpp 2014-03-04 03:22:54 +0000 | |||
3566 | @@ -59,6 +59,10 @@ | |||
3567 | 59 | 59 | ||
3568 | 60 | ReadLineIterator::~ReadLineIterator() {} | 60 | ReadLineIterator::~ReadLineIterator() {} |
3569 | 61 | 61 | ||
3570 | 62 | |||
3571 | 63 | zstring ReadLineIterator::getNameAsString() const { | ||
3572 | 64 | return "op-zorba:read-line"; | ||
3573 | 65 | } | ||
3574 | 62 | // </ReadLineIterator> | 66 | // </ReadLineIterator> |
3575 | 63 | 67 | ||
3576 | 64 | 68 | ||
3577 | @@ -89,6 +93,10 @@ | |||
3578 | 89 | 93 | ||
3579 | 90 | PrintIterator::~PrintIterator() {} | 94 | PrintIterator::~PrintIterator() {} |
3580 | 91 | 95 | ||
3581 | 96 | |||
3582 | 97 | zstring PrintIterator::getNameAsString() const { | ||
3583 | 98 | return "fn-zorba-util:print"; | ||
3584 | 99 | } | ||
3585 | 92 | // </PrintIterator> | 100 | // </PrintIterator> |
3586 | 93 | 101 | ||
3587 | 94 | 102 | ||
3588 | @@ -122,6 +130,10 @@ | |||
3589 | 122 | 130 | ||
3590 | 123 | FunctionTraceIterator::~FunctionTraceIterator() {} | 131 | FunctionTraceIterator::~FunctionTraceIterator() {} |
3591 | 124 | 132 | ||
3592 | 133 | |||
3593 | 134 | zstring FunctionTraceIterator::getNameAsString() const { | ||
3594 | 135 | return "FunctionTraceIterator"; | ||
3595 | 136 | } | ||
3596 | 125 | // </FunctionTraceIterator> | 137 | // </FunctionTraceIterator> |
3597 | 126 | 138 | ||
3598 | 127 | 139 | ||
3599 | 128 | 140 | ||
3600 | === modified file 'src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.h' | |||
3601 | --- src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.h 2014-01-31 01:39:38 +0000 | |||
3602 | +++ src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.h 2014-03-04 03:22:54 +0000 | |||
3603 | @@ -58,6 +58,8 @@ | |||
3604 | 58 | 58 | ||
3605 | 59 | virtual ~ReadLineIterator(); | 59 | virtual ~ReadLineIterator(); |
3606 | 60 | 60 | ||
3607 | 61 | zstring getNameAsString() const; | ||
3608 | 62 | |||
3609 | 61 | void accept(PlanIterVisitor& v) const; | 63 | void accept(PlanIterVisitor& v) const; |
3610 | 62 | 64 | ||
3611 | 63 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 65 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3612 | @@ -92,6 +94,8 @@ | |||
3613 | 92 | 94 | ||
3614 | 93 | virtual ~PrintIterator(); | 95 | virtual ~PrintIterator(); |
3615 | 94 | 96 | ||
3616 | 97 | zstring getNameAsString() const; | ||
3617 | 98 | |||
3618 | 95 | void accept(PlanIterVisitor& v) const; | 99 | void accept(PlanIterVisitor& v) const; |
3619 | 96 | 100 | ||
3620 | 97 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 101 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3621 | @@ -136,6 +140,8 @@ | |||
3622 | 136 | 140 | ||
3623 | 137 | virtual ~FunctionTraceIterator(); | 141 | virtual ~FunctionTraceIterator(); |
3624 | 138 | 142 | ||
3625 | 143 | zstring getNameAsString() const; | ||
3626 | 144 | |||
3627 | 139 | public: | 145 | public: |
3628 | 140 | void setFunctionName(const store::Item_t& aFunctionName); | 146 | void setFunctionName(const store::Item_t& aFunctionName); |
3629 | 141 | void setFunctionCallLocation(const QueryLoc& aFunctionLocation); | 147 | void setFunctionCallLocation(const QueryLoc& aFunctionLocation); |
3630 | 142 | 148 | ||
3631 | === modified file 'src/runtime/eval/eval.cpp' | |||
3632 | --- src/runtime/eval/eval.cpp 2013-07-26 12:48:04 +0000 | |||
3633 | +++ src/runtime/eval/eval.cpp 2014-03-04 03:22:54 +0000 | |||
3634 | @@ -50,6 +50,7 @@ | |||
3635 | 50 | 50 | ||
3636 | 51 | 51 | ||
3637 | 52 | SERIALIZABLE_CLASS_VERSIONS(EvalIterator) | 52 | SERIALIZABLE_CLASS_VERSIONS(EvalIterator) |
3638 | 53 | DEF_GET_NAME_AS_STRING(EvalIterator) | ||
3639 | 53 | 54 | ||
3640 | 54 | 55 | ||
3641 | 55 | /****************************************************************************//** | 56 | /****************************************************************************//** |
3642 | 56 | 57 | ||
3643 | === modified file 'src/runtime/eval/eval.h' | |||
3644 | --- src/runtime/eval/eval.h 2013-09-17 21:12:49 +0000 | |||
3645 | +++ src/runtime/eval/eval.h 2014-03-04 03:22:54 +0000 | |||
3646 | @@ -124,6 +124,8 @@ | |||
3647 | 124 | 124 | ||
3648 | 125 | void accept(PlanIterVisitor& v) const; | 125 | void accept(PlanIterVisitor& v) const; |
3649 | 126 | 126 | ||
3650 | 127 | zstring getNameAsString() const; | ||
3651 | 128 | |||
3652 | 127 | bool nextImpl(store::Item_t& result, PlanState& planState) const | 129 | bool nextImpl(store::Item_t& result, PlanState& planState) const |
3653 | 128 | { | 130 | { |
3654 | 129 | return nextORcount(false, result, planState); | 131 | return nextORcount(false, result, planState); |
3655 | 130 | 132 | ||
3656 | === modified file 'src/runtime/fetch/pregenerated/fetch.cpp' | |||
3657 | --- src/runtime/fetch/pregenerated/fetch.cpp 2014-01-31 01:39:38 +0000 | |||
3658 | +++ src/runtime/fetch/pregenerated/fetch.cpp 2014-03-04 03:22:54 +0000 | |||
3659 | @@ -58,6 +58,10 @@ | |||
3660 | 58 | 58 | ||
3661 | 59 | FetchContentIterator::~FetchContentIterator() {} | 59 | FetchContentIterator::~FetchContentIterator() {} |
3662 | 60 | 60 | ||
3663 | 61 | |||
3664 | 62 | zstring FetchContentIterator::getNameAsString() const { | ||
3665 | 63 | return "fn-zorba-fetch:content"; | ||
3666 | 64 | } | ||
3667 | 61 | // </FetchContentIterator> | 65 | // </FetchContentIterator> |
3668 | 62 | 66 | ||
3669 | 63 | 67 | ||
3670 | @@ -86,6 +90,10 @@ | |||
3671 | 86 | 90 | ||
3672 | 87 | FetchContentBinaryIterator::~FetchContentBinaryIterator() {} | 91 | FetchContentBinaryIterator::~FetchContentBinaryIterator() {} |
3673 | 88 | 92 | ||
3674 | 93 | |||
3675 | 94 | zstring FetchContentBinaryIterator::getNameAsString() const { | ||
3676 | 95 | return "fn-zorba-fetch:content-binary"; | ||
3677 | 96 | } | ||
3678 | 89 | // </FetchContentBinaryIterator> | 97 | // </FetchContentBinaryIterator> |
3679 | 90 | 98 | ||
3680 | 91 | 99 | ||
3681 | @@ -114,6 +122,10 @@ | |||
3682 | 114 | 122 | ||
3683 | 115 | FetchContentTypeIterator::~FetchContentTypeIterator() {} | 123 | FetchContentTypeIterator::~FetchContentTypeIterator() {} |
3684 | 116 | 124 | ||
3685 | 125 | |||
3686 | 126 | zstring FetchContentTypeIterator::getNameAsString() const { | ||
3687 | 127 | return "fn-zorba-fetch:content-type"; | ||
3688 | 128 | } | ||
3689 | 117 | // </FetchContentTypeIterator> | 129 | // </FetchContentTypeIterator> |
3690 | 118 | 130 | ||
3691 | 119 | 131 | ||
3692 | 120 | 132 | ||
3693 | === modified file 'src/runtime/fetch/pregenerated/fetch.h' | |||
3694 | --- src/runtime/fetch/pregenerated/fetch.h 2014-01-31 01:39:38 +0000 | |||
3695 | +++ src/runtime/fetch/pregenerated/fetch.h 2014-03-04 03:22:54 +0000 | |||
3696 | @@ -58,6 +58,8 @@ | |||
3697 | 58 | 58 | ||
3698 | 59 | virtual ~FetchContentIterator(); | 59 | virtual ~FetchContentIterator(); |
3699 | 60 | 60 | ||
3700 | 61 | zstring getNameAsString() const; | ||
3701 | 62 | |||
3702 | 61 | public: | 63 | public: |
3703 | 62 | static void destroyStream(std::istream& aStream); | 64 | static void destroyStream(std::istream& aStream); |
3704 | 63 | void accept(PlanIterVisitor& v) const; | 65 | void accept(PlanIterVisitor& v) const; |
3705 | @@ -90,6 +92,8 @@ | |||
3706 | 90 | 92 | ||
3707 | 91 | virtual ~FetchContentBinaryIterator(); | 93 | virtual ~FetchContentBinaryIterator(); |
3708 | 92 | 94 | ||
3709 | 95 | zstring getNameAsString() const; | ||
3710 | 96 | |||
3711 | 93 | public: | 97 | public: |
3712 | 94 | static void destroyStream(std::istream& aStream); | 98 | static void destroyStream(std::istream& aStream); |
3713 | 95 | void accept(PlanIterVisitor& v) const; | 99 | void accept(PlanIterVisitor& v) const; |
3714 | @@ -122,6 +126,8 @@ | |||
3715 | 122 | 126 | ||
3716 | 123 | virtual ~FetchContentTypeIterator(); | 127 | virtual ~FetchContentTypeIterator(); |
3717 | 124 | 128 | ||
3718 | 129 | zstring getNameAsString() const; | ||
3719 | 130 | |||
3720 | 125 | void accept(PlanIterVisitor& v) const; | 131 | void accept(PlanIterVisitor& v) const; |
3721 | 126 | 132 | ||
3722 | 127 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 133 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3723 | 128 | 134 | ||
3724 | === modified file 'src/runtime/fnput/pregenerated/fnput.cpp' | |||
3725 | --- src/runtime/fnput/pregenerated/fnput.cpp 2014-01-31 01:39:38 +0000 | |||
3726 | +++ src/runtime/fnput/pregenerated/fnput.cpp 2014-03-04 03:22:54 +0000 | |||
3727 | @@ -58,6 +58,10 @@ | |||
3728 | 58 | 58 | ||
3729 | 59 | FnPutIterator::~FnPutIterator() {} | 59 | FnPutIterator::~FnPutIterator() {} |
3730 | 60 | 60 | ||
3731 | 61 | |||
3732 | 62 | zstring FnPutIterator::getNameAsString() const { | ||
3733 | 63 | return "fn:put"; | ||
3734 | 64 | } | ||
3735 | 61 | // </FnPutIterator> | 65 | // </FnPutIterator> |
3736 | 62 | 66 | ||
3737 | 63 | 67 | ||
3738 | 64 | 68 | ||
3739 | === modified file 'src/runtime/fnput/pregenerated/fnput.h' | |||
3740 | --- src/runtime/fnput/pregenerated/fnput.h 2014-01-31 01:39:38 +0000 | |||
3741 | +++ src/runtime/fnput/pregenerated/fnput.h 2014-03-04 03:22:54 +0000 | |||
3742 | @@ -58,6 +58,8 @@ | |||
3743 | 58 | 58 | ||
3744 | 59 | virtual ~FnPutIterator(); | 59 | virtual ~FnPutIterator(); |
3745 | 60 | 60 | ||
3746 | 61 | zstring getNameAsString() const; | ||
3747 | 62 | |||
3748 | 61 | void accept(PlanIterVisitor& v) const; | 63 | void accept(PlanIterVisitor& v) const; |
3749 | 62 | 64 | ||
3750 | 63 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 65 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3751 | 64 | 66 | ||
3752 | === modified file 'src/runtime/full_text/pregenerated/ft_module.cpp' | |||
3753 | --- src/runtime/full_text/pregenerated/ft_module.cpp 2014-01-31 01:39:38 +0000 | |||
3754 | +++ src/runtime/full_text/pregenerated/ft_module.cpp 2014-03-04 03:22:54 +0000 | |||
3755 | @@ -60,6 +60,10 @@ | |||
3756 | 60 | 60 | ||
3757 | 61 | CurrentCompareOptionsIterator::~CurrentCompareOptionsIterator() {} | 61 | CurrentCompareOptionsIterator::~CurrentCompareOptionsIterator() {} |
3758 | 62 | 62 | ||
3759 | 63 | |||
3760 | 64 | zstring CurrentCompareOptionsIterator::getNameAsString() const { | ||
3761 | 65 | return "full-text:current-compare-options"; | ||
3762 | 66 | } | ||
3763 | 63 | // </CurrentCompareOptionsIterator> | 67 | // </CurrentCompareOptionsIterator> |
3764 | 64 | 68 | ||
3765 | 65 | #endif | 69 | #endif |
3766 | @@ -89,6 +93,10 @@ | |||
3767 | 89 | 93 | ||
3768 | 90 | CurrentLangIterator::~CurrentLangIterator() {} | 94 | CurrentLangIterator::~CurrentLangIterator() {} |
3769 | 91 | 95 | ||
3770 | 96 | |||
3771 | 97 | zstring CurrentLangIterator::getNameAsString() const { | ||
3772 | 98 | return "full-text:current-lang"; | ||
3773 | 99 | } | ||
3774 | 92 | // </CurrentLangIterator> | 100 | // </CurrentLangIterator> |
3775 | 93 | 101 | ||
3776 | 94 | #endif | 102 | #endif |
3777 | @@ -118,6 +126,10 @@ | |||
3778 | 118 | 126 | ||
3779 | 119 | HostLangIterator::~HostLangIterator() {} | 127 | HostLangIterator::~HostLangIterator() {} |
3780 | 120 | 128 | ||
3781 | 129 | |||
3782 | 130 | zstring HostLangIterator::getNameAsString() const { | ||
3783 | 131 | return "full-text:host-lang"; | ||
3784 | 132 | } | ||
3785 | 121 | // </HostLangIterator> | 133 | // </HostLangIterator> |
3786 | 122 | 134 | ||
3787 | 123 | #endif | 135 | #endif |
3788 | @@ -147,6 +159,10 @@ | |||
3789 | 147 | 159 | ||
3790 | 148 | IsStemLangSupportedIterator::~IsStemLangSupportedIterator() {} | 160 | IsStemLangSupportedIterator::~IsStemLangSupportedIterator() {} |
3791 | 149 | 161 | ||
3792 | 162 | |||
3793 | 163 | zstring IsStemLangSupportedIterator::getNameAsString() const { | ||
3794 | 164 | return "full-text:is-stem-lang-supported"; | ||
3795 | 165 | } | ||
3796 | 150 | // </IsStemLangSupportedIterator> | 166 | // </IsStemLangSupportedIterator> |
3797 | 151 | 167 | ||
3798 | 152 | #endif | 168 | #endif |
3799 | @@ -176,6 +192,10 @@ | |||
3800 | 176 | 192 | ||
3801 | 177 | IsStopWordIterator::~IsStopWordIterator() {} | 193 | IsStopWordIterator::~IsStopWordIterator() {} |
3802 | 178 | 194 | ||
3803 | 195 | |||
3804 | 196 | zstring IsStopWordIterator::getNameAsString() const { | ||
3805 | 197 | return "full-text:is-stop-word"; | ||
3806 | 198 | } | ||
3807 | 179 | // </IsStopWordIterator> | 199 | // </IsStopWordIterator> |
3808 | 180 | 200 | ||
3809 | 181 | #endif | 201 | #endif |
3810 | @@ -205,6 +225,10 @@ | |||
3811 | 205 | 225 | ||
3812 | 206 | IsStopWordLangSupportedIterator::~IsStopWordLangSupportedIterator() {} | 226 | IsStopWordLangSupportedIterator::~IsStopWordLangSupportedIterator() {} |
3813 | 207 | 227 | ||
3814 | 228 | |||
3815 | 229 | zstring IsStopWordLangSupportedIterator::getNameAsString() const { | ||
3816 | 230 | return "full-text:is-stop-word-lang-supported"; | ||
3817 | 231 | } | ||
3818 | 208 | // </IsStopWordLangSupportedIterator> | 232 | // </IsStopWordLangSupportedIterator> |
3819 | 209 | 233 | ||
3820 | 210 | #endif | 234 | #endif |
3821 | @@ -234,6 +258,10 @@ | |||
3822 | 234 | 258 | ||
3823 | 235 | IsThesaurusLangSupportedIterator::~IsThesaurusLangSupportedIterator() {} | 259 | IsThesaurusLangSupportedIterator::~IsThesaurusLangSupportedIterator() {} |
3824 | 236 | 260 | ||
3825 | 261 | |||
3826 | 262 | zstring IsThesaurusLangSupportedIterator::getNameAsString() const { | ||
3827 | 263 | return "full-text:is-thesaurus-lang-supported"; | ||
3828 | 264 | } | ||
3829 | 237 | // </IsThesaurusLangSupportedIterator> | 265 | // </IsThesaurusLangSupportedIterator> |
3830 | 238 | 266 | ||
3831 | 239 | #endif | 267 | #endif |
3832 | @@ -263,6 +291,10 @@ | |||
3833 | 263 | 291 | ||
3834 | 264 | IsTokenizerLangSupportedIterator::~IsTokenizerLangSupportedIterator() {} | 292 | IsTokenizerLangSupportedIterator::~IsTokenizerLangSupportedIterator() {} |
3835 | 265 | 293 | ||
3836 | 294 | |||
3837 | 295 | zstring IsTokenizerLangSupportedIterator::getNameAsString() const { | ||
3838 | 296 | return "full-text:is-tokenizer-lang-supported"; | ||
3839 | 297 | } | ||
3840 | 266 | // </IsTokenizerLangSupportedIterator> | 298 | // </IsTokenizerLangSupportedIterator> |
3841 | 267 | 299 | ||
3842 | 268 | #endif | 300 | #endif |
3843 | @@ -292,6 +324,10 @@ | |||
3844 | 292 | 324 | ||
3845 | 293 | StemIterator::~StemIterator() {} | 325 | StemIterator::~StemIterator() {} |
3846 | 294 | 326 | ||
3847 | 327 | |||
3848 | 328 | zstring StemIterator::getNameAsString() const { | ||
3849 | 329 | return "full-text:stem"; | ||
3850 | 330 | } | ||
3851 | 295 | // </StemIterator> | 331 | // </StemIterator> |
3852 | 296 | 332 | ||
3853 | 297 | #endif | 333 | #endif |
3854 | @@ -321,6 +357,10 @@ | |||
3855 | 321 | 357 | ||
3856 | 322 | StripDiacriticsIterator::~StripDiacriticsIterator() {} | 358 | StripDiacriticsIterator::~StripDiacriticsIterator() {} |
3857 | 323 | 359 | ||
3858 | 360 | |||
3859 | 361 | zstring StripDiacriticsIterator::getNameAsString() const { | ||
3860 | 362 | return "full-text:strip-diacritics"; | ||
3861 | 363 | } | ||
3862 | 324 | // </StripDiacriticsIterator> | 364 | // </StripDiacriticsIterator> |
3863 | 325 | 365 | ||
3864 | 326 | #endif | 366 | #endif |
3865 | @@ -358,6 +398,10 @@ | |||
3866 | 358 | void ThesaurusLookupIteratorState::reset(PlanState& planState) { | 398 | void ThesaurusLookupIteratorState::reset(PlanState& planState) { |
3867 | 359 | PlanIteratorState::reset(planState); | 399 | PlanIteratorState::reset(planState); |
3868 | 360 | } | 400 | } |
3869 | 401 | |||
3870 | 402 | zstring ThesaurusLookupIterator::getNameAsString() const { | ||
3871 | 403 | return "full-text:thesaurus-lookup"; | ||
3872 | 404 | } | ||
3873 | 361 | // </ThesaurusLookupIterator> | 405 | // </ThesaurusLookupIterator> |
3874 | 362 | 406 | ||
3875 | 363 | #endif | 407 | #endif |
3876 | @@ -395,6 +439,10 @@ | |||
3877 | 395 | void TokenizeNodeIteratorState::reset(PlanState& planState) { | 439 | void TokenizeNodeIteratorState::reset(PlanState& planState) { |
3878 | 396 | PlanIteratorState::reset(planState); | 440 | PlanIteratorState::reset(planState); |
3879 | 397 | } | 441 | } |
3880 | 442 | |||
3881 | 443 | zstring TokenizeNodeIterator::getNameAsString() const { | ||
3882 | 444 | return "full-text:tokenize-node"; | ||
3883 | 445 | } | ||
3884 | 398 | // </TokenizeNodeIterator> | 446 | // </TokenizeNodeIterator> |
3885 | 399 | 447 | ||
3886 | 400 | #endif | 448 | #endif |
3887 | @@ -432,6 +480,10 @@ | |||
3888 | 432 | void TokenizeNodesIteratorState::reset(PlanState& planState) { | 480 | void TokenizeNodesIteratorState::reset(PlanState& planState) { |
3889 | 433 | PlanIteratorState::reset(planState); | 481 | PlanIteratorState::reset(planState); |
3890 | 434 | } | 482 | } |
3891 | 483 | |||
3892 | 484 | zstring TokenizeNodesIterator::getNameAsString() const { | ||
3893 | 485 | return "full-text:tokenize-nodes"; | ||
3894 | 486 | } | ||
3895 | 435 | // </TokenizeNodesIterator> | 487 | // </TokenizeNodesIterator> |
3896 | 436 | 488 | ||
3897 | 437 | #endif | 489 | #endif |
3898 | @@ -461,6 +513,10 @@ | |||
3899 | 461 | 513 | ||
3900 | 462 | TokenizerPropertiesIterator::~TokenizerPropertiesIterator() {} | 514 | TokenizerPropertiesIterator::~TokenizerPropertiesIterator() {} |
3901 | 463 | 515 | ||
3902 | 516 | |||
3903 | 517 | zstring TokenizerPropertiesIterator::getNameAsString() const { | ||
3904 | 518 | return "full-text:tokenizer-properties"; | ||
3905 | 519 | } | ||
3906 | 464 | // </TokenizerPropertiesIterator> | 520 | // </TokenizerPropertiesIterator> |
3907 | 465 | 521 | ||
3908 | 466 | #endif | 522 | #endif |
3909 | @@ -498,6 +554,10 @@ | |||
3910 | 498 | void TokenizeStringIteratorState::reset(PlanState& planState) { | 554 | void TokenizeStringIteratorState::reset(PlanState& planState) { |
3911 | 499 | PlanIteratorState::reset(planState); | 555 | PlanIteratorState::reset(planState); |
3912 | 500 | } | 556 | } |
3913 | 557 | |||
3914 | 558 | zstring TokenizeStringIterator::getNameAsString() const { | ||
3915 | 559 | return "full-text:tokenize-string"; | ||
3916 | 560 | } | ||
3917 | 501 | // </TokenizeStringIterator> | 561 | // </TokenizeStringIterator> |
3918 | 502 | 562 | ||
3919 | 503 | #endif | 563 | #endif |
3920 | 504 | 564 | ||
3921 | === modified file 'src/runtime/full_text/pregenerated/ft_module.h' | |||
3922 | --- src/runtime/full_text/pregenerated/ft_module.h 2014-01-31 01:39:38 +0000 | |||
3923 | +++ src/runtime/full_text/pregenerated/ft_module.h 2014-03-04 03:22:54 +0000 | |||
3924 | @@ -66,6 +66,8 @@ | |||
3925 | 66 | 66 | ||
3926 | 67 | virtual ~CurrentCompareOptionsIterator(); | 67 | virtual ~CurrentCompareOptionsIterator(); |
3927 | 68 | 68 | ||
3928 | 69 | zstring getNameAsString() const; | ||
3929 | 70 | |||
3930 | 69 | void accept(PlanIterVisitor& v) const; | 71 | void accept(PlanIterVisitor& v) const; |
3931 | 70 | 72 | ||
3932 | 71 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 73 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3933 | @@ -98,6 +100,8 @@ | |||
3934 | 98 | 100 | ||
3935 | 99 | virtual ~CurrentLangIterator(); | 101 | virtual ~CurrentLangIterator(); |
3936 | 100 | 102 | ||
3937 | 103 | zstring getNameAsString() const; | ||
3938 | 104 | |||
3939 | 101 | void accept(PlanIterVisitor& v) const; | 105 | void accept(PlanIterVisitor& v) const; |
3940 | 102 | 106 | ||
3941 | 103 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 107 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3942 | @@ -130,6 +134,8 @@ | |||
3943 | 130 | 134 | ||
3944 | 131 | virtual ~HostLangIterator(); | 135 | virtual ~HostLangIterator(); |
3945 | 132 | 136 | ||
3946 | 137 | zstring getNameAsString() const; | ||
3947 | 138 | |||
3948 | 133 | void accept(PlanIterVisitor& v) const; | 139 | void accept(PlanIterVisitor& v) const; |
3949 | 134 | 140 | ||
3950 | 135 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 141 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3951 | @@ -162,6 +168,8 @@ | |||
3952 | 162 | 168 | ||
3953 | 163 | virtual ~IsStemLangSupportedIterator(); | 169 | virtual ~IsStemLangSupportedIterator(); |
3954 | 164 | 170 | ||
3955 | 171 | zstring getNameAsString() const; | ||
3956 | 172 | |||
3957 | 165 | void accept(PlanIterVisitor& v) const; | 173 | void accept(PlanIterVisitor& v) const; |
3958 | 166 | 174 | ||
3959 | 167 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 175 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3960 | @@ -194,6 +202,8 @@ | |||
3961 | 194 | 202 | ||
3962 | 195 | virtual ~IsStopWordIterator(); | 203 | virtual ~IsStopWordIterator(); |
3963 | 196 | 204 | ||
3964 | 205 | zstring getNameAsString() const; | ||
3965 | 206 | |||
3966 | 197 | void accept(PlanIterVisitor& v) const; | 207 | void accept(PlanIterVisitor& v) const; |
3967 | 198 | 208 | ||
3968 | 199 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 209 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3969 | @@ -226,6 +236,8 @@ | |||
3970 | 226 | 236 | ||
3971 | 227 | virtual ~IsStopWordLangSupportedIterator(); | 237 | virtual ~IsStopWordLangSupportedIterator(); |
3972 | 228 | 238 | ||
3973 | 239 | zstring getNameAsString() const; | ||
3974 | 240 | |||
3975 | 229 | void accept(PlanIterVisitor& v) const; | 241 | void accept(PlanIterVisitor& v) const; |
3976 | 230 | 242 | ||
3977 | 231 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 243 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3978 | @@ -258,6 +270,8 @@ | |||
3979 | 258 | 270 | ||
3980 | 259 | virtual ~IsThesaurusLangSupportedIterator(); | 271 | virtual ~IsThesaurusLangSupportedIterator(); |
3981 | 260 | 272 | ||
3982 | 273 | zstring getNameAsString() const; | ||
3983 | 274 | |||
3984 | 261 | void accept(PlanIterVisitor& v) const; | 275 | void accept(PlanIterVisitor& v) const; |
3985 | 262 | 276 | ||
3986 | 263 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 277 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3987 | @@ -290,6 +304,8 @@ | |||
3988 | 290 | 304 | ||
3989 | 291 | virtual ~IsTokenizerLangSupportedIterator(); | 305 | virtual ~IsTokenizerLangSupportedIterator(); |
3990 | 292 | 306 | ||
3991 | 307 | zstring getNameAsString() const; | ||
3992 | 308 | |||
3993 | 293 | void accept(PlanIterVisitor& v) const; | 309 | void accept(PlanIterVisitor& v) const; |
3994 | 294 | 310 | ||
3995 | 295 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 311 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
3996 | @@ -322,6 +338,8 @@ | |||
3997 | 322 | 338 | ||
3998 | 323 | virtual ~StemIterator(); | 339 | virtual ~StemIterator(); |
3999 | 324 | 340 | ||
4000 | 341 | zstring getNameAsString() const; | ||
4001 | 342 | |||
4002 | 325 | void accept(PlanIterVisitor& v) const; | 343 | void accept(PlanIterVisitor& v) const; |
4003 | 326 | 344 | ||
4004 | 327 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 345 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4005 | @@ -354,6 +372,8 @@ | |||
4006 | 354 | 372 | ||
4007 | 355 | virtual ~StripDiacriticsIterator(); | 373 | virtual ~StripDiacriticsIterator(); |
4008 | 356 | 374 | ||
4009 | 375 | zstring getNameAsString() const; | ||
4010 | 376 | |||
4011 | 357 | void accept(PlanIterVisitor& v) const; | 377 | void accept(PlanIterVisitor& v) const; |
4012 | 358 | 378 | ||
4013 | 359 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 379 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4014 | @@ -403,6 +423,8 @@ | |||
4015 | 403 | 423 | ||
4016 | 404 | virtual ~ThesaurusLookupIterator(); | 424 | virtual ~ThesaurusLookupIterator(); |
4017 | 405 | 425 | ||
4018 | 426 | zstring getNameAsString() const; | ||
4019 | 427 | |||
4020 | 406 | void accept(PlanIterVisitor& v) const; | 428 | void accept(PlanIterVisitor& v) const; |
4021 | 407 | 429 | ||
4022 | 408 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 430 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4023 | @@ -450,6 +472,8 @@ | |||
4024 | 450 | 472 | ||
4025 | 451 | virtual ~TokenizeNodeIterator(); | 473 | virtual ~TokenizeNodeIterator(); |
4026 | 452 | 474 | ||
4027 | 475 | zstring getNameAsString() const; | ||
4028 | 476 | |||
4029 | 453 | void accept(PlanIterVisitor& v) const; | 477 | void accept(PlanIterVisitor& v) const; |
4030 | 454 | 478 | ||
4031 | 455 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 479 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4032 | @@ -504,6 +528,8 @@ | |||
4033 | 504 | 528 | ||
4034 | 505 | virtual ~TokenizeNodesIterator(); | 529 | virtual ~TokenizeNodesIterator(); |
4035 | 506 | 530 | ||
4036 | 531 | zstring getNameAsString() const; | ||
4037 | 532 | |||
4038 | 507 | void accept(PlanIterVisitor& v) const; | 533 | void accept(PlanIterVisitor& v) const; |
4039 | 508 | 534 | ||
4040 | 509 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 535 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4041 | @@ -538,6 +564,8 @@ | |||
4042 | 538 | 564 | ||
4043 | 539 | virtual ~TokenizerPropertiesIterator(); | 565 | virtual ~TokenizerPropertiesIterator(); |
4044 | 540 | 566 | ||
4045 | 567 | zstring getNameAsString() const; | ||
4046 | 568 | |||
4047 | 541 | void accept(PlanIterVisitor& v) const; | 569 | void accept(PlanIterVisitor& v) const; |
4048 | 542 | 570 | ||
4049 | 543 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 571 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4050 | @@ -582,6 +610,8 @@ | |||
4051 | 582 | 610 | ||
4052 | 583 | virtual ~TokenizeStringIterator(); | 611 | virtual ~TokenizeStringIterator(); |
4053 | 584 | 612 | ||
4054 | 613 | zstring getNameAsString() const; | ||
4055 | 614 | |||
4056 | 585 | void accept(PlanIterVisitor& v) const; | 615 | void accept(PlanIterVisitor& v) const; |
4057 | 586 | 616 | ||
4058 | 587 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 617 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4059 | 588 | 618 | ||
4060 | === modified file 'src/runtime/hof/dynamic_fncall_iterator.cpp' | |||
4061 | --- src/runtime/hof/dynamic_fncall_iterator.cpp 2013-08-16 13:00:06 +0000 | |||
4062 | +++ src/runtime/hof/dynamic_fncall_iterator.cpp 2014-03-04 03:22:54 +0000 | |||
4063 | @@ -48,8 +48,10 @@ | |||
4064 | 48 | NOARY_ACCEPT(ArgumentPlaceholderIterator) | 48 | NOARY_ACCEPT(ArgumentPlaceholderIterator) |
4065 | 49 | 49 | ||
4066 | 50 | SERIALIZABLE_CLASS_VERSIONS(SingleDynamicFnCallIterator) | 50 | SERIALIZABLE_CLASS_VERSIONS(SingleDynamicFnCallIterator) |
4067 | 51 | DEF_GET_NAME_AS_STRING(SingleDynamicFnCallIterator) | ||
4068 | 51 | 52 | ||
4069 | 52 | SERIALIZABLE_CLASS_VERSIONS(MultiDynamicFnCallIterator) | 53 | SERIALIZABLE_CLASS_VERSIONS(MultiDynamicFnCallIterator) |
4070 | 54 | DEF_GET_NAME_AS_STRING(MultiDynamicFnCallIterator) | ||
4071 | 53 | 55 | ||
4072 | 54 | 56 | ||
4073 | 55 | /******************************************************************************* | 57 | /******************************************************************************* |
4074 | 56 | 58 | ||
4075 | === modified file 'src/runtime/hof/dynamic_fncall_iterator.h' | |||
4076 | --- src/runtime/hof/dynamic_fncall_iterator.h 2013-08-16 13:00:06 +0000 | |||
4077 | +++ src/runtime/hof/dynamic_fncall_iterator.h 2014-03-04 03:22:54 +0000 | |||
4078 | @@ -121,6 +121,8 @@ | |||
4079 | 121 | 121 | ||
4080 | 122 | void openImpl(PlanState& planState, uint32_t& offset); | 122 | void openImpl(PlanState& planState, uint32_t& offset); |
4081 | 123 | 123 | ||
4082 | 124 | zstring getNameAsString() const; | ||
4083 | 125 | |||
4084 | 124 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 126 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4085 | 125 | }; | 127 | }; |
4086 | 126 | 128 | ||
4087 | @@ -186,6 +188,8 @@ | |||
4088 | 186 | 188 | ||
4089 | 187 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 189 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4090 | 188 | 190 | ||
4091 | 191 | zstring getNameAsString() const; | ||
4092 | 192 | |||
4093 | 189 | void resetImpl(PlanState& planState) const; | 193 | void resetImpl(PlanState& planState) const; |
4094 | 190 | }; | 194 | }; |
4095 | 191 | 195 | ||
4096 | 192 | 196 | ||
4097 | === modified file 'src/runtime/hof/function_item_iter.cpp' | |||
4098 | --- src/runtime/hof/function_item_iter.cpp 2013-10-10 03:54:10 +0000 | |||
4099 | +++ src/runtime/hof/function_item_iter.cpp 2014-03-04 03:22:54 +0000 | |||
4100 | @@ -33,6 +33,7 @@ | |||
4101 | 33 | { | 33 | { |
4102 | 34 | 34 | ||
4103 | 35 | SERIALIZABLE_CLASS_VERSIONS(FunctionItemIterator) | 35 | SERIALIZABLE_CLASS_VERSIONS(FunctionItemIterator) |
4104 | 36 | DEF_GET_NAME_AS_STRING(FunctionItemIterator) | ||
4105 | 36 | 37 | ||
4106 | 37 | /******************************************************************************* | 38 | /******************************************************************************* |
4107 | 38 | 39 | ||
4108 | 39 | 40 | ||
4109 | === modified file 'src/runtime/hof/function_item_iter.h' | |||
4110 | --- src/runtime/hof/function_item_iter.h 2013-04-24 01:35:58 +0000 | |||
4111 | +++ src/runtime/hof/function_item_iter.h 2014-03-04 03:22:54 +0000 | |||
4112 | @@ -59,6 +59,8 @@ | |||
4113 | 59 | 59 | ||
4114 | 60 | void accept(PlanIterVisitor& v) const; | 60 | void accept(PlanIterVisitor& v) const; |
4115 | 61 | 61 | ||
4116 | 62 | zstring getNameAsString() const; | ||
4117 | 63 | |||
4118 | 62 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 64 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
4119 | 63 | }; | 65 | }; |
4120 | 64 | 66 | ||
4121 | 65 | 67 | ||
4122 | === modified file 'src/runtime/hof/pregenerated/fn_hof_functions.cpp' | |||
4123 | --- src/runtime/hof/pregenerated/fn_hof_functions.cpp 2014-01-31 01:39:38 +0000 | |||
4124 | +++ src/runtime/hof/pregenerated/fn_hof_functions.cpp 2014-03-04 03:22:54 +0000 | |||
4125 | @@ -62,6 +62,10 @@ | |||
4126 | 62 | 62 | ||
4127 | 63 | FunctionLookupIterator::~FunctionLookupIterator() {} | 63 | FunctionLookupIterator::~FunctionLookupIterator() {} |
4128 | 64 | 64 | ||
4129 | 65 | |||
4130 | 66 | zstring FunctionLookupIterator::getNameAsString() const { | ||
4131 | 67 | return "fn:function-lookup"; | ||
4132 | 68 | } | ||
4133 | 65 | // </FunctionLookupIterator> | 69 | // </FunctionLookupIterator> |
4134 | 66 | 70 | ||
4135 | 67 | 71 | ||
4136 | @@ -90,6 +94,10 @@ | |||
4137 | 90 | 94 | ||
4138 | 91 | FunctionNameIterator::~FunctionNameIterator() {} | 95 | FunctionNameIterator::~FunctionNameIterator() {} |
4139 | 92 | 96 | ||
4140 | 97 | |||
4141 | 98 | zstring FunctionNameIterator::getNameAsString() const { | ||
4142 | 99 | return "fn:function-name"; | ||
4143 | 100 | } | ||
4144 | 93 | // </FunctionNameIterator> | 101 | // </FunctionNameIterator> |
4145 | 94 | 102 | ||
4146 | 95 | 103 | ||
4147 | @@ -118,6 +126,10 @@ | |||
4148 | 118 | 126 | ||
4149 | 119 | FunctionArityIterator::~FunctionArityIterator() {} | 127 | FunctionArityIterator::~FunctionArityIterator() {} |
4150 | 120 | 128 | ||
4151 | 129 | |||
4152 | 130 | zstring FunctionArityIterator::getNameAsString() const { | ||
4153 | 131 | return "fn:function-arity"; | ||
4154 | 132 | } | ||
4155 | 121 | // </FunctionArityIterator> | 133 | // </FunctionArityIterator> |
4156 | 122 | 134 | ||
4157 | 123 | 135 | ||
4158 | @@ -148,6 +160,10 @@ | |||
4159 | 148 | 160 | ||
4160 | 149 | FnForEachPairIteratorState::FnForEachPairIteratorState() {} | 161 | FnForEachPairIteratorState::FnForEachPairIteratorState() {} |
4161 | 150 | 162 | ||
4162 | 163 | |||
4163 | 164 | zstring FnForEachPairIterator::getNameAsString() const { | ||
4164 | 165 | return "fn:for-each-pair"; | ||
4165 | 166 | } | ||
4166 | 151 | // </FnForEachPairIterator> | 167 | // </FnForEachPairIterator> |
4167 | 152 | 168 | ||
4168 | 153 | 169 | ||
4169 | @@ -180,6 +196,10 @@ | |||
4170 | 180 | 196 | ||
4171 | 181 | FnFoldLeftIteratorState::FnFoldLeftIteratorState() {} | 197 | FnFoldLeftIteratorState::FnFoldLeftIteratorState() {} |
4172 | 182 | 198 | ||
4173 | 199 | |||
4174 | 200 | zstring FnFoldLeftIterator::getNameAsString() const { | ||
4175 | 201 | return "fn:fold-left"; | ||
4176 | 202 | } | ||
4177 | 183 | // </FnFoldLeftIterator> | 203 | // </FnFoldLeftIterator> |
4178 | 184 | 204 | ||
4179 | 185 | 205 | ||
4180 | 186 | 206 | ||
4181 | === modified file 'src/runtime/hof/pregenerated/fn_hof_functions.h' | |||
4182 | --- src/runtime/hof/pregenerated/fn_hof_functions.h 2014-01-31 01:39:38 +0000 | |||
4183 | +++ src/runtime/hof/pregenerated/fn_hof_functions.h 2014-03-04 03:22:54 +0000 | |||
4184 | @@ -64,6 +64,8 @@ | |||
4185 | 64 | 64 | ||
4186 | 65 | virtual ~FunctionLookupIterator(); | 65 | virtual ~FunctionLookupIterator(); |
4187 | 66 | 66 | ||
4188 | 67 | zstring getNameAsString() const; | ||
4189 | 68 | |||
4190 | 67 | void accept(PlanIterVisitor& v) const; | 69 | void accept(PlanIterVisitor& v) const; |
4191 | 68 | 70 | ||
4192 | 69 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 71 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4193 | @@ -96,6 +98,8 @@ | |||
4194 | 96 | 98 | ||
4195 | 97 | virtual ~FunctionNameIterator(); | 99 | virtual ~FunctionNameIterator(); |
4196 | 98 | 100 | ||
4197 | 101 | zstring getNameAsString() const; | ||
4198 | 102 | |||
4199 | 99 | void accept(PlanIterVisitor& v) const; | 103 | void accept(PlanIterVisitor& v) const; |
4200 | 100 | 104 | ||
4201 | 101 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 105 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4202 | @@ -128,6 +132,8 @@ | |||
4203 | 128 | 132 | ||
4204 | 129 | virtual ~FunctionArityIterator(); | 133 | virtual ~FunctionArityIterator(); |
4205 | 130 | 134 | ||
4206 | 135 | zstring getNameAsString() const; | ||
4207 | 136 | |||
4208 | 131 | void accept(PlanIterVisitor& v) const; | 137 | void accept(PlanIterVisitor& v) const; |
4209 | 132 | 138 | ||
4210 | 133 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 139 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4211 | @@ -177,6 +183,8 @@ | |||
4212 | 177 | 183 | ||
4213 | 178 | virtual ~FnForEachPairIterator(); | 184 | virtual ~FnForEachPairIterator(); |
4214 | 179 | 185 | ||
4215 | 186 | zstring getNameAsString() const; | ||
4216 | 187 | |||
4217 | 180 | uint32_t getStateSizeOfSubtree() const; | 188 | uint32_t getStateSizeOfSubtree() const; |
4218 | 181 | 189 | ||
4219 | 182 | void accept(PlanIterVisitor& v) const; | 190 | void accept(PlanIterVisitor& v) const; |
4220 | @@ -234,6 +242,8 @@ | |||
4221 | 234 | 242 | ||
4222 | 235 | virtual ~FnFoldLeftIterator(); | 243 | virtual ~FnFoldLeftIterator(); |
4223 | 236 | 244 | ||
4224 | 245 | zstring getNameAsString() const; | ||
4225 | 246 | |||
4226 | 237 | uint32_t getStateSizeOfSubtree() const; | 247 | uint32_t getStateSizeOfSubtree() const; |
4227 | 238 | 248 | ||
4228 | 239 | void accept(PlanIterVisitor& v) const; | 249 | void accept(PlanIterVisitor& v) const; |
4229 | 240 | 250 | ||
4230 | === modified file 'src/runtime/indexing/index_ddl.cpp' | |||
4231 | --- src/runtime/indexing/index_ddl.cpp 2013-06-13 20:06:14 +0000 | |||
4232 | +++ src/runtime/indexing/index_ddl.cpp 2014-03-04 03:22:54 +0000 | |||
4233 | @@ -49,24 +49,34 @@ | |||
4234 | 49 | 49 | ||
4235 | 50 | 50 | ||
4236 | 51 | SERIALIZABLE_CLASS_VERSIONS(CreateInternalIndexIterator) | 51 | SERIALIZABLE_CLASS_VERSIONS(CreateInternalIndexIterator) |
4237 | 52 | DEF_GET_NAME_AS_STRING(CreateInternalIndexIterator) | ||
4238 | 52 | 53 | ||
4239 | 53 | SERIALIZABLE_CLASS_VERSIONS(CreateIndexIterator) | 54 | SERIALIZABLE_CLASS_VERSIONS(CreateIndexIterator) |
4240 | 55 | DEF_GET_NAME_AS_STRING(CreateIndexIterator) | ||
4241 | 54 | 56 | ||
4242 | 55 | SERIALIZABLE_CLASS_VERSIONS(DeleteIndexIterator) | 57 | SERIALIZABLE_CLASS_VERSIONS(DeleteIndexIterator) |
4243 | 58 | DEF_GET_NAME_AS_STRING(DeleteIndexIterator) | ||
4244 | 56 | 59 | ||
4245 | 57 | SERIALIZABLE_CLASS_VERSIONS(RefreshIndexIterator) | 60 | SERIALIZABLE_CLASS_VERSIONS(RefreshIndexIterator) |
4246 | 61 | DEF_GET_NAME_AS_STRING(RefreshIndexIterator) | ||
4247 | 58 | 62 | ||
4248 | 59 | SERIALIZABLE_CLASS_VERSIONS(ValueIndexEntryBuilderIterator) | 63 | SERIALIZABLE_CLASS_VERSIONS(ValueIndexEntryBuilderIterator) |
4249 | 64 | DEF_GET_NAME_AS_STRING(ValueIndexEntryBuilderIterator) | ||
4250 | 60 | 65 | ||
4251 | 61 | SERIALIZABLE_CLASS_VERSIONS(GeneralIndexEntryBuilderIterator) | 66 | SERIALIZABLE_CLASS_VERSIONS(GeneralIndexEntryBuilderIterator) |
4252 | 67 | DEF_GET_NAME_AS_STRING(GeneralIndexEntryBuilderIterator) | ||
4253 | 62 | 68 | ||
4254 | 63 | SERIALIZABLE_CLASS_VERSIONS(ProbeIndexPointValueIterator) | 69 | SERIALIZABLE_CLASS_VERSIONS(ProbeIndexPointValueIterator) |
4255 | 70 | DEF_GET_NAME_AS_STRING(ProbeIndexPointValueIterator) | ||
4256 | 64 | 71 | ||
4257 | 65 | SERIALIZABLE_CLASS_VERSIONS(ProbeIndexPointGeneralIterator) | 72 | SERIALIZABLE_CLASS_VERSIONS(ProbeIndexPointGeneralIterator) |
4258 | 73 | DEF_GET_NAME_AS_STRING(ProbeIndexPointGeneralIterator) | ||
4259 | 66 | 74 | ||
4260 | 67 | SERIALIZABLE_CLASS_VERSIONS(ProbeIndexRangeValueIterator) | 75 | SERIALIZABLE_CLASS_VERSIONS(ProbeIndexRangeValueIterator) |
4261 | 76 | DEF_GET_NAME_AS_STRING(ProbeIndexRangeValueIterator) | ||
4262 | 68 | 77 | ||
4263 | 69 | SERIALIZABLE_CLASS_VERSIONS(ProbeIndexRangeGeneralIterator) | 78 | SERIALIZABLE_CLASS_VERSIONS(ProbeIndexRangeGeneralIterator) |
4264 | 79 | DEF_GET_NAME_AS_STRING(ProbeIndexRangeGeneralIterator) | ||
4265 | 70 | 80 | ||
4266 | 71 | 81 | ||
4267 | 72 | /******************************************************************************* | 82 | /******************************************************************************* |
4268 | 73 | 83 | ||
4269 | === modified file 'src/runtime/indexing/index_ddl.h' | |||
4270 | --- src/runtime/indexing/index_ddl.h 2013-03-24 20:40:03 +0000 | |||
4271 | +++ src/runtime/indexing/index_ddl.h 2014-03-04 03:22:54 +0000 | |||
4272 | @@ -85,6 +85,8 @@ | |||
4273 | 85 | 85 | ||
4274 | 86 | void accept(PlanIterVisitor& v) const; | 86 | void accept(PlanIterVisitor& v) const; |
4275 | 87 | 87 | ||
4276 | 88 | zstring getNameAsString() const; | ||
4277 | 89 | |||
4278 | 88 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 90 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4279 | 89 | }; | 91 | }; |
4280 | 90 | 92 | ||
4281 | @@ -146,6 +148,8 @@ | |||
4282 | 146 | 148 | ||
4283 | 147 | void accept(PlanIterVisitor& v) const; | 149 | void accept(PlanIterVisitor& v) const; |
4284 | 148 | 150 | ||
4285 | 151 | zstring getNameAsString() const; | ||
4286 | 152 | |||
4287 | 149 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 153 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4288 | 150 | }; | 154 | }; |
4289 | 151 | 155 | ||
4290 | @@ -187,6 +191,8 @@ | |||
4291 | 187 | 191 | ||
4292 | 188 | void accept(PlanIterVisitor& v) const; | 192 | void accept(PlanIterVisitor& v) const; |
4293 | 189 | 193 | ||
4294 | 194 | zstring getNameAsString() const; | ||
4295 | 195 | |||
4296 | 190 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 196 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4297 | 191 | }; | 197 | }; |
4298 | 192 | 198 | ||
4299 | @@ -226,6 +232,8 @@ | |||
4300 | 226 | 232 | ||
4301 | 227 | void accept(PlanIterVisitor& v) const; | 233 | void accept(PlanIterVisitor& v) const; |
4302 | 228 | 234 | ||
4303 | 235 | zstring getNameAsString() const; | ||
4304 | 236 | |||
4305 | 229 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 237 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4306 | 230 | }; | 238 | }; |
4307 | 231 | 239 | ||
4308 | @@ -278,6 +286,8 @@ | |||
4309 | 278 | 286 | ||
4310 | 279 | void accept(PlanIterVisitor& v) const; | 287 | void accept(PlanIterVisitor& v) const; |
4311 | 280 | 288 | ||
4312 | 289 | zstring getNameAsString() const; | ||
4313 | 290 | |||
4314 | 281 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 291 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4315 | 282 | }; | 292 | }; |
4316 | 283 | 293 | ||
4317 | @@ -307,6 +317,8 @@ | |||
4318 | 307 | 317 | ||
4319 | 308 | void accept(PlanIterVisitor& v) const; | 318 | void accept(PlanIterVisitor& v) const; |
4320 | 309 | 319 | ||
4321 | 320 | zstring getNameAsString() const; | ||
4322 | 321 | |||
4323 | 310 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 322 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4324 | 311 | }; | 323 | }; |
4325 | 312 | 324 | ||
4326 | @@ -369,6 +381,8 @@ | |||
4327 | 369 | 381 | ||
4328 | 370 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 382 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
4329 | 371 | 383 | ||
4330 | 384 | zstring getNameAsString() const; | ||
4331 | 385 | |||
4332 | 372 | bool count(store::Item_t& result, PlanState& planState) const; | 386 | bool count(store::Item_t& result, PlanState& planState) const; |
4333 | 373 | 387 | ||
4334 | 374 | protected: | 388 | protected: |
4335 | @@ -426,6 +440,8 @@ | |||
4336 | 426 | 440 | ||
4337 | 427 | void accept(PlanIterVisitor& v) const; | 441 | void accept(PlanIterVisitor& v) const; |
4338 | 428 | 442 | ||
4339 | 443 | zstring getNameAsString() const; | ||
4340 | 444 | |||
4341 | 429 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 445 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4342 | 430 | 446 | ||
4343 | 431 | protected: | 447 | protected: |
4344 | @@ -509,6 +525,8 @@ | |||
4345 | 509 | 525 | ||
4346 | 510 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 526 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
4347 | 511 | 527 | ||
4348 | 528 | zstring getNameAsString() const; | ||
4349 | 529 | |||
4350 | 512 | bool count(store::Item_t& result, PlanState& planState) const; | 530 | bool count(store::Item_t& result, PlanState& planState) const; |
4351 | 513 | 531 | ||
4352 | 514 | protected: | 532 | protected: |
4353 | @@ -587,6 +605,8 @@ | |||
4354 | 587 | 605 | ||
4355 | 588 | void accept(PlanIterVisitor& v) const; | 606 | void accept(PlanIterVisitor& v) const; |
4356 | 589 | 607 | ||
4357 | 608 | zstring getNameAsString() const; | ||
4358 | 609 | |||
4359 | 590 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 610 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4360 | 591 | 611 | ||
4361 | 592 | private: | 612 | private: |
4362 | 593 | 613 | ||
4363 | === modified file 'src/runtime/indexing/pregenerated/ic_ddl.cpp' | |||
4364 | --- src/runtime/indexing/pregenerated/ic_ddl.cpp 2014-01-31 01:39:38 +0000 | |||
4365 | +++ src/runtime/indexing/pregenerated/ic_ddl.cpp 2014-03-04 03:22:54 +0000 | |||
4366 | @@ -55,6 +55,10 @@ | |||
4367 | 55 | 55 | ||
4368 | 56 | ActivateICIterator::~ActivateICIterator() {} | 56 | ActivateICIterator::~ActivateICIterator() {} |
4369 | 57 | 57 | ||
4370 | 58 | |||
4371 | 59 | zstring ActivateICIterator::getNameAsString() const { | ||
4372 | 60 | return "zorba-store-static-integrity-constraints-ddl:activate"; | ||
4373 | 61 | } | ||
4374 | 58 | // </ActivateICIterator> | 62 | // </ActivateICIterator> |
4375 | 59 | 63 | ||
4376 | 60 | 64 | ||
4377 | @@ -79,6 +83,10 @@ | |||
4378 | 79 | 83 | ||
4379 | 80 | DeactivateICIterator::~DeactivateICIterator() {} | 84 | DeactivateICIterator::~DeactivateICIterator() {} |
4380 | 81 | 85 | ||
4381 | 86 | |||
4382 | 87 | zstring DeactivateICIterator::getNameAsString() const { | ||
4383 | 88 | return "zorba-store-static-integrity-constraints-ddl:deactivate"; | ||
4384 | 89 | } | ||
4385 | 82 | // </DeactivateICIterator> | 90 | // </DeactivateICIterator> |
4386 | 83 | 91 | ||
4387 | 84 | 92 | ||
4388 | @@ -103,6 +111,10 @@ | |||
4389 | 103 | 111 | ||
4390 | 104 | CheckICIterator::~CheckICIterator() {} | 112 | CheckICIterator::~CheckICIterator() {} |
4391 | 105 | 113 | ||
4392 | 114 | |||
4393 | 115 | zstring CheckICIterator::getNameAsString() const { | ||
4394 | 116 | return "zorba-store-static-integrity-constraints-dml:check-integrity-constraint"; | ||
4395 | 117 | } | ||
4396 | 106 | // </CheckICIterator> | 118 | // </CheckICIterator> |
4397 | 107 | 119 | ||
4398 | 108 | 120 | ||
4399 | 109 | 121 | ||
4400 | === modified file 'src/runtime/indexing/pregenerated/ic_ddl.h' | |||
4401 | --- src/runtime/indexing/pregenerated/ic_ddl.h 2014-01-31 01:39:38 +0000 | |||
4402 | +++ src/runtime/indexing/pregenerated/ic_ddl.h 2014-03-04 03:22:54 +0000 | |||
4403 | @@ -66,6 +66,8 @@ | |||
4404 | 66 | 66 | ||
4405 | 67 | virtual ~ActivateICIterator(); | 67 | virtual ~ActivateICIterator(); |
4406 | 68 | 68 | ||
4407 | 69 | zstring getNameAsString() const; | ||
4408 | 70 | |||
4409 | 69 | void accept(PlanIterVisitor& v) const; | 71 | void accept(PlanIterVisitor& v) const; |
4410 | 70 | 72 | ||
4411 | 71 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 73 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4412 | @@ -104,6 +106,8 @@ | |||
4413 | 104 | 106 | ||
4414 | 105 | virtual ~DeactivateICIterator(); | 107 | virtual ~DeactivateICIterator(); |
4415 | 106 | 108 | ||
4416 | 109 | zstring getNameAsString() const; | ||
4417 | 110 | |||
4418 | 107 | void accept(PlanIterVisitor& v) const; | 111 | void accept(PlanIterVisitor& v) const; |
4419 | 108 | 112 | ||
4420 | 109 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 113 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4421 | @@ -141,6 +145,8 @@ | |||
4422 | 141 | 145 | ||
4423 | 142 | virtual ~CheckICIterator(); | 146 | virtual ~CheckICIterator(); |
4424 | 143 | 147 | ||
4425 | 148 | zstring getNameAsString() const; | ||
4426 | 149 | |||
4427 | 144 | void accept(PlanIterVisitor& v) const; | 150 | void accept(PlanIterVisitor& v) const; |
4428 | 145 | 151 | ||
4429 | 146 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 152 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4430 | 147 | 153 | ||
4431 | === modified file 'src/runtime/indexing/pregenerated/index_func.cpp' | |||
4432 | --- src/runtime/indexing/pregenerated/index_func.cpp 2014-01-31 01:39:38 +0000 | |||
4433 | +++ src/runtime/indexing/pregenerated/index_func.cpp 2014-03-04 03:22:54 +0000 | |||
4434 | @@ -73,6 +73,10 @@ | |||
4435 | 73 | void IndexKeysIteratorState::reset(PlanState& planState) { | 73 | void IndexKeysIteratorState::reset(PlanState& planState) { |
4436 | 74 | PlanIteratorState::reset(planState); | 74 | PlanIteratorState::reset(planState); |
4437 | 75 | } | 75 | } |
4438 | 76 | |||
4439 | 77 | zstring IndexKeysIterator::getNameAsString() const { | ||
4440 | 78 | return "zorba-store-indexes-static-dml:keys"; | ||
4441 | 79 | } | ||
4442 | 76 | // </IndexKeysIterator> | 80 | // </IndexKeysIterator> |
4443 | 77 | 81 | ||
4444 | 78 | 82 | ||
4445 | 79 | 83 | ||
4446 | === modified file 'src/runtime/indexing/pregenerated/index_func.h' | |||
4447 | --- src/runtime/indexing/pregenerated/index_func.h 2014-01-31 01:39:38 +0000 | |||
4448 | +++ src/runtime/indexing/pregenerated/index_func.h 2014-03-04 03:22:54 +0000 | |||
4449 | @@ -78,6 +78,8 @@ | |||
4450 | 78 | 78 | ||
4451 | 79 | virtual ~IndexKeysIterator(); | 79 | virtual ~IndexKeysIterator(); |
4452 | 80 | 80 | ||
4453 | 81 | zstring getNameAsString() const; | ||
4454 | 82 | |||
4455 | 81 | void accept(PlanIterVisitor& v) const; | 83 | void accept(PlanIterVisitor& v) const; |
4456 | 82 | 84 | ||
4457 | 83 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 85 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4458 | 84 | 86 | ||
4459 | === modified file 'src/runtime/item/pregenerated/item.cpp' | |||
4460 | --- src/runtime/item/pregenerated/item.cpp 2014-01-31 01:39:38 +0000 | |||
4461 | +++ src/runtime/item/pregenerated/item.cpp 2014-03-04 03:22:54 +0000 | |||
4462 | @@ -58,6 +58,10 @@ | |||
4463 | 58 | 58 | ||
4464 | 59 | MemSizeIterator::~MemSizeIterator() {} | 59 | MemSizeIterator::~MemSizeIterator() {} |
4465 | 60 | 60 | ||
4466 | 61 | |||
4467 | 62 | zstring MemSizeIterator::getNameAsString() const { | ||
4468 | 63 | return "fn-zorba-item:size"; | ||
4469 | 64 | } | ||
4470 | 61 | // </MemSizeIterator> | 65 | // </MemSizeIterator> |
4471 | 62 | 66 | ||
4472 | 63 | 67 | ||
4473 | 64 | 68 | ||
4474 | === modified file 'src/runtime/item/pregenerated/item.h' | |||
4475 | --- src/runtime/item/pregenerated/item.h 2014-01-31 01:39:38 +0000 | |||
4476 | +++ src/runtime/item/pregenerated/item.h 2014-03-04 03:22:54 +0000 | |||
4477 | @@ -58,6 +58,8 @@ | |||
4478 | 58 | 58 | ||
4479 | 59 | virtual ~MemSizeIterator(); | 59 | virtual ~MemSizeIterator(); |
4480 | 60 | 60 | ||
4481 | 61 | zstring getNameAsString() const; | ||
4482 | 62 | |||
4483 | 61 | void accept(PlanIterVisitor& v) const; | 63 | void accept(PlanIterVisitor& v) const; |
4484 | 62 | 64 | ||
4485 | 63 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 65 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4486 | 64 | 66 | ||
4487 | === modified file 'src/runtime/json/json_constructors.cpp' | |||
4488 | --- src/runtime/json/json_constructors.cpp 2013-06-15 02:57:08 +0000 | |||
4489 | +++ src/runtime/json/json_constructors.cpp 2014-03-04 03:22:54 +0000 | |||
4490 | @@ -33,10 +33,13 @@ | |||
4491 | 33 | { | 33 | { |
4492 | 34 | 34 | ||
4493 | 35 | SERIALIZABLE_CLASS_VERSIONS(JSONObjectIterator) | 35 | SERIALIZABLE_CLASS_VERSIONS(JSONObjectIterator) |
4494 | 36 | DEF_GET_NAME_AS_STRING(JSONObjectIterator) | ||
4495 | 36 | 37 | ||
4496 | 37 | SERIALIZABLE_CLASS_VERSIONS(JSONArrayIterator) | 38 | SERIALIZABLE_CLASS_VERSIONS(JSONArrayIterator) |
4497 | 39 | DEF_GET_NAME_AS_STRING(JSONArrayIterator) | ||
4498 | 38 | 40 | ||
4499 | 39 | SERIALIZABLE_CLASS_VERSIONS(JSONDirectObjectIterator) | 41 | SERIALIZABLE_CLASS_VERSIONS(JSONDirectObjectIterator) |
4500 | 42 | DEF_GET_NAME_AS_STRING(JSONDirectObjectIterator) | ||
4501 | 40 | 43 | ||
4502 | 41 | 44 | ||
4503 | 42 | /********************************************************************************* | 45 | /********************************************************************************* |
4504 | 43 | 46 | ||
4505 | === modified file 'src/runtime/json/json_constructors.h' | |||
4506 | --- src/runtime/json/json_constructors.h 2013-06-15 02:57:08 +0000 | |||
4507 | +++ src/runtime/json/json_constructors.h 2014-03-04 03:22:54 +0000 | |||
4508 | @@ -72,6 +72,8 @@ | |||
4509 | 72 | 72 | ||
4510 | 73 | void openImpl(PlanState& planState, uint32_t& offset); | 73 | void openImpl(PlanState& planState, uint32_t& offset); |
4511 | 74 | 74 | ||
4512 | 75 | zstring getNameAsString() const; | ||
4513 | 76 | |||
4514 | 75 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 77 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
4515 | 76 | }; | 78 | }; |
4516 | 77 | 79 | ||
4517 | @@ -123,6 +125,8 @@ | |||
4518 | 123 | 125 | ||
4519 | 124 | void openImpl(PlanState& planState, uint32_t& offset); | 126 | void openImpl(PlanState& planState, uint32_t& offset); |
4520 | 125 | 127 | ||
4521 | 128 | zstring getNameAsString() const; | ||
4522 | 129 | |||
4523 | 126 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 130 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
4524 | 127 | }; | 131 | }; |
4525 | 128 | 132 | ||
4526 | @@ -156,10 +160,13 @@ | |||
4527 | 156 | 160 | ||
4528 | 157 | void accept(PlanIterVisitor& v) const; | 161 | void accept(PlanIterVisitor& v) const; |
4529 | 158 | 162 | ||
4530 | 163 | zstring getNameAsString() const; | ||
4531 | 164 | |||
4532 | 159 | bool nextImpl(store::Item_t& result, PlanState& planState) const; | 165 | bool nextImpl(store::Item_t& result, PlanState& planState) const; |
4533 | 160 | }; | 166 | }; |
4534 | 161 | 167 | ||
4535 | 162 | 168 | ||
4537 | 163 | } | 169 | } // namespace zorba |
4538 | 164 | 170 | ||
4540 | 165 | #endif | 171 | #endif /* ZORBA_RUNTIME_JSON_CONSTRUCTORS */ |
4541 | 172 | /* vim:set et sw=2 ts=2: */ | ||
4542 | 166 | 173 | ||
4543 | === modified file 'src/runtime/json/pregenerated/json.cpp' | |||
4544 | --- src/runtime/json/pregenerated/json.cpp 2014-01-31 01:39:38 +0000 | |||
4545 | +++ src/runtime/json/pregenerated/json.cpp 2014-03-04 03:22:54 +0000 | |||
4546 | @@ -58,6 +58,10 @@ | |||
4547 | 58 | 58 | ||
4548 | 59 | JSONtoXMLInternal::~JSONtoXMLInternal() {} | 59 | JSONtoXMLInternal::~JSONtoXMLInternal() {} |
4549 | 60 | 60 | ||
4550 | 61 | |||
4551 | 62 | zstring JSONtoXMLInternal::getNameAsString() const { | ||
4552 | 63 | return "fn-zorba-json:json-to-xml-internal"; | ||
4553 | 64 | } | ||
4554 | 61 | // </JSONtoXMLInternal> | 65 | // </JSONtoXMLInternal> |
4555 | 62 | 66 | ||
4556 | 63 | 67 | ||
4557 | @@ -86,6 +90,10 @@ | |||
4558 | 86 | 90 | ||
4559 | 87 | XMLtoJSONInternal::~XMLtoJSONInternal() {} | 91 | XMLtoJSONInternal::~XMLtoJSONInternal() {} |
4560 | 88 | 92 | ||
4561 | 93 | |||
4562 | 94 | zstring XMLtoJSONInternal::getNameAsString() const { | ||
4563 | 95 | return "fn-zorba-json:xml-to-json-internal"; | ||
4564 | 96 | } | ||
4565 | 89 | // </XMLtoJSONInternal> | 97 | // </XMLtoJSONInternal> |
4566 | 90 | 98 | ||
4567 | 91 | 99 | ||
4568 | 92 | 100 | ||
4569 | === modified file 'src/runtime/json/pregenerated/json.h' | |||
4570 | --- src/runtime/json/pregenerated/json.h 2014-01-31 01:39:38 +0000 | |||
4571 | +++ src/runtime/json/pregenerated/json.h 2014-03-04 03:22:54 +0000 | |||
4572 | @@ -60,6 +60,8 @@ | |||
4573 | 60 | 60 | ||
4574 | 61 | virtual ~JSONtoXMLInternal(); | 61 | virtual ~JSONtoXMLInternal(); |
4575 | 62 | 62 | ||
4576 | 63 | zstring getNameAsString() const; | ||
4577 | 64 | |||
4578 | 63 | void accept(PlanIterVisitor& v) const; | 65 | void accept(PlanIterVisitor& v) const; |
4579 | 64 | 66 | ||
4580 | 65 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 67 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4581 | @@ -92,6 +94,8 @@ | |||
4582 | 92 | 94 | ||
4583 | 93 | virtual ~XMLtoJSONInternal(); | 95 | virtual ~XMLtoJSONInternal(); |
4584 | 94 | 96 | ||
4585 | 97 | zstring getNameAsString() const; | ||
4586 | 98 | |||
4587 | 95 | void accept(PlanIterVisitor& v) const; | 99 | void accept(PlanIterVisitor& v) const; |
4588 | 96 | 100 | ||
4589 | 97 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 101 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4590 | 98 | 102 | ||
4591 | === modified file 'src/runtime/json/pregenerated/jsoniq_functions.cpp' | |||
4592 | --- src/runtime/json/pregenerated/jsoniq_functions.cpp 2014-01-31 01:39:38 +0000 | |||
4593 | +++ src/runtime/json/pregenerated/jsoniq_functions.cpp 2014-03-04 03:22:54 +0000 | |||
4594 | @@ -70,6 +70,10 @@ | |||
4595 | 70 | void JSONDecodeFromRoundtripIteratorState::reset(PlanState& planState) { | 70 | void JSONDecodeFromRoundtripIteratorState::reset(PlanState& planState) { |
4596 | 71 | PlanIteratorState::reset(planState); | 71 | PlanIteratorState::reset(planState); |
4597 | 72 | } | 72 | } |
4598 | 73 | |||
4599 | 74 | zstring JSONDecodeFromRoundtripIterator::getNameAsString() const { | ||
4600 | 75 | return "fn-jsoniq:decode-from-roundtrip"; | ||
4601 | 76 | } | ||
4602 | 73 | // </JSONDecodeFromRoundtripIterator> | 77 | // </JSONDecodeFromRoundtripIterator> |
4603 | 74 | 78 | ||
4604 | 75 | 79 | ||
4605 | @@ -110,6 +114,10 @@ | |||
4606 | 110 | void JSONEncodeForRoundtripIteratorState::reset(PlanState& planState) { | 114 | void JSONEncodeForRoundtripIteratorState::reset(PlanState& planState) { |
4607 | 111 | PlanIteratorState::reset(planState); | 115 | PlanIteratorState::reset(planState); |
4608 | 112 | } | 116 | } |
4609 | 117 | |||
4610 | 118 | zstring JSONEncodeForRoundtripIterator::getNameAsString() const { | ||
4611 | 119 | return "fn-jsoniq:encode-for-roundtrip"; | ||
4612 | 120 | } | ||
4613 | 113 | // </JSONEncodeForRoundtripIterator> | 121 | // </JSONEncodeForRoundtripIterator> |
4614 | 114 | 122 | ||
4615 | 115 | 123 | ||
4616 | @@ -142,6 +150,10 @@ | |||
4617 | 142 | 150 | ||
4618 | 143 | JSONParseIteratorState::JSONParseIteratorState() {} | 151 | JSONParseIteratorState::JSONParseIteratorState() {} |
4619 | 144 | 152 | ||
4620 | 153 | |||
4621 | 154 | zstring JSONParseIterator::getNameAsString() const { | ||
4622 | 155 | return "fn-jsoniq:parse-json"; | ||
4623 | 156 | } | ||
4624 | 145 | // </JSONParseIterator> | 157 | // </JSONParseIterator> |
4625 | 146 | 158 | ||
4626 | 147 | 159 | ||
4627 | @@ -170,6 +182,10 @@ | |||
4628 | 170 | 182 | ||
4629 | 171 | MultiObjectKeysIteratorState::~MultiObjectKeysIteratorState() {} | 183 | MultiObjectKeysIteratorState::~MultiObjectKeysIteratorState() {} |
4630 | 172 | 184 | ||
4631 | 185 | |||
4632 | 186 | zstring MultiObjectKeysIterator::getNameAsString() const { | ||
4633 | 187 | return "fn-jsoniq:keys"; | ||
4634 | 188 | } | ||
4635 | 173 | // </MultiObjectKeysIterator> | 189 | // </MultiObjectKeysIterator> |
4636 | 174 | 190 | ||
4637 | 175 | 191 | ||
4638 | @@ -206,6 +222,10 @@ | |||
4639 | 206 | void SingleObjectKeysIteratorState::reset(PlanState& planState) { | 222 | void SingleObjectKeysIteratorState::reset(PlanState& planState) { |
4640 | 207 | PlanIteratorState::reset(planState); | 223 | PlanIteratorState::reset(planState); |
4641 | 208 | } | 224 | } |
4642 | 225 | |||
4643 | 226 | zstring SingleObjectKeysIterator::getNameAsString() const { | ||
4644 | 227 | return "op-zorba:keys"; | ||
4645 | 228 | } | ||
4646 | 209 | // </SingleObjectKeysIterator> | 229 | // </SingleObjectKeysIterator> |
4647 | 210 | 230 | ||
4648 | 211 | 231 | ||
4649 | @@ -243,6 +263,10 @@ | |||
4650 | 243 | void MultiObjectLookupIteratorState::reset(PlanState& planState) { | 263 | void MultiObjectLookupIteratorState::reset(PlanState& planState) { |
4651 | 244 | PlanIteratorState::reset(planState); | 264 | PlanIteratorState::reset(planState); |
4652 | 245 | } | 265 | } |
4653 | 266 | |||
4654 | 267 | zstring MultiObjectLookupIterator::getNameAsString() const { | ||
4655 | 268 | return "op-zorba:multi-object-lookup"; | ||
4656 | 269 | } | ||
4657 | 246 | // </MultiObjectLookupIterator> | 270 | // </MultiObjectLookupIterator> |
4658 | 247 | 271 | ||
4659 | 248 | 272 | ||
4660 | @@ -268,6 +292,10 @@ | |||
4661 | 268 | 292 | ||
4662 | 269 | SingleObjectLookupIterator::~SingleObjectLookupIterator() {} | 293 | SingleObjectLookupIterator::~SingleObjectLookupIterator() {} |
4663 | 270 | 294 | ||
4664 | 295 | |||
4665 | 296 | zstring SingleObjectLookupIterator::getNameAsString() const { | ||
4666 | 297 | return "op-zorba:single-object-lookup"; | ||
4667 | 298 | } | ||
4668 | 271 | // </SingleObjectLookupIterator> | 299 | // </SingleObjectLookupIterator> |
4669 | 272 | 300 | ||
4670 | 273 | 301 | ||
4671 | @@ -305,6 +333,10 @@ | |||
4672 | 305 | void JSONObjectProjectIteratorState::reset(PlanState& planState) { | 333 | void JSONObjectProjectIteratorState::reset(PlanState& planState) { |
4673 | 306 | PlanIteratorState::reset(planState); | 334 | PlanIteratorState::reset(planState); |
4674 | 307 | } | 335 | } |
4675 | 336 | |||
4676 | 337 | zstring JSONObjectProjectIterator::getNameAsString() const { | ||
4677 | 338 | return "fn-jsoniq:project"; | ||
4678 | 339 | } | ||
4679 | 308 | // </JSONObjectProjectIterator> | 340 | // </JSONObjectProjectIterator> |
4680 | 309 | 341 | ||
4681 | 310 | 342 | ||
4682 | @@ -342,6 +374,10 @@ | |||
4683 | 342 | void JSONObjectTrimIteratorState::reset(PlanState& planState) { | 374 | void JSONObjectTrimIteratorState::reset(PlanState& planState) { |
4684 | 343 | PlanIteratorState::reset(planState); | 375 | PlanIteratorState::reset(planState); |
4685 | 344 | } | 376 | } |
4686 | 377 | |||
4687 | 378 | zstring JSONObjectTrimIterator::getNameAsString() const { | ||
4688 | 379 | return "fn-jsoniq:trim"; | ||
4689 | 380 | } | ||
4690 | 345 | // </JSONObjectTrimIterator> | 381 | // </JSONObjectTrimIterator> |
4691 | 346 | 382 | ||
4692 | 347 | 383 | ||
4693 | @@ -378,6 +414,10 @@ | |||
4694 | 378 | void MultiArrayMembersIteratorState::reset(PlanState& planState) { | 414 | void MultiArrayMembersIteratorState::reset(PlanState& planState) { |
4695 | 379 | PlanIteratorState::reset(planState); | 415 | PlanIteratorState::reset(planState); |
4696 | 380 | } | 416 | } |
4697 | 417 | |||
4698 | 418 | zstring MultiArrayMembersIterator::getNameAsString() const { | ||
4699 | 419 | return "fn-jsoniq:members"; | ||
4700 | 420 | } | ||
4701 | 381 | // </MultiArrayMembersIterator> | 421 | // </MultiArrayMembersIterator> |
4702 | 382 | 422 | ||
4703 | 383 | 423 | ||
4704 | @@ -414,6 +454,10 @@ | |||
4705 | 414 | void SingleArrayMembersIteratorState::reset(PlanState& planState) { | 454 | void SingleArrayMembersIteratorState::reset(PlanState& planState) { |
4706 | 415 | PlanIteratorState::reset(planState); | 455 | PlanIteratorState::reset(planState); |
4707 | 416 | } | 456 | } |
4708 | 457 | |||
4709 | 458 | zstring SingleArrayMembersIterator::getNameAsString() const { | ||
4710 | 459 | return "op-zorba:members"; | ||
4711 | 460 | } | ||
4712 | 417 | // </SingleArrayMembersIterator> | 461 | // </SingleArrayMembersIterator> |
4713 | 418 | 462 | ||
4714 | 419 | 463 | ||
4715 | @@ -451,6 +495,10 @@ | |||
4716 | 451 | void MultiArrayLookupIteratorState::reset(PlanState& planState) { | 495 | void MultiArrayLookupIteratorState::reset(PlanState& planState) { |
4717 | 452 | PlanIteratorState::reset(planState); | 496 | PlanIteratorState::reset(planState); |
4718 | 453 | } | 497 | } |
4719 | 498 | |||
4720 | 499 | zstring MultiArrayLookupIterator::getNameAsString() const { | ||
4721 | 500 | return "op-zorba:multi-array-lookup"; | ||
4722 | 501 | } | ||
4723 | 454 | // </MultiArrayLookupIterator> | 502 | // </MultiArrayLookupIterator> |
4724 | 455 | 503 | ||
4725 | 456 | 504 | ||
4726 | @@ -476,6 +524,10 @@ | |||
4727 | 476 | 524 | ||
4728 | 477 | SingleArrayLookupIterator::~SingleArrayLookupIterator() {} | 525 | SingleArrayLookupIterator::~SingleArrayLookupIterator() {} |
4729 | 478 | 526 | ||
4730 | 527 | |||
4731 | 528 | zstring SingleArrayLookupIterator::getNameAsString() const { | ||
4732 | 529 | return "op-zorba:single-array-lookup"; | ||
4733 | 530 | } | ||
4734 | 479 | // </SingleArrayLookupIterator> | 531 | // </SingleArrayLookupIterator> |
4735 | 480 | 532 | ||
4736 | 481 | 533 | ||
4737 | @@ -500,6 +552,10 @@ | |||
4738 | 500 | 552 | ||
4739 | 501 | JSONArraySizeIterator::~JSONArraySizeIterator() {} | 553 | JSONArraySizeIterator::~JSONArraySizeIterator() {} |
4740 | 502 | 554 | ||
4741 | 555 | |||
4742 | 556 | zstring JSONArraySizeIterator::getNameAsString() const { | ||
4743 | 557 | return "fn-jsoniq:size"; | ||
4744 | 558 | } | ||
4745 | 503 | // </JSONArraySizeIterator> | 559 | // </JSONArraySizeIterator> |
4746 | 504 | 560 | ||
4747 | 505 | 561 | ||
4748 | @@ -532,6 +588,10 @@ | |||
4749 | 532 | void JSONArrayFlattenIteratorState::init(PlanState& planState) { | 588 | void JSONArrayFlattenIteratorState::init(PlanState& planState) { |
4750 | 533 | PlanIteratorState::init(planState); | 589 | PlanIteratorState::init(planState); |
4751 | 534 | } | 590 | } |
4752 | 591 | |||
4753 | 592 | zstring JSONArrayFlattenIterator::getNameAsString() const { | ||
4754 | 593 | return "fn-jsoniq:flatten"; | ||
4755 | 594 | } | ||
4756 | 535 | // </JSONArrayFlattenIterator> | 595 | // </JSONArrayFlattenIterator> |
4757 | 536 | 596 | ||
4758 | 537 | 597 | ||
4759 | @@ -556,6 +616,10 @@ | |||
4760 | 556 | 616 | ||
4761 | 557 | JSONNullIterator::~JSONNullIterator() {} | 617 | JSONNullIterator::~JSONNullIterator() {} |
4762 | 558 | 618 | ||
4763 | 619 | |||
4764 | 620 | zstring JSONNullIterator::getNameAsString() const { | ||
4765 | 621 | return "fn-jsoniq:null"; | ||
4766 | 622 | } | ||
4767 | 559 | // </JSONNullIterator> | 623 | // </JSONNullIterator> |
4768 | 560 | 624 | ||
4769 | 561 | 625 | ||
4770 | @@ -584,6 +648,10 @@ | |||
4771 | 584 | 648 | ||
4772 | 585 | JSONObjectInsertIterator::~JSONObjectInsertIterator() {} | 649 | JSONObjectInsertIterator::~JSONObjectInsertIterator() {} |
4773 | 586 | 650 | ||
4774 | 651 | |||
4775 | 652 | zstring JSONObjectInsertIterator::getNameAsString() const { | ||
4776 | 653 | return "op-zorba:json-object-insert"; | ||
4777 | 654 | } | ||
4778 | 587 | // </JSONObjectInsertIterator> | 655 | // </JSONObjectInsertIterator> |
4779 | 588 | 656 | ||
4780 | 589 | 657 | ||
4781 | @@ -612,6 +680,10 @@ | |||
4782 | 612 | 680 | ||
4783 | 613 | JSONArrayInsertIterator::~JSONArrayInsertIterator() {} | 681 | JSONArrayInsertIterator::~JSONArrayInsertIterator() {} |
4784 | 614 | 682 | ||
4785 | 683 | |||
4786 | 684 | zstring JSONArrayInsertIterator::getNameAsString() const { | ||
4787 | 685 | return "op-zorba:json-array-insert"; | ||
4788 | 686 | } | ||
4789 | 615 | // </JSONArrayInsertIterator> | 687 | // </JSONArrayInsertIterator> |
4790 | 616 | 688 | ||
4791 | 617 | 689 | ||
4792 | @@ -637,6 +709,10 @@ | |||
4793 | 637 | 709 | ||
4794 | 638 | JSONDeleteIterator::~JSONDeleteIterator() {} | 710 | JSONDeleteIterator::~JSONDeleteIterator() {} |
4795 | 639 | 711 | ||
4796 | 712 | |||
4797 | 713 | zstring JSONDeleteIterator::getNameAsString() const { | ||
4798 | 714 | return "op-zorba:json-delete"; | ||
4799 | 715 | } | ||
4800 | 640 | // </JSONDeleteIterator> | 716 | // </JSONDeleteIterator> |
4801 | 641 | 717 | ||
4802 | 642 | 718 | ||
4803 | @@ -667,6 +743,10 @@ | |||
4804 | 667 | 743 | ||
4805 | 668 | JSONReplaceValueIterator::~JSONReplaceValueIterator() {} | 744 | JSONReplaceValueIterator::~JSONReplaceValueIterator() {} |
4806 | 669 | 745 | ||
4807 | 746 | |||
4808 | 747 | zstring JSONReplaceValueIterator::getNameAsString() const { | ||
4809 | 748 | return "op-zorba:json-replace-value"; | ||
4810 | 749 | } | ||
4811 | 670 | // </JSONReplaceValueIterator> | 750 | // </JSONReplaceValueIterator> |
4812 | 671 | 751 | ||
4813 | 672 | 752 | ||
4814 | @@ -695,6 +775,10 @@ | |||
4815 | 695 | 775 | ||
4816 | 696 | JSONRenameIterator::~JSONRenameIterator() {} | 776 | JSONRenameIterator::~JSONRenameIterator() {} |
4817 | 697 | 777 | ||
4818 | 778 | |||
4819 | 779 | zstring JSONRenameIterator::getNameAsString() const { | ||
4820 | 780 | return "op-zorba:json-rename"; | ||
4821 | 781 | } | ||
4822 | 698 | // </JSONRenameIterator> | 782 | // </JSONRenameIterator> |
4823 | 699 | 783 | ||
4824 | 700 | 784 | ||
4825 | @@ -723,6 +807,10 @@ | |||
4826 | 723 | 807 | ||
4827 | 724 | JSONArrayAppendIterator::~JSONArrayAppendIterator() {} | 808 | JSONArrayAppendIterator::~JSONArrayAppendIterator() {} |
4828 | 725 | 809 | ||
4829 | 810 | |||
4830 | 811 | zstring JSONArrayAppendIterator::getNameAsString() const { | ||
4831 | 812 | return "op-zorba:json-array-append"; | ||
4832 | 813 | } | ||
4833 | 726 | // </JSONArrayAppendIterator> | 814 | // </JSONArrayAppendIterator> |
4834 | 727 | 815 | ||
4835 | 728 | 816 | ||
4836 | @@ -747,6 +835,10 @@ | |||
4837 | 747 | 835 | ||
4838 | 748 | JSONBoxIterator::~JSONBoxIterator() {} | 836 | JSONBoxIterator::~JSONBoxIterator() {} |
4839 | 749 | 837 | ||
4840 | 838 | |||
4841 | 839 | zstring JSONBoxIterator::getNameAsString() const { | ||
4842 | 840 | return "op-zorba:json-box"; | ||
4843 | 841 | } | ||
4844 | 750 | // </JSONBoxIterator> | 842 | // </JSONBoxIterator> |
4845 | 751 | 843 | ||
4846 | 752 | 844 | ||
4847 | 753 | 845 | ||
4848 | === modified file 'src/runtime/json/pregenerated/jsoniq_functions.h' | |||
4849 | --- src/runtime/json/pregenerated/jsoniq_functions.h 2014-01-31 01:39:38 +0000 | |||
4850 | +++ src/runtime/json/pregenerated/jsoniq_functions.h 2014-03-04 03:22:54 +0000 | |||
4851 | @@ -75,6 +75,8 @@ | |||
4852 | 75 | 75 | ||
4853 | 76 | virtual ~JSONDecodeFromRoundtripIterator(); | 76 | virtual ~JSONDecodeFromRoundtripIterator(); |
4854 | 77 | 77 | ||
4855 | 78 | zstring getNameAsString() const; | ||
4856 | 79 | |||
4857 | 78 | public: | 80 | public: |
4858 | 79 | static void extractChildOfKind(const store::Item_t& aParent, const store::NodeKind& aKind, store::Item_t& aChild); | 81 | static void extractChildOfKind(const store::Item_t& aParent, const store::NodeKind& aKind, store::Item_t& aChild); |
4859 | 80 | bool decodeNode(const store::Item_t& aSerializedNode, const store::NodeKind& aKind, store::Item_t& aResult) const; | 82 | bool decodeNode(const store::Item_t& aSerializedNode, const store::NodeKind& aKind, store::Item_t& aResult) const; |
4860 | @@ -127,6 +129,8 @@ | |||
4861 | 127 | 129 | ||
4862 | 128 | virtual ~JSONEncodeForRoundtripIterator(); | 130 | virtual ~JSONEncodeForRoundtripIterator(); |
4863 | 129 | 131 | ||
4864 | 132 | zstring getNameAsString() const; | ||
4865 | 133 | |||
4866 | 130 | public: | 134 | public: |
4867 | 131 | bool encodeObject(const store::Item_t& anObj, store::Item_t& aResult, JSONEncodeForRoundtripIteratorState* aState) const; | 135 | bool encodeObject(const store::Item_t& anObj, store::Item_t& aResult, JSONEncodeForRoundtripIteratorState* aState) const; |
4868 | 132 | bool encodeArray(const store::Item_t& anArray, store::Item_t& aResult, JSONEncodeForRoundtripIteratorState* aState) const; | 136 | bool encodeArray(const store::Item_t& anArray, store::Item_t& aResult, JSONEncodeForRoundtripIteratorState* aState) const; |
4869 | @@ -184,6 +188,8 @@ | |||
4870 | 184 | 188 | ||
4871 | 185 | virtual ~JSONParseIterator(); | 189 | virtual ~JSONParseIterator(); |
4872 | 186 | 190 | ||
4873 | 191 | zstring getNameAsString() const; | ||
4874 | 192 | |||
4875 | 187 | public: | 193 | public: |
4876 | 188 | bool processBooleanOption(const store::Item_t& options, char const* option_name, bool* option_value) const; | 194 | bool processBooleanOption(const store::Item_t& options, char const* option_name, bool* option_value) const; |
4877 | 189 | void accept(PlanIterVisitor& v) const; | 195 | void accept(PlanIterVisitor& v) const; |
4878 | @@ -231,6 +237,8 @@ | |||
4879 | 231 | 237 | ||
4880 | 232 | virtual ~MultiObjectKeysIterator(); | 238 | virtual ~MultiObjectKeysIterator(); |
4881 | 233 | 239 | ||
4882 | 240 | zstring getNameAsString() const; | ||
4883 | 241 | |||
4884 | 234 | void accept(PlanIterVisitor& v) const; | 242 | void accept(PlanIterVisitor& v) const; |
4885 | 235 | 243 | ||
4886 | 236 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 244 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4887 | @@ -274,6 +282,8 @@ | |||
4888 | 274 | 282 | ||
4889 | 275 | virtual ~SingleObjectKeysIterator(); | 283 | virtual ~SingleObjectKeysIterator(); |
4890 | 276 | 284 | ||
4891 | 285 | zstring getNameAsString() const; | ||
4892 | 286 | |||
4893 | 277 | public: | 287 | public: |
4894 | 278 | bool count(store::Item_t& result, PlanState& planState) const; | 288 | bool count(store::Item_t& result, PlanState& planState) const; |
4895 | 279 | void accept(PlanIterVisitor& v) const; | 289 | void accept(PlanIterVisitor& v) const; |
4896 | @@ -319,6 +329,8 @@ | |||
4897 | 319 | 329 | ||
4898 | 320 | virtual ~MultiObjectLookupIterator(); | 330 | virtual ~MultiObjectLookupIterator(); |
4899 | 321 | 331 | ||
4900 | 332 | zstring getNameAsString() const; | ||
4901 | 333 | |||
4902 | 322 | void accept(PlanIterVisitor& v) const; | 334 | void accept(PlanIterVisitor& v) const; |
4903 | 323 | 335 | ||
4904 | 324 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 336 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4905 | @@ -349,6 +361,8 @@ | |||
4906 | 349 | 361 | ||
4907 | 350 | virtual ~SingleObjectLookupIterator(); | 362 | virtual ~SingleObjectLookupIterator(); |
4908 | 351 | 363 | ||
4909 | 364 | zstring getNameAsString() const; | ||
4910 | 365 | |||
4911 | 352 | void accept(PlanIterVisitor& v) const; | 366 | void accept(PlanIterVisitor& v) const; |
4912 | 353 | 367 | ||
4913 | 354 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 368 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4914 | @@ -392,6 +406,8 @@ | |||
4915 | 392 | 406 | ||
4916 | 393 | virtual ~JSONObjectProjectIterator(); | 407 | virtual ~JSONObjectProjectIterator(); |
4917 | 394 | 408 | ||
4918 | 409 | zstring getNameAsString() const; | ||
4919 | 410 | |||
4920 | 395 | void accept(PlanIterVisitor& v) const; | 411 | void accept(PlanIterVisitor& v) const; |
4921 | 396 | 412 | ||
4922 | 397 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 413 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4923 | @@ -435,6 +451,8 @@ | |||
4924 | 435 | 451 | ||
4925 | 436 | virtual ~JSONObjectTrimIterator(); | 452 | virtual ~JSONObjectTrimIterator(); |
4926 | 437 | 453 | ||
4927 | 454 | zstring getNameAsString() const; | ||
4928 | 455 | |||
4929 | 438 | void accept(PlanIterVisitor& v) const; | 456 | void accept(PlanIterVisitor& v) const; |
4930 | 439 | 457 | ||
4931 | 440 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 458 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4932 | @@ -478,6 +496,8 @@ | |||
4933 | 478 | 496 | ||
4934 | 479 | virtual ~MultiArrayMembersIterator(); | 497 | virtual ~MultiArrayMembersIterator(); |
4935 | 480 | 498 | ||
4936 | 499 | zstring getNameAsString() const; | ||
4937 | 500 | |||
4938 | 481 | public: | 501 | public: |
4939 | 482 | bool count(store::Item_t& result, PlanState& planState) const; | 502 | bool count(store::Item_t& result, PlanState& planState) const; |
4940 | 483 | void accept(PlanIterVisitor& v) const; | 503 | void accept(PlanIterVisitor& v) const; |
4941 | @@ -523,6 +543,8 @@ | |||
4942 | 523 | 543 | ||
4943 | 524 | virtual ~SingleArrayMembersIterator(); | 544 | virtual ~SingleArrayMembersIterator(); |
4944 | 525 | 545 | ||
4945 | 546 | zstring getNameAsString() const; | ||
4946 | 547 | |||
4947 | 526 | public: | 548 | public: |
4948 | 527 | bool count(store::Item_t& result, PlanState& planState) const; | 549 | bool count(store::Item_t& result, PlanState& planState) const; |
4949 | 528 | void accept(PlanIterVisitor& v) const; | 550 | void accept(PlanIterVisitor& v) const; |
4950 | @@ -568,6 +590,8 @@ | |||
4951 | 568 | 590 | ||
4952 | 569 | virtual ~MultiArrayLookupIterator(); | 591 | virtual ~MultiArrayLookupIterator(); |
4953 | 570 | 592 | ||
4954 | 593 | zstring getNameAsString() const; | ||
4955 | 594 | |||
4956 | 571 | void accept(PlanIterVisitor& v) const; | 595 | void accept(PlanIterVisitor& v) const; |
4957 | 572 | 596 | ||
4958 | 573 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 597 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4959 | @@ -598,6 +622,8 @@ | |||
4960 | 598 | 622 | ||
4961 | 599 | virtual ~SingleArrayLookupIterator(); | 623 | virtual ~SingleArrayLookupIterator(); |
4962 | 600 | 624 | ||
4963 | 625 | zstring getNameAsString() const; | ||
4964 | 626 | |||
4965 | 601 | void accept(PlanIterVisitor& v) const; | 627 | void accept(PlanIterVisitor& v) const; |
4966 | 602 | 628 | ||
4967 | 603 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 629 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4968 | @@ -628,6 +654,8 @@ | |||
4969 | 628 | 654 | ||
4970 | 629 | virtual ~JSONArraySizeIterator(); | 655 | virtual ~JSONArraySizeIterator(); |
4971 | 630 | 656 | ||
4972 | 657 | zstring getNameAsString() const; | ||
4973 | 658 | |||
4974 | 631 | void accept(PlanIterVisitor& v) const; | 659 | void accept(PlanIterVisitor& v) const; |
4975 | 632 | 660 | ||
4976 | 633 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 661 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4977 | @@ -673,6 +701,8 @@ | |||
4978 | 673 | 701 | ||
4979 | 674 | virtual ~JSONArrayFlattenIterator(); | 702 | virtual ~JSONArrayFlattenIterator(); |
4980 | 675 | 703 | ||
4981 | 704 | zstring getNameAsString() const; | ||
4982 | 705 | |||
4983 | 676 | void accept(PlanIterVisitor& v) const; | 706 | void accept(PlanIterVisitor& v) const; |
4984 | 677 | 707 | ||
4985 | 678 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 708 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4986 | @@ -702,6 +732,8 @@ | |||
4987 | 702 | 732 | ||
4988 | 703 | virtual ~JSONNullIterator(); | 733 | virtual ~JSONNullIterator(); |
4989 | 704 | 734 | ||
4990 | 735 | zstring getNameAsString() const; | ||
4991 | 736 | |||
4992 | 705 | void accept(PlanIterVisitor& v) const; | 737 | void accept(PlanIterVisitor& v) const; |
4993 | 706 | 738 | ||
4994 | 707 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; | 739 | bool nextImpl(store::Item_t& result, PlanState& aPlanState) const; |
4995 | @@ -734,6 +766,8 @@ | |||
4996 | 734 | 766 | ||
4997 | 735 | virtual ~JSONObjectInsertIterator(); | 767 | virtual ~JSONObjectInsertIterator(); |
4998 | 736 | 768 | ||
4999 | 769 | zstring getNameAsString() const; | ||
5000 | 770 |
What about showing elapsed time which seems more useful if making calls to the outside world (e.g. http).