Matthias Brantner has proposed merging lp:~zorba-coders/zorba/plan-serializer 
into lp:zorba.

Requested reviews:
  Zorba Coders (zorba-coders)
  Chris Hillery (ceejatec)
  Markos Zaharioudakis (markos-za)
Related bugs:
  Bug #924205 in Zorba: "test converters/base64/binaryReadWrite.xq fails with 
plan serializer"
  https://bugs.launchpad.net/zorba/+bug/924205

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

Fix in plan serializer about preparing user_functions plan for serialization.
-- 
https://code.launchpad.net/~zorba-coders/zorba/plan-serializer/+merge/91174
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/plan-serializer into lp:zorba.
=== modified file 'src/api/xqueryimpl.cpp'
--- src/api/xqueryimpl.cpp	2012-01-11 17:30:25 +0000
+++ src/api/xqueryimpl.cpp	2012-02-01 21:49:22 +0000
@@ -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 +0000
+++ src/compiler/api/compilercb.cpp	2012-02-01 21:49:22 +0000
@@ -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 rclist<user_function*>;
 }
 
 
@@ -143,6 +145,7 @@
   theTempIndexCounter(0),
   theConfig(cb.theConfig)
 {
+  theLocalUdfs = new rclist<user_function*>;
 }
 
 
@@ -169,6 +172,20 @@
 {
 }
 
+//compile all the user_functions so the expr tree is stable at serialize
+void CompilerCB::prepare_for_serialize()
+{
+  rclist<user_function*>::iterator udf_it;
+  for(udf_it=theLocalUdfs->begin(); udf_it != theLocalUdfs->end(); udf_it++)
+  {
+    (*udf_it)->prepare_for_serialize(this);
+  }
+}
+
+rchandle<rclist<user_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 +0000
+++ src/compiler/api/compilercb.h	2012-02-01 21:49:22 +0000
@@ -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 @@
 
   config                    theConfig;
 
+  rchandle<rclist<user_function*> >    theLocalUdfs;//for plan serializer
+
 public:
   SERIALIZABLE_CLASS(CompilerCB);
   CompilerCB(::zorba::serialization::Archiver& ar);
   void serialize(::zorba::serialization::Archiver& ar);
+  void prepare_for_serialize();
+  rchandle<rclist<user_function*> >  get_local_udfs();
 
 public:
   CompilerCB(XQueryDiagnostics*, long timeout = -1);

=== modified file 'src/compiler/expression/flwor_expr.cpp'
--- src/compiler/expression/flwor_expr.cpp	2011-12-21 14:40:33 +0000
+++ src/compiler/expression/flwor_expr.cpp	2012-02-01 21:49:22 +0000
@@ -803,7 +803,7 @@
 
 flwor_clause_t materialize_clause::clone(expr::substitution_t& subst) const
 {
-  ZORBA_ASSERT(false);
+  return new materialize_clause(theContext, get_loc());
 }
 
 

=== modified file 'src/compiler/expression/ftnode.cpp'
--- src/compiler/expression/ftnode.cpp	2011-07-17 20:05:49 +0000
+++ src/compiler/expression/ftnode.cpp	2012-02-01 21:49:22 +0000
@@ -363,7 +363,7 @@
 
 void ftextension_selection::serialize( serialization::Archiver &ar ) {
   serialize_baseclass( ar, (ftprimary*)this );
-  ar & pragmas_;
+  //ar & pragmas_;
   ar & ftselection_;
 }
 
@@ -392,7 +392,7 @@
 
 void ftextension_option::serialize( serialization::Archiver &ar ) {
   serialize_baseclass( ar, (ftmatch_option*)this );
-  ar & qname_;
+  //ar & qname_;
   ar & val_;
 }
 

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

=== modified file 'src/compiler/rewriter/rules/flwor_rules.cpp'
--- src/compiler/rewriter/rules/flwor_rules.cpp	2011-09-02 20:43:46 +0000
+++ src/compiler/rewriter/rules/flwor_rules.cpp	2012-02-01 21:49:22 +0000
@@ -627,6 +627,10 @@
     {
       // TODO
     }
