[Zorba-coders] [Merge] lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba

2013-05-24 Thread Markos Zaharioudakis
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/gen-flwor-opt 
into lp:zorba.

Commit message:
1. Implemented flwor-merge optimization for general FLWOR.
2. Removed gflwor_expr_kind


Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165694

1. Implemented flwor-merge optimization for general FLWOR.
2. Removed gflwor_expr_kind
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165694
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2013-05-24 00:34:25 +
+++ ChangeLog	2013-05-24 20:18:27 +
@@ -7,7 +7,9 @@
 
 Optimizations:
   * Implemented hoisting optimization for general FLWOR.
+  * Implemented flwor-merge optimization for general FLWOR.
   * Implemented document-ordering elimination for general FLWOR.
+  * Applied count optimization to the return clause of general FLWORs.
   * Optimized implementation of fn:deep-equal
   * No need to apply document ordering on the domain expression of a FOR clause
 if the FOR clause is followed by an orderby or groupby clause.

=== modified file 'src/compiler/expression/expr_base.cpp'
--- src/compiler/expression/expr_base.cpp	2013-03-15 08:22:41 +
+++ src/compiler/expression/expr_base.cpp	2013-05-24 20:18:27 +
@@ -898,7 +898,6 @@
   }
 
   case flwor_expr_kind:
-  case gflwor_expr_kind:
   {
 const flwor_expr* flworExpr = static_castconst flwor_expr *(this);
 bool haveOrderBy = false;

=== modified file 'src/compiler/expression/expr_base.h'
--- src/compiler/expression/expr_base.h	2013-03-15 08:22:41 +
+++ src/compiler/expression/expr_base.h	2013-05-24 20:18:27 +
@@ -29,8 +29,6 @@
 
 #include functions/function_consts.h
 
-//#include types/typeimpl.h
-
 #include context/static_context_consts.h
 
 
@@ -65,7 +63,6 @@
   match_expr_kind,
 
   flwor_expr_kind,
-  gflwor_expr_kind,
   if_expr_kind,
   trycatch_expr_kind,
 

=== modified file 'src/compiler/expression/expr_clone.cpp'
--- src/compiler/expression/expr_clone.cpp	2013-04-24 01:35:58 +
+++ src/compiler/expression/expr_clone.cpp	2013-05-24 20:18:27 +
@@ -261,12 +261,10 @@
   }
 
   case flwor_expr_kind:
