Merge lp:~nbrinza/zorba/bugs2 into lp:zorba

[Nicolae Brinza]

More datetime/duration fixes.

More datetime/duration fixes.

[Nicolae Brinza (nbrinza)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-08T21-02-54.335Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~nbrinza/zorba/bugs2 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bugs2-2013-04-08T21-02-54.335Z is finished. The final
  status was:

  30 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-08T21-34-55.846Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bugs2-2013-04-08T21-34-55.846Z 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, 1 Pending.

[Nicolae Brinza (nbrinza)]

review: Approve

[Chris Hillery (ceejatec)]

review: Approve

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

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

text conflict in test/fots/CMakeLists.txt

[lp:~nbrinza/zorba/bugs2]

11025. By Nicolae Brinza on 2013-04-10

Merged with Zorba trunk

[Nicolae Brinza (nbrinza)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-10T06-19-42.473Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bugs2-2013-04-10T06-19-42.473Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/runtime/core/arithmetic_impl.cpp'
--- src/runtime/core/arithmetic_impl.cpp	2013-04-01 21:52:20 +0000
+++ src/runtime/core/arithmetic_impl.cpp	2013-04-10 05:51:22 +0000
@@ -260,7 +260,13 @@
              compute<store::XS_DATETIME,store::XS_DATETIME>
              (result, dctx, tm, &aLoc, n0, n1);
     }
-    else if (TypeOps::is_subtype(tm, *type1, *rtm.DURATION_TYPE_ONE ))
+    else if (TypeOps::is_subtype(tm, *type1, *rtm.YM_DURATION_TYPE_ONE ))
+    {
+      return Operation::template
+             compute<store::XS_DATETIME,store::XS_DURATION>
+            (result, dctx, tm, &aLoc, n0, n1);
+    }
+    else if (TypeOps::is_subtype(tm, *type1, *rtm.DT_DURATION_TYPE_ONE ))
     {
       return Operation::template
              compute<store::XS_DATETIME,store::XS_DURATION>
@@ -275,7 +281,13 @@
              compute<store::XS_DATE,store::XS_DATE>
              (result, dctx, tm, &aLoc, n0, n1);
     }
-    else if (TypeOps::is_subtype(tm, *type1, *rtm.DURATION_TYPE_ONE))
+    else if (TypeOps::is_subtype(tm, *type1, *rtm.YM_DURATION_TYPE_ONE))
+    {
+      return Operation::template
+             compute<store::XS_DATE,store::XS_DURATION>
+             (result, dctx, tm, &aLoc, n0, n1);
+    }
+    else if (TypeOps::is_subtype(tm, *type1, *rtm.DT_DURATION_TYPE_ONE))
     {
       return Operation::template
              compute<store::XS_DATE,store::XS_DURATION>
@@ -732,7 +744,10 @@
   const store::Item* i0,
   const store::Item* i1 )
 {
-  xs_decimal d = i0->getYearMonthDurationValue() / i1->getYearMonthDurationValue();
+  xs_yearMonthDuration otherYMDuration = i1->getYearMonthDurationValue();
+  if (otherYMDuration.isZero())
+    throw XQUERY_EXCEPTION( err::FOAR0001, ERROR_LOC( loc ) );  
+  xs_decimal d = i0->getYearMonthDurationValue() / otherYMDuration;
   return GENV_ITEMFACTORY->createDecimal(result, d);
 }
 
@@ -746,8 +761,10 @@
     const store::Item* i0,
     const store::Item* i1 )
 {
-  xs_decimal d = i0->getDayTimeDurationValue() / i1->getDayTimeDurationValue();
-
+  xs_dayTimeDuration otherDTDuration = i1->getDayTimeDurationValue();
+  if (otherDTDuration.isZero())  
+      throw XQUERY_EXCEPTION( err::FOAR0001, ERROR_LOC(loc));
+  xs_decimal d = i0->getDayTimeDurationValue() / otherDTDuration;
   return GENV_ITEMFACTORY->createDecimal(result, d);
 }
 
 
=== modified file 'src/zorbatypes/datetime/duration.cpp'
--- src/zorbatypes/datetime/duration.cpp	2013-04-02 20:15:53 +0000
+++ src/zorbatypes/datetime/duration.cpp	2013-04-10 05:51:22 +0000
@@ -817,7 +817,9 @@
 
 
 Decimal Duration::operator/(const Duration& d) const
-{
+{ 
+  if (d.isZero())
+    XQUERY_EXCEPTION(err::FOAR0001);    
   return Decimal( getTotalSeconds() ) / Decimal( d.getTotalSeconds() );
 }
 
 
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-04-09 23:40:45 +0000
+++ test/fots/CMakeLists.txt	2013-04-10 05:51:22 +0000
@@ -260,7 +260,6 @@
 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-053 0)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-054 0)
 EXPECTED_FOTS_FAILURE (math-acos math-acos-003 0)
-EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes FOAR0001_9 0)
 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0085 0)
 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0093a 0)
 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQTY0086_3 0)
@@ -275,15 +274,6 @@
 EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-11 0)
 EXPECTED_FOTS_FAILURE (misc-XMLEdition XML10-4ed-Excluded-char-1 0)
 EXPECTED_FOTS_FAILURE (misc-XMLEdition XML11-1ed-Included-char-1 0)
-EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-002 0)
-EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-004 0)
-EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-006 0)
-EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-008 0)
-EXPECTED_FOTS_FAILURE (op-divide-yearMonthDuration-by-yearMonthDuration cbcl-divide-yearMonthDuration-by-yearMonthDuration-001 0)
-EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDurations cbcl-minus-002 0)
-EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDurations cbcl-minus-004 0)
-EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDurations cbcl-minus-006 0)
-EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDurations cbcl-minus-008 0)
 EXPECTED_FOTS_FAILURE (prod-AllowingEmpty outer-013 0)
 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0)
 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-26 0)