Merge lp:~zorba-coders/zorba/feature-profile into lp:zorba

[Paul J. Lucas]

Added a profiling feature.

Added a profiling feature.

[lp:~zorba-coders/zorba/feature-profile]

11727. By Paul J. Lucas on 2014-02-24

Intermediate check-in.

11728. By Paul J. Lucas on 2014-02-25

Removed ProfileVisitor.

11729. By Paul J. Lucas on 2014-02-25

Cosmetic changes.

11730. By Paul J. Lucas on 2014-02-25

Intermediate check-in.

11731. By Paul J. Lucas on 2014-02-25

Merge from trunk.

11732. By Paul J. Lucas on 2014-02-25

Intermediate check-in.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Matthias Brantner (matthias-brantner)]

What about showing elapsed time which seems more useful if making calls to the outside world (e.g. http).

review: Needs Information

[Paul J. Lucas (paul-lucas)]

> 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)]

In addition. The timers would only be updated and checked if the query is in profile mode, right?

[Paul J. Lucas (paul-lucas)]

> The timers would only be updated and checked if the query is in
> profile mode, right?

Yes.

[lp:~zorba-coders/zorba/feature-profile]

11733. By Paul J. Lucas on 2014-02-27

Intedmediate check-in.

11734. By Paul J. Lucas on 2014-02-27

Now using char const *.

11735. By Paul J. Lucas on 2014-02-28

Merge from trunk.

[Matthias Brantner (matthias-brantner)]

./bin/zorba -h
Error: No value given for "--debug-host" option
Use -h for help.

review: Needs Fixing

[lp:~zorba-coders/zorba/feature-profile]

11736. By Paul J. Lucas on 2014-03-01

Merge from trunk.

[Paul J. Lucas (paul-lucas)]

The "Needs Fixing" was fixed on the pjl-misc branch.

[lp:~zorba-coders/zorba/feature-profile]

11737. By Paul J. Lucas on 2014-03-04

Merge from trunk.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/feature-profile/+merge/208042

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'bin/zorbacmd_args.cpp'
--- bin/zorbacmd_args.cpp	2014-03-01 15:34:04 +0000
+++ bin/zorbacmd_args.cpp	2014-03-04 03:22:54 +0000
@@ -261,6 +261,9 @@
     HELP_OPT( "--print-translated" )
       "Print the normalized expression tree.\n\n"
 
+    HELP_OPT( "--profile" )
+      "Enable profiling.\n\n"
+
     ////////// q //////////////////////////////////////////////////////////////
 
     HELP_OPT( "--query, -q" )
@@ -685,6 +688,8 @@
       z_props.setPrintStaticTypes( true );
     else if ( IS_LONG_OPT( "--print-translated" ) )
       z_props.setPrintTranslated( true );
+    else if ( IS_LONG_OPT( "--profile" ) )
+      z_props.setProfile( true );
 
     ////////// q //////////////////////////////////////////////////////////////
 

=== modified file 'include/zorba/properties.h'
--- include/zorba/properties.h	2014-02-19 00:43:31 +0000
+++ include/zorba/properties.h	2014-03-04 03:22:54 +0000
@@ -288,6 +288,24 @@
     print_translated_ = b;
   }
 
+  /**
+   * Gets whether profiling has been enabled.
+   *
+   * @return Returns whether profiling has been enabled.
+   */
+  bool getProfile() const {
+    return profile_;
+  }
+
+  /**
+   * Enables or disables profiling.
+   *
+   * @param profile If \c true, profiling is enabled.
+   */
+  void setProfile( bool profile ) {
+    profile_ = profile;
+  }
+
   bool getStableIteratorIDs() const {
     return stable_iterator_ids_;
   }
@@ -375,6 +393,7 @@
   bool                print_optimized_;
   bool                print_static_types_;
   bool                print_translated_;
+  bool                profile_;
   bool                stable_iterator_ids_;
   bool                trace_codegen_;
 #ifndef ZORBA_NO_FULL_TEXT

=== modified file 'src/api/properties.cpp'
--- src/api/properties.cpp	2014-02-19 00:43:31 +0000
+++ src/api/properties.cpp	2014-03-04 03:22:54 +0000
@@ -55,6 +55,7 @@
   print_optimized_ = false;
   print_static_types_ = true;
   print_translated_ = false;
+  profile_ = false;
   stable_iterator_ids_ = false;
   trace_codegen_ = false;
 #ifndef ZORBA_NO_FULL_TEXT

=== modified file 'src/api/xqueryimpl.cpp'
--- src/api/xqueryimpl.cpp	2014-02-19 00:43:31 +0000
+++ src/api/xqueryimpl.cpp	2014-03-04 03:22:54 +0000
@@ -22,17 +22,18 @@
 #include <algorithm>
 #include "zorbatypes/schema_types.h"
 
+#include <zorba/audit_scoped.h>
 #include <zorba/diagnostic_handler.h>
+#include <zorba/diagnostic_list.h>
 #include <zorba/error.h>
-#include <zorba/diagnostic_list.h>
+#include <zorba/internal/unique_ptr.h>
+#include <zorba/module_info.h>
+#include <zorba/properties.h>
 #include <zorba/sax2.h>
-#include <zorba/audit_scoped.h>
-#include <zorba/module_info.h>
-#include <zorba/internal/unique_ptr.h>
 
-#include <zorbatypes/URI.h>
 
 #include "diagnostics/xquery_diagnostics.h"
+#include "zorbatypes/URI.h"
 #include "zorbatypes/zstring.h"
 #include "zorbautils/lock.h"
 
@@ -716,6 +717,17 @@
 
 /*******************************************************************************
 
+ ******************************************************************************/
+
+void XQueryImpl::dispose( PlanWrapper_t const &plan ) {
+  theExecuting = false;
+  if ( Properties::instance().getProfile() )
+    plan->profile();
+  plan->close();
+}
+
+/*******************************************************************************
+
 ********************************************************************************/
 StaticCollectionManager*
 XQueryImpl::getStaticCollectionManager() const
@@ -1084,13 +1096,11 @@
     }
     catch (...)
     {
-      lPlan->close();
-      theExecuting = false;
+      dispose( lPlan );
       throw;
     }
 
-    lPlan->close();
-    theExecuting = false;
+    dispose( lPlan );
 
     theDocLoadingUserTime = theDynamicContext->theDocLoadingUserTime;
     theDocLoadingTime = theDynamicContext->theDocLoadingTime;
@@ -1128,13 +1138,11 @@
     }
     catch (...)
     {
-      lPlan->close();
-      theExecuting = false;
+      dispose( lPlan );
       throw;
     }
 
-    lPlan->close();
-    theExecuting = false;
+    dispose( lPlan );
 
     theDocLoadingUserTime = theDynamicContext->theDocLoadingUserTime;
     theDocLoadingTime = theDynamicContext->theDocLoadingTime;
@@ -1174,13 +1182,11 @@
     }
     catch (...)
     {
-      lPlan->close();
-      theExecuting = false;
+      dispose( lPlan );
       throw;
     }
 
-    lPlan->close();
-    theExecuting = false;
+    dispose( lPlan );
 
     theDocLoadingUserTime = theDynamicContext->theDocLoadingUserTime;
     theDocLoadingTime = theDynamicContext->theDocLoadingTime;
@@ -1223,13 +1229,11 @@
     }
     catch (...)
     {
-      lPlan->close();
-      theExecuting = false;
+      dispose( lPlan );
       throw;
     }
 
-    lPlan->close();
-    theExecuting = false;
+    dispose( lPlan );
 
     theDocLoadingUserTime = theDynamicContext->theDocLoadingUserTime;
     theDocLoadingTime = theDynamicContext->theDocLoadingTime;

=== modified file 'src/api/xqueryimpl.h'
--- src/api/xqueryimpl.h	2014-02-18 19:52:39 +0000
+++ src/api/xqueryimpl.h	2014-03-04 03:22:54 +0000
@@ -370,6 +370,8 @@
         void* aHandlerData,
         const Zorba_SerializerOptions_t* = NULL);
 
+  void dispose( PlanWrapper_t const& );
+
   void removeResultIterator(const ResultIteratorImpl* iter);
 
   void checkNotClosed() const;

=== modified file 'src/functions/udf.h'
--- src/functions/udf.h	2013-04-24 01:35:58 +0000
+++ src/functions/udf.h	2014-03-04 03:22:54 +0000
@@ -202,6 +202,7 @@
   void optimize();
 
   PlanIter_t getPlan(uint32_t& planStateSize, ulong nextVarId);
+  PlanIter_t const& getPlan() const { return thePlan; }
 
   void invalidatePlan();
 

=== modified file 'src/runtime/accessors/pregenerated/accessors.cpp'
--- src/runtime/accessors/pregenerated/accessors.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/accessors/pregenerated/accessors.cpp	2014-03-04 03:22:54 +0000
@@ -59,6 +59,10 @@
 
 NodeNameIterator::~NodeNameIterator() {}
 
+
+zstring NodeNameIterator::getNameAsString() const {
+  return "fn:node-name";
+}
 // </NodeNameIterator>
 
 
@@ -87,6 +91,10 @@
 
 NilledIterator::~NilledIterator() {}
 
+
+zstring NilledIterator::getNameAsString() const {
+  return "fn:nilled";
+}
 // </NilledIterator>
 
 
@@ -131,6 +139,10 @@
   PlanIteratorState::reset(planState);
   hasOutput = false;
 }
+
+zstring FnStringIterator::getNameAsString() const {
+  return "fn:string";
+}
 // </FnStringIterator>
 
 
@@ -173,6 +185,10 @@
   PlanIteratorState::reset(planState);
   theTypedValueIter = NULL;
 }
+
+zstring FnDataIterator::getNameAsString() const {
+  return "fn:data";
+}
 // </FnDataIterator>
 
 
@@ -201,6 +217,10 @@
 
 BaseUriIterator::~BaseUriIterator() {}
 
+
+zstring BaseUriIterator::getNameAsString() const {
+  return "fn:base-uri";
+}
 // </BaseUriIterator>
 
 
@@ -229,6 +249,10 @@
 
 DocumentUriIterator::~DocumentUriIterator() {}
 
+
+zstring DocumentUriIterator::getNameAsString() const {
+  return "fn:document-uri";
+}
 // </DocumentUriIterator>
 
 
@@ -257,6 +281,10 @@
 
 RootIterator::~RootIterator() {}
 
+
+zstring RootIterator::getNameAsString() const {
+  return "fn:root";
+}
 // </RootIterator>
 
 

=== modified file 'src/runtime/accessors/pregenerated/accessors.h'
--- src/runtime/accessors/pregenerated/accessors.h	2014-01-31 01:39:38 +0000
+++ src/runtime/accessors/pregenerated/accessors.h	2014-03-04 03:22:54 +0000
@@ -58,6 +58,8 @@
 
   virtual ~NodeNameIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -88,6 +90,8 @@
 
   virtual ~NilledIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -137,6 +141,8 @@
 
   bool isUpdating() const { return theEmptyStringOnNULL; }
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -180,6 +186,8 @@
 
   virtual ~FnDataIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -210,6 +218,8 @@
 
   virtual ~BaseUriIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -240,6 +250,8 @@
 
   virtual ~DocumentUriIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -270,6 +282,8 @@
 
   virtual ~RootIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/any_uri/pregenerated/any_uri.cpp'
--- src/runtime/any_uri/pregenerated/any_uri.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/any_uri/pregenerated/any_uri.cpp	2014-03-04 03:22:54 +0000
@@ -58,6 +58,10 @@
 
 ResolveUriIterator::~ResolveUriIterator() {}
 
+
+zstring ResolveUriIterator::getNameAsString() const {
+  return "fn:resolve-uri";
+}
 // </ResolveUriIterator>
 
 

=== modified file 'src/runtime/any_uri/pregenerated/any_uri.h'
--- src/runtime/any_uri/pregenerated/any_uri.h	2014-01-31 01:39:38 +0000
+++ src/runtime/any_uri/pregenerated/any_uri.h	2014-03-04 03:22:54 +0000
@@ -58,6 +58,8 @@
 
   virtual ~ResolveUriIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/api/plan_wrapper.cpp'
--- src/runtime/api/plan_wrapper.cpp	2014-02-10 00:44:55 +0000
+++ src/runtime/api/plan_wrapper.cpp	2014-03-04 03:22:54 +0000
@@ -15,6 +15,8 @@
  */
 #include "stdafx.h"
 
+#include <zorba/properties.h>
+
 #include "context/static_context.h"
 #include "context/dynamic_context.h"
 
@@ -23,8 +25,10 @@
 #include "runtime/api/plan_wrapper.h"
 #include "runtime/base/plan_iterator.h"
 #include "runtime/util/timeout.h"
-#include <zorba/properties.h>
+#include "runtime/visitors/iterprinter.h"
+#include "runtime/visitors/printer_visitor_api.h"
 
+using namespace std;
 
 namespace zorba {
 
@@ -205,6 +209,15 @@
 }
 
 
+/******************************************************************************
+
+ ******************************************************************************/
+
+void PlanWrapper::profile() const {
+  XMLIterPrinter p( Properties::instance().getDebugStream() );
+  print_iter_plan( p, theIterator, thePlanState );
+}
+
 /*******************************************************************************
 
 ********************************************************************************/

=== modified file 'src/runtime/api/plan_wrapper.h'
--- src/runtime/api/plan_wrapper.h	2013-07-25 14:09:47 +0000
+++ src/runtime/api/plan_wrapper.h	2014-03-04 03:22:54 +0000
@@ -107,6 +107,8 @@
 
   dynamic_context* dctx() { return theDynamicContext; }
 
+  void profile() const;
+
 #ifndef NDEBUG
   virtual std::string toString() const;
 #endif    

=== modified file 'src/runtime/base/binarybase.h'
--- src/runtime/base/binarybase.h	2013-05-28 18:20:54 +0000
+++ src/runtime/base/binarybase.h	2014-03-04 03:22:54 +0000
@@ -189,7 +189,7 @@
   { }                                                                   \
                                                                         \
   void accept(PlanIterVisitor& v) const;                                \
-                                                                        \
+  zstring getNameAsString() const;                                      \
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;    \
 };
 

=== modified file 'src/runtime/base/narybase.h'
--- src/runtime/base/narybase.h	2013-05-28 18:20:54 +0000
+++ src/runtime/base/narybase.h	2014-03-04 03:22:54 +0000
@@ -213,7 +213,7 @@
   { }                                                                   \
                                                                         \
   void accept(PlanIterVisitor& v) const;                                \
-                                                                        \
+  zstring getNameAsString() const;                                      \
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;    \
 };
 

=== modified file 'src/runtime/base/noarybase.h'
--- src/runtime/base/noarybase.h	2013-05-28 18:20:54 +0000
+++ src/runtime/base/noarybase.h	2014-03-04 03:22:54 +0000
@@ -142,7 +142,7 @@
   { }                                                                   \
                                                                         \
   void accept(PlanIterVisitor& v) const;                                \
-                                                                        \
+  zstring getNameAsString() const;                                      \
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;    \
 };
 

=== modified file 'src/runtime/base/plan_iterator.cpp'
--- src/runtime/base/plan_iterator.cpp	2014-02-10 00:44:55 +0000
+++ src/runtime/base/plan_iterator.cpp	2014-03-04 03:22:54 +0000
@@ -15,6 +15,10 @@
  */
 #include "stdafx.h"
 
+#include <typeinfo>
+
+#include <zorba/properties.h>
+
 #include "compiler/api/compilercb.h"
 
 #include "context/static_context.h"
@@ -31,9 +35,6 @@
 
 #include "diagnostics/util_macros.h"
 
