[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1180633 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1180633 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 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-1180633 into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 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-1180633 into lp:zorba
Validation queue job bug-1180633-2013-05-16T22-21-57.29Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 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-1180633 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1180633-2013-05-16T22-21-57.29Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 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-1180633 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1180633 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 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/bug1167400-valType into lp:zorba
Review: Approve Approve. This merge depends on https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module/+merge/164269 -- https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 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/schema-tools-module into lp:zorba/schema-tools-module
The proposal to merge lp:~zorba-coders/zorba/schema-tools-module into lp:zorba/schema-tools-module has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module/+merge/164269 -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module/+merge/164269 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- 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/schema-tools-module into lp:zorba/schema-tools-module
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. -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module/+merge/164269 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- 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/schema-tools-module into lp:zorba/schema-tools-module
Validation queue job schema-tools-module-2013-05-16T21-25-44.074Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module/+merge/164269 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- 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/schema-tools-module into lp:zorba/schema-tools-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/schema-tools-module-2013-05-16T21-25-44.074Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module/+merge/164269 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- 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/schema-tools-module into lp:zorba/schema-tools-module
The proposal to merge lp:~zorba-coders/zorba/schema-tools-module into lp:zorba/schema-tools-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module/+merge/164269 -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module/+merge/164269 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- 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/schema-tools-module into lp:zorba/schema-tools-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module/+merge/164269 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- 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/schema-tools-module into lp:zorba/schema-tools-module
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/schema-tools-module into lp:zorba/schema-tools-module. Commit message: Added alternate result such that the fixes in merge #160990 can go through. Requested reviews: Cezar Andrei (cezar-andrei) Sorin Marian Nasoi (sorin.marian.nasoi) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module/+merge/164269 -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module/+merge/164269 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. === modified file 'test/Queries/schema-tools/inst2xsd-err1-badOpt.spec' --- test/Queries/schema-tools/inst2xsd-err1-badOpt.spec 2012-02-22 21:50:57 + +++ test/Queries/schema-tools/inst2xsd-err1-badOpt.spec 2013-05-16 21:25:28 + @@ -1,1 +1,2 @@ Error: http://www.w3.org/2005/xqt-errors:FORG0001 +Error: http://www.w3.org/2005/xqt-errors:XQDY0027 -- 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/prune-rbkt into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/prune-rbkt into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 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/prune-rbkt into lp:zorba
Validation queue job prune-rbkt-2013-05-16T20-29-09.958Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 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/prune-rbkt into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/prune-rbkt-2013-05-16T20-29-09.958Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 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/bug1167400-valType into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1167400-valType into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 -- https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 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/prune-rbkt into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/prune-rbkt into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 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/bug1167400-valType into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1167400-valType 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 bug1167400-valType-2013-05-16T20-02-14.971Z 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/bug1167400-valType/+merge/160990 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/bug1167400-valType into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1167400-valType-2013-05-16T20-02-14.971Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 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/bug1167400-valType into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1167400-valType into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 -- https://code.launchpad.net/~zorba-coders/zorba/bug1167400-valType/+merge/160990 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-1180633 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1180633 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 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-1180633 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-1180633 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 bug-1180633-2013-05-16T19-10-53.47Z is finished. The final status was: 3 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-1180633/+merge/164242 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-1180633 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1180633-2013-05-16T19-10-53.47Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 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-1180633 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1180633 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 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-1180633 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1180633 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 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-1180633 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-1180633 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 bug-1180633-2013-05-16T18-43-00.263Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 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/winfix into lp:zorba
Validation queue job winfix-2013-05-16T17-57-53.824Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/winfix/+merge/164239 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-1180633 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1180633-2013-05-16T18-43-00.263Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 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-1180633 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1180633 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 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-1180633 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242 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/new-exec into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-exec into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-exec/+merge/164166 -- https://code.launchpad.net/~zorba-coders/zorba/new-exec/+merge/164166 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-1180633 into lp:zorba
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-1180633 into
lp:zorba.
Commit message:
Now using proper types for xs:integer and friends.
Requested reviews:
Paul J. Lucas (paul-lucas)
Related bugs:
Bug #1180633 in Zorba: "Add full support for xs:integer derived types, e.g.,
xs:positiveInteger"
https://bugs.launchpad.net/zorba/+bug/1180633
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242
Now using proper types for xs:integer and friends.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1180633/+merge/164242
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/api/item_factory.h'
--- src/store/api/item_factory.h 2013-03-27 20:01:19 +
+++ src/store/api/item_factory.h 2013-05-16 18:29:30 +
@@ -320,13 +320,13 @@
* Specification: [http://www.w3.org/TR/xmlschema-2/#nonPositiveInteger]
* @param value
*/
- virtual bool createNonPositiveInteger(Item_t& result, const xs_integer& value) = 0;
+ virtual bool createNonPositiveInteger(Item_t& result, const xs_nonPositiveInteger& value) = 0;
/**
* Specification: [http://www.w3.org/TR/xmlschema-2/#negativeInteger]
* @param value
*/
- virtual bool createNegativeInteger(Item_t& result, const xs_integer& value) = 0;
+ virtual bool createNegativeInteger(Item_t& result, const xs_negativeInteger& value) = 0;
/**
* Specification: [http://www.w3.org/TR/xmlschema-2/#long]
=== modified file 'src/store/naive/atomic_items.cpp'
--- src/store/naive/atomic_items.cpp 2013-05-09 00:21:51 +
+++ src/store/naive/atomic_items.cpp 2013-05-16 18:29:30 +
@@ -2691,7 +2691,7 @@
bool DecimalItem::getEBV() const
{
- return !!theValue.sign();
+ return !!theValue;
}
@@ -2732,379 +2732,140 @@
class IntegerItemImpl
/
-#ifdef ZORBA_WITH_BIG_INTEGER
-size_t IntegerItemImpl::alloc_size() const
-{
- return IntegerItem::alloc_size() + ztd::alloc_sizeof( theValue );
-}
-#endif /* ZORBA_WITH_BIG_INTEGER */
-
-size_t IntegerItemImpl::dynamic_size() const
-{
- return sizeof( *this );
-}
-
-
-long IntegerItemImpl::compare(Item const* other, long, const XQPCollator*) const
-{
- try
- {
-return theValue.compare(other->getIntegerValue());
- }
- catch (ZorbaException const& )
- {
-return getDecimalValue().compare(other->getDecimalValue());
- }
-}
-
-
-xs_decimal IntegerItemImpl::getDecimalValue() const
-{
- return xs_decimal(theValue);
-}
-
-
-xs_long IntegerItemImpl::getLongValue() const
-{
- try
- {
-return to_xs_long(theValue);
- }
- catch ( std::range_error const& )
- {
-RAISE_ERROR_NO_LOC(err::FORG0001,
-ERROR_PARAMS(ZED(FORG0001_NoCastTo_234),
- getStringValue(),
- "xs:integer",
- "xs:long"));
- }
-}
-
-
-xs_unsignedInt IntegerItemImpl::getUnsignedIntValue() const
-{
- try
- {
-return to_xs_unsignedInt(theValue);
- }
- catch ( std::range_error const& )
- {
-RAISE_ERROR_NO_LOC(err::FORG0001,
-ERROR_PARAMS(ZED(FORG0001_NoCastTo_234),
- getStringValue(),
- "xs:integer",
- "xs:unsignedInt"));
- }
-}
-
-
-store::Item* IntegerItemImpl::getType() const
-{
- return GET_STORE().theSchemaTypeNames[store::XS_INTEGER];
-}
-
-
-bool IntegerItemImpl::getEBV() const
-{
- return !!theValue.sign();
-}
-
-
-zstring IntegerItemImpl::getStringValue() const
-{
- return theValue.toString();
-}
-
-
-void IntegerItemImpl::getStringValue2(zstring& val) const
-{
- val = theValue.toString();
-}
-
-uint32_t IntegerItemImpl::hash(long, const XQPCollator*) const
-{
- return theValue.hash();
-}
-
-
-void IntegerItemImpl::appendStringValue(zstring& buf) const
-{
- buf += theValue.toString();
-}
-
-
-zstring IntegerItemImpl::show() const
-{
- zstring res("xs:integer(");
- appendStringValue(res);
- res += ")";
- return res;
-}
-
-
-/***
- class NonPositiveIntegerItem
-/
-
-#ifdef ZORBA_WITH_BIG_INTEGER
-size_t NonPositiveIntegerItem::alloc_size() const
-{
- return IntegerItem::alloc_size() + ztd::alloc_sizeof( theValue );
-}
-#endif /* ZORBA_WITH_BIG_INTEGER */
-
-size_t NonPositiveIntegerItem::dynamic_size() const
-{
- return sizeof( *this );
-}
-
-
-long NonPositiveIntegerItem::compare(Item const* other, long, const XQPCollator*) const
-{
- try
- {
-return theValue.compare(other->getIntegerValue());
- }
- catch (ZorbaException const&)
- {
-return getDecimalValue().compare(other->getDecimalValue());
- }
-}
-
-
-bool NonPositiveIntegerItem::equals(
-const store::Item* other,
-long,
-const XQPCollator* ) const
-{
- try
- {
-return theValue == other->getIntegerValue();
- }
- catch (ZorbaException const&)
- {
-return getDecimalValue()
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/winfix into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/winfix into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/winfix/+merge/164239 -- https://code.launchpad.net/~zorba-coders/zorba/winfix/+merge/164239 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/winfix into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/winfix-2013-05-16T17-57-53.824Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/winfix/+merge/164239 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/new-exec into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-exec into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-exec/+merge/164166 -- https://code.launchpad.net/~zorba-coders/zorba/new-exec/+merge/164166 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/new-exec into lp:zorba
Validation queue job new-exec-2013-05-16T17-31-37.755Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/new-exec/+merge/164166 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/winfix into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/winfix into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/winfix/+merge/164239 -- https://code.launchpad.net/~zorba-coders/zorba/winfix/+merge/164239 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/winfix into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/winfix/+merge/164239 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/winfix into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/winfix/+merge/164239 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/winfix into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/winfix into lp:zorba.
Commit message:
Windows fix for src/util/stl_util.h
Requested reviews:
Juan Zacarias (juan457)
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/winfix/+merge/164239
Windows fix for src/util/stl_util.h
--
https://code.launchpad.net/~zorba-coders/zorba/winfix/+merge/164239
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/util/stl_util.h'
--- src/util/stl_util.h 2013-05-09 00:21:51 +
+++ src/util/stl_util.h 2013-05-16 17:42:32 +
@@ -421,10 +421,7 @@
return true;
}
-inline std::enable_if::value
- && !ZORBA_TR1_NS::is_unsigned::value,
- bool>::type
-ge0( char c ) {
+inline bool ge0( char c ) {
return c >= 0;
}
@@ -440,10 +437,7 @@
return false;
}
-inline std::enable_if::value
- && !ZORBA_TR1_NS::is_unsigned::value,
- bool>::type
-lt0( char c ) {
+inline bool lt0( char c ) {
return c < 0;
}
--
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/new-exec into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/new-exec-2013-05-16T17-31-37.755Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/new-exec/+merge/164166 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/prune-rbkt into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 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/new-exec into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/new-exec/+merge/164166 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/164062 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/164062 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-05-16T17-01-49.255Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/164062 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-05-16T17-01-49.255Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/164062 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/164062 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/164062 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/164062 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/new-exec into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-exec into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-exec/+merge/164166 -- https://code.launchpad.net/~zorba-coders/zorba/new-exec/+merge/164166 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/new-exec into lp:zorba
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. -- https://code.launchpad.net/~zorba-coders/zorba/new-exec/+merge/164166 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/new-exec into lp:zorba
Validation queue job new-exec-2013-05-16T11-56-05.465Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/new-exec/+merge/164166 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/new-exec into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/new-exec-2013-05-16T11-56-05.465Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/new-exec/+merge/164166 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/new-exec into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-exec into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-exec/+merge/164166 -- https://code.launchpad.net/~zorba-coders/zorba/new-exec/+merge/164166 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/new-exec into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/new-exec/+merge/164166 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/new-exec into lp:zorba
Nicolae Brinza has proposed merging lp:~zorba-coders/zorba/new-exec into lp:zorba. Commit message: Modified files that use the process module to request version 1.0, in preparation of the new version of the module. Requested reviews: Nicolae Brinza (nbrinza) Matthias Brantner (matthias-brantner) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-exec/+merge/164166 Modified files that use the process module to request version 1.0, in preparation of the new version of the module. -- https://code.launchpad.net/~zorba-coders/zorba/new-exec/+merge/164166 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'test/fots_driver/tools/process.xq' --- test/fots_driver/tools/process.xq 2013-02-25 15:39:39 + +++ test/fots_driver/tools/process.xq 2013-05-16 11:54:46 + @@ -23,7 +23,7 @@ import module namespace proc = - "http://www.zorba-xquery.com/modules/process";; + "http://www.zorba-xquery.com/modules/process#1.0";; import module namespace util = "http://www.zorba-xquery.com/fots-driver/util"; at "../util.xq"; import module namespace d = === modified file 'test/zperf/src/start.xq' --- test/zperf/src/start.xq 2013-02-07 17:24:36 + +++ test/zperf/src/start.xq 2013-05-16 11:54:46 + @@ -17,7 +17,7 @@ (: XQuery main module :) import module namespace file="http://expath.org/ns/file";; -import module namespace proc="http://www.zorba-xquery.com/modules/process";; +import module namespace proc="http://www.zorba-xquery.com/modules/process#1.0";; import module namespace tims="http://www.example.com/timings"; at "timings.xq"; import module namespace sys ="http://www.zorba-xquery.com/modules/system";; import module namespace http="http://expath.org/ns/http-client";; -- 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/gen-flwor-opt into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850 -- https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850 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/gen-flwor-opt into lp:zorba
Validation queue job gen-flwor-opt-2013-05-16T10-58-07.097Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850 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/gen-flwor-opt into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/gen-flwor-opt-2013-05-16T10-58-07.097Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850 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/gen-flwor-opt into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850 -- https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850 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/gen-flwor-opt into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850 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/prune-rbkt into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 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/prune-rbkt into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/prune-rbkt into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/prune-rbkt into 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/prune-rbkt into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/prune-rbkt into 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/prune-rbkt into lp:zorba
Validation queue job prune-rbkt-2013-05-16T09-22-43.725Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/prune-rbkt into 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/prune-rbkt into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/prune-rbkt-2013-05-16T09-22-43.725Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/prune-rbkt into 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/prune-rbkt into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/prune-rbkt into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/prune-rbkt into 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/prune-rbkt into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/prune-rbkt into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/prune-rbkt into 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/prune-rbkt into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/prune-rbkt into lp:zorba failed. Below is the output from the failed tests. -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/prune-rbkt into 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/gen-flwor-opt into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has been updated. Description changed to: 1. Implemented hoisting optimization for general FLWOR. 2. Fixed bug in hoisting through try-catch expr For more details, see: https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850 -- https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850 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/prune-rbkt into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/prune-rbkt-2013-05-16T09-17-42.01Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/prune-rbkt into 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/gen-flwor-opt into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/gen-flwor-opt into lp:zorba has been updated. Commit Message changed to: 1. Implemented hoisting optimization for general FLWOR. 2. Fixed bug in hoisting through try-catch expr For more details, see: https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850 -- https://code.launchpad.net/~zorba-coders/zorba/gen-flwor-opt/+merge/163850 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/prune-rbkt into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/prune-rbkt-2013-05-16T08-31-55.534Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/prune-rbkt into 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/prune-rbkt into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/prune-rbkt into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/prune-rbkt into 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/prune-rbkt into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/prune-rbkt into lp:zorba has been updated. Commit Message changed to: Consolidate all test driver sources into one place. Eliminate stale and unused scripts and source. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/prune-rbkt into 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/prune-rbkt into lp:zorba
Chris Hillery has proposed merging lp:~zorba-coders/zorba/prune-rbkt into
lp:zorba.
Requested reviews:
Zorba Coders (zorba-coders)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088
--
https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088
Your team Zorba Coders is requested to review the proposed merge of
lp:~zorba-coders/zorba/prune-rbkt into lp:zorba.
=== modified file 'test/CMakeLists.txt'
--- test/CMakeLists.txt 2013-05-14 10:07:03 +
+++ test/CMakeLists.txt 2013-05-16 08:27:29 +
@@ -23,11 +23,12 @@
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/src)
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_BINARY_DIR}/src)
-INCLUDE_DIRECTORIES(BEFORE ${CMAKE_BINARY_DIR}/test)
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
INCLUDE(${CMAKE_SOURCE_DIR}/cmake_modules/ZorbaGenerateExe.cmake)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/driver)
+ADD_SUBDIRECTORY(driver)
ADD_SUBDIRECTORY(api)
ADD_SUBDIRECTORY(rbkt)
ADD_SUBDIRECTORY(extern)
=== removed directory 'test/commons'
=== added directory 'test/driver'
=== added file 'test/driver/CMakeLists.txt'
--- test/driver/CMakeLists.txt 1970-01-01 00:00:00 +
+++ test/driver/CMakeLists.txt 2013-05-16 08:27:29 +
@@ -0,0 +1,97 @@
+# Copyright 2006-2013 The FLWOR Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# configure the testdrivers
+CONFIGURE_FILE(testdriverconfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/testdriverconfig.h)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+
+
+#
+# Compile and build the testdriver executable
+#
+SET (TESTDRIVER_SRCS
+ testdriver.cpp
+ testdriver_common.cpp
+ testdriver_comparator.cpp
+ testuriresolver.cpp
+ )
+
+ZORBA_GENERATE_EXE("testdriver" "${TESTDRIVER_SRCS}" "" "" "bin")
+
+#
+# Compile and build the multi-threaded testdriver executable, if boost
+# available
+#
+
+FIND_PACKAGE(Boost COMPONENTS filesystem)
+IF (NOT Boost_FILESYSTEM_FOUND)
+ MESSAGE(STATUS "Boost filesystem or system component not found - not building multithreaded test driver")
+ELSE (NOT Boost_FILESYSTEM_FOUND)
+ MESSAGE(STATUS "Found Boost v${Boost_LIB_VERSION}: ${Boost_INCLUDE_DIRS}")
+ MESSAGE(STATUS " Boost lib path: ${Boost_LIBRARY_DIRS}")
+
+ # Assume this is OK for the moment...
+ SET (ZORBATEST_TESTDRIVER_MT_AVAILABLE TRUE)
+
+ IF (Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION GREATER 34)
+# Boost 1.35 and above included a separate "system" component. In
+# at least some versions, filesystem depends on system - and the
+# Mac linker apparently does not figure this out. Therefore we
+# need to link it explicitly, which means we need to find it
+# first.
+FIND_PACKAGE(Boost COMPONENTS system)
+IF (NOT Boost_SYSTEM_FOUND)
+ MESSAGE(STATUS "Did NOT find Boost SYSTEM component - not building multithreaded test driver")
+ SET (ZORBATEST_TESTDRIVER_MT_AVAILABLE FALSE)
+ELSE (NOT Boost_SYSTEM_FOUND)
+ SET (Boost_system_lib "boost_system-mt")
+ENDIF (NOT Boost_SYSTEM_FOUND)
+
+ ENDIF (Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION GREATER 34)
+
+ENDIF (NOT Boost_FILESYSTEM_FOUND)
+
+IF (ZORBATEST_TESTDRIVER_MT_AVAILABLE)
+ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+
+ SET (TESTDRIVER_MT_SRCS
+testdriver_mt.cpp
+testdriver_common.cpp
+testdriver_comparator.cpp
+testuriresolver.cpp
+)
+
+ ZORBA_GENERATE_EXE(
+"testdriver_mt" "${TESTDRIVER_MT_SRCS}" "${Boost_LIBRARIES}" "" "")
+
+ SET (ZORBATEST_USE_MT_XQTS NO CACHE BOOLEAN
+"If true, use testdriver_mt (when available) for running XQTS")
+ MARK_AS_ADVANCED (ZORBATEST_USE_MT_XQTS)
+
+ENDIF (ZORBATEST_TESTDRIVER_MT_AVAILABLE)
+
+# Compile and build the update testdriver executable
+SET(UPDTESTDRIVER_SRCS
+updtestdriver.cpp
+testdriver_comparator.cpp
+testuriresolver.cpp)
+ZORBA_GENERATE_EXE("updtestdriver" "${UPDTESTDRIVER_SRCS}" "" "" "")
+
+# Compile and build the SAX2 test driver executable
+SET (SAX2_TESTDRIVER_SRCS
+ sax2testdriver.cpp
+ ${CMAKE_SOURCE_DIR}/test/driver/testdriver_comparator.cpp
+ )
+
+ZORBA_GENERATE_EXE(sax2testdriver "${SAX2_TESTDRIVER_SRCS}" "" "" "")
=== renamed file 'test/sax2/sax2testdriver.cpp' => 'test/driver/sax2testdriver.cpp'
--- test/sax2/sax2testdriver.cpp 2013-02-26 04:12:43 +
+++ test/driver/sax2testdriver.cpp 2013-05-16 08:27:29 +
@@ -26,7 +26,7 @@
#include
-#include "sax2testdriverconfig.h" // SRC and BIN dir definitions
+#include "testdriverconf
