Merge lp:~zorba-coders/zorba/fnserialize into lp:zorba

[Matthias Brantner]

fn:serialize avoids copying the result but returns a streamable string instead

fn:serialize avoids copying the result but returns a streamable string instead

[Matthias Brantner (matthias-brantner)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fnserialize-2012-01-20T22-20-00.394Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job fnserialize-2012-01-20T22-20-00.394Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve, 1 Pending.

[Till Westmann (tillw)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fnserialize-2012-01-20T23-40-03.054Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job fnserialize-2012-01-20T23-40-03.054Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp'
--- src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp	2011-08-10 02:50:23 +0000
+++ src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp	2012-01-20 22:06:28 +0000
@@ -122,12 +122,16 @@
 /*******************************************************************************
   14.9.2 fn:serialize
 ********************************************************************************/
+void
+FnSerializeIterator::streamReleaser(std::istream* s)
+{
+  delete s;
+}
+
 bool
 FnSerializeIterator::nextImpl(store::Item_t& aResult, PlanState& aPlanState) const
 {
   store::Item_t lParams;
-  std::stringstream lResultStream;
-  zstring lResult;
 
   PlanIteratorState* lState;
   DEFAULT_STACK_INIT(PlanIteratorState, lState, aPlanState);
@@ -254,12 +258,15 @@
       lElemIter->close();
     }
 
-    // and now serialize
-    lSerializer.serialize(lIterWrapper, lResultStream);
-    lResult = lResultStream.str();
+    {
+      // and now serialize
+      std::auto_ptr<std::stringstream> lResultStream(new std::stringstream());
+      lSerializer.serialize(lIterWrapper, *lResultStream.get());
+      GENV_ITEMFACTORY->createStreamableString(aResult, *lResultStream.release(), FnSerializeIterator::streamReleaser, true);
+    }
   }
+  STACK_PUSH(true, lState);
 
-  STACK_PUSH(GENV_ITEMFACTORY->createString(aResult, lResult), lState);
   STACK_END (lState);
 }
 

=== modified file 'src/runtime/parsing_and_serializing/pregenerated/parsing_and_serializing.h'
--- src/runtime/parsing_and_serializing/pregenerated/parsing_and_serializing.h	2011-10-19 15:28:51 +0000
+++ src/runtime/parsing_and_serializing/pregenerated/parsing_and_serializing.h	2012-01-20 22:06:28 +0000
@@ -95,6 +95,8 @@
 
   virtual ~FnSerializeIterator();
 
+public:
+  static void streamReleaser(std::istream* stream);
   void accept(PlanIterVisitor& v) const;
 
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;

=== modified file 'src/runtime/spec/parsing_and_serializing/parsing_and_serializing.xml'
--- src/runtime/spec/parsing_and_serializing/parsing_and_serializing.xml	2012-01-11 17:30:25 +0000
+++ src/runtime/spec/parsing_and_serializing/parsing_and_serializing.xml	2012-01-20 22:06:28 +0000
@@ -74,6 +74,10 @@
 
     </zorba:function>
 
+    <zorba:method static="true" name="streamReleaser" return="void">
+      <zorba:param type="std::istream*" name="stream"/>
+    </zorba:method>
+
   </zorba:iterator>
   
 </zorba:iterators>