-#ifndef NDEBUG
-#include <zorba/properties.h>
-#endif
 
 namespace zorba
 {
@@ -70,7 +71,8 @@
   theQuery(0),
   theGlobalDynCtx(globalDctx),
   theLocalDynCtx(localDctx),
-  theHasToQuit(false)
+  theHasToQuit(false),
+  profile_( Properties::instance().getProfile() )
 {
   assert(globalDctx != NULL && localDctx != NULL);
   theBlock = new int8_t[theBlockSize];
@@ -132,9 +134,15 @@
 {
 }
 
+PlanIterator::~PlanIterator() {
+  // out-of-line since it's virtual
+}
 
 SERIALIZE_INTERNAL_METHOD(PlanIterator)
 
+zstring PlanIterator::getNameAsString() const {
+  return typeid( *this ).name();        // default name (should be overridden)
+}
 
 void PlanIterator::serialize(::zorba::serialization::Archiver& ar)
 {

=== modified file 'src/runtime/base/plan_iterator.h'
--- src/runtime/base/plan_iterator.h	2014-01-31 01:39:38 +0000
+++ src/runtime/base/plan_iterator.h	2014-03-04 03:22:54 +0000
@@ -27,6 +27,7 @@
 
 #include "compiler/parser/query_loc.h"
 
+#include "util/time_util.h"
 #include "zorbaserialization/class_serializer.h"
 #include "zorbaserialization/serialize_template_types.h"
 #include "zorbaserialization/serialize_zorba_types.h"
@@ -138,6 +139,8 @@
 
   bool                      theHasToQuit;
 
+  bool const                profile_;   // cache Properties::getProfile()
+
 public:
   PlanState(
       dynamic_context* globalDctx,
@@ -153,6 +156,48 @@
 
 
 /*******************************************************************************
+
+ ******************************************************************************/
+
+/**
+ * Contains all profiling data for an iterator.
+ *
+ * An init() member function is used rather than a constructor so
+ * initialization is done only when profileing is enabled.
+ */
+struct profile_data {
+  /**
+   * Contains per-member-function profiling data.
+   *
+   * An init() member function is used rather than a constructor so
+   * initialization is done only when profileing is enabled.
+   */
+  struct mbr_fn {
+    unsigned call_count_;
+    time::msec_type cpu_time_;
+    time::msec_type wall_time_;
+
+    void init() {
+      call_count_ = 0;
+      cpu_time_ = 0;
+      wall_time_ = 0;
+    }
+
+    void add( time::msec_type cpu, time::msec_type wall ) {
+      ++call_count_;
+      cpu_time_ += cpu;
+      wall_time_ += wall;
+    }
+  };
+
+  mbr_fn next_;                         // for nextImpl()
+
+  void init() {
+    next_.init();
+  }
+};
+
+/*******************************************************************************
   Base class for all iterator state objects.
 ********************************************************************************/
 class PlanIteratorState
@@ -163,6 +208,9 @@
 private:
   uint32_t        theDuffsLine;
 
+  profile_data    profile_data_;
+  friend class PlanIterator;
+
 #ifndef NDEBUG
 public:
   bool            theIsOpened;
@@ -194,9 +242,11 @@
    * Each subclass implementation of this method must call the init() method of
    * their parent class explicitly in order to guarantee proper initialization.
    */
-  void init(PlanState&)
+  void init(PlanState &planState)
   {
     theDuffsLine = DUFFS_ALLOCATE_RESOURCES;
+    if ( planState.profile_ )
+      profile_data_.init();
   }
 
   /*
@@ -215,6 +265,10 @@
   {
     theDuffsLine = DUFFS_ALLOCATE_RESOURCES;
   }
+
+  profile_data const& get_profile_data() const {
+    return profile_data_;
+  }
 };
 
 
@@ -299,12 +353,14 @@
 
   PlanIterator(const PlanIterator& it);
 
-  virtual ~PlanIterator() {}
+  ~PlanIterator();
 
   void setLocation(const QueryLoc& loc_) { loc = loc_; }
 
   const QueryLoc& getLocation() const { return loc; }
 
+  virtual zstring getNameAsString() const;
+
   uint32_t getStateOffset() const { return theStateOffset; }
 
   static_context* getStaticContext() const { return theSctx; }
@@ -420,12 +476,29 @@
    */
   bool produceNext(store::Item_t& result, PlanState& planState) const
   {
+    PlanIteratorState *const state =
+      StateTraitsImpl<PlanIteratorState>::getState(planState, theStateOffset);
 #ifndef NDEBUG
-    PlanIteratorState* state =
-    StateTraitsImpl<PlanIteratorState>::getState(planState, theStateOffset);
     ZORBA_ASSERT(state->theIsOpened);
 #endif
-    return nextImpl(result, planState);
+    time::cpu::timer c;
+    time::wall::timer w;
+    if ( planState.profile_ ) {
+      c.start();
+      w.start();
+    }
+    bool const ret_val = nextImpl(result, planState);
+    if ( planState.profile_ ) {
+      //
+      // Temporaries are used here to guarantee the order in which the timers
+      // are stopped.  (If the expressions were passed as functio arguments,
+      // the order is platform/compiler-dependent.)
+      //
+      time::msec_type const ce( c.elapsed() );
+      time::msec_type const we( w.elapsed() );
+      state->profile_data_.next_.add( ce, we );
+    }
+    return ret_val;
   }
 
   virtual bool nextImpl(store::Item_t& result, PlanState& planState) const = 0;
@@ -467,6 +540,9 @@
 
 } /* namespace zorba */
 
+#define DEF_GET_NAME_AS_STRING(...) \
+  zstring __VA_ARGS__::getNameAsString() const { return #__VA_ARGS__; }
+
 #endif  /* ZORBA_ITERATOR_H */
 
 /*

=== modified file 'src/runtime/base/unarybase.h'
--- src/runtime/base/unarybase.h	2013-05-28 18:20:54 +0000
+++ src/runtime/base/unarybase.h	2014-03-04 03:22:54 +0000
@@ -128,12 +128,12 @@
 }
 
 
-#define UNARY_ACCEPT(IterType)                      \
-void IterType::accept(PlanIterVisitor& v) const     \
-{                                                   \
-  v.beginVisit(*this);                              \
-  theChild->accept(v);                              \
-  v.endVisit(*this);                                \
+#define UNARY_ACCEPT(IterType)                  \
+void IterType::accept(PlanIterVisitor& v) const \
+{                                               \
+  v.beginVisit(*this);                          \
+  theChild->accept(v);                          \
+  v.endVisit(*this);                            \
 }
 
 
@@ -162,7 +162,7 @@
   { }                                                                   \
                                                                         \
   void accept(PlanIterVisitor& v) const;                                \
-                                                                        \
+  zstring getNameAsString() const;                                      \
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;    \
 };
 

=== modified file 'src/runtime/base64/pregenerated/base64.cpp'
--- src/runtime/base64/pregenerated/base64.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/base64/pregenerated/base64.cpp	2014-03-04 03:22:54 +0000
@@ -58,6 +58,10 @@
 
 Base64DecodeIterator::~Base64DecodeIterator() {}
 
+
+zstring Base64DecodeIterator::getNameAsString() const {
+  return "fn-zorba-base64:decode";
+}
 // </Base64DecodeIterator>
 
 
@@ -86,6 +90,10 @@
 
 Base64EncodeIterator::~Base64EncodeIterator() {}
 
+
+zstring Base64EncodeIterator::getNameAsString() const {
+  return "fn-zorba-base64:encode";
+}
 // </Base64EncodeIterator>
 
 

=== modified file 'src/runtime/base64/pregenerated/base64.h'
--- src/runtime/base64/pregenerated/base64.h	2014-01-31 01:39:38 +0000
+++ src/runtime/base64/pregenerated/base64.h	2014-03-04 03:22:54 +0000
@@ -58,6 +58,8 @@
 
   virtual ~Base64DecodeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -88,6 +90,8 @@
 
   virtual ~Base64EncodeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/booleans/BooleanImpl.cpp'
--- src/runtime/booleans/BooleanImpl.cpp	2013-08-14 15:16:42 +0000
+++ src/runtime/booleans/BooleanImpl.cpp	2014-03-04 03:22:54 +0000
@@ -45,34 +45,49 @@
 namespace zorba {
 
 SERIALIZABLE_CLASS_VERSIONS(FnBooleanIterator)
+DEF_GET_NAME_AS_STRING(FnBooleanIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(OrIterator)
+DEF_GET_NAME_AS_STRING(OrIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(AndIterator)
+DEF_GET_NAME_AS_STRING(AndIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(CompareIterator)
+DEF_GET_NAME_AS_STRING(CompareIterator)
 
 SERIALIZABLE_TEMPLATE_INSTANCE(TypedValueCompareIterator,
                                TypedValueCompareIterator<store::XS_DOUBLE>,
                                1)
+template<>
+DEF_GET_NAME_AS_STRING(TypedValueCompareIterator<store::XS_DOUBLE>)
 
 SERIALIZABLE_TEMPLATE_INSTANCE(TypedValueCompareIterator,
                                TypedValueCompareIterator<store::XS_FLOAT>,
                                2)
+template<>
+DEF_GET_NAME_AS_STRING(TypedValueCompareIterator<store::XS_FLOAT>)
 
 SERIALIZABLE_TEMPLATE_INSTANCE(TypedValueCompareIterator,
                                TypedValueCompareIterator<store::XS_DECIMAL>,
                                3)
+template<>
+DEF_GET_NAME_AS_STRING(TypedValueCompareIterator<store::XS_DECIMAL>)
 
 SERIALIZABLE_TEMPLATE_INSTANCE(TypedValueCompareIterator,
                                TypedValueCompareIterator<store::XS_INTEGER>,
                                4)
+template<>
+DEF_GET_NAME_AS_STRING(TypedValueCompareIterator<store::XS_INTEGER>)
 
 SERIALIZABLE_TEMPLATE_INSTANCE(TypedValueCompareIterator,
                                TypedValueCompareIterator<store::XS_STRING>,
                                5)
+template<>
+DEF_GET_NAME_AS_STRING(TypedValueCompareIterator<store::XS_STRING>)
 
 SERIALIZABLE_CLASS_VERSIONS(AtomicValuesEquivalenceIterator)
+DEF_GET_NAME_AS_STRING(AtomicValuesEquivalenceIterator)
 
 
 /*******************************************************************************

=== modified file 'src/runtime/booleans/BooleanImpl.h'
--- src/runtime/booleans/BooleanImpl.h	2013-02-07 17:24:36 +0000
+++ src/runtime/booleans/BooleanImpl.h	2014-03-04 03:22:54 +0000
@@ -65,6 +65,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 
 public:
@@ -105,6 +107,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -129,6 +133,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -162,6 +168,8 @@
 
   void openImpl(PlanState& planState, uint32_t& offset);
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 
 public:
@@ -288,6 +296,8 @@
 
   void openImpl(PlanState& planState, uint32_t& offset);
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -321,6 +331,8 @@
 
   void openImpl(PlanState& planState, uint32_t& offset);
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 
 };

=== modified file 'src/runtime/booleans/pregenerated/booleans.cpp'
--- src/runtime/booleans/pregenerated/booleans.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/booleans/pregenerated/booleans.cpp	2014-03-04 03:22:54 +0000
@@ -58,6 +58,10 @@
 
 IsSameNodeIterator::~IsSameNodeIterator() {}
 
+
+zstring IsSameNodeIterator::getNameAsString() const {
+  return "op:is-same-node";
+}
 // </IsSameNodeIterator>
 
 
@@ -86,6 +90,10 @@
 
 NodeBeforeIterator::~NodeBeforeIterator() {}
 
+
+zstring NodeBeforeIterator::getNameAsString() const {
+  return "op:node-before";
+}
 // </NodeBeforeIterator>
 
 
@@ -114,6 +122,10 @@
 
 NodeAfterIterator::~NodeAfterIterator() {}
 
+
+zstring NodeAfterIterator::getNameAsString() const {
+  return "op:node-after";
+}
 // </NodeAfterIterator>
 
 

=== modified file 'src/runtime/booleans/pregenerated/booleans.h'
--- src/runtime/booleans/pregenerated/booleans.h	2014-01-31 01:39:38 +0000
+++ src/runtime/booleans/pregenerated/booleans.h	2014-03-04 03:22:54 +0000
@@ -58,6 +58,8 @@
 
   virtual ~IsSameNodeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -88,6 +90,8 @@
 
   virtual ~NodeBeforeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -118,6 +122,8 @@
 
   virtual ~NodeAfterIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/collections/pregenerated/collections.cpp'
--- src/runtime/collections/pregenerated/collections.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/collections/pregenerated/collections.cpp	2014-03-04 03:22:54 +0000
@@ -61,6 +61,10 @@
 
 ZorbaCreateCollectionIterator::~ZorbaCreateCollectionIterator() {}
 
+
+zstring ZorbaCreateCollectionIterator::getNameAsString() const {
+  return "zorba-store-static-collections-ddl:create";
+}
 // </ZorbaCreateCollectionIterator>
 
 
@@ -91,6 +95,10 @@
 
 ZorbaDeleteCollectionIterator::~ZorbaDeleteCollectionIterator() {}
 
+
+zstring ZorbaDeleteCollectionIterator::getNameAsString() const {
+  return "zorba-store-static-collections-ddl:delete";
+}
 // </ZorbaDeleteCollectionIterator>
 
 
@@ -121,6 +129,10 @@
 
 IsAvailableCollectionIterator::~IsAvailableCollectionIterator() {}
 
+
+zstring IsAvailableCollectionIterator::getNameAsString() const {
+  return "zorba-store-static-collections-ddl:is-available-collection";
+}
 // </IsAvailableCollectionIterator>
 
 
@@ -153,6 +165,10 @@
 
 AvailableCollectionsIteratorState::AvailableCollectionsIteratorState() {}
 
+
+zstring AvailableCollectionsIterator::getNameAsString() const {
+  return "zorba-store-static-collections-ddl:available-collections";
+}
 // </AvailableCollectionsIterator>
 
 
@@ -183,6 +199,10 @@
 
 FnCollectionIteratorState::FnCollectionIteratorState() {}
 
+
+zstring FnCollectionIterator::getNameAsString() const {
+  return "fn:collection";
+}
 // </FnCollectionIterator>
 
 
@@ -215,6 +235,10 @@
 
 ZorbaCollectionIteratorState::ZorbaCollectionIteratorState() {}
 
+
+zstring ZorbaCollectionIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:collection";
+}
 // </ZorbaCollectionIterator>
 
 
@@ -243,6 +267,10 @@
 
 ZorbaCollectionNameIterator::~ZorbaCollectionNameIterator() {}
 
+
+zstring ZorbaCollectionNameIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:collection-name";
+}
 // </ZorbaCollectionNameIterator>
 
 
@@ -273,6 +301,10 @@
 
 ZorbaIndexOfIterator::~ZorbaIndexOfIterator() {}
 
+
+zstring ZorbaIndexOfIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:index-of";
+}
 // </ZorbaIndexOfIterator>
 
 
@@ -303,6 +335,10 @@
 
 ZorbaApplyInsertIteratorState::ZorbaApplyInsertIteratorState() {}
 
+
+zstring ZorbaApplyInsertIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:apply-insert";
+}
 // </ZorbaApplyInsertIterator>
 
 
@@ -333,6 +369,10 @@
 
 ZorbaInsertAfterIterator::~ZorbaInsertAfterIterator() {}
 
+
+zstring ZorbaInsertAfterIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:insert-after";
+}
 // </ZorbaInsertAfterIterator>
 
 
@@ -361,6 +401,10 @@
 
 ZorbaInsertBeforeIterator::~ZorbaInsertBeforeIterator() {}
 
+
+zstring ZorbaInsertBeforeIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:insert-before";
+}
 // </ZorbaInsertBeforeIterator>
 
 
@@ -389,6 +433,10 @@
 
 ZorbaInsertFirstIterator::~ZorbaInsertFirstIterator() {}
 
+
+zstring ZorbaInsertFirstIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:insert-first";
+}
 // </ZorbaInsertFirstIterator>
 
 
@@ -417,6 +465,10 @@
 
 ZorbaInsertLastIterator::~ZorbaInsertLastIterator() {}
 
+
+zstring ZorbaInsertLastIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:insert-last";
+}
 // </ZorbaInsertLastIterator>
 
 
@@ -447,6 +499,10 @@
 
 ZorbaApplyInsertFirstIteratorState::ZorbaApplyInsertFirstIteratorState() {}
 
+
+zstring ZorbaApplyInsertFirstIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:apply-insert-first";
+}
 // </ZorbaApplyInsertFirstIterator>
 
 
@@ -477,6 +533,10 @@
 
 ZorbaApplyInsertLastIteratorState::ZorbaApplyInsertLastIteratorState() {}
 
+
+zstring ZorbaApplyInsertLastIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:apply-insert-last";
+}
 // </ZorbaApplyInsertLastIterator>
 
 
@@ -507,6 +567,10 @@
 
 ZorbaApplyInsertBeforeIteratorState::ZorbaApplyInsertBeforeIteratorState() {}
 
+
+zstring ZorbaApplyInsertBeforeIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:apply-insert-before";
+}
 // </ZorbaApplyInsertBeforeIterator>
 
 
@@ -537,6 +601,10 @@
 
 ZorbaApplyInsertAfterIteratorState::ZorbaApplyInsertAfterIteratorState() {}
 
+
+zstring ZorbaApplyInsertAfterIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:apply-insert-after";
+}
 // </ZorbaApplyInsertAfterIterator>
 
 
@@ -567,6 +635,10 @@
 
 ZorbaDeleteIterator::~ZorbaDeleteIterator() {}
 
+
+zstring ZorbaDeleteIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:delete";
+}
 // </ZorbaDeleteIterator>
 
 
@@ -597,6 +669,10 @@
 
 ZorbaDeleteFirstIterator::~ZorbaDeleteFirstIterator() {}
 
+
+zstring ZorbaDeleteFirstIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:delete-first";
+}
 // </ZorbaDeleteFirstIterator>
 
 
@@ -627,6 +703,10 @@
 
 ZorbaDeleteLastIterator::~ZorbaDeleteLastIterator() {}
 
+
+zstring ZorbaDeleteLastIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:delete-last";
+}
 // </ZorbaDeleteLastIterator>
 
 
@@ -658,6 +738,10 @@
 
 ZorbaEditIterator::~ZorbaEditIterator() {}
 
+
+zstring ZorbaEditIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:edit";
+}
 // </ZorbaEditIterator>
 
 
@@ -686,6 +770,10 @@
 
 ZorbaInsertIterator::~ZorbaInsertIterator() {}
 
+
+zstring ZorbaInsertIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:insert";
+}
 // </ZorbaInsertIterator>
 
 
@@ -716,6 +804,10 @@
 
 ZorbaTruncateCollectionIterator::~ZorbaTruncateCollectionIterator() {}
 
+
+zstring ZorbaTruncateCollectionIterator::getNameAsString() const {
+  return "zorba-store-static-collections-dml:truncate";
+}
 // </ZorbaTruncateCollectionIterator>
 
 
@@ -744,6 +836,10 @@
 
 IsAvailableIndexIterator::~IsAvailableIndexIterator() {}
 
+
+zstring IsAvailableIndexIterator::getNameAsString() const {
+  return "zorba-store-indexes-static-ddl:is-available-index";
+}
 // </IsAvailableIndexIterator>
 
 
@@ -774,6 +870,10 @@
 
 AvailableIndexesIteratorState::AvailableIndexesIteratorState() {}
 
+
+zstring AvailableIndexesIterator::getNameAsString() const {
+  return "zorba-store-indexes-static-ddl:available-indexes";
+}
 // </AvailableIndexesIterator>
 
 
@@ -802,6 +902,10 @@
 
 IsActivatedICIterator::~IsActivatedICIterator() {}
 
+
+zstring IsActivatedICIterator::getNameAsString() const {
+  return "zorba-store-static-integrity-constraints-ddl:is-activated-integrity-constraint";
+}
 // </IsActivatedICIterator>
 
 
@@ -832,6 +936,10 @@
 
 ActivatedICsIteratorState::ActivatedICsIteratorState() {}
 
+
+zstring ActivatedICsIterator::getNameAsString() const {
+  return "zorba-store-static-integrity-constraints-ddl:activated-integrity-constraints";
+}
 // </ActivatedICsIterator>
 
 
@@ -860,6 +968,10 @@
 
 IsDeclaredCollectionIterator::~IsDeclaredCollectionIterator() {}
 
+
+zstring IsDeclaredCollectionIterator::getNameAsString() const {
+  return "zorba-store-static-collections-ddl:is-declared-collection";
+}
 // </IsDeclaredCollectionIterator>
 
 
@@ -890,6 +1002,10 @@
 
 DeclaredCollectionsIteratorState::DeclaredCollectionsIteratorState() {}
 
+
+zstring DeclaredCollectionsIterator::getNameAsString() const {
+  return "zorba-store-static-collections-ddl:declared-collections";
+}
 // </DeclaredCollectionsIterator>
 
 
@@ -918,6 +1034,10 @@
 
 IsDeclaredIndexIterator::~IsDeclaredIndexIterator() {}
 
+
+zstring IsDeclaredIndexIterator::getNameAsString() const {
+  return "zorba-store-indexes-static-ddl:is-declared-index";
+}
 // </IsDeclaredIndexIterator>
 
 
@@ -953,6 +1073,10 @@
   PlanIteratorState::init(planState);
   nameItState = NULL;
 }
+
+zstring DeclaredIndexesIterator::getNameAsString() const {
+  return "zorba-store-indexes-static-ddl:declared-indexes";
+}
 // </DeclaredIndexesIterator>
 
 
@@ -981,6 +1105,10 @@
 
 IsDeclaredICIterator::~IsDeclaredICIterator() {}
 
+
+zstring IsDeclaredICIterator::getNameAsString() const {
+  return "zorba-store-static-integrity-constraints-ddl:is-declared-integrity-constraint";
+}
 // </IsDeclaredICIterator>
 
 
@@ -1016,6 +1144,10 @@
   PlanIteratorState::init(planState);
   nameItState = NULL;
 }
+
+zstring DeclaredICsIterator::getNameAsString() const {
+  return "zorba-store-static-integrity-constraints-ddl:declared-integrity-constraints";
+}
 // </DeclaredICsIterator>
 
 
@@ -1046,6 +1178,10 @@
 
 FnURICollectionIteratorState::FnURICollectionIteratorState() {}
 
+
+zstring FnURICollectionIterator::getNameAsString() const {
+  return "fn:uri-collection";
+}
 // </FnURICollectionIterator>
 
 

=== modified file 'src/runtime/collections/pregenerated/collections.h'
--- src/runtime/collections/pregenerated/collections.h	2014-01-31 01:39:38 +0000
+++ src/runtime/collections/pregenerated/collections.h	2014-03-04 03:22:54 +0000
@@ -63,6 +63,8 @@
 
   virtual ~ZorbaCreateCollectionIterator();
 
+  zstring getNameAsString() const;
+
 public:
   const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const;
   void accept(PlanIterVisitor& v) const;
@@ -99,6 +101,8 @@
 
   virtual ~ZorbaDeleteCollectionIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -133,6 +137,8 @@
 
   virtual ~IsAvailableCollectionIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -180,6 +186,8 @@
 
   virtual ~AvailableCollectionsIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -224,6 +232,8 @@
 
   virtual ~FnCollectionIterator();
 
+  zstring getNameAsString() const;
+
 public:
   bool count(store::Item_t& result, PlanState& planState) const;
   store::Collection_t getCollection(PlanState& planState) const;
@@ -277,6 +287,8 @@
 
   bool isDynamic() const { return theIsDynamic; }
 
+  zstring getNameAsString() const;
+
 public:
   bool isCountOptimizable() const;
   bool count(store::Item_t& result, PlanState& planState) const;
@@ -312,6 +324,8 @@
 
   virtual ~ZorbaCollectionNameIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -346,6 +360,8 @@
 
   virtual ~ZorbaIndexOfIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -392,6 +408,8 @@
 
   virtual ~ZorbaApplyInsertIterator();
 
+  zstring getNameAsString() const;
+
 public:
   const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const;
   void accept(PlanIterVisitor& v) const;
@@ -429,6 +447,8 @@
 
   virtual ~ZorbaInsertAfterIterator();
 
+  zstring getNameAsString() const;
+
 public:
   const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const;
   void accept(PlanIterVisitor& v) const;
@@ -463,6 +483,8 @@
 
   virtual ~ZorbaInsertBeforeIterator();
 
+  zstring getNameAsString() const;
+
 public:
   const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const;
   void accept(PlanIterVisitor& v) const;
@@ -497,6 +519,8 @@
 
   virtual ~ZorbaInsertFirstIterator();
 
+  zstring getNameAsString() const;
+
 public:
   const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const;
   void accept(PlanIterVisitor& v) const;
@@ -531,6 +555,8 @@
 
   virtual ~ZorbaInsertLastIterator();
 
+  zstring getNameAsString() const;
+
 public:
   const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const;
   void accept(PlanIterVisitor& v) const;
@@ -579,6 +605,8 @@
 
   virtual ~ZorbaApplyInsertFirstIterator();
 
+  zstring getNameAsString() const;
+
 public:
   const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const;
   void accept(PlanIterVisitor& v) const;
@@ -627,6 +655,8 @@
 
   virtual ~ZorbaApplyInsertLastIterator();
 
+  zstring getNameAsString() const;
+
 public:
   const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const;
   void accept(PlanIterVisitor& v) const;
@@ -675,6 +705,8 @@
 
   virtual ~ZorbaApplyInsertBeforeIterator();
 
+  zstring getNameAsString() const;
+
 public:
   const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const;
   void accept(PlanIterVisitor& v) const;
@@ -723,6 +755,8 @@
 
   virtual ~ZorbaApplyInsertAfterIterator();
 
+  zstring getNameAsString() const;
+
 public:
   const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const;
   void accept(PlanIterVisitor& v) const;
@@ -759,6 +793,8 @@
 
   virtual ~ZorbaDeleteIterator();
 
+  zstring getNameAsString() const;
+
 public:
   const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const;
   void accept(PlanIterVisitor& v) const;
@@ -795,6 +831,8 @@
 
   virtual ~ZorbaDeleteFirstIterator();
 
+  zstring getNameAsString() const;
+
 public:
   const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const;
   void accept(PlanIterVisitor& v) const;
@@ -831,6 +869,8 @@
 
   virtual ~ZorbaDeleteLastIterator();
 
+  zstring getNameAsString() const;
+
 public:
   const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const;
   void accept(PlanIterVisitor& v) const;
@@ -870,6 +910,8 @@
 
   virtual ~ZorbaEditIterator();
 
+  zstring getNameAsString() const;
+
 public:
   const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const;
   void accept(PlanIterVisitor& v) const;
@@ -904,6 +946,8 @@
 
   virtual ~ZorbaInsertIterator();
 
+  zstring getNameAsString() const;
+
 public:
   const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const;
   void accept(PlanIterVisitor& v) const;
@@ -940,6 +984,8 @@
 
   virtual ~ZorbaTruncateCollectionIterator();
 
+  zstring getNameAsString() const;
+
 public:
   const StaticallyKnownCollection* getCollection(const store::Item_t& name, store::Collection_t& coll) const;
   void accept(PlanIterVisitor& v) const;
@@ -972,6 +1018,8 @@
 
   virtual ~IsAvailableIndexIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -1015,6 +1063,8 @@
 
   virtual ~AvailableIndexesIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -1045,6 +1095,8 @@
 
   virtual ~IsActivatedICIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -1088,6 +1140,8 @@
 
   virtual ~ActivatedICsIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -1118,6 +1172,8 @@
 
   virtual ~IsDeclaredCollectionIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -1161,6 +1217,8 @@
 
   virtual ~DeclaredCollectionsIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -1191,6 +1249,8 @@
 
   virtual ~IsDeclaredIndexIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -1234,6 +1294,8 @@
 
   virtual ~DeclaredIndexesIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -1264,6 +1326,8 @@
 
   virtual ~IsDeclaredICIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -1307,6 +1371,8 @@
 
   virtual ~DeclaredICsIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -1351,6 +1417,8 @@
 
   virtual ~FnURICollectionIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/context/pregenerated/context.cpp'
--- src/runtime/context/pregenerated/context.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/context/pregenerated/context.cpp	2014-03-04 03:22:54 +0000
@@ -58,6 +58,10 @@
 
 CurrentDateTimeIterator::~CurrentDateTimeIterator() {}
 
+
+zstring CurrentDateTimeIterator::getNameAsString() const {
+  return "fn:current-dateTime";
+}
 // </CurrentDateTimeIterator>
 
 
@@ -86,6 +90,10 @@
 
 CurrentDateIterator::~CurrentDateIterator() {}
 
+
+zstring CurrentDateIterator::getNameAsString() const {
+  return "fn:current-date";
+}
 // </CurrentDateIterator>
 
 
@@ -114,6 +122,10 @@
 
 CurrentTimeIterator::~CurrentTimeIterator() {}
 
+
+zstring CurrentTimeIterator::getNameAsString() const {
+  return "fn:current-time";
+}
 // </CurrentTimeIterator>
 
 
@@ -142,6 +154,10 @@
 
 ImplicitTimezoneIterator::~ImplicitTimezoneIterator() {}
 
+
+zstring ImplicitTimezoneIterator::getNameAsString() const {
+  return "fn:implicit-timezone";
+}
 // </ImplicitTimezoneIterator>
 
 
@@ -170,6 +186,10 @@
 
 DefaultCollationIterator::~DefaultCollationIterator() {}
 
+
+zstring DefaultCollationIterator::getNameAsString() const {
+  return "fn:default-collation";
+}
 // </DefaultCollationIterator>
 
 

=== modified file 'src/runtime/context/pregenerated/context.h'
--- src/runtime/context/pregenerated/context.h	2014-01-31 01:39:38 +0000
+++ src/runtime/context/pregenerated/context.h	2014-03-04 03:22:54 +0000
@@ -58,6 +58,8 @@
 
   virtual ~CurrentDateTimeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -88,6 +90,8 @@
 
   virtual ~CurrentDateIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -118,6 +122,8 @@
 
   virtual ~CurrentTimeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -148,6 +154,8 @@
 
   virtual ~ImplicitTimezoneIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -178,6 +186,8 @@
 
   virtual ~DefaultCollationIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/core/apply_updates.cpp'
--- src/runtime/core/apply_updates.cpp	2013-02-07 17:24:36 +0000
+++ src/runtime/core/apply_updates.cpp	2014-03-04 03:22:54 +0000
@@ -46,6 +46,7 @@
 {
 
 SERIALIZABLE_CLASS_VERSIONS(ApplyIterator)
+DEF_GET_NAME_AS_STRING(ApplyIterator)
 
 
 /*******************************************************************************

=== modified file 'src/runtime/core/apply_updates.h'
--- src/runtime/core/apply_updates.h	2013-02-07 17:24:36 +0000
+++ src/runtime/core/apply_updates.h	2014-03-04 03:22:54 +0000
@@ -66,6 +66,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 

=== modified file 'src/runtime/core/constructors.cpp'
--- src/runtime/core/constructors.cpp	2013-06-22 10:59:44 +0000
+++ src/runtime/core/constructors.cpp	2014-03-04 03:22:54 +0000
@@ -50,22 +50,31 @@
 {
 
 SERIALIZABLE_CLASS_VERSIONS(DocumentIterator)
+DEF_GET_NAME_AS_STRING(DocumentIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(ElementIterator)
+DEF_GET_NAME_AS_STRING(ElementIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(AttributeIterator)
+DEF_GET_NAME_AS_STRING(AttributeIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(NameCastIterator)
+DEF_GET_NAME_AS_STRING(NameCastIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(CommentIterator)
+DEF_GET_NAME_AS_STRING(CommentIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(PiIterator)
+DEF_GET_NAME_AS_STRING(PiIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(TextIterator)
+DEF_GET_NAME_AS_STRING(TextIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(NamespaceIterator)
+DEF_GET_NAME_AS_STRING(NamespaceIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(EnclosedIterator)
+DEF_GET_NAME_AS_STRING(EnclosedIterator)
 
 /*******************************************************************************
 

=== modified file 'src/runtime/core/constructors.h'
--- src/runtime/core/constructors.h	2013-03-05 12:34:19 +0000
+++ src/runtime/core/constructors.h	2014-03-04 03:22:54 +0000
@@ -73,6 +73,8 @@
 
   void openImpl(PlanState& planState, uint32_t& offset);
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -151,6 +153,8 @@
 
   void openImpl(PlanState& planState, uint32_t& offset);
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 
   void resetImpl(PlanState& planState) const;
@@ -201,6 +205,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -244,6 +250,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -287,6 +295,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -317,6 +327,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -344,6 +356,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -401,6 +415,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -435,6 +451,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 

=== modified file 'src/runtime/core/flwor_iterator.cpp'
--- src/runtime/core/flwor_iterator.cpp	2013-10-10 03:54:10 +0000
+++ src/runtime/core/flwor_iterator.cpp	2014-03-04 03:22:54 +0000
@@ -1801,6 +1801,11 @@
 /*******************************************************************************
 
 ********************************************************************************/
+zstring FLWORIterator::getNameAsString() const {
+  return "FLWORIterator";
+}
+
+
 uint32_t FLWORIterator::getStateSize() const  
 {
   return sizeof(FlworState); 

=== modified file 'src/runtime/core/flwor_iterator.h'
--- src/runtime/core/flwor_iterator.h	2013-05-28 18:20:54 +0000
+++ src/runtime/core/flwor_iterator.h	2014-03-04 03:22:54 +0000
@@ -471,6 +471,8 @@
   void resetImpl(PlanState& planState) const;
   void closeImpl(PlanState& planState);
 
+  zstring getNameAsString() const;
+
   uint32_t getStateSize() const;
 
   uint32_t getStateSizeOfSubtree() const;

=== modified file 'src/runtime/core/fncall_iterator.cpp'
--- src/runtime/core/fncall_iterator.cpp	2014-01-15 03:02:39 +0000
+++ src/runtime/core/fncall_iterator.cpp	2014-03-04 03:22:54 +0000
@@ -40,6 +40,7 @@
 #include "runtime/util/flowctl_exception.h"  // for ExitException
 #include "runtime/api/plan_iterator_wrapper.h"
 #include "runtime/visitors/planiter_visitor.h"
+#include "runtime/visitors/printer_visitor.h"
 
 #include "api/unmarshaller.h"
 #include "api/xqueryimpl.h"
@@ -119,11 +120,8 @@
 {
   if (thePlanOpen)
     thePlan->close(*thePlanState);
-
-  if (thePlanState != NULL)
-    delete thePlanState;
-
-  if (theLocalDCtx != NULL && theIsLocalDCtxOwner)
+  delete thePlanState;
+  if (theIsLocalDCtxOwner)
     delete theLocalDCtx;
 }
 
@@ -243,6 +241,15 @@
 /*******************************************************************************
 
 ********************************************************************************/
+zstring UDFunctionCallIterator::getNameAsString() const
+{
+  return theUDF->getName()->getStringValue();
+}
+
+
+/*******************************************************************************
+
+********************************************************************************/
 bool UDFunctionCallIterator::isUpdating() const
 {
   return theUDF->isUpdating();
@@ -640,7 +647,38 @@
 }
 
 
+#if 0
 NARY_ACCEPT(UDFunctionCallIterator);
+#else
+//
+// We specialize accept() to descend into the separate plan for the UDF, but
+// only for a PrinterVisitor and no other kind of visitor.
+//
+void UDFunctionCallIterator::accept( PlanIterVisitor &v ) const {
+  v.beginVisit( *this );
+  std::vector<PlanIter_t>::const_iterator i( theChildren.begin() );
+  std::vector<PlanIter_t>::const_iterator const end( theChildren.end() );
+  for ( ; i != end; ++i )
+    (*i)->accept( v );
+  if ( PrinterVisitor *const pv = dynamic_cast<PrinterVisitor*>( &v ) ) {
+    PlanState *const state = pv->getPlanState();
+    if ( state && Properties::instance().getProfile() ) {
+      UDFunctionCallIteratorState *const udf_state =
+        StateTraitsImpl<UDFunctionCallIteratorState>::getState(
+          *state, getStateOffset()
+        );
+      if ( udf_state->thePlanOpen ) {
+        if ( PlanIterator *const udf_pi = udf_state->thePlan.getp() ) {
+          pv->setPlanState( udf_state->thePlanState );
+          udf_pi->accept( *pv );
+          pv->setPlanState( state );
+        }
+      }
+    }
+  }
+  v.endVisit( *this );
+}
+#endif
 
 
 /////////////////////////////////////////////////////////////////////////////////
@@ -788,6 +826,15 @@
 }
 
 
+zstring ExtFunctionCallIterator::getNameAsString() const {
+  String const uri( theFunction->getURI() );
+  String const local( theFunction->getLocalName() );
+
+  zstring name( '{' + Unmarshaller::getInternalString( uri ) + '}' + Unmarshaller::getInternalString( local ) );
+  return name;
+}
+
+
 void ExtFunctionCallIterator::serialize(serialization::Archiver& ar)
 {
   ar.dont_allow_delay_for_plan_sctx = true;

=== modified file 'src/runtime/core/fncall_iterator.h'
--- src/runtime/core/fncall_iterator.h	2014-01-15 00:58:24 +0000
+++ src/runtime/core/fncall_iterator.h	2014-03-04 03:22:54 +0000
@@ -168,6 +168,8 @@
 
   virtual ~UDFunctionCallIterator();
 
+  zstring getNameAsString() const;
+
   bool isUpdating() const;
 
   void setDynamic() { theIsDynamic = true; }
@@ -252,6 +254,8 @@
 
   virtual ~ExtFunctionCallIterator();
 
+  zstring getNameAsString() const;
+
   virtual bool isUpdating() const { return theIsUpdating; }
 
   void accept(PlanIterVisitor& v) const;

=== modified file 'src/runtime/core/gflwor/count_iterator.cpp'
--- src/runtime/core/gflwor/count_iterator.cpp	2013-02-07 17:24:36 +0000
+++ src/runtime/core/gflwor/count_iterator.cpp	2014-03-04 03:22:54 +0000
@@ -31,6 +31,7 @@
 namespace flwor 
 {
 SERIALIZABLE_CLASS_VERSIONS(CountIterator)
+DEF_GET_NAME_AS_STRING(CountIterator)
 
 
 /////////////////////////////////////////////////////////////////////////////////

=== modified file 'src/runtime/core/gflwor/count_iterator.h'
--- src/runtime/core/gflwor/count_iterator.h	2013-02-07 17:24:36 +0000
+++ src/runtime/core/gflwor/count_iterator.h	2014-03-04 03:22:54 +0000
@@ -70,6 +70,8 @@
   
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl ( store::Item_t& result, PlanState& planState ) const;
 };
 

=== modified file 'src/runtime/core/gflwor/for_iterator.cpp'
--- src/runtime/core/gflwor/for_iterator.cpp	2013-02-07 17:24:36 +0000
+++ src/runtime/core/gflwor/for_iterator.cpp	2014-03-04 03:22:54 +0000
@@ -109,6 +109,11 @@
 }
 
 
+zstring ForIterator::getNameAsString() const {
+  return "ForIterator";
+}
+
+
 bool ForIterator::nextImpl(store::Item_t& aResult, PlanState& aPlanState) const 
 {
   ForState* lState;

=== modified file 'src/runtime/core/gflwor/for_iterator.h'
--- src/runtime/core/gflwor/for_iterator.h	2013-02-07 17:24:36 +0000
+++ src/runtime/core/gflwor/for_iterator.h	2014-03-04 03:22:54 +0000
@@ -105,6 +105,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 

=== modified file 'src/runtime/core/gflwor/groupby_iterator.cpp'
--- src/runtime/core/gflwor/groupby_iterator.cpp	2013-10-10 03:54:10 +0000
+++ src/runtime/core/gflwor/groupby_iterator.cpp	2014-03-04 03:22:54 +0000
@@ -161,6 +161,11 @@
 /***************************************************************************//**
 
 ********************************************************************************/
+zstring GroupByIterator::getNameAsString() const {
+  return "GroupByIterator";
+}
+
+
 uint32_t GroupByIterator::getStateSize() const  
 {
   return StateTraitsImpl<GroupByState>::getStateSize();

=== modified file 'src/runtime/core/gflwor/groupby_iterator.h'
--- src/runtime/core/gflwor/groupby_iterator.h	2013-05-28 18:20:54 +0000
+++ src/runtime/core/gflwor/groupby_iterator.h	2014-03-04 03:22:54 +0000
@@ -83,6 +83,8 @@
 
   ~GroupByIterator();
 
+  zstring getNameAsString() const;
+
   uint32_t getStateSize() const;
 
   uint32_t getStateSizeOfSubtree() const;

=== modified file 'src/runtime/core/gflwor/let_iterator.cpp'
--- src/runtime/core/gflwor/let_iterator.cpp	2013-02-26 04:12:43 +0000
+++ src/runtime/core/gflwor/let_iterator.cpp	2014-03-04 03:22:54 +0000
@@ -84,6 +84,10 @@
 }
 
 
+zstring LetIterator::getNameAsString() const {
+  return "LetIterator";
+}
+
 
 bool LetIterator::nextImpl(store::Item_t& result, PlanState& planState) const 
 {

=== modified file 'src/runtime/core/gflwor/let_iterator.h'
--- src/runtime/core/gflwor/let_iterator.h	2013-02-26 04:12:43 +0000
+++ src/runtime/core/gflwor/let_iterator.h	2014-03-04 03:22:54 +0000
@@ -69,6 +69,8 @@
 
   ~LetIterator();
 
+  zstring getNameAsString() const;
+
   store::Item* getVarName() const { return theVarName.getp(); }
 
   void setSingleItem() { theSingleItemLETVar = true; }

=== modified file 'src/runtime/core/gflwor/orderby_iterator.cpp'
--- src/runtime/core/gflwor/orderby_iterator.cpp	2013-05-28 18:20:54 +0000
+++ src/runtime/core/gflwor/orderby_iterator.cpp	2014-03-04 03:22:54 +0000
@@ -220,6 +220,11 @@
 }
 
 
+zstring OrderByIterator::getNameAsString() const {
+  return "OrderByIterator";
+}
+
+
 uint32_t OrderByIterator::getStateSize() const 
 {
   return sizeof(OrderByState);

=== modified file 'src/runtime/core/gflwor/orderby_iterator.h'
--- src/runtime/core/gflwor/orderby_iterator.h	2013-05-28 18:20:54 +0000
+++ src/runtime/core/gflwor/orderby_iterator.h	2014-03-04 03:22:54 +0000
@@ -216,6 +216,8 @@
   void resetImpl(PlanState& planState) const;
   void closeImpl(PlanState& planState);
   
+  zstring getNameAsString() const;
+
   virtual uint32_t getStateSize() const;
   virtual uint32_t getStateSizeOfSubtree() const;
 

=== modified file 'src/runtime/core/gflwor/outerfor_iterator.cpp'
--- src/runtime/core/gflwor/outerfor_iterator.cpp	2013-02-07 17:24:36 +0000
+++ src/runtime/core/gflwor/outerfor_iterator.cpp	2014-03-04 03:22:54 +0000
@@ -33,6 +33,7 @@
 namespace flwor
 {
 SERIALIZABLE_CLASS_VERSIONS(OuterForIterator)
+DEF_GET_NAME_AS_STRING(OuterForIterator)
 
 
 /////////////////////////////////////////////////////////////////////////////////

=== modified file 'src/runtime/core/gflwor/outerfor_iterator.h'
--- src/runtime/core/gflwor/outerfor_iterator.h	2013-02-07 17:24:36 +0000
+++ src/runtime/core/gflwor/outerfor_iterator.h	2014-03-04 03:22:54 +0000
@@ -75,6 +75,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 

=== modified file 'src/runtime/core/gflwor/tuplesource_iterator.cpp'
--- src/runtime/core/gflwor/tuplesource_iterator.cpp	2013-02-07 17:24:36 +0000
+++ src/runtime/core/gflwor/tuplesource_iterator.cpp	2014-03-04 03:22:54 +0000
@@ -36,6 +36,7 @@
 {
 
 SERIALIZABLE_CLASS_VERSIONS(TupleSourceIterator)
+DEF_GET_NAME_AS_STRING(TupleSourceIterator)
 
 
 bool TupleSourceIterator::nextImpl(store::Item_t& aResult, PlanState& aPlanState) const

=== modified file 'src/runtime/core/gflwor/tuplestream_iterator.cpp'
--- src/runtime/core/gflwor/tuplestream_iterator.cpp	2013-09-17 21:12:49 +0000
+++ src/runtime/core/gflwor/tuplestream_iterator.cpp	2014-03-04 03:22:54 +0000
@@ -35,6 +35,7 @@
 namespace flwor 
 {
 SERIALIZABLE_CLASS_VERSIONS(TupleStreamIterator)
+DEF_GET_NAME_AS_STRING(TupleStreamIterator)
 
 
 TupleStreamIterator::TupleStreamIterator(

=== modified file 'src/runtime/core/gflwor/tuplestream_iterator.h'
--- src/runtime/core/gflwor/tuplestream_iterator.h	2013-02-07 17:24:36 +0000
+++ src/runtime/core/gflwor/tuplestream_iterator.h	2014-03-04 03:22:54 +0000
@@ -67,6 +67,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl ( store::Item_t& result, PlanState& planState ) const;
 };
 

=== modified file 'src/runtime/core/gflwor/where_iterator.cpp'
--- src/runtime/core/gflwor/where_iterator.cpp	2013-02-07 17:24:36 +0000
+++ src/runtime/core/gflwor/where_iterator.cpp	2014-03-04 03:22:54 +0000
@@ -28,6 +28,7 @@
 {
 
 SERIALIZABLE_CLASS_VERSIONS(WhereIterator)
+DEF_GET_NAME_AS_STRING(WhereIterator)
 
 
 /////////////////////////////////////////////////////////////////////////////////

=== modified file 'src/runtime/core/gflwor/window_iterator.cpp'
--- src/runtime/core/gflwor/window_iterator.cpp	2013-05-28 18:20:54 +0000
+++ src/runtime/core/gflwor/window_iterator.cpp	2014-03-04 03:22:54 +0000
@@ -669,6 +669,11 @@
 /***************************************************************************//**
 
 ********************************************************************************/
+zstring WindowIterator::getNameAsString() const {
+  return "WindowIterator";
+}
+
+
 uint32_t WindowIterator::getStateSize() const
 {
   return StateTraitsImpl<WindowState>::getStateSize();

=== modified file 'src/runtime/core/gflwor/window_iterator.h'
--- src/runtime/core/gflwor/window_iterator.h	2013-05-28 18:20:54 +0000
+++ src/runtime/core/gflwor/window_iterator.h	2014-03-04 03:22:54 +0000
@@ -368,6 +368,8 @@
 
   ~WindowIterator();
 
+  zstring getNameAsString() const;
+
   uint32_t getStateSize() const;
 
   uint32_t getStateSizeOfSubtree() const;

=== modified file 'src/runtime/core/internal_operators.cpp'
--- src/runtime/core/internal_operators.cpp	2013-10-10 03:54:10 +0000
+++ src/runtime/core/internal_operators.cpp	2014-03-04 03:22:54 +0000
@@ -30,8 +30,10 @@
 namespace zorba {
 
 SERIALIZABLE_CLASS_VERSIONS(HoistIterator)
+DEF_GET_NAME_AS_STRING(HoistIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(UnhoistIterator)
+DEF_GET_NAME_AS_STRING(UnhoistIterator)
 
 
 

=== modified file 'src/runtime/core/item_iterator.cpp'
--- src/runtime/core/item_iterator.cpp	2013-05-28 18:20:54 +0000
+++ src/runtime/core/item_iterator.cpp	2014-03-04 03:22:54 +0000
@@ -28,10 +28,13 @@
 namespace zorba
 {
 SERIALIZABLE_CLASS_VERSIONS(EmptyIterator)
+DEF_GET_NAME_AS_STRING(EmptyIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(SingletonIterator)
+DEF_GET_NAME_AS_STRING(SingletonIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(IfThenElseIterator)
+DEF_GET_NAME_AS_STRING(IfThenElseIterator)
 
 
 /*******************************************************************************

=== modified file 'src/runtime/core/item_iterator.h'
--- src/runtime/core/item_iterator.h	2013-05-28 18:20:54 +0000
+++ src/runtime/core/item_iterator.h	2014-03-04 03:22:54 +0000
@@ -63,6 +63,8 @@
 
   virtual ~SingletonIterator() {}
   
+  zstring getNameAsString() const;
+
   const store::Item_t& getValue() const { return theValue; }
 
   void accept(PlanIterVisitor& v) const;
@@ -115,6 +117,8 @@
         PlanIter_t& aElseIter,
         bool aIsBooleanIter = false);
 
+  zstring getNameAsString() const;
+
   virtual uint32_t getStateSize() const { return sizeof(IfThenElseIteratorState); }
 
   virtual uint32_t getStateSizeOfSubtree() const;

=== modified file 'src/runtime/core/nodeid_iterators.cpp'
--- src/runtime/core/nodeid_iterators.cpp	2013-02-07 17:24:36 +0000
+++ src/runtime/core/nodeid_iterators.cpp	2014-03-04 03:22:54 +0000
@@ -30,8 +30,10 @@
 namespace zorba
 {
 SERIALIZABLE_CLASS_VERSIONS(NodeDistinctIterator)
+DEF_GET_NAME_AS_STRING(NodeDistinctIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(NodeSortIterator)
+DEF_GET_NAME_AS_STRING(NodeSortIterator)
 
 
 /*******************************************************************************

=== modified file 'src/runtime/core/nodeid_iterators.h'
--- src/runtime/core/nodeid_iterators.h	2013-02-07 17:24:36 +0000
+++ src/runtime/core/nodeid_iterators.h	2014-03-04 03:22:54 +0000
@@ -81,6 +81,8 @@
 
   void openImpl(PlanState& planState, uint32_t& offset);
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -142,6 +144,8 @@
 
   void openImpl(PlanState& planState, uint32_t& offset);
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 

=== modified file 'src/runtime/core/path_iterators.cpp'
--- src/runtime/core/path_iterators.cpp	2013-06-13 14:54:50 +0000
+++ src/runtime/core/path_iterators.cpp	2014-03-04 03:22:54 +0000
@@ -143,36 +143,52 @@
 
 
 UNARY_ACCEPT(SelfAxisIterator);
+DEF_GET_NAME_AS_STRING(SelfAxisIterator)
 
 UNARY_ACCEPT(AttributeAxisIterator);
+DEF_GET_NAME_AS_STRING(AttributeAxisIterator)
 
 UNARY_ACCEPT(ParentAxisIterator);
+DEF_GET_NAME_AS_STRING(ParentAxisIterator)
 
 UNARY_ACCEPT(AncestorAxisIterator);
+DEF_GET_NAME_AS_STRING(AncestorAxisIterator)
 
 UNARY_ACCEPT(AncestorReverseAxisIterator);
+DEF_GET_NAME_AS_STRING(AncestorReverseAxisIterator)
 
 UNARY_ACCEPT(AncestorSelfAxisIterator);
+DEF_GET_NAME_AS_STRING(AncestorSelfAxisIterator)
 
 UNARY_ACCEPT(AncestorSelfReverseAxisIterator);
+DEF_GET_NAME_AS_STRING(AncestorSelfReverseAxisIterator)
 
 UNARY_ACCEPT(RSiblingAxisIterator);
+DEF_GET_NAME_AS_STRING(RSiblingAxisIterator)
 
 UNARY_ACCEPT(LSiblingAxisIterator);
+DEF_GET_NAME_AS_STRING(LSiblingAxisIterator)
 
 UNARY_ACCEPT(LSiblingReverseAxisIterator);
+DEF_GET_NAME_AS_STRING(LSiblingReverseAxisIterator)
 
 UNARY_ACCEPT(ChildAxisIterator);
+DEF_GET_NAME_AS_STRING(ChildAxisIterator)
 
 UNARY_ACCEPT(DescendantAxisIterator);
+DEF_GET_NAME_AS_STRING(DescendantAxisIterator)
 
 UNARY_ACCEPT(DescendantSelfAxisIterator);
+DEF_GET_NAME_AS_STRING(DescendantSelfAxisIterator)
 
 UNARY_ACCEPT(PrecedingAxisIterator);
+DEF_GET_NAME_AS_STRING(PrecedingAxisIterator)
 
 UNARY_ACCEPT(PrecedingReverseAxisIterator);
+DEF_GET_NAME_AS_STRING(PrecedingReverseAxisIterator)
 
 UNARY_ACCEPT(FollowingAxisIterator);
+DEF_GET_NAME_AS_STRING(FollowingAxisIterator)
 
 
 

=== modified file 'src/runtime/core/path_iterators.h'
--- src/runtime/core/path_iterators.h	2013-02-07 17:24:36 +0000
+++ src/runtime/core/path_iterators.h	2014-03-04 03:22:54 +0000
@@ -205,6 +205,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -248,6 +250,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -280,6 +284,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -316,6 +322,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -354,6 +362,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -383,6 +393,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -417,6 +429,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -465,6 +479,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -497,6 +513,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -547,6 +565,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -590,6 +610,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -675,6 +697,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -709,6 +733,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -760,6 +786,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -849,6 +877,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -903,6 +933,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 

=== modified file 'src/runtime/core/sequencetypes.cpp'
--- src/runtime/core/sequencetypes.cpp	2014-01-17 20:07:49 +0000
+++ src/runtime/core/sequencetypes.cpp	2014-03-04 03:22:54 +0000
@@ -39,16 +39,22 @@
 {
 
 SERIALIZABLE_CLASS_VERSIONS(InstanceOfIterator)
+DEF_GET_NAME_AS_STRING(InstanceOfIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(CastIterator)
+DEF_GET_NAME_AS_STRING(CastIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(CastableIterator)
+DEF_GET_NAME_AS_STRING(CastableIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(PromoteIterator)
+DEF_GET_NAME_AS_STRING(PromoteIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(TreatIterator)
+DEF_GET_NAME_AS_STRING(TreatIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(EitherNodesOrAtomicsIterator)
+DEF_GET_NAME_AS_STRING(EitherNodesOrAtomicsIterator)
 
 
 /*******************************************************************************
@@ -628,6 +634,7 @@
   }
 }
 
+
 bool TreatIterator::nextImpl(store::Item_t& result, PlanState& planState) const
 {
   store::Item_t temp;

=== modified file 'src/runtime/core/sequencetypes.h'
--- src/runtime/core/sequencetypes.h	2014-01-17 20:07:49 +0000
+++ src/runtime/core/sequencetypes.h	2014-03-04 03:22:54 +0000
@@ -64,6 +64,8 @@
   ~InstanceOfIterator();
 
   void accept(PlanIterVisitor& v) const;
+
+  zstring getNameAsString() const;
   
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
@@ -114,6 +116,8 @@
 
   void accept(PlanIterVisitor& v) const;
   
+  zstring getNameAsString() const;
+  
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
 };
 
@@ -151,6 +155,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+  
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
 };
 
@@ -192,6 +198,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+  
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
 
 protected:
@@ -241,6 +249,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+  
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
 
   bool count(store::Item_t& result, PlanState& planState) const;

=== modified file 'src/runtime/core/trycatch.cpp'
--- src/runtime/core/trycatch.cpp	2013-03-07 13:18:55 +0000
+++ src/runtime/core/trycatch.cpp	2014-03-04 03:22:54 +0000
@@ -140,6 +140,12 @@
 
 }
 
+
+zstring TryCatchIterator::getNameAsString() const {
+  return "TryCatchIterator";
+}
+
+
 uint32_t
 TryCatchIterator::getStateSizeOfSubtree() const
 {

=== modified file 'src/runtime/core/trycatch.h'
--- src/runtime/core/trycatch.h	2013-03-07 13:18:55 +0000
+++ src/runtime/core/trycatch.h	2014-03-04 03:22:54 +0000
@@ -128,6 +128,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   uint32_t getStateSizeOfSubtree() const;
 
 protected:

=== modified file 'src/runtime/core/var_iterators.cpp'
--- src/runtime/core/var_iterators.cpp	2014-01-17 01:22:32 +0000
+++ src/runtime/core/var_iterators.cpp	2014-03-04 03:22:54 +0000
@@ -41,16 +41,22 @@
 {
 
 SERIALIZABLE_CLASS_VERSIONS(CtxVarIterator)
+DEF_GET_NAME_AS_STRING(CtxVarIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(CtxVarDeclareIterator)
+DEF_GET_NAME_AS_STRING(CtxVarDeclareIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(CtxVarAssignIterator)
+DEF_GET_NAME_AS_STRING(CtxVarAssignIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(CtxVarIsSetIterator)
+DEF_GET_NAME_AS_STRING(CtxVarIsSetIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(ForVarIterator)
+DEF_GET_NAME_AS_STRING(ForVarIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(LetVarIterator)
+DEF_GET_NAME_AS_STRING(LetVarIterator)
 
 
 /////////////////////////////////////////////////////////////////////////////////

=== modified file 'src/runtime/core/var_iterators.h'
--- src/runtime/core/var_iterators.h	2013-05-08 20:14:47 +0000
+++ src/runtime/core/var_iterators.h	2014-03-04 03:22:54 +0000
@@ -93,6 +93,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -152,6 +154,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -196,6 +200,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -301,6 +307,8 @@
 
   void closeImpl(PlanState& planState);
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -357,6 +365,8 @@
 
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 
+  zstring getNameAsString() const;
+
   void bind(store::Item* value, PlanState& planState);
 };
 
@@ -472,6 +482,8 @@
 
   void closeImpl(PlanState& planState);
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 

=== modified file 'src/runtime/csv/pregenerated/csv.cpp'
--- src/runtime/csv/pregenerated/csv.cpp	2014-02-28 01:46:12 +0000
+++ src/runtime/csv/pregenerated/csv.cpp	2014-03-04 03:22:54 +0000
@@ -79,6 +79,10 @@
   missing_ = missing::null;
   skip_called_ = false;
 }
+
+zstring CsvParseIterator::getNameAsString() const {
+  return "fn-zorba-csv:parse";
+}
 // </CsvParseIterator>
 
 
@@ -111,6 +115,10 @@
 
 CsvSerializeIteratorState::~CsvSerializeIteratorState() {}
 
+
+zstring CsvSerializeIterator::getNameAsString() const {
+  return "fn-zorba-csv:serialize";
+}
 // </CsvSerializeIterator>
 
 

=== modified file 'src/runtime/csv/pregenerated/csv.h'
--- src/runtime/csv/pregenerated/csv.h	2014-01-31 01:39:38 +0000
+++ src/runtime/csv/pregenerated/csv.h	2014-03-04 03:22:54 +0000
@@ -86,6 +86,8 @@
 
   virtual ~CsvParseIterator();
 
+  zstring getNameAsString() const;
+
 public:
   bool count(store::Item_t& result, PlanState& planState) const;
   bool skip(int64_t count, PlanState& planState) const;
@@ -140,6 +142,8 @@
 
   virtual ~CsvSerializeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/datetime/pregenerated/datetime.cpp'
--- src/runtime/datetime/pregenerated/datetime.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/datetime/pregenerated/datetime.cpp	2014-03-04 03:22:54 +0000
@@ -58,6 +58,10 @@
 
 CurrentDate::~CurrentDate() {}
 
+
+zstring CurrentDate::getNameAsString() const {
+  return "fn-zorba-dateTime:current-date";
+}
 // </CurrentDate>
 
 
@@ -86,6 +90,10 @@
 
 CurrentDateTime::~CurrentDateTime() {}
 
+
+zstring CurrentDateTime::getNameAsString() const {
+  return "fn-zorba-dateTime:current-dateTime";
+}
 // </CurrentDateTime>
 
 
@@ -114,6 +122,10 @@
 
 CurrentTime::~CurrentTime() {}
 
+
+zstring CurrentTime::getNameAsString() const {
+  return "fn-zorba-dateTime:current-time";
+}
 // </CurrentTime>
 
 
@@ -142,6 +154,10 @@
 
 MillisToDateTime::~MillisToDateTime() {}
 
+
+zstring MillisToDateTime::getNameAsString() const {
+  return "fn-zorba-dateTime:millis-to-dateTime";
+}
 // </MillisToDateTime>
 
 
@@ -170,6 +186,10 @@
 
 ParseDate::~ParseDate() {}
 
+
+zstring ParseDate::getNameAsString() const {
+  return "fn-zorba-dateTime:parse-date";
+}
 // </ParseDate>
 
 
@@ -198,6 +218,10 @@
 
 ParseDateTime::~ParseDateTime() {}
 
+
+zstring ParseDateTime::getNameAsString() const {
+  return "fn-zorba-dateTime:parse-dateTime";
+}
 // </ParseDateTime>
 
 
@@ -226,6 +250,10 @@
 
 ParseTime::~ParseTime() {}
 
+
+zstring ParseTime::getNameAsString() const {
+  return "fn-zorba-dateTime:parse-time";
+}
 // </ParseTime>
 
 
@@ -254,6 +282,10 @@
 
 Timestamp::~Timestamp() {}
 
+
+zstring Timestamp::getNameAsString() const {
+  return "fn-zorba-dateTime:timestamp";
+}
 // </Timestamp>
 
 
@@ -282,6 +314,10 @@
 
 UTCOffset::~UTCOffset() {}
 
+
+zstring UTCOffset::getNameAsString() const {
+  return "fn-zorba-dateTime:utc-offset";
+}
 // </UTCOffset>
 
 

=== modified file 'src/runtime/datetime/pregenerated/datetime.h'
--- src/runtime/datetime/pregenerated/datetime.h	2014-01-31 01:39:38 +0000
+++ src/runtime/datetime/pregenerated/datetime.h	2014-03-04 03:22:54 +0000
@@ -61,6 +61,8 @@
 
   virtual ~CurrentDate();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -93,6 +95,8 @@
 
   virtual ~CurrentDateTime();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -125,6 +129,8 @@
 
   virtual ~CurrentTime();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -157,6 +163,8 @@
 
   virtual ~MillisToDateTime();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -189,6 +197,8 @@
 
   virtual ~ParseDate();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -221,6 +231,8 @@
 
   virtual ~ParseDateTime();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -253,6 +265,8 @@
 
   virtual ~ParseTime();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -285,6 +299,8 @@
 
   virtual ~Timestamp();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -317,6 +333,8 @@
 
   virtual ~UTCOffset();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/debug/pregenerated/debug_iterator.cpp'
--- src/runtime/debug/pregenerated/debug_iterator.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/debug/pregenerated/debug_iterator.cpp	2014-03-04 03:22:54 +0000
@@ -79,6 +79,10 @@
   PlanIteratorState::reset(planState);
   notEmptySequence = false;
 }
+
+zstring DebugIterator::getNameAsString() const {
+  return "DebugIterator";
+}
 // </DebugIterator>
 
 #endif

=== modified file 'src/runtime/debug/pregenerated/debug_iterator.h'
--- src/runtime/debug/pregenerated/debug_iterator.h	2014-01-31 01:39:38 +0000
+++ src/runtime/debug/pregenerated/debug_iterator.h	2014-03-04 03:22:54 +0000
@@ -99,6 +99,8 @@
 
   void setVarDeclaration(bool aValue) { theIsVarDeclaration= aValue; }
 
+  zstring getNameAsString() const;
+
 public:
   const DebugIterator* getDebuggerParent() const;
   std::vector<DebugIterator*> getDebuggerChildren() const;

=== modified file 'src/runtime/durations_dates_times/DurationsDatesTimesImpl.cpp'
--- src/runtime/durations_dates_times/DurationsDatesTimesImpl.cpp	2013-09-17 21:12:49 +0000
+++ src/runtime/durations_dates_times/DurationsDatesTimesImpl.cpp	2014-03-04 03:22:54 +0000
@@ -52,10 +52,13 @@
 
 
 BINARY_ACCEPT(FnDateTimeConstructorIterator);
+DEF_GET_NAME_AS_STRING(FnDateTimeConstructorIterator)
 
 UNARY_ACCEPT(FnAdjustToTimeZoneIterator_1);
+DEF_GET_NAME_AS_STRING(FnAdjustToTimeZoneIterator_1)
 
 BINARY_ACCEPT(FnAdjustToTimeZoneIterator_2);
+DEF_GET_NAME_AS_STRING(FnAdjustToTimeZoneIterator_2)
 
 
 bool FnDateTimeConstructorIterator::nextImpl(store::Item_t& result, PlanState& planState) const

=== modified file 'src/runtime/durations_dates_times/format_dateTime.cpp'
--- src/runtime/durations_dates_times/format_dateTime.cpp	2013-08-02 18:34:08 +0000
+++ src/runtime/durations_dates_times/format_dateTime.cpp	2014-03-04 03:22:54 +0000
@@ -57,6 +57,7 @@
 
 SERIALIZABLE_CLASS_VERSIONS(FnFormatDateTimeIterator)
 NARY_ACCEPT(FnFormatDateTimeIterator);
+DEF_GET_NAME_AS_STRING(FnFormatDateTimeIterator)
 
 ///////////////////////////////////////////////////////////////////////////////
 

=== modified file 'src/runtime/durations_dates_times/format_dateTime.h'
--- src/runtime/durations_dates_times/format_dateTime.h	2013-03-03 15:28:41 +0000
+++ src/runtime/durations_dates_times/format_dateTime.h	2014-03-04 03:22:54 +0000
@@ -62,6 +62,8 @@
 
   void accept( PlanIterVisitor& ) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl( store::Item_t&, PlanState& ) const;
 
 private:

=== modified file 'src/runtime/durations_dates_times/pregenerated/durations_dates_times.cpp'
--- src/runtime/durations_dates_times/pregenerated/durations_dates_times.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/durations_dates_times/pregenerated/durations_dates_times.cpp	2014-03-04 03:22:54 +0000
@@ -58,6 +58,10 @@
 
 YearsFromDurationIterator::~YearsFromDurationIterator() {}
 
+
+zstring YearsFromDurationIterator::getNameAsString() const {
+  return "fn:years-from-duration";
+}
 // </YearsFromDurationIterator>
 
 
@@ -86,6 +90,10 @@
 
 MonthsFromDurationIterator::~MonthsFromDurationIterator() {}
 
+
+zstring MonthsFromDurationIterator::getNameAsString() const {
+  return "fn:months-from-duration";
+}
 // </MonthsFromDurationIterator>
 
 
@@ -114,6 +122,10 @@
 
 DaysFromDurationIterator::~DaysFromDurationIterator() {}
 
+
+zstring DaysFromDurationIterator::getNameAsString() const {
+  return "fn:days-from-duration";
+}
 // </DaysFromDurationIterator>
 
 
@@ -142,6 +154,10 @@
 
 HoursFromDurationIterator::~HoursFromDurationIterator() {}
 
+
+zstring HoursFromDurationIterator::getNameAsString() const {
+  return "fn:hours-from-duration";
+}
 // </HoursFromDurationIterator>
 
 
@@ -170,6 +186,10 @@
 
 MinutesFromDurationIterator::~MinutesFromDurationIterator() {}
 
+
+zstring MinutesFromDurationIterator::getNameAsString() const {
+  return "fn:minutes-from-duration";
+}
 // </MinutesFromDurationIterator>
 
 
@@ -198,6 +218,10 @@
 
 SecondsFromDurationIterator::~SecondsFromDurationIterator() {}
 
+
+zstring SecondsFromDurationIterator::getNameAsString() const {
+  return "fn:seconds-from-duration";
+}
 // </SecondsFromDurationIterator>
 
 
@@ -226,6 +250,10 @@
 
 YearFromDatetimeIterator::~YearFromDatetimeIterator() {}
 
+
+zstring YearFromDatetimeIterator::getNameAsString() const {
+  return "fn:year-from-dateTime";
+}
 // </YearFromDatetimeIterator>
 
 
@@ -254,6 +282,10 @@
 
 MonthFromDatetimeIterator::~MonthFromDatetimeIterator() {}
 
+
+zstring MonthFromDatetimeIterator::getNameAsString() const {
+  return "fn:month-from-dateTime";
+}
 // </MonthFromDatetimeIterator>
 
 
@@ -282,6 +314,10 @@
 
 DayFromDatetimeIterator::~DayFromDatetimeIterator() {}
 
+
+zstring DayFromDatetimeIterator::getNameAsString() const {
+  return "fn:day-from-dateTime";
+}
 // </DayFromDatetimeIterator>
 
 
@@ -310,6 +346,10 @@
 
 HoursFromDatetimeIterator::~HoursFromDatetimeIterator() {}
 
+
+zstring HoursFromDatetimeIterator::getNameAsString() const {
+  return "fn:hours-from-dateTime";
+}
 // </HoursFromDatetimeIterator>
 
 
@@ -338,6 +378,10 @@
 
 MinutesFromDatetimeIterator::~MinutesFromDatetimeIterator() {}
 
+
+zstring MinutesFromDatetimeIterator::getNameAsString() const {
+  return "fn:minutes-from-dateTime";
+}
 // </MinutesFromDatetimeIterator>
 
 
@@ -366,6 +410,10 @@
 
 SecondsFromDatetimeIterator::~SecondsFromDatetimeIterator() {}
 
+
+zstring SecondsFromDatetimeIterator::getNameAsString() const {
+  return "fn:seconds-from-dateTime";
+}
 // </SecondsFromDatetimeIterator>
 
 
@@ -394,6 +442,10 @@
 
 TimezoneFromDatetimeIterator::~TimezoneFromDatetimeIterator() {}
 
+
+zstring TimezoneFromDatetimeIterator::getNameAsString() const {
+  return "fn:timezone-from-dateTime";
+}
 // </TimezoneFromDatetimeIterator>
 
 
@@ -422,6 +474,10 @@
 
 YearFromDateIterator::~YearFromDateIterator() {}
 
+
+zstring YearFromDateIterator::getNameAsString() const {
+  return "fn:year-from-date";
+}
 // </YearFromDateIterator>
 
 
@@ -450,6 +506,10 @@
 
 MonthFromDateIterator::~MonthFromDateIterator() {}
 
+
+zstring MonthFromDateIterator::getNameAsString() const {
+  return "fn:month-from-date";
+}
 // </MonthFromDateIterator>
 
 
@@ -478,6 +538,10 @@
 
 DayFromDateIterator::~DayFromDateIterator() {}
 
+
+zstring DayFromDateIterator::getNameAsString() const {
+  return "fn:day-from-date";
+}
 // </DayFromDateIterator>
 
 
@@ -506,6 +570,10 @@
 
 TimezoneFromDateIterator::~TimezoneFromDateIterator() {}
 
+
+zstring TimezoneFromDateIterator::getNameAsString() const {
+  return "fn:timezone-from-date";
+}
 // </TimezoneFromDateIterator>
 
 
@@ -534,6 +602,10 @@
 
 HoursFromTimeIterator::~HoursFromTimeIterator() {}
 
+
+zstring HoursFromTimeIterator::getNameAsString() const {
+  return "fn:hours-from-time";
+}
 // </HoursFromTimeIterator>
 
 
@@ -562,6 +634,10 @@
 
 MinutesFromTimeIterator::~MinutesFromTimeIterator() {}
 
+
+zstring MinutesFromTimeIterator::getNameAsString() const {
+  return "fn:minutes-from-time";
+}
 // </MinutesFromTimeIterator>
 
 
@@ -590,6 +666,10 @@
 
 SecondsFromTimeIterator::~SecondsFromTimeIterator() {}
 
+
+zstring SecondsFromTimeIterator::getNameAsString() const {
+  return "fn:seconds-from-time";
+}
 // </SecondsFromTimeIterator>
 
 
@@ -618,6 +698,10 @@
 
 TimezoneFromTimeIterator::~TimezoneFromTimeIterator() {}
 
+
+zstring TimezoneFromTimeIterator::getNameAsString() const {
+  return "fn:timezone-from-time";
+}
 // </TimezoneFromTimeIterator>
 
 

=== modified file 'src/runtime/durations_dates_times/pregenerated/durations_dates_times.h'
--- src/runtime/durations_dates_times/pregenerated/durations_dates_times.h	2014-01-31 01:39:38 +0000
+++ src/runtime/durations_dates_times/pregenerated/durations_dates_times.h	2014-03-04 03:22:54 +0000
@@ -58,6 +58,8 @@
 
   virtual ~YearsFromDurationIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -88,6 +90,8 @@
 
   virtual ~MonthsFromDurationIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -118,6 +122,8 @@
 
   virtual ~DaysFromDurationIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -148,6 +154,8 @@
 
   virtual ~HoursFromDurationIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -178,6 +186,8 @@
 
   virtual ~MinutesFromDurationIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -208,6 +218,8 @@
 
   virtual ~SecondsFromDurationIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -238,6 +250,8 @@
 
   virtual ~YearFromDatetimeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -268,6 +282,8 @@
 
   virtual ~MonthFromDatetimeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -298,6 +314,8 @@
 
   virtual ~DayFromDatetimeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -328,6 +346,8 @@
 
   virtual ~HoursFromDatetimeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -358,6 +378,8 @@
 
   virtual ~MinutesFromDatetimeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -388,6 +410,8 @@
 
   virtual ~SecondsFromDatetimeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -418,6 +442,8 @@
 
   virtual ~TimezoneFromDatetimeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -448,6 +474,8 @@
 
   virtual ~YearFromDateIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -478,6 +506,8 @@
 
   virtual ~MonthFromDateIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -508,6 +538,8 @@
 
   virtual ~DayFromDateIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -538,6 +570,8 @@
 
   virtual ~TimezoneFromDateIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -568,6 +602,8 @@
 
   virtual ~HoursFromTimeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -598,6 +634,8 @@
 
   virtual ~MinutesFromTimeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -628,6 +666,8 @@
 
   virtual ~SecondsFromTimeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -658,6 +698,8 @@
 
   virtual ~TimezoneFromTimeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.cpp'
--- src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.cpp	2014-03-04 03:22:54 +0000
@@ -59,6 +59,10 @@
 
 ErrorIterator::~ErrorIterator() {}
 
+
+zstring ErrorIterator::getNameAsString() const {
+  return "fn:error";
+}
 // </ErrorIterator>
 
 
@@ -107,6 +111,10 @@
   theOS = 0;
   theSerializer = NULL;
 }
+
+zstring TraceIterator::getNameAsString() const {
+  return "fn:trace";
+}
 // </TraceIterator>
 
 

=== modified file 'src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.h'
--- src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.h	2014-01-31 01:39:38 +0000
+++ src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.h	2014-03-04 03:22:54 +0000
@@ -58,6 +58,8 @@
 
   virtual ~ErrorIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -104,6 +106,8 @@
 
   virtual ~TraceIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.cpp'
--- src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.cpp	2014-03-04 03:22:54 +0000
@@ -59,6 +59,10 @@
 
 ReadLineIterator::~ReadLineIterator() {}
 
+
+zstring ReadLineIterator::getNameAsString() const {
+  return "op-zorba:read-line";
+}
 // </ReadLineIterator>
 
 
@@ -89,6 +93,10 @@
 
 PrintIterator::~PrintIterator() {}
 
+
+zstring PrintIterator::getNameAsString() const {
+  return "fn-zorba-util:print";
+}
 // </PrintIterator>
 
 
@@ -122,6 +130,10 @@
 
 FunctionTraceIterator::~FunctionTraceIterator() {}
 
+
+zstring FunctionTraceIterator::getNameAsString() const {
+  return "FunctionTraceIterator";
+}
 // </FunctionTraceIterator>
 
 

=== modified file 'src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.h'
--- src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.h	2014-01-31 01:39:38 +0000
+++ src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.h	2014-03-04 03:22:54 +0000
@@ -58,6 +58,8 @@
 
   virtual ~ReadLineIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -92,6 +94,8 @@
 
   virtual ~PrintIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -136,6 +140,8 @@
 
   virtual ~FunctionTraceIterator();
 
+  zstring getNameAsString() const;
+
 public:
   void setFunctionName(const store::Item_t& aFunctionName);
   void setFunctionCallLocation(const QueryLoc& aFunctionLocation);

=== modified file 'src/runtime/eval/eval.cpp'
--- src/runtime/eval/eval.cpp	2013-07-26 12:48:04 +0000
+++ src/runtime/eval/eval.cpp	2014-03-04 03:22:54 +0000
@@ -50,6 +50,7 @@
 
 
 SERIALIZABLE_CLASS_VERSIONS(EvalIterator)
+DEF_GET_NAME_AS_STRING(EvalIterator)
 
 
 /****************************************************************************//**

=== modified file 'src/runtime/eval/eval.h'
--- src/runtime/eval/eval.h	2013-09-17 21:12:49 +0000
+++ src/runtime/eval/eval.h	2014-03-04 03:22:54 +0000
@@ -124,6 +124,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const
   {
     return nextORcount(false, result, planState);

=== modified file 'src/runtime/fetch/pregenerated/fetch.cpp'
--- src/runtime/fetch/pregenerated/fetch.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/fetch/pregenerated/fetch.cpp	2014-03-04 03:22:54 +0000
@@ -58,6 +58,10 @@
 
 FetchContentIterator::~FetchContentIterator() {}
 
+
+zstring FetchContentIterator::getNameAsString() const {
+  return "fn-zorba-fetch:content";
+}
 // </FetchContentIterator>
 
 
@@ -86,6 +90,10 @@
 
 FetchContentBinaryIterator::~FetchContentBinaryIterator() {}
 
+
+zstring FetchContentBinaryIterator::getNameAsString() const {
+  return "fn-zorba-fetch:content-binary";
+}
 // </FetchContentBinaryIterator>
 
 
@@ -114,6 +122,10 @@
 
 FetchContentTypeIterator::~FetchContentTypeIterator() {}
 
+
+zstring FetchContentTypeIterator::getNameAsString() const {
+  return "fn-zorba-fetch:content-type";
+}
 // </FetchContentTypeIterator>
 
 

=== modified file 'src/runtime/fetch/pregenerated/fetch.h'
--- src/runtime/fetch/pregenerated/fetch.h	2014-01-31 01:39:38 +0000
+++ src/runtime/fetch/pregenerated/fetch.h	2014-03-04 03:22:54 +0000
@@ -58,6 +58,8 @@
 
   virtual ~FetchContentIterator();
 
+  zstring getNameAsString() const;
+
 public:
   static void destroyStream(std::istream& aStream);
   void accept(PlanIterVisitor& v) const;
@@ -90,6 +92,8 @@
 
   virtual ~FetchContentBinaryIterator();
 
+  zstring getNameAsString() const;
+
 public:
   static void destroyStream(std::istream& aStream);
   void accept(PlanIterVisitor& v) const;
@@ -122,6 +126,8 @@
 
   virtual ~FetchContentTypeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/fnput/pregenerated/fnput.cpp'
--- src/runtime/fnput/pregenerated/fnput.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/fnput/pregenerated/fnput.cpp	2014-03-04 03:22:54 +0000
@@ -58,6 +58,10 @@
 
 FnPutIterator::~FnPutIterator() {}
 
+
+zstring FnPutIterator::getNameAsString() const {
+  return "fn:put";
+}
 // </FnPutIterator>
 
 

=== modified file 'src/runtime/fnput/pregenerated/fnput.h'
--- src/runtime/fnput/pregenerated/fnput.h	2014-01-31 01:39:38 +0000
+++ src/runtime/fnput/pregenerated/fnput.h	2014-03-04 03:22:54 +0000
@@ -58,6 +58,8 @@
 
   virtual ~FnPutIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/full_text/pregenerated/ft_module.cpp'
--- src/runtime/full_text/pregenerated/ft_module.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/full_text/pregenerated/ft_module.cpp	2014-03-04 03:22:54 +0000
@@ -60,6 +60,10 @@
 
 CurrentCompareOptionsIterator::~CurrentCompareOptionsIterator() {}
 
+
+zstring CurrentCompareOptionsIterator::getNameAsString() const {
+  return "full-text:current-compare-options";
+}
 // </CurrentCompareOptionsIterator>
 
 #endif
@@ -89,6 +93,10 @@
 
 CurrentLangIterator::~CurrentLangIterator() {}
 
+
+zstring CurrentLangIterator::getNameAsString() const {
+  return "full-text:current-lang";
+}
 // </CurrentLangIterator>
 
 #endif
@@ -118,6 +126,10 @@
 
 HostLangIterator::~HostLangIterator() {}
 
+
+zstring HostLangIterator::getNameAsString() const {
+  return "full-text:host-lang";
+}
 // </HostLangIterator>
 
 #endif
@@ -147,6 +159,10 @@
 
 IsStemLangSupportedIterator::~IsStemLangSupportedIterator() {}
 
+
+zstring IsStemLangSupportedIterator::getNameAsString() const {
+  return "full-text:is-stem-lang-supported";
+}
 // </IsStemLangSupportedIterator>
 
 #endif
@@ -176,6 +192,10 @@
 
 IsStopWordIterator::~IsStopWordIterator() {}
 
+
+zstring IsStopWordIterator::getNameAsString() const {
+  return "full-text:is-stop-word";
+}
 // </IsStopWordIterator>
 
 #endif
@@ -205,6 +225,10 @@
 
 IsStopWordLangSupportedIterator::~IsStopWordLangSupportedIterator() {}
 
+
+zstring IsStopWordLangSupportedIterator::getNameAsString() const {
+  return "full-text:is-stop-word-lang-supported";
+}
 // </IsStopWordLangSupportedIterator>
 
 #endif
@@ -234,6 +258,10 @@
 
 IsThesaurusLangSupportedIterator::~IsThesaurusLangSupportedIterator() {}
 
+
+zstring IsThesaurusLangSupportedIterator::getNameAsString() const {
+  return "full-text:is-thesaurus-lang-supported";
+}
 // </IsThesaurusLangSupportedIterator>
 
 #endif
@@ -263,6 +291,10 @@
 
 IsTokenizerLangSupportedIterator::~IsTokenizerLangSupportedIterator() {}
 
+
+zstring IsTokenizerLangSupportedIterator::getNameAsString() const {
+  return "full-text:is-tokenizer-lang-supported";
+}
 // </IsTokenizerLangSupportedIterator>
 
 #endif
@@ -292,6 +324,10 @@
 
 StemIterator::~StemIterator() {}
 
+
+zstring StemIterator::getNameAsString() const {
+  return "full-text:stem";
+}
 // </StemIterator>
 
 #endif
@@ -321,6 +357,10 @@
 
 StripDiacriticsIterator::~StripDiacriticsIterator() {}
 
+
+zstring StripDiacriticsIterator::getNameAsString() const {
+  return "full-text:strip-diacritics";
+}
 // </StripDiacriticsIterator>
 
 #endif
@@ -358,6 +398,10 @@
 void ThesaurusLookupIteratorState::reset(PlanState& planState) {
   PlanIteratorState::reset(planState);
 }
+
+zstring ThesaurusLookupIterator::getNameAsString() const {
+  return "full-text:thesaurus-lookup";
+}
 // </ThesaurusLookupIterator>
 
 #endif
@@ -395,6 +439,10 @@
 void TokenizeNodeIteratorState::reset(PlanState& planState) {
   PlanIteratorState::reset(planState);
 }
+
+zstring TokenizeNodeIterator::getNameAsString() const {
+  return "full-text:tokenize-node";
+}
 // </TokenizeNodeIterator>
 
 #endif
@@ -432,6 +480,10 @@
 void TokenizeNodesIteratorState::reset(PlanState& planState) {
   PlanIteratorState::reset(planState);
 }
+
+zstring TokenizeNodesIterator::getNameAsString() const {
+  return "full-text:tokenize-nodes";
+}
 // </TokenizeNodesIterator>
 
 #endif
@@ -461,6 +513,10 @@
 
 TokenizerPropertiesIterator::~TokenizerPropertiesIterator() {}
 
+
+zstring TokenizerPropertiesIterator::getNameAsString() const {
+  return "full-text:tokenizer-properties";
+}
 // </TokenizerPropertiesIterator>
 
 #endif
@@ -498,6 +554,10 @@
 void TokenizeStringIteratorState::reset(PlanState& planState) {
   PlanIteratorState::reset(planState);
 }
+
+zstring TokenizeStringIterator::getNameAsString() const {
+  return "full-text:tokenize-string";
+}
 // </TokenizeStringIterator>
 
 #endif

=== modified file 'src/runtime/full_text/pregenerated/ft_module.h'
--- src/runtime/full_text/pregenerated/ft_module.h	2014-01-31 01:39:38 +0000
+++ src/runtime/full_text/pregenerated/ft_module.h	2014-03-04 03:22:54 +0000
@@ -66,6 +66,8 @@
 
   virtual ~CurrentCompareOptionsIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -98,6 +100,8 @@
 
   virtual ~CurrentLangIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -130,6 +134,8 @@
 
   virtual ~HostLangIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -162,6 +168,8 @@
 
   virtual ~IsStemLangSupportedIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -194,6 +202,8 @@
 
   virtual ~IsStopWordIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -226,6 +236,8 @@
 
   virtual ~IsStopWordLangSupportedIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -258,6 +270,8 @@
 
   virtual ~IsThesaurusLangSupportedIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -290,6 +304,8 @@
 
   virtual ~IsTokenizerLangSupportedIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -322,6 +338,8 @@
 
   virtual ~StemIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -354,6 +372,8 @@
 
   virtual ~StripDiacriticsIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -403,6 +423,8 @@
 
   virtual ~ThesaurusLookupIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -450,6 +472,8 @@
 
   virtual ~TokenizeNodeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -504,6 +528,8 @@
 
   virtual ~TokenizeNodesIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -538,6 +564,8 @@
 
   virtual ~TokenizerPropertiesIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -582,6 +610,8 @@
 
   virtual ~TokenizeStringIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/hof/dynamic_fncall_iterator.cpp'
--- src/runtime/hof/dynamic_fncall_iterator.cpp	2013-08-16 13:00:06 +0000
+++ src/runtime/hof/dynamic_fncall_iterator.cpp	2014-03-04 03:22:54 +0000
@@ -48,8 +48,10 @@
 NOARY_ACCEPT(ArgumentPlaceholderIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(SingleDynamicFnCallIterator)
+DEF_GET_NAME_AS_STRING(SingleDynamicFnCallIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(MultiDynamicFnCallIterator)
+DEF_GET_NAME_AS_STRING(MultiDynamicFnCallIterator)
 
 
 /*******************************************************************************

=== modified file 'src/runtime/hof/dynamic_fncall_iterator.h'
--- src/runtime/hof/dynamic_fncall_iterator.h	2013-08-16 13:00:06 +0000
+++ src/runtime/hof/dynamic_fncall_iterator.h	2014-03-04 03:22:54 +0000
@@ -121,6 +121,8 @@
 
   void openImpl(PlanState& planState, uint32_t& offset);
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
 };
 
@@ -186,6 +188,8 @@
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
 
+  zstring getNameAsString() const;
+
   void resetImpl(PlanState& planState) const;
 };
 

=== modified file 'src/runtime/hof/function_item_iter.cpp'
--- src/runtime/hof/function_item_iter.cpp	2013-10-10 03:54:10 +0000
+++ src/runtime/hof/function_item_iter.cpp	2014-03-04 03:22:54 +0000
@@ -33,6 +33,7 @@
 {
 
 SERIALIZABLE_CLASS_VERSIONS(FunctionItemIterator)
+DEF_GET_NAME_AS_STRING(FunctionItemIterator)
 
 /*******************************************************************************
 

=== modified file 'src/runtime/hof/function_item_iter.h'
--- src/runtime/hof/function_item_iter.h	2013-04-24 01:35:58 +0000
+++ src/runtime/hof/function_item_iter.h	2014-03-04 03:22:54 +0000
@@ -59,6 +59,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 

=== modified file 'src/runtime/hof/pregenerated/fn_hof_functions.cpp'
--- src/runtime/hof/pregenerated/fn_hof_functions.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/hof/pregenerated/fn_hof_functions.cpp	2014-03-04 03:22:54 +0000
@@ -62,6 +62,10 @@
 
 FunctionLookupIterator::~FunctionLookupIterator() {}
 
+
+zstring FunctionLookupIterator::getNameAsString() const {
+  return "fn:function-lookup";
+}
 // </FunctionLookupIterator>
 
 
@@ -90,6 +94,10 @@
 
 FunctionNameIterator::~FunctionNameIterator() {}
 
+
+zstring FunctionNameIterator::getNameAsString() const {
+  return "fn:function-name";
+}
 // </FunctionNameIterator>
 
 
@@ -118,6 +126,10 @@
 
 FunctionArityIterator::~FunctionArityIterator() {}
 
+
+zstring FunctionArityIterator::getNameAsString() const {
+  return "fn:function-arity";
+}
 // </FunctionArityIterator>
 
 
@@ -148,6 +160,10 @@
 
 FnForEachPairIteratorState::FnForEachPairIteratorState() {}
 
+
+zstring FnForEachPairIterator::getNameAsString() const {
+  return "fn:for-each-pair";
+}
 // </FnForEachPairIterator>
 
 
@@ -180,6 +196,10 @@
 
 FnFoldLeftIteratorState::FnFoldLeftIteratorState() {}
 
+
+zstring FnFoldLeftIterator::getNameAsString() const {
+  return "fn:fold-left";
+}
 // </FnFoldLeftIterator>
 
 

=== modified file 'src/runtime/hof/pregenerated/fn_hof_functions.h'
--- src/runtime/hof/pregenerated/fn_hof_functions.h	2014-01-31 01:39:38 +0000
+++ src/runtime/hof/pregenerated/fn_hof_functions.h	2014-03-04 03:22:54 +0000
@@ -64,6 +64,8 @@
 
   virtual ~FunctionLookupIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -96,6 +98,8 @@
 
   virtual ~FunctionNameIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -128,6 +132,8 @@
 
   virtual ~FunctionArityIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -177,6 +183,8 @@
 
   virtual ~FnForEachPairIterator();
 
+  zstring getNameAsString() const;
+
   uint32_t getStateSizeOfSubtree() const;
 
   void accept(PlanIterVisitor& v) const;
@@ -234,6 +242,8 @@
 
   virtual ~FnFoldLeftIterator();
 
+  zstring getNameAsString() const;
+
   uint32_t getStateSizeOfSubtree() const;
 
   void accept(PlanIterVisitor& v) const;

=== modified file 'src/runtime/indexing/index_ddl.cpp'
--- src/runtime/indexing/index_ddl.cpp	2013-06-13 20:06:14 +0000
+++ src/runtime/indexing/index_ddl.cpp	2014-03-04 03:22:54 +0000
@@ -49,24 +49,34 @@
 
 
 SERIALIZABLE_CLASS_VERSIONS(CreateInternalIndexIterator)
+DEF_GET_NAME_AS_STRING(CreateInternalIndexIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(CreateIndexIterator)
+DEF_GET_NAME_AS_STRING(CreateIndexIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(DeleteIndexIterator)
+DEF_GET_NAME_AS_STRING(DeleteIndexIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(RefreshIndexIterator)
+DEF_GET_NAME_AS_STRING(RefreshIndexIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(ValueIndexEntryBuilderIterator)
+DEF_GET_NAME_AS_STRING(ValueIndexEntryBuilderIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(GeneralIndexEntryBuilderIterator)
+DEF_GET_NAME_AS_STRING(GeneralIndexEntryBuilderIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(ProbeIndexPointValueIterator)
+DEF_GET_NAME_AS_STRING(ProbeIndexPointValueIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(ProbeIndexPointGeneralIterator)
+DEF_GET_NAME_AS_STRING(ProbeIndexPointGeneralIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(ProbeIndexRangeValueIterator)
+DEF_GET_NAME_AS_STRING(ProbeIndexRangeValueIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(ProbeIndexRangeGeneralIterator)
+DEF_GET_NAME_AS_STRING(ProbeIndexRangeGeneralIterator)
 
 
 /*******************************************************************************

=== modified file 'src/runtime/indexing/index_ddl.h'
--- src/runtime/indexing/index_ddl.h	2013-03-24 20:40:03 +0000
+++ src/runtime/indexing/index_ddl.h	2014-03-04 03:22:54 +0000
@@ -85,6 +85,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
 };
 
@@ -146,6 +148,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
 };
 
@@ -187,6 +191,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
 };
 
@@ -226,6 +232,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
 };
 
@@ -278,6 +286,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
 };
 
@@ -307,6 +317,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
 };
 
@@ -369,6 +381,8 @@
 
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 
+  zstring getNameAsString() const;
+
   bool count(store::Item_t& result, PlanState& planState) const;
 
 protected:
@@ -426,6 +440,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
 
 protected:
@@ -509,6 +525,8 @@
 
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 
+  zstring getNameAsString() const;
+
   bool count(store::Item_t& result, PlanState& planState) const;
 
 protected:
@@ -587,6 +605,8 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
 
 private:

=== modified file 'src/runtime/indexing/pregenerated/ic_ddl.cpp'
--- src/runtime/indexing/pregenerated/ic_ddl.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/indexing/pregenerated/ic_ddl.cpp	2014-03-04 03:22:54 +0000
@@ -55,6 +55,10 @@
 
 ActivateICIterator::~ActivateICIterator() {}
 
+
+zstring ActivateICIterator::getNameAsString() const {
+  return "zorba-store-static-integrity-constraints-ddl:activate";
+}
 // </ActivateICIterator>
 
 
@@ -79,6 +83,10 @@
 
 DeactivateICIterator::~DeactivateICIterator() {}
 
+
+zstring DeactivateICIterator::getNameAsString() const {
+  return "zorba-store-static-integrity-constraints-ddl:deactivate";
+}
 // </DeactivateICIterator>
 
 
@@ -103,6 +111,10 @@
 
 CheckICIterator::~CheckICIterator() {}
 
+
+zstring CheckICIterator::getNameAsString() const {
+  return "zorba-store-static-integrity-constraints-dml:check-integrity-constraint";
+}
 // </CheckICIterator>
 
 

=== modified file 'src/runtime/indexing/pregenerated/ic_ddl.h'
--- src/runtime/indexing/pregenerated/ic_ddl.h	2014-01-31 01:39:38 +0000
+++ src/runtime/indexing/pregenerated/ic_ddl.h	2014-03-04 03:22:54 +0000
@@ -66,6 +66,8 @@
 
   virtual ~ActivateICIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -104,6 +106,8 @@
 
   virtual ~DeactivateICIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -141,6 +145,8 @@
 
   virtual ~CheckICIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/indexing/pregenerated/index_func.cpp'
--- src/runtime/indexing/pregenerated/index_func.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/indexing/pregenerated/index_func.cpp	2014-03-04 03:22:54 +0000
@@ -73,6 +73,10 @@
 void IndexKeysIteratorState::reset(PlanState& planState) {
   PlanIteratorState::reset(planState);
 }
+
+zstring IndexKeysIterator::getNameAsString() const {
+  return "zorba-store-indexes-static-dml:keys";
+}
 // </IndexKeysIterator>
 
 

=== modified file 'src/runtime/indexing/pregenerated/index_func.h'
--- src/runtime/indexing/pregenerated/index_func.h	2014-01-31 01:39:38 +0000
+++ src/runtime/indexing/pregenerated/index_func.h	2014-03-04 03:22:54 +0000
@@ -78,6 +78,8 @@
 
   virtual ~IndexKeysIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/item/pregenerated/item.cpp'
--- src/runtime/item/pregenerated/item.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/item/pregenerated/item.cpp	2014-03-04 03:22:54 +0000
@@ -58,6 +58,10 @@
 
 MemSizeIterator::~MemSizeIterator() {}
 
+
+zstring MemSizeIterator::getNameAsString() const {
+  return "fn-zorba-item:size";
+}
 // </MemSizeIterator>
 
 

=== modified file 'src/runtime/item/pregenerated/item.h'
--- src/runtime/item/pregenerated/item.h	2014-01-31 01:39:38 +0000
+++ src/runtime/item/pregenerated/item.h	2014-03-04 03:22:54 +0000
@@ -58,6 +58,8 @@
 
   virtual ~MemSizeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/json/json_constructors.cpp'
--- src/runtime/json/json_constructors.cpp	2013-06-15 02:57:08 +0000
+++ src/runtime/json/json_constructors.cpp	2014-03-04 03:22:54 +0000
@@ -33,10 +33,13 @@
 {
 
 SERIALIZABLE_CLASS_VERSIONS(JSONObjectIterator)
+DEF_GET_NAME_AS_STRING(JSONObjectIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(JSONArrayIterator)
+DEF_GET_NAME_AS_STRING(JSONArrayIterator)
 
 SERIALIZABLE_CLASS_VERSIONS(JSONDirectObjectIterator)
+DEF_GET_NAME_AS_STRING(JSONDirectObjectIterator)
 
 
 /*********************************************************************************

=== modified file 'src/runtime/json/json_constructors.h'
--- src/runtime/json/json_constructors.h	2013-06-15 02:57:08 +0000
+++ src/runtime/json/json_constructors.h	2014-03-04 03:22:54 +0000
@@ -72,6 +72,8 @@
 
   void openImpl(PlanState& planState, uint32_t& offset);
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -123,6 +125,8 @@
 
   void openImpl(PlanState& planState, uint32_t& offset);
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
@@ -156,10 +160,13 @@
 
   void accept(PlanIterVisitor& v) const;
 
+  zstring getNameAsString() const;
+
   bool nextImpl(store::Item_t& result, PlanState& planState) const;
 };
 
 
-}
+} // namespace zorba
 
-#endif
+#endif /* ZORBA_RUNTIME_JSON_CONSTRUCTORS */
+/* vim:set et sw=2 ts=2: */

=== modified file 'src/runtime/json/pregenerated/json.cpp'
--- src/runtime/json/pregenerated/json.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/json/pregenerated/json.cpp	2014-03-04 03:22:54 +0000
@@ -58,6 +58,10 @@
 
 JSONtoXMLInternal::~JSONtoXMLInternal() {}
 
+
+zstring JSONtoXMLInternal::getNameAsString() const {
+  return "fn-zorba-json:json-to-xml-internal";
+}
 // </JSONtoXMLInternal>
 
 
@@ -86,6 +90,10 @@
 
 XMLtoJSONInternal::~XMLtoJSONInternal() {}
 
+
+zstring XMLtoJSONInternal::getNameAsString() const {
+  return "fn-zorba-json:xml-to-json-internal";
+}
 // </XMLtoJSONInternal>
 
 

=== modified file 'src/runtime/json/pregenerated/json.h'
--- src/runtime/json/pregenerated/json.h	2014-01-31 01:39:38 +0000
+++ src/runtime/json/pregenerated/json.h	2014-03-04 03:22:54 +0000
@@ -60,6 +60,8 @@
 
   virtual ~JSONtoXMLInternal();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -92,6 +94,8 @@
 
   virtual ~XMLtoJSONInternal();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/json/pregenerated/jsoniq_functions.cpp'
--- src/runtime/json/pregenerated/jsoniq_functions.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/json/pregenerated/jsoniq_functions.cpp	2014-03-04 03:22:54 +0000
@@ -70,6 +70,10 @@
 void JSONDecodeFromRoundtripIteratorState::reset(PlanState& planState) {
   PlanIteratorState::reset(planState);
 }
+
+zstring JSONDecodeFromRoundtripIterator::getNameAsString() const {
+  return "fn-jsoniq:decode-from-roundtrip";
+}
 // </JSONDecodeFromRoundtripIterator>
 
 
@@ -110,6 +114,10 @@
 void JSONEncodeForRoundtripIteratorState::reset(PlanState& planState) {
   PlanIteratorState::reset(planState);
 }
+
+zstring JSONEncodeForRoundtripIterator::getNameAsString() const {
+  return "fn-jsoniq:encode-for-roundtrip";
+}
 // </JSONEncodeForRoundtripIterator>
 
 
@@ -142,6 +150,10 @@
 
 JSONParseIteratorState::JSONParseIteratorState() {}
 
+
+zstring JSONParseIterator::getNameAsString() const {
+  return "fn-jsoniq:parse-json";
+}
 // </JSONParseIterator>
 
 
@@ -170,6 +182,10 @@
 
 MultiObjectKeysIteratorState::~MultiObjectKeysIteratorState() {}
 
+
+zstring MultiObjectKeysIterator::getNameAsString() const {
+  return "fn-jsoniq:keys";
+}
 // </MultiObjectKeysIterator>
 
 
@@ -206,6 +222,10 @@
 void SingleObjectKeysIteratorState::reset(PlanState& planState) {
   PlanIteratorState::reset(planState);
 }
+
+zstring SingleObjectKeysIterator::getNameAsString() const {
+  return "op-zorba:keys";
+}
 // </SingleObjectKeysIterator>
 
 
@@ -243,6 +263,10 @@
 void MultiObjectLookupIteratorState::reset(PlanState& planState) {
   PlanIteratorState::reset(planState);
 }
+
+zstring MultiObjectLookupIterator::getNameAsString() const {
+  return "op-zorba:multi-object-lookup";
+}
 // </MultiObjectLookupIterator>
 
 
@@ -268,6 +292,10 @@
 
 SingleObjectLookupIterator::~SingleObjectLookupIterator() {}
 
+
+zstring SingleObjectLookupIterator::getNameAsString() const {
+  return "op-zorba:single-object-lookup";
+}
 // </SingleObjectLookupIterator>
 
 
@@ -305,6 +333,10 @@
 void JSONObjectProjectIteratorState::reset(PlanState& planState) {
   PlanIteratorState::reset(planState);
 }
+
+zstring JSONObjectProjectIterator::getNameAsString() const {
+  return "fn-jsoniq:project";
+}
 // </JSONObjectProjectIterator>
 
 
@@ -342,6 +374,10 @@
 void JSONObjectTrimIteratorState::reset(PlanState& planState) {
   PlanIteratorState::reset(planState);
 }
+
+zstring JSONObjectTrimIterator::getNameAsString() const {
+  return "fn-jsoniq:trim";
+}
 // </JSONObjectTrimIterator>
 
 
@@ -378,6 +414,10 @@
 void MultiArrayMembersIteratorState::reset(PlanState& planState) {
   PlanIteratorState::reset(planState);
 }
+
+zstring MultiArrayMembersIterator::getNameAsString() const {
+  return "fn-jsoniq:members";
+}
 // </MultiArrayMembersIterator>
 
 
@@ -414,6 +454,10 @@
 void SingleArrayMembersIteratorState::reset(PlanState& planState) {
   PlanIteratorState::reset(planState);
 }
+
+zstring SingleArrayMembersIterator::getNameAsString() const {
+  return "op-zorba:members";
+}
 // </SingleArrayMembersIterator>
 
 
@@ -451,6 +495,10 @@
 void MultiArrayLookupIteratorState::reset(PlanState& planState) {
   PlanIteratorState::reset(planState);
 }
+
+zstring MultiArrayLookupIterator::getNameAsString() const {
+  return "op-zorba:multi-array-lookup";
+}
 // </MultiArrayLookupIterator>
 
 
@@ -476,6 +524,10 @@
 
 SingleArrayLookupIterator::~SingleArrayLookupIterator() {}
 
+
+zstring SingleArrayLookupIterator::getNameAsString() const {
+  return "op-zorba:single-array-lookup";
+}
 // </SingleArrayLookupIterator>
 
 
@@ -500,6 +552,10 @@
 
 JSONArraySizeIterator::~JSONArraySizeIterator() {}
 
+
+zstring JSONArraySizeIterator::getNameAsString() const {
+  return "fn-jsoniq:size";
+}
 // </JSONArraySizeIterator>
 
 
@@ -532,6 +588,10 @@
 void JSONArrayFlattenIteratorState::init(PlanState& planState) {
   PlanIteratorState::init(planState);
 }
+
+zstring JSONArrayFlattenIterator::getNameAsString() const {
+  return "fn-jsoniq:flatten";
+}
 // </JSONArrayFlattenIterator>
 
 
@@ -556,6 +616,10 @@
 
 JSONNullIterator::~JSONNullIterator() {}
 
+
+zstring JSONNullIterator::getNameAsString() const {
+  return "fn-jsoniq:null";
+}
 // </JSONNullIterator>
 
 
@@ -584,6 +648,10 @@
 
 JSONObjectInsertIterator::~JSONObjectInsertIterator() {}
 
+
+zstring JSONObjectInsertIterator::getNameAsString() const {
+  return "op-zorba:json-object-insert";
+}
 // </JSONObjectInsertIterator>
 
 
@@ -612,6 +680,10 @@
 
 JSONArrayInsertIterator::~JSONArrayInsertIterator() {}
 
+
+zstring JSONArrayInsertIterator::getNameAsString() const {
+  return "op-zorba:json-array-insert";
+}
 // </JSONArrayInsertIterator>
 
 
@@ -637,6 +709,10 @@
 
 JSONDeleteIterator::~JSONDeleteIterator() {}
 
+
+zstring JSONDeleteIterator::getNameAsString() const {
+  return "op-zorba:json-delete";
+}
 // </JSONDeleteIterator>
 
 
@@ -667,6 +743,10 @@
 
 JSONReplaceValueIterator::~JSONReplaceValueIterator() {}
 
+
+zstring JSONReplaceValueIterator::getNameAsString() const {
+  return "op-zorba:json-replace-value";
+}
 // </JSONReplaceValueIterator>
 
 
@@ -695,6 +775,10 @@
 
 JSONRenameIterator::~JSONRenameIterator() {}
 
+
+zstring JSONRenameIterator::getNameAsString() const {
+  return "op-zorba:json-rename";
+}
 // </JSONRenameIterator>
 
 
@@ -723,6 +807,10 @@
 
 JSONArrayAppendIterator::~JSONArrayAppendIterator() {}
 
+
+zstring JSONArrayAppendIterator::getNameAsString() const {
+  return "op-zorba:json-array-append";
+}
 // </JSONArrayAppendIterator>
 
 
@@ -747,6 +835,10 @@
 
 JSONBoxIterator::~JSONBoxIterator() {}
 
+
+zstring JSONBoxIterator::getNameAsString() const {
+  return "op-zorba:json-box";
+}
 // </JSONBoxIterator>
 
 

=== modified file 'src/runtime/json/pregenerated/jsoniq_functions.h'
--- src/runtime/json/pregenerated/jsoniq_functions.h	2014-01-31 01:39:38 +0000
+++ src/runtime/json/pregenerated/jsoniq_functions.h	2014-03-04 03:22:54 +0000
@@ -75,6 +75,8 @@
 
   virtual ~JSONDecodeFromRoundtripIterator();
 
+  zstring getNameAsString() const;
+
 public:
   static void extractChildOfKind(const store::Item_t& aParent, const store::NodeKind& aKind, store::Item_t& aChild);
   bool decodeNode(const store::Item_t& aSerializedNode, const store::NodeKind& aKind, store::Item_t& aResult) const;
@@ -127,6 +129,8 @@
 
   virtual ~JSONEncodeForRoundtripIterator();
 
+  zstring getNameAsString() const;
+
 public:
   bool encodeObject(const store::Item_t& anObj, store::Item_t& aResult, JSONEncodeForRoundtripIteratorState* aState) const;
   bool encodeArray(const store::Item_t& anArray, store::Item_t& aResult, JSONEncodeForRoundtripIteratorState* aState) const;
@@ -184,6 +188,8 @@
 
   virtual ~JSONParseIterator();
 
+  zstring getNameAsString() const;
+
 public:
   bool processBooleanOption(const store::Item_t& options, char const* option_name, bool* option_value) const;
   void accept(PlanIterVisitor& v) const;
@@ -231,6 +237,8 @@
 
   virtual ~MultiObjectKeysIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -274,6 +282,8 @@
 
   virtual ~SingleObjectKeysIterator();
 
+  zstring getNameAsString() const;
+
 public:
   bool count(store::Item_t& result, PlanState& planState) const;
   void accept(PlanIterVisitor& v) const;
@@ -319,6 +329,8 @@
 
   virtual ~MultiObjectLookupIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -349,6 +361,8 @@
 
   virtual ~SingleObjectLookupIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -392,6 +406,8 @@
 
   virtual ~JSONObjectProjectIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -435,6 +451,8 @@
 
   virtual ~JSONObjectTrimIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -478,6 +496,8 @@
 
   virtual ~MultiArrayMembersIterator();
 
+  zstring getNameAsString() const;
+
 public:
   bool count(store::Item_t& result, PlanState& planState) const;
   void accept(PlanIterVisitor& v) const;
@@ -523,6 +543,8 @@
 
   virtual ~SingleArrayMembersIterator();
 
+  zstring getNameAsString() const;
+
 public:
   bool count(store::Item_t& result, PlanState& planState) const;
   void accept(PlanIterVisitor& v) const;
@@ -568,6 +590,8 @@
 
   virtual ~MultiArrayLookupIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -598,6 +622,8 @@
 
   virtual ~SingleArrayLookupIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -628,6 +654,8 @@
 
   virtual ~JSONArraySizeIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -673,6 +701,8 @@
 
   virtual ~JSONArrayFlattenIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -702,6 +732,8 @@
 
   virtual ~JSONNullIterator();
 
+  zstring getNameAsString() const;
+
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
@@ -734,6 +766,8 @@
 
   virtual ~JSONObjectInsertIterator();
 
+  zstring getNameAsString() const;
+