-  case gflwor_expr_kind:
   {
 const flwor_expr* e = static_castconst flwor_expr*(this);
 
-flwor_expr* cloneExpr = theCCB-theEM-
-create_flwor_expr(theSctx, udf, theLoc, e-is_general());
+flwor_expr* cloneExpr = theCCB-theEM-create_flwor_expr(theSctx, udf, theLoc);
 
 csize numClauses = e-num_clauses();
 

=== modified file 'src/compiler/expression/expr_iter.cpp'
--- src/compiler/expression/expr_iter.cpp	2013-04-24 01:35:58 +
+++ src/compiler/expression/expr_iter.cpp	2013-05-24 20:18:27 +
@@ -97,7 +97,6 @@
   switch (theExpr-get_expr_kind())
   {
   case flwor_expr_kind:
-  case gflwor_expr_kind:
   {
 flwor_expr* flworExpr = static_castflwor_expr*(theExpr);
 

=== modified file 'src/compiler/expression/expr_manager.cpp'
--- src/compiler/expression/expr_manager.cpp	2013-05-08 20:14:47 +
+++ src/compiler/expression/expr_manager.cpp	2013-05-24 20:18:27 +
@@ -1017,10 +1017,9 @@
 flwor_expr* ExprManager::create_flwor_expr(
 static_context* sctx,
 user_function* udf,
-const QueryLoc loc,
-bool general)
+const QueryLoc loc)
 {
-  CREATE_AND_RETURN_EXPR(flwor_expr, sctx, udf, loc, general);
+  CREATE_AND_RETURN_EXPR(flwor_expr, sctx, udf, loc);
 }
 
 

=== modified file 'src/compiler/expression/expr_manager.h'
--- src/compiler/expression/expr_manager.h	2013-04-16 20:06:08 +
+++ src/compiler/expression/expr_manager.h	2013-05-24 20:18:27 +
@@ -341,8 +341,6 @@
 
 
 
-#ifdef ZORBA_WITH_JSON
-
   json_array_expr* create_json_array_expr(
   static_context* sctx,
   user_function* udf,
@@ -363,8 +361,6 @@
   std::vectorexpr* names,
   std::vectorexpr* values);
 
-#endif
-
 
 
   insert_expr* create_insert_expr(
@@ -614,8 +610,7 @@
   flwor_expr* create_flwor_expr(
   static_context* sctx,
   user_function* udf,
-  const QueryLoc loc,
-  bool general);
+  const QueryLoc loc);
 
   pragma* create_pragma(
   const store::Item_t,
@@ -624,8 +619,6 @@
 
 
 
-#ifdef ZORBA_WITH_JSON
-
 json_array_expr* create_json_array_expr(
   static_context* sctx,
   user_function* udf,
@@ -646,8 +639,6 @@
   std::vectorexpr* names,
   std::vectorexpr* values);
 
-#endif
-
 } // namespace zorba
 
 #endif // ZORBA_COMPILER_EXPRMANAGER_H

=== modified file 'src/compiler/expression/expr_type.cpp'
--- src/compiler/expression/expr_type.cpp	2013-05-06 08:47:57 +
+++ src/compiler/expression/expr_type.cpp	2013-05-24 20:18:27 +
@@ -116,7 +116,6 @@
   }
 
   case 

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba

2013-05-24 Thread Markos Zaharioudakis
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165694
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-24 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165694
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165694
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-24 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/gen-flwor-opt-2013-05-24T20-21-01.305Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165694
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-24 Thread Zorba Build Bot
Validation queue job gen-flwor-opt-2013-05-24T20-21-01.305Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165694
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-24 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165694
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165694
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-22 Thread Markos Zaharioudakis
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/gen-flwor-opt 
into lp:zorba.

Commit message:
1, Implemented document-ordering elimination for general FLWOR.
2. No need to apply document ordering on the domain expression of a FOR clause, 
if the FOR clause is followed by an orderby or groupby clause.
3. Must apply document ordering on the domain expression of a FOR clause, if 
the FOR clause is followed by a sequential clause.

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165266

1, Implemented document-ordering elimination for general FLWOR.
2. No need to apply document ordering on the domain expression of a FOR clause, 
if the FOR clause is followed by an orderby or groupby clause.
3. Must apply document ordering on the domain expression of a FOR clause, if 
the FOR clause is followed by a sequential clause.
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165266
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/rewriter/rules/fold_rules.cpp'
--- src/compiler/rewriter/rules/fold_rules.cpp	2013-05-08 20:14:47 +
+++ src/compiler/rewriter/rules/fold_rules.cpp	2013-05-22 23:06:33 +
@@ -746,7 +746,8 @@
   }
 }
 
-if (arg-get_expr_kind() == flwor_expr_kind)
+if (arg-get_expr_kind() == flwor_expr_kind ||
+arg-get_expr_kind() == gflwor_expr_kind)
 {
   bool modified = false;
   expr* newArg = partial_eval_return_clause(static_castflwor_expr*(arg),
@@ -1021,7 +1022,8 @@
 }
   }
 
-  if (returnExpr-get_expr_kind() == flwor_expr_kind)
+  if (returnExpr-get_expr_kind() == flwor_expr_kind ||
+  returnExpr-get_expr_kind() == gflwor_expr_kind)
   {
 expr* newRet =
 partial_eval_return_clause(static_castflwor_expr*(returnExpr),  modified, rCtx);

=== modified file 'src/compiler/rewriter/rules/type_rules.cpp'
--- src/compiler/rewriter/rules/type_rules.cpp	2013-02-07 17:24:36 +
+++ src/compiler/rewriter/rules/type_rules.cpp	2013-05-22 23:06:33 +
@@ -20,7 +20,6 @@
 #include types/root_typemanager.h
 #include types/typeops.h
 
-#include compiler/expression/flwor_expr.h
 #include compiler/expression/expr_iter.h
 #include compiler/expression/expr.h
 
@@ -445,46 +444,6 @@
   }
 }
   }