+    else if (kind == flwor_clause::materialize_clause)
+    {
+      // TODO
+    }
     else
     {
       ZORBA_ASSERT(false);

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2012-01-25 10:24:39 +0000
+++ src/compiler/translator/translator.cpp	2012-02-01 21:49:22 +0000
@@ -3340,7 +3340,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);
@@ -10433,7 +10433,8 @@
     user_function* udf = new user_function(loc,
                                            fn->getSignature(),
                                            NULL, // no body for now
-                                           fn->getScriptingKind());
+                                           fn->getScriptingKind(),
+                                           theCCB);
 
     std::vector<expr_t> foArgs(arity);
     std::vector<var_expr_t> udfArgs(arity);
@@ -10641,7 +10642,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'
--- src/context/static_context.cpp	2012-01-23 10:06:24 +0000
+++ src/context/static_context.cpp	2012-02-01 21:49:22 +0000
@@ -22,6 +22,7 @@
 #include <zorba/external_module.h>
 #include <zorba/serialization_callback.h>
 
+#include "functions/udf.h"
 #include "zorbaserialization/serialization_engine.h"
 
 #include "zorbamisc/ns_consts.h"

=== modified file 'src/context/static_context.h'
--- src/context/static_context.h	2012-01-23 10:06:24 +0000
+++ src/context/static_context.h	2012-02-01 21:49:22 +0000
@@ -599,6 +599,8 @@
 
   void serialize(serialization::Archiver& ar);
 
+  void prepare_for_serialize(CompilerCB *compiler_cb);
+
 public:
   static_context(::zorba::serialization::Archiver& ar);
 

=== modified file 'src/functions/udf.cpp'
--- src/functions/udf.cpp	2012-01-14 21:58:23 +0000
+++ src/functions/udf.cpp	2012-02-01 21:49:22 +0000
@@ -50,7 +50,8 @@
     const QueryLoc& loc,
     const signature& sig,
     expr_t expr_body,
-    short scriptingKind)
+    short scriptingKind,
+    CompilerCB  *compilerCB)
   :
   function(sig, FunctionConsts::FN_UNKNOWN),
   theLoc(loc),
@@ -68,6 +69,8 @@
   resetFlag(FunctionConsts::isBuiltin);
   setDeterministic(true);
   setPrivate(false);
+  theLocalUdfs = compilerCB->get_local_udfs();
+  theLocalUdfs->push_back(this);
 }
 
 
