Re: [Zorba-coders] [Merge] lp:~danielturcanu/zorba/plan-serializer into lp:zorba

2012-01-18 Thread Chris Hillery
Code does not compile. I would fix if this branch was owned by ~zorba-coders, 
but since it's ~danielturcanu, we'll need Daniel to fix it.

[ 13%] Building CXX object 
src/CMakeFiles/zorba_simplestore.dir/api/xqueryimpl.cpp.o
.In file included from ../../src/api/xqueryimpl.cpp:58:
../../src/compiler/api/compilercb.h:169: warning: '' operator will be treated 
as two right angle brackets in C++0x
../../src/compiler/api/compilercb.h:169: warning: suggest parentheses around 
'' expression
../../src/compiler/api/compilercb.h:169: error: 'theLocalUdfs' was not declared 
in this scope
../../src/compiler/api/compilercb.h:169: error: '' should be ' ' within a 
nested template argument list
../../src/compiler/api/compilercb.h:176: warning: '' operator will be treated 
as two right angle brackets in C++0x
../../src/compiler/api/compilercb.h:176: warning: suggest parentheses around 
'' expression
../../src/compiler/api/compilercb.h:176: error: a function call cannot appear 
in a constant-expression
../../src/compiler/api/compilercb.h:176: error: '' should be ' ' within a 
nested template argument list

-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/88783
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2012-01-18 Thread Daniel Turcanu
In my debugging I saw that the flwor_expr is outside the udf. So when compiling 
a udf, probably the optimizer is changing the expression tree in other places 
as well, probably the caller of the udf, but I cannot say for sure. This 
woulnd't surprise me, it should be normal for an optimizer. 
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/88783
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2012-01-18 Thread Daniel Turcanu
Daniel Turcanu has proposed merging lp:~danielturcanu/zorba/plan-serializer 
into lp:zorba.

Requested reviews:
  Chris Hillery (ceejatec)
  Markos Zaharioudakis (markos-za)
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/89025

Fix in plan serializer about preparing user_functions plan for serialization.
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/89025
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into lp:zorba.
=== modified file 'src/api/xqueryimpl.cpp'
--- src/api/xqueryimpl.cpp	2012-01-11 17:30:25 +
+++ src/api/xqueryimpl.cpp	2012-01-18 13:02:26 +
@@ -193,7 +193,8 @@
   }
   else
   {
-ar.compiler_cb = theCompilerCB;
+//ar.compiler_cb = theCompilerCB;
+theCompilerCB-prepare_for_serialize();
   }
 
   ar  theCompilerCB;

=== modified file 'src/compiler/api/compilercb.cpp'
--- src/compiler/api/compilercb.cpp	2012-01-11 17:30:25 +
+++ src/compiler/api/compilercb.cpp	2012-01-18 13:02:26 +
@@ -27,6 +27,7 @@
 #include system/properties.h
 
 #include zorbaserialization/serialization_engine.h
+#include functions/udf.h
 
 
 namespace zorba 
@@ -120,6 +121,7 @@
   theTimeout(timeout),
   theTempIndexCounter(0)
 {
+  theLocalUdfs = new rclistuser_function*;
 }
 
 
@@ -143,6 +145,7 @@
   theTempIndexCounter(0),
   theConfig(cb.theConfig)
 {
+  theLocalUdfs = new rclistuser_function*;
 }
 
 
@@ -169,6 +172,20 @@
 {
 }
 