-#if 0
-  else if (node-get_expr_kind() == flwor_expr_kind ||
-   node-get_expr_kind() == gflwor_expr_kind)
-  {
-flwor_expr* flworExpr = static_castflwor_expr*(node);
-
-bool modified = false;
-
-csize numClauses = flworExpr-num_clauses();
-for (csize i = 0; i  numClauses; ++i)
-{
-  if (flworExpr-get_clause(i)-get_kind() == flwor_clause::order_clause)
-  {
-orderby_clause* obc =
-static_castorderby_clause*(flworExpr-get_clause(i));
-
-csize numColumns = obc-num_columns();
-for (csize j = 0; j  numColumns; ++j)
-{
-  expr* colExpr = obc-get_column_expr(j);
-  xqtref_t colType = colExpr-get_return_type();
-  const QueryLoc colLoc = colExpr-get_loc();
-
-  if (!TypeOps::is_equal(tm, *colType, *rtm.EMPTY_TYPE, colLoc) 
-  TypeOps::is_subtype(tm, *colType, *rtm.UNTYPED_ATOMIC_TYPE_STAR, colLoc))
-  {
-expr* castExpr = rCtx.theEM-
-create_cast_expr(sctx, udf, colLoc, colExpr, rtm.STRING_TYPE_QUESTION);
-
-obc-set_column_expr(j, castExpr);
-modified = true;
-  }
-}
-  }
-}
-
-if (modified)
-  return node;
-  }
-#endif
 
   return NULL;
 }

-- 
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/gen-flwor-opt into lp:zorba

2013-05-22 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Commit Message changed to:

1, Implemented document-ordering elimination for general FLWOR.
2. No need to apply document ordering on the domain expression of a FOR clause, 
if the FOR clause is followed by an orderby or groupby clause.
3. Must apply document ordering on the domain expression of a FOR clause, if 
the FOR clause is followed by a sequential clause.
4. Applied count optimization to the return clause of general FLWORs

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165266
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165266
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-22 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Description changed to:

1, Implemented document-ordering elimination for general FLWOR.
2. No need to apply document ordering on the domain expression of a FOR clause, 
if the FOR clause is followed by an orderby or groupby clause.
3. Must apply document ordering on the domain expression of a FOR clause, if 
the FOR clause is followed by a sequential clause.
4 Applied count optimization to the return clause of general FLWORs

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165266
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165266
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-22 Thread Markos Zaharioudakis
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165266
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-22 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165266
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165266
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-22 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/gen-flwor-opt-2013-05-23T02-33-02.296Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165266
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-22 Thread Zorba Build Bot
Validation queue job gen-flwor-opt-2013-05-23T02-33-02.296Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165266
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-22 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165266
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/165266
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-16 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Commit Message changed to:

1. Implemented hoisting optimization for general FLWOR.
2. Fixed bug in hoisting through try-catch expr

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-16 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Description changed to:

1. Implemented hoisting optimization for general FLWOR.
2. Fixed bug in hoisting through try-catch expr


For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-16 Thread Markos Zaharioudakis
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-16 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-16 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/gen-flwor-opt-2013-05-16T10-58-07.097Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-16 Thread Zorba Build Bot
Validation queue job gen-flwor-opt-2013-05-16T10-58-07.097Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-05-16 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Zorba Build Bot
Attempt to merge into lp:zorba failed due to conflicts: 