@@ -88,8 +91,22 @@
 ********************************************************************************/
 user_function::~user_function()
 {
-}
-
+  if(theLocalUdfs != NULL)
+    theLocalUdfs->remove(this);
+}
+
+
+void user_function::prepare_for_serialize(CompilerCB *compilerCB)
+{
+  uint32_t planStateSize;
+  getPlan(compilerCB, planStateSize);
+  std::vector<user_function*>::iterator udf_it;
+  for(udf_it=theMutuallyRecursiveUDFs.begin(); udf_it!=theMutuallyRecursiveUDFs.end();udf_it++)
+  {
+    if((*udf_it)->thePlan == NULL)
+      (*udf_it)->prepare_for_serialize(compilerCB);
+  }
+}
 
 /*******************************************************************************
 
@@ -124,8 +141,10 @@
         getPlan(ar.compiler_cb);
       }
 #else
-      uint32_t planStateSize;
-      getPlan(ar.compiler_cb, planStateSize);
+      //uint32_t planStateSize;
+      //getPlan(ar.compiler_cb, planStateSize);
+      assert(thePlan != NULL);
+      ZORBA_ASSERT(thePlan != NULL);
 #endif
     }
     catch(...)

=== modified file 'src/functions/udf.h'
--- src/functions/udf.h	2012-01-14 21:58:23 +0000
+++ src/functions/udf.h	2012-02-01 21:49:22 +0000
@@ -20,6 +20,7 @@
 #include "functions/function.h"
 
 #include "compiler/expression/expr_base.h"
+#include "zorbatypes/rclist.h"
 
 
 namespace zorba 
@@ -131,17 +132,21 @@
   bool                        theCacheResults;
   bool                        theCacheComputed;
 
+  rchandle<rclist<user_function*> >    theLocalUdfs;//for plan serializer
+
 public:
   SERIALIZABLE_CLASS(user_function)
   user_function(::zorba::serialization::Archiver& ar);
   void serialize(::zorba::serialization::Archiver& ar);
+  void prepare_for_serialize(CompilerCB *compilerCB);
 
 public:
   user_function(
       const QueryLoc& loc,
       const signature& sig,
       expr_t expr_body,
-      short kind);
+      short kind,
+      CompilerCB  *compilerCB);
 
   virtual ~user_function();
 

=== modified file 'src/util/uri_util.cpp'
--- src/util/uri_util.cpp	2011-06-26 09:24:24 +0000
+++ src/util/uri_util.cpp	2012-02-01 21:49:22 +0000
@@ -53,7 +53,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-ZORBA_DLL_PUBLIC extern signed char const hex2dec[] = {          
+extern signed char const hex2dec[] = {          
   /*       0  1  2  3   4  5  6  7   8  9  A  B   C  D  E  F */
   /* 0 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
   /* 1 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
@@ -79,7 +79,7 @@
 /**
  * Characters that need not be percent-encoded (%xx) in URIs.  See RFC 3986.
  */
