Merge lp:~zorba-coders/zorba/bug-943788 into lp:zorba

[Matthias Brantner]

fix for bug #943788 (streamable string is not seekable)

fix for bug #943788 (streamable string is not seekable)

[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/bug-943788-2012-03-01T04-09-09.503Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug-943788 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug-943788-2012-03-01T04-09-09.503Z 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

[lp:~zorba-coders/zorba/bug-943788]

10687. By Matthias Brantner on 2012-03-01

adapted old streamability2 test which makes streamability4 obsolete

10688. By Matthias Brantner on 2012-03-02

fix bug #945241 (StaticCollectionManager::declaredIndexes() and temporary indexes)

10689. By Matthias Brantner on 2012-03-02

fixed comment syntax

Unmerged revisions

=== modified file 'ChangeLog'
--- ChangeLog	2012-02-29 17:15:09 +0000
+++ ChangeLog	2012-03-01 15:40:43 +0000
@@ -51,6 +51,7 @@
   * Fixed bug #917981 (disallow declaring same module twice).
   * Added API method StaticContext::getNamespaceBindings() (see bug #905035)
   * Deprecated StaticContext:getNamespaceURIByPrefix()
+  * Fixed bug #943788 (streamable string is not seekable)
   * Fixed bug 921624 (slow queries with bogus example.com schema URIs)
   * Fixed bug #918211 (xqueryx fulltext w3c conformance generation)
   * Fixed bug #918157 (Add XQFTTS to validation queue)

=== modified file 'modules/org/expath/ns/file.xq.src/file.cpp'
--- modules/org/expath/ns/file.xq.src/file.cpp	2012-02-28 20:45:43 +0000
+++ modules/org/expath/ns/file.xq.src/file.cpp	2012-03-01 15:40:43 +0000
@@ -215,7 +215,7 @@
   }
   lFile->openInputStream(*lInStream.get(), false, true);
   lResult = theModule->getItemFactory()->createStreamableString(
-      *lInStream.release(), &FileModule::streamReleaser
+      *lInStream.release(), &FileModule::streamReleaser, true
     );
   return ItemSequence_t(new SingletonItemSequence(lResult));
 

=== modified file 'src/store/naive/atomic_items.cpp'
--- src/store/naive/atomic_items.cpp	2012-02-29 17:15:09 +0000
+++ src/store/naive/atomic_items.cpp	2012-03-01 15:40:43 +0000
@@ -1787,6 +1787,7 @@
     std::streambuf * pbuf;
     pbuf = theIstream.rdbuf();
     pbuf->pubseekoff(0, std::ios::beg);
+    theIstream.clear();
   }
   theIsConsumed = true;
   return theIstream;

=== added file 'test/rbkt/ExpQueryResults/zorba/file/streamability2.xml.res'
--- test/rbkt/ExpQueryResults/zorba/file/streamability2.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/file/streamability2.xml.res	2012-03-01 15:40:43 +0000
@@ -0,0 +1,2 @@
+sample
+ sample

=== modified file 'test/rbkt/Queries/zorba/file/streamability2.spec'
--- test/rbkt/Queries/zorba/file/streamability2.spec	2011-07-12 23:32:16 +0000
+++ test/rbkt/Queries/zorba/file/streamability2.spec	2012-03-01 15:40:43 +0000
@@ -1,4 +1,3 @@
 Args: 
 -x 
 rbktPath:=xs:string($RBKT_SRC_DIR)
-Error: http://www.zorba-xquery.com/errors:ZSTR0055