text conflict in ChangeLog
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/gen-flwor-opt-2013-02-28T11-32-29.632Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Zorba Build Bot
The attempt to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba failed. 
Below is the output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 
(message):
  Validation queue job gen-flwor-opt-2013-02-28T11-32-29.632Z is finished.
  The final status was:

  

  2 tests did not succeed - changes not commited.


Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/gen-flwor-opt-2013-02-28T12-50-12.909Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Zorba Build Bot
The attempt to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba failed. 
Below is the output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 
(message):
  Validation queue job gen-flwor-opt-2013-02-28T12-50-12.909Z is finished.
  The final status was:

  

  2 tests did not succeed - changes not commited.


Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Markos Zaharioudakis
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/gen-flwor-opt-2013-02-28T20-52-18.552Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Zorba Build Bot
The attempt to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba failed. 
Below is the output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 
(message):
  Validation queue job gen-flwor-opt-2013-02-28T20-52-18.552Z is finished.
  The final status was:

  

  5 tests did not succeed - changes not commited.


Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/gen-flwor-opt-2013-02-28T21-55-21.647Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread Zorba Build Bot
Validation queue job gen-flwor-opt-2013-02-28T21-55-21.647Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-28 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-26 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-26 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/gen-flwor-opt-2013-02-26T09-56-30.35Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-26 Thread Zorba Build Bot
The attempt to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba failed. 
Below is the output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 
(message):
  Validation queue job gen-flwor-opt-2013-02-26T09-56-30.35Z is finished.
  The final status was:

  

  16 tests did not succeed - changes not commited.


Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-26 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-26 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-26 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/gen-flwor-opt-2013-02-26T16-15-22.294Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-26 Thread Zorba Build Bot
The attempt to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba failed. 
Below is the output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 
(message):
  Validation queue job gen-flwor-opt-2013-02-26T16-15-22.294Z is finished.
  The final status was:

  

  18 tests did not succeed - changes not commited.


Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-26 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-26 Thread Chris Hillery
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-26 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/gen-flwor-opt-2013-02-26T20-53-20.631Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-26 Thread Zorba Build Bot
The attempt to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba failed. 
Below is the output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 
(message):
  Validation queue job gen-flwor-opt-2013-02-26T20-53-20.631Z is finished.
  The final status was:

  

  18 tests did not succeed - changes not commited.


Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-26 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-25 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Commit Message changed to:

Extended automatic hash-join rule to general flwor and scripting

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-25 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Description changed to:

Extended automatic hash-join rule to general flwor and scripting

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-25 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-25 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/gen-flwor-opt-2013-02-26T07-24-42.137Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-25 Thread Zorba Build Bot
The attempt to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba failed. 
Below is the output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 
(message):
  Validation queue job gen-flwor-opt-2013-02-26T07-24-42.137Z is finished.
  The final status was:

  

  22 tests did not succeed - changes not commited.


Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-25 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2013-02-07 Thread Markos Zaharioudakis
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/gen-flwor-opt 
into lp:zorba.

Commit message:
Extended automatic hash-join rule to general flwor

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161

Extended automatic hash-join rule to general flwor
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/147161
Your team Zorba Coders is subscribed to branch lp:zorba.
-- 
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/gen-flwor-opt into lp:zorba

2012-09-10 Thread Markos Zaharioudakis
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/87444
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2012-09-10 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/87444
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/87444
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2012-09-10 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/gen-flwor-opt-2012-09-10T19-46-31.653Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/87444
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2012-09-10 Thread Zorba Build Bot
Validation queue job gen-flwor-opt-2012-09-10T19-46-31.653Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/87444
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2012-09-10 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/87444
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/87444
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2012-09-09 Thread Zorba Build Bot
There are additional revisions which have not been approved in review. Please 
seek review and approval of these new revisions.
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/87444
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2012-09-09 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/87444
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/87444
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2012-09-06 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/87444
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/87444
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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/gen-flwor-opt into lp:zorba

2012-01-04 Thread Markos Zaharioudakis
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/gen-flwor-opt 
into lp:zorba.

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/87444

general flwor compile-time optimizations
-- 
https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/87444
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/expression/fo_expr.cpp'
--- src/compiler/expression/fo_expr.cpp	2011-11-23 15:16:51 +
+++ src/compiler/expression/fo_expr.cpp	2012-01-04 09:24:32 +
@@ -38,7 +38,7 @@
 {
   if (v.begin_visit(*this))
   {
-accept_children(v); 
+accept_children(v);
   }
 
   v.end_visit(*this);
@@ -147,6 +147,17 @@
   return theFunction-getName();
 }
 
+void fo_expr::add_arg(expr_t e)
+{
+  theArgs.push_back(e);
+  compute_scripting_kind();
+}
+
+void fo_expr::add_args(const std::vectorexpr_t args)
+{
+  theArgs.insert(theArgs.end(), args.begin(), args.end());
+  compute_scripting_kind();
+}
 
 void fo_expr::compute_scripting_kind()
 {
@@ -179,7 +190,7 @@
  ERROR_PARAMS(ZED(XUST0001_CONCAT)),
  ERROR_LOC(theArgs[i]-get_loc()));
 }
