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

[Paul J. Lucas]

Fixed for large sequences.

Fixed for large sequences.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1083006-2013-05-08T14-22-44.359Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1083006-2013-05-08T14-22-44.359Z 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, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Attempt to merge into lp:zorba failed due to conflicts:

text conflict in ChangeLog

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

11443. By Paul J. Lucas on 2013-05-08

Merge from trunk.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1083006-2013-05-08T20-49-43.652Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1083006-2013-05-08T20-49-43.652Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2013-05-08 20:14:47 +0000
+++ ChangeLog	2013-05-08 20:43:36 +0000
@@ -50,6 +50,7 @@
   * Fixed bug #1102997 (Swapping referenced nodes)
   * Fixed bug #1169908 (Zorba hangs with invalid utf-8 input)
   * Fixed bug #1111487 (Swapping nodes that are in collections)
+  * Fixed bug #1083006 (subsequence: large input values)
   * Fixed bug #1123836 (overflows in date/time casts now return FODT0001 and
     in durations return FODT0002)
   * Fixed bug #1147518 (fn:round-half-to-even (at least 11 failures))

=== modified file 'src/runtime/sequences/sequences_impl.cpp'
--- src/runtime/sequences/sequences_impl.cpp	2013-05-03 14:12:53 +0000
+++ src/runtime/sequences/sequences_impl.cpp	2013-05-08 20:43:36 +0000
@@ -471,9 +471,8 @@
 
 bool FnSubsequenceIterator::nextImpl(store::Item_t& result, PlanState& planState) const
 {
-  store::Item_t startPosItem;
+  store::Item_t item;
   xs_long startPos;
-  store::Item_t lengthItem;
   xs_double startPosDouble; 
   xs_double lengthDouble;
 
@@ -482,8 +481,8 @@
 
   state->theIsChildReset = false;
   
-  CONSUME(startPosItem, 1);
-  startPosDouble = startPosItem->getDoubleValue();
+  CONSUME(item, 1);
+  startPosDouble = item->getDoubleValue();
 
   //If starting position is set to +INF return empty sequence
   if (startPosDouble.isPosInf() || startPosDouble.isNaN())
@@ -495,26 +494,37 @@
 
   if (theChildren.size() == 3)
   {
-    CONSUME(lengthItem, 2);
-    lengthDouble = lengthItem->getDoubleValue();
-    if (lengthDouble.isPosInf())
-    {
-      //if startPos is -INF and length is +INF return empty sequence because -INF + INF = NaN
-      if (startPosDouble.isNegInf())
+    CONSUME(item, 2);
+    lengthDouble = item->getDoubleValue();
+    if ( lengthDouble.isPosInf() ) {
+      if ( startPosDouble.isNegInf() ) {
+        //
+        // XQuery F&0 3.0 14.1.9: ... if $startingLoc is -INF and $length is
+        // +INF, then fn:round($startingLoc) + fn:round($length) is NaN; since
+        // position() lt NaN is always false, the result is an empty sequence.
+        //
         goto done;
+      }
 
       state->theRemaining = 1;
     }
     else
+    {
       state->theRemaining =
         static_cast<xs_long>(lengthDouble.round().getNumber());
+      if ( state->theRemaining < 0 && lengthDouble > 0 ) {
+        // overflow happened
+        state->theRemaining = numeric_limits<xs_long>::max();
+      }
+    }
   }
 
   if (startPos < 1)
   {
-    if (theChildren.size() >= 3)
+    if ( theChildren.size() == 3 &&
+         state->theRemaining != numeric_limits<xs_long>::max() ) {
       state->theRemaining += startPos - 1;
-
+    }
     startPos = 0;
   }