zorba-coders team mailing list archive

[Daniel Turcanu <danielturcanu@xxxxxxxxx>]

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 +0000
+++ src/functions/udf.cpp	2011-12-22 14:45:56 +0000
@@ -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 +0000
+++ src/functions/udf.h	2011-12-22 14:45:56 +0000
@@ -127,7 +127,7 @@
   uint32_t                    thePlanStateSize;
   std::vector<ArgVarRefs>     theArgVarsRefs;
 
-  store::Index_t              theCache;
+  store::Index_t              theCache; //note: not for serialization
   bool                        theCacheResults;
   bool                        theCacheComputed;
 

=== modified file 'src/runtime/core/flwor_iterator.h'
--- src/runtime/core/flwor_iterator.h	2011-06-14 17:26:33 +0000
+++ src/runtime/core/flwor_iterator.h	2011-12-22 14:45:56 +0000
@@ -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 +0000
+++ src/runtime/strings/strings_impl.cpp	2011-12-22 14:45:56 +0000
@@ -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;