zorba-coders team mailing list archive

[Markos Zaharioudakis <markos_za@xxxxxxxxx>]

Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/zorba-2.9-perf into lp:~zorba-coders/zorba/zorba-2.9.

Commit message:
Fixed performance regression in xray query

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zorba-2.9-perf/+merge/165922

Fixed performance regression in xray query
-- 
https://code.launchpad.net/~zorba-coders/zorba/zorba-2.9-perf/+merge/165922
Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9.

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2013-05-15 10:58:40 +0000
+++ src/compiler/translator/translator.cpp	2013-05-27 17:54:28 +0000
@@ -12666,6 +12666,19 @@
 
         break;
       }
+      case FunctionConsts::FN_MAP_2:
+      case FunctionConsts::FN_FILTER_2:
+      {
+        flwor_expr* flworBody = CREATE(flwor)(theRootSctx, theUDF, loc, false);
+
+        let_clause* lc = wrap_in_letclause(foArgs[0]);
+        flworBody->add_clause(lc);
+        foArgs[0] = CREATE(wrapper)(theRootSctx, theUDF, loc, lc->get_var());
+
+        flworBody->set_return_expr(generate_fn_body(f, foArgs, loc));
+        body = flworBody;
+        break;
+      }
       case FunctionConsts::FN_FUNCTION_LOOKUP_2:
       {
         bool varAdded = false;

=== modified file 'src/runtime/api/plan_iterator_wrapper.cpp'
--- src/runtime/api/plan_iterator_wrapper.cpp	2013-03-17 13:55:28 +0000
+++ src/runtime/api/plan_iterator_wrapper.cpp	2013-05-27 17:54:28 +0000
@@ -44,12 +44,6 @@
 }
 
 
-void PlanIteratorWrapper::reset()
-{
-  theIterator->reset(*theStateBlock);
-}
-
-
 #ifndef NDEBUG
 std::string PlanIteratorWrapper::toString() const
 {

=== modified file 'src/runtime/api/plan_iterator_wrapper.h'
--- src/runtime/api/plan_iterator_wrapper.h	2013-03-05 02:20:27 +0000
+++ src/runtime/api/plan_iterator_wrapper.h	2013-05-27 17:54:28 +0000
@@ -47,7 +47,7 @@
 
   bool next(store::Item_t&);
 
-  void reset();
+  void reset() {}
 
   void close() {}