Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-960083 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-960083 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-960083 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 -- https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-960083 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-960083-2012-06-14T10-19-56.929Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-960083 into lp:zorba
Validation queue job bug-960083-2012-06-14T10-19-56.929Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-960083 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-960083 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 -- https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-960083 into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/bug-960083
into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326
fixed bug 960083$ (improper error handling of NaN comparisons) + small
optimization of comparison operations
--
https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/booleans/BooleanImpl.cpp'
--- src/runtime/booleans/BooleanImpl.cpp 2012-05-03 12:31:51 +
+++ src/runtime/booleans/BooleanImpl.cpp 2012-06-01 12:05:28 +
@@ -443,11 +443,8 @@
theCollation)),
state);
- if (consumeNext(item0, theChild0.getp(), planState) ||
- consumeNext(item1, theChild1.getp(), planState))
- {
-RAISE_ERROR(err::XPTY0004, loc, ERROR_PARAMS(ZED(NoSeqInValueComp)));
- }
+ assert(!consumeNext(item0, theChild0.getp(), planState)
+ !consumeNext(item1, theChild1.getp(), planState));
}
}
@@ -501,10 +498,11 @@
}
}
}
- catch (ZorbaException const e)
+ catch (const ZorbaException e)
{
if (e.diagnostic() == zerr::ZSTR0041_NAN_COMPARISON)
return false;
+
throw;
}
}
@@ -665,7 +663,7 @@
}
}
}
- catch (ZorbaException const e)
+ catch (const ZorbaException e)
{
if (e.diagnostic() == zerr::ZSTR0041_NAN_COMPARISON)
return false;
@@ -943,7 +941,7 @@
}
}
}
- catch(ZorbaException const e)
+ catch(const ZorbaException e)
{
// For example, two QName items do not have an order relationship.
if (e.diagnostic() == zerr::ZSTR0040_TYPE_ERROR)
@@ -954,6 +952,7 @@
RAISE_ERROR(err::XPTY0004, loc,
ERROR_PARAMS(ZED(BadType_23o), *type0, ZED(NoCompareWithType_4), *type1));
}
+
throw;
}
}
@@ -1001,7 +1000,6 @@
store::Item_t lItem0, lItem1;
bool bRes;
bool neq = false;
- bool nonempty = false;
long cmp;
PlanIteratorState* state;
@@ -1009,8 +1007,6 @@
if (CONSUME(lItem0, 0) CONSUME(lItem1, 1))
{
-nonempty = true;
-
switch (theCompType)
{
case CompareConsts::VALUE_NOT_EQUAL:
@@ -1027,39 +1023,41 @@
default:
{
- cmp = lItem0-compare(lItem1, theTimezone, theCollation);
+ try
+ {
+cmp = lItem0-compare(lItem1, theTimezone, theCollation);
- switch (theCompType)
+switch (theCompType)
+{
+case CompareConsts::VALUE_LESS:
+ bRes = (cmp 0);
+ break;
+case CompareConsts::VALUE_GREATER:
+ bRes = (cmp 0);
+ break;
+case CompareConsts::VALUE_LESS_EQUAL:
+ bRes = (cmp = 0);
+ break;
+case CompareConsts::VALUE_GREATER_EQUAL:
+ bRes = (cmp = 0);
+ break;
+default:
+ ZORBA_ASSERT(false);
+} // switch (theCompType)
+ }
+ catch (const ZorbaException e)
{
- case CompareConsts::VALUE_LESS:
-bRes = (cmp 0);
-break;
- case CompareConsts::VALUE_GREATER:
-bRes = (cmp 0);
-break;
- case CompareConsts::VALUE_LESS_EQUAL:
-bRes = (cmp = 0);
-break;
- case CompareConsts::VALUE_GREATER_EQUAL:
-bRes = (cmp = 0);
-break;
- default:
-ZORBA_ASSERT(false);
- } // switch (theCompType)
+if (e.diagnostic() == zerr::ZSTR0041_NAN_COMPARISON)
+ bRes = false;
+else
+ throw;
+ }
} // default
} // switch (theCompType)
-if (nonempty)
- STACK_PUSH(GENV_ITEMFACTORY-createBoolean(result, bRes), state);
+STACK_PUSH(GENV_ITEMFACTORY-createBoolean(result, bRes), state);
-if (CONSUME(lItem0, 0) || CONSUME(lItem1, 1))
-{
- throw XQUERY_EXCEPTION(
-err::XPTY0004,
-ERROR_PARAMS( ZED( NoSeqInValueComp ) ),
-ERROR_LOC( this-loc )
- );
-}
+assert(!CONSUME(lItem0, 0) !CONSUME(lItem1, 1));
}
STACK_END(state);
=== modified file 'src/runtime/indexing/index_ddl.cpp'
--- src/runtime/indexing/index_ddl.cpp 2012-05-11 22:49:47 +
+++ src/runtime/indexing/index_ddl.cpp 2012-06-01 12:05:28 +
@@ -713,9 +713,9 @@
STACK_END(state);
}
- catch (XQueryException e)
+ catch (ZorbaException e)
{
-set_source( e, loc, false );
+set_source(e, loc, false);
throw;
}
}
@@ -822,12 +822,10 @@
numChildren != 2)
{
RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc,
-ERROR_PARAMS(
- qnameItem-getStringValue(),
- index,
- numChildren-1,
- state-theIndexDecl-getKeyExpressions().size())
-);
+ERROR_PARAMS(qnameItem-getStringValue(),
+ index,
+ numChildren-1,
+
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-960083 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-960083 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 -- https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-960083 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-960083-2012-06-01T12-24-03.535Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-960083 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-960083 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-960083-2012-06-01T12-24-03.535Z 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 -- https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-960083 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-960083 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 -- https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-960083 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-960083 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 -- https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-960083 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-960083-2012-06-01T13-46-04.963Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-960083 into lp:zorba
Validation queue job bug-960083-2012-06-01T13-46-04.963Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-960083 into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-960083 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-960083 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 -- https://code.launchpad.net/~zorba-coders/zorba/bug-960083/+merge/108326 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
