[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-2.9-perf into lp:~zorba-coders/zorba/zorba-2.9

[Markos Zaharioudakis]

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 +
+++ src/compiler/translator/translator.cpp	2013-05-27 17:54:28 +
@@ -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 +
+++ src/runtime/api/plan_iterator_wrapper.cpp	2013-05-27 17:54:28 +
@@ -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 +
+++ src/runtime/api/plan_iterator_wrapper.h	2013-05-27 17:54:28 +
@@ -47,7 +47,7 @@
 
   bool next(store::Item_t);
 
-  void reset();
+  void reset() {}
 
   void close() {}
 

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-2.9-perf into lp:~zorba-coders/zorba/zorba-2.9

[Markos Zaharioudakis]

Review: Approve


-- 
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.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-2.9-perf into lp:~zorba-coders/zorba/zorba-2.9

[Markos Zaharioudakis]

The proposal to merge lp:~zorba-coders/zorba/zorba-2.9-perf into 
lp:~zorba-coders/zorba/zorba-2.9 has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zorba-2.9-perf/+merge/165922
-- 
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.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-2.9-perf into lp:~zorba-coders/zorba/zorba-2.9

[Zorba Build Bot]

Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/zorba-2.9-perf-2013-05-27T18-04-49.509Z/log.html
-- 
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.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-2.9-perf into lp:~zorba-coders/zorba/zorba-2.9

[Zorba Build Bot]

Validation queue job zorba-2.9-perf-2013-05-27T18-04-49.509Z is finished. The 
final status was:

All tests succeeded!
-- 
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.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-2.9-perf into lp:~zorba-coders/zorba/zorba-2.9

[noreply]

The proposal to merge lp:~zorba-coders/zorba/zorba-2.9-perf into 
lp:~zorba-coders/zorba/zorba-2.9 has been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zorba-2.9-perf/+merge/165922
-- 
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.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp