Re: [Zorba-coders] [Merge] lp:~fcavalieri/zorba/bugs into lp:zorba
Review: Approve -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/87750 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/87750 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/87750 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:~fcavalieri/zorba/bugs into lp:zorba
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions. -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/87750 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:~fcavalieri/zorba/bugs into lp:zorba
Review: Approve -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/80487 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:~fcavalieri/zorba/bugs into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-10-26T18-23-21.59Z/log.html -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/80487 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/80487 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/80487 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:~fcavalieri/zorba/bugs into lp:zorba
Federico Cavalieri has proposed merging lp:~fcavalieri/zorba/bugs into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070
Fixed bug #872697
Updated Changelog for bugs #872697, #871623 and #871629
--
https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2011-10-10 19:29:05 +
+++ ChangeLog 2011-10-12 07:21:30 +
@@ -41,11 +41,13 @@
* Fixed bug #863730 (static delete-node* functions don't raise ZDDY0012)
* Implemented the probe-index-range-value for general indexes
* Fixed bug #867662 (nullptr warning)
+ * Fixed bug #871623 and #871629 (assertion failures with insertions in dynamic collections)
* Fixed bug #867262 (allow reuse of iterator over ExtFuncArgItemSequence)
* Fixed bug #869024 (segmentation fault with node-reference)
* Fixed bug #869025 (segmentation fault with node-reference)
* New node-reference module. References can be obtained for any node, and
different nodes cannot have the same identifier.
+ * Fixed bug #872697 (segmentation fault with validation of NMTOKENS)
version 2.0.1
=== modified file 'src/store/naive/simple_item_factory.cpp'
--- src/store/naive/simple_item_factory.cpp 2011-07-22 07:23:17 +
+++ src/store/naive/simple_item_factory.cpp 2011-10-12 07:21:30 +
@@ -162,7 +162,7 @@
for ( unsigned int i = 0; i atomicTextValues.size() ; i++)
{
store::Item_t resultItem;
-if ( createNMTOKENS(resultItem, atomicTextValues[i]) )
+if ( createNMTOKEN(resultItem, atomicTextValues[i]) )
{
typedValues.push_back(resultItem.getp());
}
=== added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-18.xml.res'
--- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-18.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-18.xml.res 2011-10-12 07:21:30 +
@@ -0,0 +1,2 @@
+?xml version=1.0 encoding=UTF-8?
+note nmt=aaa/
\ No newline at end of file
=== added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-18.xq'
--- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-18.xq 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-18.xq 2011-10-12 07:21:30 +
@@ -0,0 +1,10 @@
+import module namespace x = http://www.zorba-xquery.com/modules/xml;;
+
+x:parse-xml-fragment(?xml version='1.0'?
+!DOCTYPE note [
+!ELEMENT note (#PCDATA)
+!ATTLIST note nmt NMTOKENS #REQUIRED
+]
+note nmt='aaa'/
+,
+d)
--
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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Commit Message changed to: Fixed bug #872697 Updated Changelog for bugs #872697, #871623 and #871629 For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 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:~fcavalieri/zorba/bugs into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-10-12T07-31-14.98Z/log.html -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 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:~fcavalieri/zorba/bugs into lp:zorba
Validation queue job bugs-2011-10-12T07-31-14.98Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 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:~fcavalieri/zorba/bugs into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1. Got: 1 Pending. -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 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:~fcavalieri/zorba/bugs into lp:zorba
Review: Approve -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 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:~fcavalieri/zorba/bugs into lp:zorba
Review: Approve -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 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:~fcavalieri/zorba/bugs into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-10-12T08-49-58.151Z/log.html -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 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:~fcavalieri/zorba/bugs into lp:zorba
Validation queue job bugs-2011-10-12T08-49-58.151Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070 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:~fcavalieri/zorba/bugs into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-10-11T20-38-00.369Z/log.html -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/78814 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:~fcavalieri/zorba/bugs into lp:zorba
Validation queue job bugs-2011-10-10T10-18-36.455Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/78814 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/78814 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/78814 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:~fcavalieri/zorba/bugs into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-10-07T10-13-02.076Z/log.html -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/78396 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:~fcavalieri/zorba/bugs into lp:zorba
The attempt to merge lp:~fcavalieri/zorba/bugs into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message): Validation queue job bugs-2011-10-07T10-13-02.076Z 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/~fcavalieri/zorba/bugs/+merge/78396 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/78396 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/78396 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:~fcavalieri/zorba/bugs into lp:zorba
Some tests fail, but I have no idea why. Can you help me? -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/78396 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:~fcavalieri/zorba/bugs into lp:zorba
Some tests fail, but I have no idea why. Can you help me? It seems to be a problem also with other coders merge, es: https://code.launchpad.net/~danielturcanu/zorba/my_conv_module/+merge/78588 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/78396 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:~fcavalieri/zorba/bugs into lp:zorba
Federico Cavalieri has proposed merging lp:~fcavalieri/zorba/bugs into lp:zorba. Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77287 Updated Changelog to reflect fixes in revisions 10470, 10471, 10472, 10473 and 10475 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77287 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2011-09-27 10:43:46 + +++ ChangeLog 2011-09-28 07:00:32 + @@ -30,6 +30,11 @@ * Fixed bug # (Should not destroy the parent of a node that is being detached before the detach is done). * Fixed bug #3408181 (available-collection() returns undeclared collections) + * Fixed bug #859465 (Fatal error if a PUL contains two deactivate IC primitives) + * Fixed bug #859467 (Fatal error if a PUL contains two activate Foreign Key primitives) + * Fixed bug #859468 (Fatal error if a PUL contains two activate Simple IC primitives) + * Fixed bug #859522 (Fatal error if a PUL contains two delete document primitives) + * Fixed bug #859968 (Using put on an attribute produces an invalid XDM instance and may cause segmentation faults) * Fixed bug #855314 (should not fold a constant expr that returns an error item) version 2.0.1 -- 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77287 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77287 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77287 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77287 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:~fcavalieri/zorba/bugs into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-09-28T08-25-42.98Z/log.html -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77287 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77287 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77287 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:~fcavalieri/zorba/bugs into lp:zorba
Voting does not meet specified criteria. Required: Approve 0, Disapprove 1. Got: 1 Pending. -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77063 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77063 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77063 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77063 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77063 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:~fcavalieri/zorba/bugs into lp:zorba
Federico Cavalieri has proposed merging lp:~fcavalieri/zorba/bugs into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77162
Fixed bug 859968
--
https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77162
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/fnput/fnput_impl.cpp'
--- src/runtime/fnput/fnput_impl.cpp 2011-07-04 19:13:55 +
+++ src/runtime/fnput/fnput_impl.cpp 2011-09-27 13:00:23 +
@@ -50,6 +50,14 @@
consumeNext(node, theChildren[0].getp(), planState);
+ if (node-getNodeKind()==store::StoreConsts::attributeNode)
+ {
+throw XQUERY_EXCEPTION(
+ err::FOUP0001,
+ ERROR_LOC( loc )
+);
+ }
+
consumeNext(uriItem, theChildren[1].getp(), planState);
uriString = uriItem-getStringValue();
=== added file 'test/rbkt/Queries/zorba/updates/upd13.spec'
--- test/rbkt/Queries/zorba/updates/upd13.spec 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/updates/upd13.spec 2011-09-27 13:00:23 +
@@ -0,0 +1,1 @@
+Error: http://www.w3.org/2005/xqt-errors:FOUP0001
=== added file 'test/rbkt/Queries/zorba/updates/upd13.xq'
--- test/rbkt/Queries/zorba/updates/upd13.xq 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/updates/upd13.xq 2011-09-27 13:00:23 +
@@ -0,0 +1,4 @@
+import module namespace doc = http://www.zorba-xquery.com/modules/store/dynamic/documents;;
+
+put(attribute {test}{test},http://www.zorba-xquery.com;);
+doc:document(http://www.zorba-xquery.com;)
--
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:~fcavalieri/zorba/bugs into lp:zorba
The attempt to merge lp:~fcavalieri/zorba/bugs into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:231 (message): Validation queue job bugs-2011-09-27T13-01-23.036Z is finished. The final status was: 2 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77162 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77162 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77162 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:~fcavalieri/zorba/bugs into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-09-27T15-07-09.348Z/log.html -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77162 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Commit Message changed to: Changed expected test failures: now fn-put-005-fail succeeds and fn-put-005 fails. Fixed bug 859968. For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77162 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77162 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:~fcavalieri/zorba/bugs into lp:zorba
Validation queue job bugs-2011-09-27T15-07-09.348Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77162 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77162 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77162 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:~fcavalieri/zorba/bugs into lp:zorba
Voting does not meet specified criteria. Required: Approve 0, Disapprove 1. Got: 1 Pending. -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/76945 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:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/76945 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/76945 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:~fcavalieri/zorba/bugs into lp:zorba
Federico Cavalieri has proposed merging lp:~fcavalieri/zorba/bugs into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77063
Fixed bug 859465
--
https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/77063
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/pul_primitives.cpp'
--- src/store/naive/pul_primitives.cpp 2011-09-26 18:30:33 +
+++ src/store/naive/pul_primitives.cpp 2011-09-26 22:57:27 +
@@ -1320,8 +1320,8 @@
if (theIsApplied)
{
SimpleStore* store = GET_STORE();
-store-deactivateIC(theQName);
-theIsApplied = false;
+bool isApplied;
+store-deactivateIC(theQName,isApplied);
}
}
@@ -1361,8 +1361,8 @@
if (theIsApplied)
{
SimpleStore* store = GET_STORE();
-store-deactivateIC(theQName);
-theIsApplied = false;
+bool isApplied;
+store-deactivateIC(theQName,isApplied);
}
}
@@ -1389,20 +1389,22 @@
void UpdDeActivateIC::apply()
{
SimpleStore* store = GET_STORE();
- store::IC_t ic = store-deactivateIC(theQName);
- theICKind = ic-getICKind();
- switch (theICKind) {
-case store::IC::ic_collection:
- theFromCollectionName = ic-getCollectionName();
- break;
-case store::IC::ic_foreignkey:
- theFromCollectionName = ic-getFromCollectionName();
- theToCollectionName = ic-getToCollectionName();
- break;
-default:
- ZORBA_ASSERT(false);
+ store::IC_t ic = store-deactivateIC(theQName,theIsApplied);
+ if (theIsApplied)
+ {
+theICKind = ic-getICKind();
+switch (theICKind) {
+ case store::IC::ic_collection:
+theFromCollectionName = ic-getCollectionName();
+break;
+ case store::IC::ic_foreignkey:
+theFromCollectionName = ic-getFromCollectionName();
+theToCollectionName = ic-getToCollectionName();
+break;
+ default:
+ZORBA_ASSERT(false);
+}
}
- theIsApplied = true;
}
=== modified file 'src/store/naive/simple_store.cpp'
--- src/store/naive/simple_store.cpp 2011-09-26 15:50:32 +
+++ src/store/naive/simple_store.cpp 2011-09-26 22:57:27 +
@@ -853,7 +853,8 @@
store::IC_t
-SimpleStore::deactivateIC(const store::Item_t icQName)
+SimpleStore::deactivateIC(const store::Item_t icQName,
+bool isApplied)
{
ZORBA_ASSERT(icQName != NULL);
@@ -861,13 +862,11 @@
if (!theICs.get(icQName.getp(), ic))
{
-throw ZORBA_EXCEPTION(
- zerr::ZSTR0016_IC_DOES_NOT_EXIST,
- ERROR_PARAMS( icQName-getStringValue() )
-);
+return ic; // already deactivated in the same PUL = noop
}
theICs.remove(icQName.getp());
+ isApplied=true;
return ic;
}
=== modified file 'src/store/naive/simple_store.h'
--- src/store/naive/simple_store.h 2011-09-26 15:50:32 +
+++ src/store/naive/simple_store.h 2011-09-26 22:57:27 +
@@ -238,7 +238,8 @@
const store::Item_t toCollectionQName,
bool isApplied);
- store::IC_t deactivateIC(const store::Item_t icQName);
+ store::IC_t deactivateIC(const store::Item_t icQName,
+bool isApplied);
store::Iterator_t listActiveICNames();
=== added file 'test/rbkt/ExpQueryResults/zorba/xqddf/ic-deactivate-err.xml.res'
--- test/rbkt/ExpQueryResults/zorba/xqddf/ic-deactivate-err.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/xqddf/ic-deactivate-err.xml.res 2011-09-26 22:57:27 +
@@ -0,0 +1,1 @@
+OK
\ No newline at end of file
=== added file 'test/rbkt/Queries/zorba/xqddf/ic-deactivate-err.xq'
--- test/rbkt/Queries/zorba/xqddf/ic-deactivate-err.xq 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/xqddf/ic-deactivate-err.xq 2011-09-26 22:57:27 +
@@ -0,0 +1,14 @@
+import module namespace m = 'xqueryzorba.org/test/xqddf/ic' at 'ic.xqlib';
+import module namespace ddl = http://www.zorba-xquery.com/modules/store/static/collections/ddl;;
+import module namespace dml = http://www.zorba-xquery.com/modules/store/static/collections/dml;;
+import module namespace ic_ddl = http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl;;
+
+ddl:create($m:empc);
+ic_ddl:activate(xs:QName(m:ic_simple));
+
+(
+ic_ddl:deactivate(xs:QName(m:ic_simple)),
+ic_ddl:deactivate(xs:QName(m:ic_simple))
+);
+
+OK
\ No newline at end of file
--
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
