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

[Paul J. Lucas]

fixed bug #957580 (stream read failure in StringToCodepointsIteartor)

Fixed EOF handling.

[Paul J. Lucas (paul-lucas)]

review: Approve

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

10727. By Matthias Brantner on 2012-03-19

added test for bug #957580 + ChangeLog fixes

[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-957580-2012-03-19T17-15-59.922Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-957580-2012-03-19T17-15-59.922Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2012-03-14 15:28:15 +0000
+++ ChangeLog	2012-03-19 17:07:21 +0000
@@ -41,13 +41,14 @@
     of the annotations map in expressions.
 
 Bug Fixes/Other Changes:
-  * Fixed bug 923015 (clone() not implemented for full-text expressions)
-  * Fixed bug 917923 (bug in copying outer var values into the eval dynamic context)
-  * Fixed bug 867509 (Can not handle largest xs:unsignedLong values)
-  * Fixed bug 924063 (sentence is incorrectly incremented when token characters end without sentence terminator)
-  * Fixed bug 909126 (bug in cloning of var_expr)
+  * Fixed bug #923015 (clone() not implemented for full-text expressions)
+  * Fixed bug #917923 (bug in copying outer var values into the eval dynamic context)
+  * Fixed bug #867509 (Can not handle largest xs:unsignedLong values)
+  * Fixed bug #924063 (sentence is incorrectly incremented when token characters end without sentence terminator)
+  * Fixed bug #909126 (bug in cloning of var_expr)
   * Fixed bug in destruction of exit_catcher_expr
   * Fixed bug #867024 (error messages)
+  * Fixed bug #957580 (stream read failure in StringToCodepointsIteartor)
   * Fixed bug #911585 (management of variables during eval)
   * Fixed bug #866423 (fn:empty and fn:exists iterators must reset their input in
     case of early-out)
@@ -65,13 +66,13 @@
   * Fixed bug #917981 (disallow declaring same module twice).
   * Deprecated StaticContext:getNamespaceURIByPrefix()
   * Fixed bug #943788 (streamable string is not seekable)
-  * Fixed bug 921624 (slow queries with bogus example.com schema URIs)
+  * 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)
   * Fixed bug with unversioned modules with C++ external functions
   * Fixed bug #912579 (validate-in-place on non-root elements)
   * Fixed bug #891209 (validation with xsi:type returns untyped)
-  * Fixed bug 952829 (Nondeterministic annotation doesn't seem to be checked)
+  * Fixed bug #952829 (Nondeterministic annotation doesn't seem to be checked)
   * Fixed bug #951772 (Comment node crashes serialization)
   * Fixed bug #945241 (StaticCollectionManager::declaredIndexes() and temporary indexes)
 
 
=== modified file 'src/runtime/spec/strings/strings.xml'
--- src/runtime/spec/strings/strings.xml	2012-01-18 13:57:48 +0000
+++ src/runtime/spec/strings/strings.xml	2012-03-19 17:07:21 +0000
@@ -59,6 +59,7 @@
     <zorba:member type="checked_vector&lt;xs_unsignedInt&gt;" name="theResult"
       brief="the resulting vector"/>
     <zorba:member type="std::istream*" name="theStream" />
+    <zorba:member type="store::Item_t" name="theStreamItem" />
   </zorba:state>
 
 </zorba:iterator>
 
=== modified file 'src/runtime/strings/pregenerated/strings.h'
--- src/runtime/strings/pregenerated/strings.h	2012-01-18 13:57:48 +0000
+++ src/runtime/strings/pregenerated/strings.h	2012-03-19 17:07:21 +0000
@@ -83,6 +83,7 @@
   xs_unsignedInt theIterator; //the current iterator
   checked_vector<xs_unsignedInt> theResult; //the resulting vector
   std::istream* theStream; //
+  store::Item_t theStreamItem; //
 
   StringToCodepointsIteratorState();
 
 
=== modified file 'src/runtime/strings/strings_impl.cpp'
--- src/runtime/strings/strings_impl.cpp	2012-02-29 11:10:30 +0000
+++ src/runtime/strings/strings_impl.cpp	2012-03-19 17:07:21 +0000
@@ -126,13 +126,14 @@
     }
     else
     {
+      state->theStreamItem = item;
       state->theStream = &item->getStream();
     }
   }
 
   if ( state->theStream )
   {
-    while ( !state->theStream->eof() )
+    while ( true )
     {
       utf8::encoded_char_type ec;
       memset( ec, 0, sizeof( ec ) );
@@ -141,6 +142,8 @@
 
       if ( utf8::read( *state->theStream, ec ) == utf8::npos )
       {
+        if ( state->theStream->eof() )
+          break;
         if ( state->theStream->good() ) {
           //
           // If read() failed but the stream state is good, it means that an
@@ -212,6 +215,7 @@
   PlanIteratorState::reset(planState);
   theIterator = 0;
   theResult.clear();
+  theStreamItem = 0;
 }
 
 
 
=== added file 'test/rbkt/ExpQueryResults/zorba/string/StringToCodepointFunc/StringToCodepointFunc4.xml.res'
--- test/rbkt/ExpQueryResults/zorba/string/StringToCodepointFunc/StringToCodepointFunc4.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/string/StringToCodepointFunc/StringToCodepointFunc4.xml.res	2012-03-19 17:07:21 +0000
@@ -0,0 +1,1 @@
[phone] 62 109 121 86 97 108 117 101 60 47 110 111 100 101 62
 
=== added file 'test/rbkt/Queries/zorba/string/StringToCodepointFunc/StringToCodepointFunc4.xq'
--- test/rbkt/Queries/zorba/string/StringToCodepointFunc/StringToCodepointFunc4.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/string/StringToCodepointFunc/StringToCodepointFunc4.xq	2012-03-19 17:07:21 +0000
@@ -0,0 +1,10 @@
+let $n := <root><node>myValue</node></root>
+let $v := fn:serialize(
+          $n/child::node(),
+          <output:serialization-parameters
+            xmlns:output="http://www.w3.org/2010/xslt-xquery-serialization">
+            <output:method value="xml"/>
+            <output:omit-xml-declaration value="yes"/>
+            <output:version value="1.0"/>
+          </output:serialization-parameters>)
+return fn:string-to-codepoints($v)