+//compile all the user_functions so the expr tree is stable at serialize
+void CompilerCB::prepare_for_serialize()
+{
+  rclistuser_function*::iterator udf_it;
+  for(udf_it=theLocalUdfs-begin(); udf_it != theLocalUdfs-end(); udf_it++)
+  {
+(*udf_it)-prepare_for_serialize(this);
+  }
+}
+
+rchandlerclistuser_function*   CompilerCB::get_local_udfs()
+{
+  return theLocalUdfs;
+}
 
 /***
 

=== modified file 'src/compiler/api/compilercb.h'
--- src/compiler/api/compilercb.h	2012-01-11 17:30:25 +
+++ src/compiler/api/compilercb.h	2012-01-18 13:02:26 +
@@ -29,7 +29,7 @@
 // without having the definition of static_context availble.
 # include context/static_context.h
 #endif
-
+#include zorbatypes/rclist.h
 #include zorbaserialization/class_serializer.h
 
 namespace zorba {
@@ -39,7 +39,6 @@
 #endif
 class static_context;
 
-
 /***
   There is one CompilerCB per query plus one CompilerCB per invocation of an
   eval or xqdoc expression that appears in the query. The query-level ccb is
@@ -167,10 +166,14 @@
 
   configtheConfig;
 
+  rchandlerclistuser_function* theLocalUdfs;//for plan serializer
+
 public:
   SERIALIZABLE_CLASS(CompilerCB);
   CompilerCB(::zorba::serialization::Archiver ar);
   void serialize(::zorba::serialization::Archiver ar);
+  void prepare_for_serialize();
+  rchandlerclistuser_function*   get_local_udfs();
 
 public:
   CompilerCB(XQueryDiagnostics*, long timeout = -1);

=== modified file 'src/compiler/expression/var_expr.cpp'
--- src/compiler/expression/var_expr.cpp	2012-01-11 17:30:25 +
+++ src/compiler/expression/var_expr.cpp	2012-01-18 13:02:26 +
@@ -134,6 +134,7 @@
   ar  theCopyClause;
   ar  theParamPos;
   ar  theUDF;
+  ar  theSetExprs;
   ar  theIsPrivate;
   ar  theIsExternal;
   ar  theIsMutable;

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2012-01-11 17:30:25 +
+++ src/compiler/translator/translator.cpp	2012-01-18 13:02:26 +
@@ -3331,7 +3331,7 @@
 }
 else // Process UDF (non-external) function declaration
 {
-  f = new user_function(loc, sig, NULL, scriptKind); // no body for now
+  f = new user_function(loc, sig, NULL, scriptKind, theCCB); // no body for now
 }
 
 f-setAnnotations(theAnnotations);
@@ -10424,7 +10424,8 @@
 user_function* udf = new user_function(loc,
fn-getSignature(),
NULL, // no body for now
-   fn-getScriptingKind());
+   fn-getScriptingKind(),
+   theCCB);
 
 std::vectorexpr_t foArgs(arity);
 std::vectorvar_expr_t udfArgs(arity);
@@ -10632,7 +10633,8 @@
   user_function_t udf(new user_function(loc,
 signature(0, paramTypes, returnType),
 body.getp(),
-body-get_scripting_detail()));
+body-get_scripting_detail(),
+theCCB));
   udf-setArgVars(argVars);
   udf-setOptimized(true);
 

=== modified file 'src/context/static_context.cpp'
--- 

[Zorba-coders] [Merge] lp:~danielturcanu/zorba/plan-serializer into lp:zorba

2012-01-18 Thread Daniel Turcanu
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Commit Message changed to:

Fix in plan serializer about preparing user_functions plan for serialization.

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/89025
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/89025
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2012-01-18 Thread Chris Hillery
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/89025
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/89025
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2012-01-18 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/log.html
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/89025
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2012-01-18 Thread Zorba Build Bot
The attempt to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba 
failed. Below is the output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:273 
(message):
  Validation queue job plan-serializer-2012-01-18T16-04-09.348Z is finished.
  The final status was:

  

  1 tests did not succeed - changes not commited.


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

-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/89025
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2012-01-18 Thread Zorba Build Bot
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/89025
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/89025
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2012-01-18 Thread Chris Hillery
zorba_data-converters_module/converters/base64/binaryReadWrite.xq   Failed



/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0
 [0x7fde24a51399]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0
 [0x7fde24a5152e]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0
 [0x7fde2495d70c]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0
 [0x7fde24960637]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0
 [0x7fde249b3f07]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0
 [0x7fde249a55cd]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0
 [0x7fde249a5536]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0
 [0x7fde249a5536]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0
 [0x7fde249a5536]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0
 [0x7fde249a5536]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0
 [0x7fde249a5536]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0
 [0x7fde2499f30d]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0
 [0x7fde249a2ce1]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0
 [0x7fde24b8967e]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0
 [0x7fde24b8a0a8]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0(_ZN5zorba10CompilerCB21prepare_for_serializeEv+0x2c)
 [0x7fde249d39bc]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0
 [0x7fde2475ad59]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/src/libzorba_simplestore.so.2.1.0
 [0x7fde2475b16a]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/test/rbkt/testdriver
 [0x408044]
/lib64/libc.so.6(__libc_start_main+0xfa) [0x325ac1e32a]
/home/ceej/zo/testing/zorbatest/tester/remotequeue/plan-serializer-2012-01-18T16-04-09.348Z/bzr/zorba/build/test/rbkt/testdriver(__gxx_personality_v0+0x1d1)
 [0x405c59]
save execution plan FAILED

-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/89025
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2012-01-17 Thread Markos Zaharioudakis
I would like to understand this better. What is the problem that this change 
fixes?
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/88783
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2012-01-17 Thread Daniel Turcanu
The user_functions were compiled during plan serialization, and this modified 
some expr trees that were already serialized. I had to ensure that all 
user_functions are compiled before plan serialization is started.
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/88783
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2012-01-17 Thread Daniel Turcanu
For example in one test, in flwor_expr object, theClauses was receiving another 
flwor_clause in the vector, which made the vector to increase and move to 
another space. But the initial flwor_clause had already been serialized, and 
its address was registered for address duplication detection. Sometimes another 
object would be allocated at the same address, and the plan serializer thought 
it is the same object. This only occured sometimes, so the problem was hard to 
debug.
So as a rule, all the objects should freeze during plan serialization, nothing 
should change.
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/88783
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2012-01-16 Thread Daniel Turcanu
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/88783
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/88783
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-29 Thread Daniel Turcanu
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Commit Message changed to:

Fixing plan serializer memory leaks

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86959
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86959
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-29 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/plan-serializer-2011-12-29T08-09-47.208Z/log.html
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86959
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-29 Thread Zorba Build Bot
Validation queue job plan-serializer-2011-12-29T08-09-47.208Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86959
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-29 Thread noreply
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86959
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86959
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-28 Thread Daniel Turcanu
Review: Approve

+one
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86959
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-28 Thread Chris Hillery
FYI, Daniel/Matthias - this proposal will need a commit message in order to get 
merged...
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86959
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-27 Thread Matthias Brantner
Review: Approve


-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86959
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-23 Thread Daniel Turcanu
Daniel Turcanu has proposed merging lp:~danielturcanu/zorba/plan-serializer 
into lp:zorba.

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86807

Fixed memory leak in serialization of Diagnostic class.
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86807
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into lp:zorba.
=== modified file 'src/zorbaserialization/zorba_class_serializer.cpp'
--- src/zorbaserialization/zorba_class_serializer.cpp	2011-09-30 14:06:33 +
+++ src/zorbaserialization/zorba_class_serializer.cpp	2011-12-23 14:18:26 +
@@ -1080,6 +1080,7 @@
 ar  local;
 ar.set_is_temp_field(false);
 obj = internal::SystemDiagnosticBase::find(local);
+free(local);
 ZORBA_ASSERT(obj);
   }
   else

=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt	2011-12-22 20:34:53 +
+++ test/rbkt/Queries/CMakeLists.txt	2011-12-23 14:18:26 +
@@ -168,6 +168,11 @@
   SET (SKIP_TEST 1)
 ENDIF (NEEDS_FULL_TEXT)
   ENDIF (ZORBA_NO_FULL_TEXT)
+  IF(WIN32)
+IF(${TESTNAME} MATCHES test/rbkt/zorba/versioning/link1)
+  SET(SKIP_TEST 1)
+ENDIF(${TESTNAME} MATCHES test/rbkt/zorba/versioning/link1)
+  ENDIF(WIN32)
 
   # If WordNet thesaurus not found, skip ft-thesaurus-true tests
   IF (NOT ZORBA_WORDNET_FOUND)
@@ -260,10 +265,12 @@
 ENDIF(XVERMAJ EQUAL 2)
 
 IF(WIN32)
-  EXPECTED_FAILURE(test/rbkt/zorba/versioning/external1 870991)
-  EXPECTED_FAILURE(test/rbkt/zorba/versioning/external2 870991)
+  #there tests now work on Windows
+  #EXPECTED_FAILURE(test/rbkt/zorba/versioning/external1 870991)
+  #EXPECTED_FAILURE(test/rbkt/zorba/versioning/external2 870991)
 
-  EXPECTED_FAILURE(test/rbkt/zorba/versioning/link1 871061)
+  #disabled this test on WIN32
+  #EXPECTED_FAILURE(test/rbkt/zorba/versioning/link1 871061)
 
   # this is still an expected failure but has been commented out since the
   # test is now completely disabled because of bug 871335

=== modified file 'test/rbkt/modules/CMakeLists.txt'
--- test/rbkt/modules/CMakeLists.txt	2011-08-26 22:46:24 +
+++ test/rbkt/modules/CMakeLists.txt	2011-12-23 14:18:26 +
@@ -32,6 +32,7 @@
 DECLARE_ZORBA_MODULE(URI http://www.zorba-xquery.com/modules/ext;
   VERSION 1.0 FILE ext.xq TEST_ONLY)
 
+IF(NOT WIN32) #disable link + ourlib on Windows
 ADD_SUBDIRECTORY(ourlib)
 
 # For the moment, this test module depends on Xerces
@@ -39,6 +40,7 @@
   DECLARE_ZORBA_MODULE(URI http://www.zorba-xquery.com/modules/link;
 VERSION 1.0 LINK_LIBRARIES ourlib FILE link.xq TEST_ONLY)
 ENDIF (NOT ZORBA_NO_XMLSCHEMA)
+ENDIF(NOT WIN32)
 
 DECLARE_ZORBA_SCHEMA(URI http://www.zorba-xquery.com/modules/theschema;
   FILE schema.xsd TEST_ONLY)

-- 
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-23 Thread Daniel Turcanu
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86807
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86807
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-23 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/plan-serializer-2011-12-23T14-18-07.233Z/log.html
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86807
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-23 Thread Zorba Build Bot
Validation queue job plan-serializer-2011-12-23T14-18-07.233Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86807
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-23 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1. 
Got: 1 Pending.
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86807
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-23 Thread Zorba Build Bot
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86807
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86807
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-23 Thread Matthias Brantner
Daniel, could you please commit the fix for the plan serializer separately from 
disabling the module test? Otherwise it will be hard for Chris to find out what 
you did.
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86807
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-22 Thread Daniel Turcanu
Daniel Turcanu has proposed merging lp:~danielturcanu/zorba/plan-serializer 
into lp:zorba.

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714

Fixed plan serialization of udf_function
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into lp:zorba.
=== modified file 'src/functions/udf.cpp'
--- src/functions/udf.cpp	2011-12-22 14:14:53 +
+++ src/functions/udf.cpp	2011-12-22 14:45:56 +
@@ -148,6 +148,7 @@
   ar  theScriptingKind;
   ar  theIsExiting;
   ar  theIsLeaf;
+  ar  theMutuallyRecursiveUDFs;
   ar  theIsOptimized;
   //ar.set_is_temp_field(true);
   //ar  save_plan;
@@ -156,6 +157,10 @@
   ar  thePlan;
   ar  thePlanStateSize;
   ar  theArgVarsRefs;
+
+  //+ar  theCache;
+  ar  theCacheResults;
+  ar  theCacheComputed;
 }
 
 

=== modified file 'src/functions/udf.h'
--- src/functions/udf.h	2011-12-22 14:14:53 +
+++ src/functions/udf.h	2011-12-22 14:45:56 +
@@ -127,7 +127,7 @@
   uint32_tthePlanStateSize;
   std::vectorArgVarRefs theArgVarsRefs;
 
-  store::Index_t  theCache;
+  store::Index_t  theCache; //note: not for serialization
   booltheCacheResults;
   booltheCacheComputed;
 

=== modified file 'src/runtime/core/flwor_iterator.h'
--- src/runtime/core/flwor_iterator.h	2011-06-14 17:26:33 +
+++ src/runtime/core/flwor_iterator.h	2011-12-22 14:45:56 +
@@ -264,6 +264,7 @@
   SERIALIZABLE_CLASS_CONSTRUCTOR(GroupByClause)
   void serialize(::zorba::serialization::Archiver ar)
   {
+ar  theLocation;
 ar  theGroupingSpecs;
 ar  theNonGroupingSpecs;
   }

=== modified file 'src/runtime/strings/strings_impl.cpp'
--- src/runtime/strings/strings_impl.cpp	2011-12-21 14:40:33 +
+++ src/runtime/strings/strings_impl.cpp	2011-12-22 14:45:56 +
@@ -135,7 +135,7 @@
 while ( !state-theStream-eof() )
 {
   utf8::encoded_char_type ec;
-  ::bzero( ec, sizeof( ec ) );
+  memset( ec, 0, sizeof( ec ) );
   utf8::storage_type *p;
   p = ec;
 

-- 
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-22 Thread Daniel Turcanu
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-22 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/plan-serializer-2011-12-22T14-45-09.912Z/log.html
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-22 Thread Zorba Build Bot
Validation queue job plan-serializer-2011-12-22T14-45-09.912Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-22 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1. 
Got: 1 Pending.
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-22 Thread Zorba Build Bot
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-22 Thread Matthias Brantner
Review: Approve


-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-22 Thread Matthias Brantner
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-22 Thread Zorba Build Bot
Validation queue job plan-serializer-2011-12-22T17-05-15.429Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-22 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1. 
Got: 1 Approve, 2 Pending.
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-22 Thread Zorba Build Bot
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-22 Thread Markos Zaharioudakis
Review: Approve


-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-22 Thread Markos Zaharioudakis
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-22 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/plan-serializer-2011-12-23T06-19-09.247Z/log.html
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-22 Thread Zorba Build Bot
Validation queue job plan-serializer-2011-12-23T06-19-09.247Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-12-22 Thread noreply
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86714
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-11-21 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/plan-serializer-2011-11-21T23-20-41.803Z/log.html
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-11-21 Thread Zorba Build Bot
The attempt to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba 
failed. Below is the output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 
(message):
  Validation queue job plan-serializer-2011-11-21T23-20-41.803Z is finished.
  The final status was:

  

  3 tests did not succeed - changes not commited.


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

-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-11-21 Thread Zorba Build Bot
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-11-21 Thread Matthias Brantner
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-11-21 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/plan-serializer-2011-11-22T03-33-01.027Z/log.html
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-11-21 Thread Zorba Build Bot
Validation queue job plan-serializer-2011-11-22T03-33-01.027Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-11-21 Thread noreply
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-11-17 Thread Matthias Brantner
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-11-16 Thread David Graf
Review: Approve


-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-11-16 Thread Matthias Brantner
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Commit Message changed to:

Fixed bug #872850 about plan serializer crash

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-11-16 Thread Zorba Build Bot
Attempt to merge into lp:zorba failed due to conflicts: 

text conflict in ChangeLog
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-11-16 Thread Matthias Brantner
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-11-16 Thread Zorba Build Bot
Attempt to merge into lp:zorba failed due to conflicts: 

text conflict in ChangeLog
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-11-16 Thread Zorba Build Bot
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-11-15 Thread Matthias Brantner
Review: Approve


-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-10-18 Thread David Graf
Review: Approve


-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79162
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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-10-17 Thread Daniel Turcanu
1. What I did was fixing the plan serializer. This means running all the zorba 
tests and making them work. If it doesn't belong to the tumbling windows, then 
it's probably another failing test.
2. If that test already exist, I will delete it.
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79162
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-10-17 Thread David Graf
Hey Daniel

Ok. Can you just additionally add the test from the diff from my bug report?
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79162
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-10-17 Thread Daniel Turcanu
Daniel Turcanu has proposed merging lp:~danielturcanu/zorba/plan-serializer 
into lp:zorba.

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528

Fixed bug #872850 about plan serializer crash
Updated unit test
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2011-10-12 21:30:46 +
+++ ChangeLog	2011-10-17 09:50:23 +
@@ -52,6 +52,7 @@
   * Added undo for node revalidation
   * Fixed bug #872796  (validate-in-place can interfere with other update primitives)
   * Fixed bug #872799 (validate-in-place can set incorrect types)
+  * Fixed bug #872850  (Serialization of Tumbling Window For fails)
 
 version 2.0.1
 

=== modified file 'src/compiler/expression/expr.cpp'
--- src/compiler/expression/expr.cpp	2011-09-16 19:36:18 +
+++ src/compiler/expression/expr.cpp	2011-10-17 09:50:23 +
@@ -1402,7 +1402,7 @@
 
 void eval_expr::serialize(::zorba::serialization::Archiver ar)
 {
-  serialize_baseclass(ar, (expr*)this);
+  serialize_baseclass(ar, (namespace_context_base_expr*)this);
   ar  theExpr;
   ar  theVars;
   ar  theArgs;

=== modified file 'src/compiler/expression/flwor_expr.cpp'
--- src/compiler/expression/flwor_expr.cpp	2011-08-15 14:17:09 +
+++ src/compiler/expression/flwor_expr.cpp	2011-10-17 09:50:23 +
@@ -70,6 +70,12 @@
 SERIALIZABLE_CLASS_VERSIONS(flwor_expr)
 END_SERIALIZABLE_CLASS_VERSIONS(flwor_expr)
 
+SERIALIZABLE_CLASS_VERSIONS(flwor_wincond)
+END_SERIALIZABLE_CLASS_VERSIONS(flwor_wincond)
+
+SERIALIZABLE_CLASS_VERSIONS(flwor_wincond::vars)
+END_SERIALIZABLE_CLASS_VERSIONS(flwor_wincond::vars)
+
 
 DEF_EXPR_ACCEPT (flwor_expr)
 
@@ -530,6 +536,25 @@
   set_flwor_clause(NULL);
 }
 
+void flwor_wincond::serialize(::zorba::serialization::Archiver ar)
+{
+  ar  theIsOnly;
+  ar  theInputVars;
+  ar  theOutputVars;
+  ar  theCondExpr;
+}
+
+void flwor_wincond::vars::serialize(::zorba::serialization::Archiver ar)
+{
+  ar  posvar;
+  ar  curr;
+  ar  prev;
+  ar  next;
+}
+
+flwor_wincond::vars::vars()
+{
+}
 
 flwor_wincond::vars::~vars()
 {

=== modified file 'src/compiler/expression/flwor_expr.h'
--- src/compiler/expression/flwor_expr.h	2011-08-15 14:17:09 +
+++ src/compiler/expression/flwor_expr.h	2011-10-17 09:50:23 +
@@ -360,19 +360,24 @@
   friend class ExprIterator;
 
 public:
-  struct vars
+  struct vars : public SerializeBaseClass
   {
 var_expr_t posvar;
 var_expr_t curr;
 var_expr_t prev;
 var_expr_t next;
 
+vars();
 ~vars();
 void set_flwor_clause(flwor_clause* c);
 
 void clone(vars cloneVars, expr::substitution_t subst) const;
 
 std::ostream put(std::ostream) const;
+  public:
+SERIALIZABLE_CLASS(vars)
+SERIALIZABLE_CLASS_CONSTRUCTOR(vars)
+void serialize(::zorba::serialization::Archiver ar);
   };
 
 protected:
@@ -382,6 +387,11 @@
   expr_t  theCondExpr;
 
 public:
+  SERIALIZABLE_CLASS(flwor_wincond)
+  SERIALIZABLE_CLASS_CONSTRUCTOR2(flwor_wincond, SimpleRCObject)
+  void serialize(::zorba::serialization::Archiver ar);
+
+public:
   flwor_wincond(
 static_context* sctx,
 bool isOnly,

=== added file 'test/rbkt/ExpQueryResults/zorba/windowing/windowing12.xml.res'
--- test/rbkt/ExpQueryResults/zorba/windowing/windowing12.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/windowing/windowing12.xml.res	2011-10-17 09:50:23 +
@@ -0,0 +1,1 @@
+window1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52/windowwindow53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104/windowwindow105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156/windowwindow157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208/windowwindow209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260/windowwindow261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312/windowwindow313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 

[Zorba-coders] [Merge] lp:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-10-17 Thread Daniel Turcanu
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79528
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-10-13 Thread David Graf
Hello Daniel
Thanks for fixing the issue that fast. Unfortunately, I didn't approve the 
patch because of two comments I have:
1) Does the fix in src/compiler/expression/expr.cpp belongs do the tumbling 
window for fix or is this something else? If yes, we need an extra test for 
this. Or even better, we need an extra merge for it.
2) Maybe I am wrong and something is not correct in my CMake configuration. The 
test you added for the tumbling window bug does not really make sense to. 
Because it is a normal rbkt test. It passes on my system without your fix. 
Can't you just add the test from the bug report?
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79160
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-10-12 Thread Daniel Turcanu
Daniel Turcanu has proposed merging lp:~danielturcanu/zorba/plan-serializer 
into lp:zorba.

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79160

Fixed bug #872850 about plan serializer crash
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79160
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2011-10-12 09:58:12 +
+++ ChangeLog	2011-10-12 17:53:34 +
@@ -49,7 +49,11 @@
   * New node-reference module. References can be obtained for any node, and
 	different nodes cannot have the same identifier.
   * Fixed bug #872697  (segmentation fault with validation of NMTOKENS)
+ TREE
   * Added undo for node revalidation
+===
+  * Fixed bug #872850  (Serialization of Tumbling Window For fails)
+ MERGE-SOURCE
 
 version 2.0.1
 

=== modified file 'src/compiler/expression/expr.cpp'
--- src/compiler/expression/expr.cpp	2011-09-16 19:36:18 +
+++ src/compiler/expression/expr.cpp	2011-10-12 17:53:34 +
@@ -1402,7 +1402,7 @@
 
 void eval_expr::serialize(::zorba::serialization::Archiver ar)
 {
-  serialize_baseclass(ar, (expr*)this);
+  serialize_baseclass(ar, (namespace_context_base_expr*)this);
   ar  theExpr;
   ar  theVars;
   ar  theArgs;

=== modified file 'src/compiler/expression/flwor_expr.cpp'
--- src/compiler/expression/flwor_expr.cpp	2011-08-15 14:17:09 +
+++ src/compiler/expression/flwor_expr.cpp	2011-10-12 17:53:34 +
@@ -70,6 +70,12 @@
 SERIALIZABLE_CLASS_VERSIONS(flwor_expr)
 END_SERIALIZABLE_CLASS_VERSIONS(flwor_expr)
 
+SERIALIZABLE_CLASS_VERSIONS(flwor_wincond)
+END_SERIALIZABLE_CLASS_VERSIONS(flwor_wincond)
+
+SERIALIZABLE_CLASS_VERSIONS(flwor_wincond::vars)
+END_SERIALIZABLE_CLASS_VERSIONS(flwor_wincond::vars)
+
 
 DEF_EXPR_ACCEPT (flwor_expr)
 
@@ -530,6 +536,25 @@
   set_flwor_clause(NULL);
 }
 
+void flwor_wincond::serialize(::zorba::serialization::Archiver ar)
+{
+  ar  theIsOnly;
+  ar  theInputVars;
+  ar  theOutputVars;
+  ar  theCondExpr;
+}
+
+void flwor_wincond::vars::serialize(::zorba::serialization::Archiver ar)
+{
+  ar  posvar;
+  ar  curr;
+  ar  prev;
+  ar  next;
+}
+
+flwor_wincond::vars::vars()
+{
+}
 
 flwor_wincond::vars::~vars()
 {

=== modified file 'src/compiler/expression/flwor_expr.h'
--- src/compiler/expression/flwor_expr.h	2011-08-15 14:17:09 +
+++ src/compiler/expression/flwor_expr.h	2011-10-12 17:53:34 +
@@ -360,19 +360,24 @@
   friend class ExprIterator;
 
 public:
-  struct vars
+  struct vars : public SerializeBaseClass
   {
 var_expr_t posvar;
 var_expr_t curr;
 var_expr_t prev;
 var_expr_t next;
 
+vars();
 ~vars();
 void set_flwor_clause(flwor_clause* c);
 
 void clone(vars cloneVars, expr::substitution_t subst) const;
 
 std::ostream put(std::ostream) const;
+  public:
+SERIALIZABLE_CLASS(vars)
+SERIALIZABLE_CLASS_CONSTRUCTOR(vars)
+void serialize(::zorba::serialization::Archiver ar);
   };
 
 protected:
@@ -382,6 +387,11 @@
   expr_t  theCondExpr;
 
 public:
+  SERIALIZABLE_CLASS(flwor_wincond)
+  SERIALIZABLE_CLASS_CONSTRUCTOR2(flwor_wincond, SimpleRCObject)
+  void serialize(::zorba::serialization::Archiver ar);
+
+public:
   flwor_wincond(
 static_context* sctx,
 bool isOnly,

=== added file 'test/rbkt/ExpQueryResults/zorba/windowing/windowing12.xml.res'
--- test/rbkt/ExpQueryResults/zorba/windowing/windowing12.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/windowing/windowing12.xml.res	2011-10-12 17:53:34 +
@@ -0,0 +1,1 @@
+window1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52/windowwindow53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104/windowwindow105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156/windowwindow157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208/windowwindow209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260/windowwindow261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312/windowwindow313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 

[Zorba-coders] [Merge] lp:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-10-12 Thread Daniel Turcanu
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79160
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79160
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-10-12 Thread Zorba Build Bot
Attempt to merge into lp:zorba failed due to conflicts: 

text conflict in ChangeLog
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79160
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-10-12 Thread Zorba Build Bot
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79160
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79160
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-10-12 Thread Daniel Turcanu
Daniel Turcanu has proposed merging lp:~danielturcanu/zorba/plan-serializer 
into lp:zorba.

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79162

Fixed bug #872850 about plan serializer crash
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79162
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2011-10-12 09:58:12 +
+++ ChangeLog	2011-10-12 18:17:28 +
@@ -50,6 +50,7 @@
 	different nodes cannot have the same identifier.
   * Fixed bug #872697  (segmentation fault with validation of NMTOKENS)
   * Added undo for node revalidation
+  * Fixed bug #872850  (Serialization of Tumbling Window For fails)
 
 version 2.0.1
 

=== modified file 'src/compiler/expression/expr.cpp'
--- src/compiler/expression/expr.cpp	2011-09-16 19:36:18 +
+++ src/compiler/expression/expr.cpp	2011-10-12 18:17:28 +
@@ -1402,7 +1402,7 @@
 
 void eval_expr::serialize(::zorba::serialization::Archiver ar)
 {
-  serialize_baseclass(ar, (expr*)this);
+  serialize_baseclass(ar, (namespace_context_base_expr*)this);
   ar  theExpr;
   ar  theVars;
   ar  theArgs;

=== modified file 'src/compiler/expression/flwor_expr.cpp'
--- src/compiler/expression/flwor_expr.cpp	2011-08-15 14:17:09 +
+++ src/compiler/expression/flwor_expr.cpp	2011-10-12 18:17:28 +
@@ -70,6 +70,12 @@
 SERIALIZABLE_CLASS_VERSIONS(flwor_expr)
 END_SERIALIZABLE_CLASS_VERSIONS(flwor_expr)
 
+SERIALIZABLE_CLASS_VERSIONS(flwor_wincond)
+END_SERIALIZABLE_CLASS_VERSIONS(flwor_wincond)
+
+SERIALIZABLE_CLASS_VERSIONS(flwor_wincond::vars)
+END_SERIALIZABLE_CLASS_VERSIONS(flwor_wincond::vars)
+
 
 DEF_EXPR_ACCEPT (flwor_expr)
 
@@ -530,6 +536,25 @@
   set_flwor_clause(NULL);
 }
 
+void flwor_wincond::serialize(::zorba::serialization::Archiver ar)
+{
+  ar  theIsOnly;
+  ar  theInputVars;
+  ar  theOutputVars;
+  ar  theCondExpr;
+}
+
+void flwor_wincond::vars::serialize(::zorba::serialization::Archiver ar)
+{
+  ar  posvar;
+  ar  curr;
+  ar  prev;
+  ar  next;
+}
+
+flwor_wincond::vars::vars()
+{
+}
 
 flwor_wincond::vars::~vars()
 {

=== modified file 'src/compiler/expression/flwor_expr.h'
--- src/compiler/expression/flwor_expr.h	2011-08-15 14:17:09 +
+++ src/compiler/expression/flwor_expr.h	2011-10-12 18:17:28 +
@@ -360,19 +360,24 @@
   friend class ExprIterator;
 
 public:
-  struct vars
+  struct vars : public SerializeBaseClass
   {
 var_expr_t posvar;
 var_expr_t curr;
 var_expr_t prev;
 var_expr_t next;
 
+vars();
 ~vars();
 void set_flwor_clause(flwor_clause* c);
 
 void clone(vars cloneVars, expr::substitution_t subst) const;
 
 std::ostream put(std::ostream) const;
+  public:
+SERIALIZABLE_CLASS(vars)
+SERIALIZABLE_CLASS_CONSTRUCTOR(vars)
+void serialize(::zorba::serialization::Archiver ar);
   };
 
 protected:
@@ -382,6 +387,11 @@
   expr_t  theCondExpr;
 
 public:
+  SERIALIZABLE_CLASS(flwor_wincond)
+  SERIALIZABLE_CLASS_CONSTRUCTOR2(flwor_wincond, SimpleRCObject)
+  void serialize(::zorba::serialization::Archiver ar);
+
+public:
   flwor_wincond(
 static_context* sctx,
 bool isOnly,

=== added file 'test/rbkt/ExpQueryResults/zorba/windowing/windowing12.xml.res'
--- test/rbkt/ExpQueryResults/zorba/windowing/windowing12.xml.res	1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/windowing/windowing12.xml.res	2011-10-12 18:17:28 +
@@ -0,0 +1,1 @@
+window1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52/windowwindow53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104/windowwindow105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156/windowwindow157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208/windowwindow209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260/windowwindow261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312/windowwindow313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 

[Zorba-coders] [Merge] lp:~danielturcanu/zorba/plan-serializer into lp:zorba

2011-10-12 Thread Daniel Turcanu
The proposal to merge lp:~danielturcanu/zorba/plan-serializer into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79162
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79162
Your team Zorba Coders is requested to review the proposed merge of 
lp:~danielturcanu/zorba/plan-serializer into 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