-ZORBA_DLL_PUBLIC extern char const uri_safe[256] = {
+extern char const uri_safe[256] = {
   /*      0 1 2 3  4 5 6 7  8 9 A B  C D E F   */
   /* 0 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
   /* 1 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,

=== modified file 'src/util/uri_util.h'
--- src/util/uri_util.h	2011-11-26 16:54:51 +0000
+++ src/util/uri_util.h	2012-02-01 21:49:22 +0000
@@ -80,8 +80,8 @@
 
 ////////// Encoding ///////////////////////////////////////////////////////////
 
-extern char const uri_safe[];
-extern signed char const hex2dec[];
+ZORBA_DLL_PUBLIC extern char const uri_safe[];
+ZORBA_DLL_PUBLIC extern signed char const hex2dec[];
 
 /**
  * A %back_insert_iterator can be used to append characters to a string

=== modified file 'src/zorbaserialization/archiver.cpp'
--- src/zorbaserialization/archiver.cpp	2011-07-13 01:56:45 +0000
+++ src/zorbaserialization/archiver.cpp	2012-02-01 21:49:22 +0000
@@ -27,6 +27,7 @@
 #include "class_serializer.h"
 #include "mem_archiver.h"
 
+
 namespace zorba
 {
 
@@ -112,7 +113,7 @@
     current_level(0),
     internal_archive(internal_archive),
     theUserCallback(0),
-    compiler_cb(0),
+    //compiler_cb(0),
     dont_allow_delay_for_plan_sctx(false)
 {
 
@@ -195,6 +196,7 @@
     ref_field = check_nonclass_pointer(type, orig_ptr);
   if(ref_field)
   {
+    assert((field_treat != ARCHIVE_FIELD_NORMAL) || (ref_field->field_treat != ARCHIVE_FIELD_NORMAL));
     if(get_is_temp_field_one_level() && (field_treat == ARCHIVE_FIELD_IS_PTR) && (allow_delay2 == ALLOW_DELAY))
       allow_delay2 = DONT_ALLOW_DELAY;
     if(field_treat == ARCHIVE_FIELD_NORMAL)
@@ -309,6 +311,7 @@
   }
   if(ref_field)
   {
+    assert((field_treat != ARCHIVE_FIELD_NORMAL) || (ref_field->field_treat != ARCHIVE_FIELD_NORMAL));
     if(get_is_temp_field_one_level() && (field_treat == ARCHIVE_FIELD_IS_PTR) && (allow_delay2 == ALLOW_DELAY))
       allow_delay2 = DONT_ALLOW_DELAY;
     if(field_treat == ARCHIVE_FIELD_NORMAL)

=== modified file 'src/zorbaserialization/archiver.h'
--- src/zorbaserialization/archiver.h	2011-10-03 09:18:49 +0000
+++ src/zorbaserialization/archiver.h	2012-02-01 21:49:22 +0000
@@ -202,7 +202,7 @@
   SerializationCallback*      theUserCallback;
 
 public:
-  CompilerCB  *compiler_cb;///to workaround user defined function compile-at-runtime
+  //CompilerCB  *compiler_cb;///to workaround user defined function compile-at-runtime
   bool        dont_allow_delay_for_plan_sctx;
 public:
   Archiver(bool is_serializing_out, bool internal_archive=false);

=== modified file 'src/zorbaserialization/zorba_class_serializer.h'
--- src/zorbaserialization/zorba_class_serializer.h	2011-07-07 12:05:43 +0000
+++ src/zorbaserialization/zorba_class_serializer.h	2012-02-01 21:49:22 +0000
@@ -28,6 +28,7 @@
 #include "zorbaserialization/archiver.h"
 
 #include "store/api/shared_types.h"
+#include "diagnostics/assert.h"
 
 #include <stdio.h>
 #include <map>
@@ -224,7 +225,8 @@
     bool is_ref;
     ENUM_ALLOW_DELAY allow_delay = ar.get_allow_delay();
     is_ref = ar.add_compound_field("rchandle<T>", 0, !FIELD_IS_CLASS, "", &obj, ARCHIVE_FIELD_NORMAL);
-    if(!is_ref)
+    assert(!is_ref);
+    ZORBA_ASSERT(!is_ref);
     {
       T *p = obj.getp();
       if(allow_delay != ALLOW_DELAY)
@@ -242,10 +244,6 @@
         ar.set_is_temp_field_one_level(false);
       ar.add_end_compound_field();
     }
-    else
-    {
-      assert(false);
-    }
   }
   else
   {

=== modified file 'src/zorbatypes/rchandle.h'
--- src/zorbatypes/rchandle.h	2011-07-12 20:15:01 +0000
+++ src/zorbatypes/rchandle.h	2012-02-01 21:49:22 +0000
@@ -92,9 +92,9 @@
 
   long getRefCount() const { return theRefCount; }
 
-  long* getSharedRefCounter() const { ZORBA_FATAL(0, ""); return NULL; } 
+  //long* getSharedRefCounter() const { ZORBA_FATAL(0, ""); return NULL; } 
  
-  SYNC_CODE(RCLock* getRCLock() const { ZORBA_FATAL(0, ""); return NULL; });
+  //SYNC_CODE(RCLock* getRCLock() const { ZORBA_FATAL(0, ""); return NULL; });
 
   void addReference(long* sharedCounter SYNC_PARAM2(RCLock* lock)) const;
 

=== added file 'src/zorbatypes/rclist.h'
--- src/zorbatypes/rclist.h	1970-01-01 00:00:00 +0000
+++ src/zorbatypes/rclist.h	2012-02-01 21:49:22 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2006-2008 The FLWOR Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <list>
+#include "common/common.h"
+#include "zorbatypes/rchandle.h"
+#pragma once
+#ifndef ZORBA_REF_COUNTED_STD_LIST
+#define ZORBA_REF_COUNTED_STD_LIST
+
+namespace zorba
+{
+
+template <typename T>
+class rclist : public RCObject, public std::list<T>
+{
+  SYNC_CODE(mutable RCLock  lock;)
+public:
+  long* getSharedRefCounter() const { return NULL; }
+  SYNC_CODE(RCLock* getRCLock() const { return &lock; });
+};
+
+}//end namespace zorba
+
+#endif

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

Reply via email to