-
+
 if (i  0  !is_updating()  !is_vacuous()  (argKind  UPDATING_EXPR))
 {
   throw XQUERY_EXCEPTION(err::XUST0001,
@@ -248,7 +259,7 @@
 
 expr_t fo_expr::clone(substitution_t subst) const
 {
-  if (get_func()-getKind() == 
+  if (get_func()-getKind() ==
   FunctionConsts::ZORBA_STORE_COLLECTIONS_STATIC_DML_COLLECTION_1)
   {
 expr::subst_iter_t i = subst.find(this);

=== modified file 'src/compiler/expression/fo_expr.h'
--- src/compiler/expression/fo_expr.h	2012-01-03 12:10:06 +
+++ src/compiler/expression/fo_expr.h	2012-01-04 09:24:32 +
@@ -79,11 +79,25 @@
 
   const store::Item* get_fname() const;
 
+ TREE
   csize num_args() const { return theArgs.size(); }
 
   expr* get_arg(csize i) const { return theArgs[i].getp(); }
 
   void set_arg(csize i, expr* e) { theArgs[i] = e; }
+===
+  ulong num_args() const { return (ulong)theArgs.size(); }
+
+  expr* get_arg(ulong i) const { return theArgs[i].getp(); }
+
+  const std::vectorexpr_t get_args() const {return theArgs;}
+
+  void set_arg(ulong i, expr* e) { theArgs[i] = e; }
+ MERGE-SOURCE
+
+  void add_arg(expr_t e);
+
+  void add_args(const std::vectorexpr_t args);
 
   void compute_scripting_kind();
 

=== modified file 'src/compiler/rewriter/rules/flwor_rules.cpp'
--- src/compiler/rewriter/rules/flwor_rules.cpp	2011-09-02 20:43:46 +
+++ src/compiler/rewriter/rules/flwor_rules.cpp	2012-01-04 09:24:32 +
@@ -173,7 +173,7 @@
   expr* whereExpr;
   if ((whereExpr = flwor.get_where()) != NULL  !flwor.has_sequential_clauses())
   {
-const expr_tools::var_ptr_set whereVars = 
+const expr_tools::var_ptr_set whereVars =
 expr_tools::get_varset_annotation(whereExpr);
 
 expr_tools::var_ptr_set diff;
@@ -229,7 +229,7 @@
   ulong domainCount = TypeOps::type_max_cnt(tm, *domainType);
   const var_expr* pvar = fc-get_pos_var();
 
-  if (pvar != NULL  
+  if (pvar != NULL 
   expr_tools::count_variable_uses(flwor, pvar, rCtx, 1) == 0)
   {
 MODIFY(fc-set_pos_var(NULL));
@@ -340,7 +340,7 @@
 let_clause_t save = lc;
 MODIFY(flwor.remove_clause(i));
 const QueryLoc loc = var-get_loc();
-var_expr_t fvar = new var_expr(sctx, loc, var_expr::for_var, var-get_name()); 
+var_expr_t fvar = new var_expr(sctx, loc, var_expr::for_var, var-get_name());
 for_clause_t fc = new for_clause(sctx, loc, fvar, domainExpr);
 flwor.add_clause(i, fc);
 
@@ -376,7 +376,7 @@
 
 if ((whereExpr = flwor.get_where()) != NULL)
 {
-  rchandleif_expr ifExpr = 
+  rchandleif_expr ifExpr =
   new if_expr(whereExpr-get_sctx(),
   LOC(whereExpr),
   whereExpr,
@@ -384,7 +384,7 @@
   fo_expr::create_seq(whereExpr-get_sctx(),
   LOC(whereExpr)));
   fix_if_annotations(ifExpr);
-  
+
   return ifExpr.getp();
 }
 
@@ -406,7 +406,7 @@
   FOR, LET, or WINDOW clauses of a flwor expr.
 /
 static void collect_flw_vars(
-const flwor_expr flwor, 
+const flwor_expr flwor,
 expr_tools::VarSetAnnVal vars)
 {
   for (uint32_t i = 0; i  flwor.num_clauses(); ++i)
@@ -499,9 +499,9 @@
   Check if it is OK to fold (inline) a FOR/LET var X that we know is referenced
   only once withing its flwor expr.
 
-  For a LET var, varQuant is always QUNAT_ONE. 
+  For a LET var, varQuant is always QUNAT_ONE.
 
-  For a FOR var, varQuant is the quantifier of the type of the domain expr. 
+  For a FOR var, varQuant is the quantifier of the type of the domain expr.
   It can be either QUANT_ONE or QUANT_QUESTION.