[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba. Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/112672 Fixed bug #1018673 + renamed misleading isXXXNode() methods. -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/112672 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
Validation queue job markos-scratch2-2012-06-28T14-12-08.295Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch2-2012-06-28T14-12-08.295Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/markos-scratch2 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 markos-scratch2-2012-06-28T13-38-35.179Z 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/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch2-2012-06-28T13-38-35.179Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in ChangeLog -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/markos-scratch2 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 markos-scratch2-2012-06-20T06-57-03.786Z 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/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch2-2012-06-20T06-57-03.786Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/markos-scratch2 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 markos-scratch2-2012-06-19T22-07-55.183Z 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/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch2-2012-06-19T22-07-55.183Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 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/markos-scratch2 into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba. Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 Optimized hash sets used by fn:distinct-values and nodes-distinct -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/08 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2012-06-19 17:58:10 + +++ ChangeLog 2012-06-19 21:36:21 + @@ -10,6 +10,7 @@ * Small optimization of comparison operations. * Improved hoist rule: tighter hoisting of expressions (also fixes bug #967428, which is only a performance bug) + * Optimized hash sets used by fn:distinct-values and nodes-distinct Bug Fixes/Other Changes: * Fixed bug #932314 (non-comparable values must be treated as distinct by === modified file 'src/runtime/indexing/index_ddl.cpp' --- src/runtime/indexing/index_ddl.cpp 2012-06-15 21:31:03 + +++ src/runtime/indexing/index_ddl.cpp 2012-06-19 21:36:21 + @@ -38,7 +38,7 @@ #include "context/static_context.h" #include "context/dynamic_context.h" -#include "zorbautils/hashset_itemh.h" +#include "zorbautils/hashset_node_itemh.h" #include "diagnostics/xquery_exception.h" #include "diagnostics/util_macros.h" @@ -1372,7 +1372,7 @@ assert(state->theSearchItems.size() >= 1); assert(state->theKeyType == NULL || state->theSearchItems.size() == 1); - state->theNodeHashSet = new ItemHandleHashSet(1024, false); + state->theNodeHashSet = new NodeHandleHashSet(1024, false); state->theSearchItemsIte = state->theSearchItems.begin(); state->theSearchItemsEnd = state->theSearchItems.end(); === modified file 'src/runtime/indexing/index_ddl.h' --- src/runtime/indexing/index_ddl.h 2012-06-15 21:31:03 + +++ src/runtime/indexing/index_ddl.h 2012-06-19 21:36:21 + @@ -29,7 +29,7 @@ { class IndexDecl; -class ItemHandleHashSet; +class NodeHandleHashSet; /*** @@ -547,7 +547,7 @@ store::IndexProbeIterator_t theIterator; - ItemHandleHashSet * theNodeHashSet; + NodeHandleHashSet * theNodeHashSet; public: ProbeIndexRangeGeneralIteratorState(); === modified file 'src/runtime/sequences/SequencesImpl.cpp' --- src/runtime/sequences/SequencesImpl.cpp 2012-06-15 21:31:03 + +++ src/runtime/sequences/SequencesImpl.cpp 2012-06-19 21:36:21 + @@ -36,7 +36,7 @@ #include "runtime/sequences/SequencesImpl.h" #include "runtime/core/arithmetic_impl.h" #include "runtime/util/iterator_impl.h" -#include "runtime/util/handle_hashset_item_value.h" +#include "runtime/booleans/BooleanImpl.h" #include "runtime/visitors/planiter_visitor.h" #include "system/globalenv.h" @@ -51,6 +51,7 @@ #include "store/util/hashset_node_handle.h" #include "context/static_context.h" +#include "context/dynamic_context.h" namespace zorba { === modified file 'src/runtime/sequences/pregenerated/sequences.cpp' --- src/runtime/sequences/pregenerated/sequences.cpp 2012-06-15 21:31:03 + +++ src/runtime/sequences/pregenerated/sequences.cpp 2012-06-19 21:36:21 + @@ -29,7 +29,7 @@ #include "system/globalenv.h" -#include "runtime/util/handle_hashset_item_value.h" +#include "zorbautils/hashset_atomic_itemh.h" namespace zorba { === modified file 'src/runtime/sequences/pregenerated/sequences.h' --- src/runtime/sequences/pregenerated/sequences.h 2012-06-15 21:31:03 + +++ src/runtime/sequences/pregenerated/sequences.h 2012-06-19 21:36:21 + @@ -37,7 +37,7 @@ namespace store{ class NodeHashSet; } -class ItemValueCollHandleHashSet; +class AtomicItemHandleHashSet; /** * *op:concatenate @@ -248,7 +248,7 @@ { public: bool theHasNaN; //indicates whether NaN was found in the sequence - std::auto_ptr theAlreadySeenMap; //hashmap for doing the duplicate elimination + std::auto_ptr theAlreadySeenMap; //hashmap for doing the duplicate elimination FnDistinctValuesIteratorState(); === modified file 'src/runtime/sequences/sequences_impl.cpp' --- src/runtime/sequences/sequences_impl.cpp 2012-06-19 17:58:10 + +++ src/runtime/sequences/sequences_impl.cpp 2012-06-19 21:36:21 + @@ -40,7 +40,6 @@ #include #include #include -#include #include #include @@ -58,6 +57,8 @@ #include +#include "zorbautils/hashset_atomic_itemh.h" + namespace zorbatm = zorba::time; using namespace std; @@ -286,7 +287,7 @@ } // theValueCompare managed by state->theAlreadySeenMap - state->theAlreadySeenMap.reset(new ItemValueCollHandleHashSet(valueCompare)); + state->theAlreadySeenMap.reset(new AtomicItemHandleHashSet(valueCompare)); while (consumeNext(result, theChildren[0].getp(), planState)) { === modified file 'src/runtime/spec/sequences/sequences.xml' ---
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111079 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111079 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/markos-scratch2 into lp:zorba
Validation queue job markos-scratch2-2012-06-19T18-35-55.107Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111079 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/markos-scratch2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch2-2012-06-19T18-35-55.107Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111079 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111079 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111079 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/markos-scratch2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111079 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/markos-scratch2 into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba. Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111079 Fixed bug #932314 (non-comparable values must be treated as distinct by fn:distinct-values) -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111079 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2012-06-19 14:23:40 + +++ ChangeLog 2012-06-19 18:18:22 + @@ -12,6 +12,8 @@ which is only a performance bug) Bug Fixes/Other Changes: + * Fixed bug #932314 (non-comparable values must be treated as distinct by +fn:distinct-values) * Fixed bug #991088$ (raise XUST0001 in trycatch with mixed updating and simple clauses) * Fixed bug #854506 (ugly type error messages) and partial fix for bug #867008 * Fixed bug #1008082 (bug in transform expr when a copy var is not used anywhere) === modified file 'src/runtime/sequences/sequences_impl.cpp' --- src/runtime/sequences/sequences_impl.cpp 2012-06-15 21:31:03 + +++ src/runtime/sequences/sequences_impl.cpp 2012-06-19 18:18:22 + @@ -248,6 +248,7 @@ STACK_END (state); } + /*** 15.1.6 fn:distinct-values / @@ -259,6 +260,7 @@ theAlreadySeenMap->clear(); } + bool FnDistinctValuesIterator::nextImpl( store::Item_t& result, PlanState& planState) const @@ -266,7 +268,7 @@ store::Item_t lItem; xqtref_t lItemType; XQPCollator* lCollator; - ValueCompareParam* theValueCompare; + ValueCompareParam* valueCompare; FnDistinctValuesIteratorState* state; DEFAULT_STACK_INIT(FnDistinctValuesIteratorState, state, planState); @@ -275,16 +277,16 @@ { lCollator = getCollator(theSctx, loc, planState, theChildren[1].getp()); -theValueCompare = new ValueCompareParam(loc, planState.theLocalDynCtx, theSctx); -theValueCompare->theCollator = lCollator; +valueCompare = new ValueCompareParam(loc, planState.theLocalDynCtx, theSctx); +valueCompare->theCollator = lCollator; } else { -theValueCompare = new ValueCompareParam(loc, planState.theLocalDynCtx, theSctx); +valueCompare = new ValueCompareParam(loc, planState.theLocalDynCtx, theSctx); } // theValueCompare managed by state->theAlreadySeenMap - state->theAlreadySeenMap.reset(new ItemValueCollHandleHashSet(theValueCompare)); + state->theAlreadySeenMap.reset(new ItemValueCollHandleHashSet(valueCompare)); while (consumeNext(result, theChildren[0].getp(), planState)) { @@ -298,7 +300,6 @@ } else if ( ! state->theAlreadySeenMap->exists(result) ) { - // check if the item is already in the map state->theAlreadySeenMap->insert(result); STACK_PUSH(true, state); } @@ -307,6 +308,7 @@ STACK_END(state); } + /*** 15.1.7 fn:insert-before / === modified file 'src/runtime/util/handle_hashset_item_value.h' --- src/runtime/util/handle_hashset_item_value.h 2012-06-15 21:31:03 + +++ src/runtime/util/handle_hashset_item_value.h 2012-06-19 18:18:22 + @@ -72,12 +72,25 @@ assert (item2 != NULL); store::Item_t t1(item1); store::Item_t t2(item2); - return CompareIterator::valueEqual(theCompareParam->theLocation, - t1, - t2, - theCompareParam->theTypeManager, - theCompareParam->theTimezone, - theCompareParam->theCollator); + + try + { +return CompareIterator::valueEqual(theCompareParam->theLocation, + t1, + t2, + theCompareParam->theTypeManager, + theCompareParam->theTimezone, + theCompareParam->theCollator); + } + catch(ZorbaException& e) + { +if (e.diagnostic() == err::XPTY0004) +{ + return false; +} + +throw e; + } } uint32_t hash(const store::Item_t& t) const === added file 'test/rbkt/ExpQueryResults/zorba/sequences/distinct01.xml.res' --- test/rbkt/ExpQueryResults/zorba/sequences/distinct01.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/sequences/distinct01.xml.res 2012-06-19 18:18:22 + @@ -0,0 +1,2 @@ + +1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 3
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111026 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111026 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/markos-scratch2 into lp:zorba
Validation queue job markos-scratch2-2012-06-19T14-33-57.089Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111026 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/markos-scratch2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch2-2012-06-19T14-33-57.089Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111026 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111026 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111026 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/markos-scratch2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111026 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/markos-scratch2 into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba. Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111026 Fixed bug #1008082 (bug in transform expr when a copy var is not used anywhere) -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/111026 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2012-06-15 21:31:03 + +++ ChangeLog 2012-06-19 14:25:23 + @@ -14,6 +14,7 @@ Bug Fixes/Other Changes: * Fixed bug #991088$ (raise XUST0001 in trycatch with mixed updating and simple clauses) * Fixed bug #854506 (ugly type error messages) and partial fix for bug #867008 + * Fixed bug #1008082 (bug in transform expr when a copy var is not used anywhere) * Fixed bug #1003023$ (optimizer problems due to common subexpression after var folding into if-then-else) * Fixed bug #1006166 (disabling 2 functions with the same qname) === modified file 'src/runtime/update/update.cpp' --- src/runtime/update/update.cpp 2012-06-15 21:31:03 + +++ src/runtime/update/update.cpp 2012-06-19 14:25:23 + @@ -741,6 +741,13 @@ /*** / +void CopyClause::serialize(::zorba::serialization::Archiver& ar) +{ + ar & theCopyVars; + ar & theInput; +} + + TransformIterator::TransformIterator( static_context* sctx, const QueryLoc& aLoc, @@ -765,6 +772,17 @@ } +void TransformIterator::serialize(::zorba::serialization::Archiver& ar) +{ + serialize_baseclass(ar, (Batcher*)this); + ar & theCopyClauses; + ar & theModifyIter; + ar & thePulHolderIter; + ar & theApplyIter; + ar & theReturnIter; +} + + uint32_t TransformIterator::getStateSizeOfSubtree() const { @@ -801,15 +819,15 @@ bool TransformIterator::nextImpl(store::Item_t& result, PlanState& aPlanState) const { - std::vector::const_iterator lVarRefIter; - std::vector::const_iterator lVarRefEnd; + std::vector::const_iterator varRefIte; + std::vector::const_iterator varRefEnd; store::Item_t pulItem; store::Item_t validationPul; store::PUL_t pul; store::Item_t temp; store::Item_t lItem; - store::Item_t lCopyNode; - store::CopyMode lCopyMode; + store::Item_t copyNode; + store::CopyMode copymode; bool typePreserve; bool nsPreserve; bool nsInherit; @@ -826,22 +844,22 @@ nsInherit = (theSctx->inherit_mode() == StaticContextConsts::inherit_ns ? true : false); - lCopyMode.set(true, typePreserve, nsPreserve, nsInherit); + copymode.set(true, typePreserve, nsPreserve, nsInherit); { -ulong numCopyClauses = (ulong)theCopyClauses.size(); +csize numCopyClauses = theCopyClauses.size(); std::vector copyNodes(numCopyClauses); // For each copy var compute the target node and bind that node to all // references of the copy var. -for (ulong i = 0; i < numCopyClauses; i++) +for (csize i = 0; i < numCopyClauses; i++) { const CopyClause& copyClause = theCopyClauses[i]; - if (!consumeNext(lCopyNode, copyClause.theInput, aPlanState) || - (!lCopyNode->isNode() + if (!consumeNext(copyNode, copyClause.theInput, aPlanState) || + (!copyNode->isNode() #ifdef ZORBA_WITH_JSON - && !lCopyNode->isJSONItem() + && !copyNode->isJSONItem() #endif )) { @@ -853,13 +871,16 @@ throw XQUERY_EXCEPTION(err::XUTY0013, ERROR_LOC(loc)); } - copyNodes[i] = lCopyNode->copy(NULL, lCopyMode); - - lVarRefIter = copyClause.theCopyVars.begin(); - lVarRefEnd = copyClause.theCopyVars.end(); - for(; lVarRefIter != lVarRefEnd; ++lVarRefIter) + if (!copyClause.theCopyVars.empty()) { -(*lVarRefIter)->bind(copyNodes[i], aPlanState); +copyNodes[i] = copyNode->copy(NULL, copymode); + +varRefIte = copyClause.theCopyVars.begin(); +varRefEnd = copyClause.theCopyVars.end(); +for(; varRefIte != varRefEnd; ++varRefIte) +{ + (*varRefIte)->bind(copyNodes[i], aPlanState); +} } } === modified file 'src/runtime/update/update.h' --- src/runtime/update/update.h 2012-06-15 21:31:03 + +++ src/runtime/update/update.h 2012-06-19 14:25:23 + @@ -159,24 +159,16 @@ public: SERIALIZABLE_CLASS(CopyClause); - SERIALIZABLE_CLASS_CONSTRUCTOR(CopyClause); - - void serialize(::zorba::serialization::Archiver &ar) - { -ar & theCopyVars; -ar & theInput; - } + void serialize(::zorba::serialization::Archiver& ar); public: CopyClause() {} - CopyClause( -std::vector& aCopyVars, -PlanIter_t aInput) + CopyClause(std::vector& copyVars, PlanIter_t input) : -theCopyVars(aCopyVars), -theIn
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/110609 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/110609 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/markos-scratch2 into lp:zorba
Validation queue job markos-scratch2-2012-06-15T21-47-24.246Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/110609 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/markos-scratch2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch2-2012-06-15T21-47-24.246Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/110609 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/110609 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/110609 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/110609 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/110609 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/markos-scratch2 into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: contents conflict in test/unit/static_context.cpp -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/110609 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/110609 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/110609 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/markos-scratch2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/110609 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/markos-scratch2 into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba. Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/110609 renamed file test/unit/static_context.cpp to avoid conflict with src/context/static_contectx.cpp during debugging -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/110609 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'test/unit/CMakeLists.txt' --- test/unit/CMakeLists.txt 2012-06-14 22:50:21 + +++ test/unit/CMakeLists.txt 2012-06-15 20:03:19 + @@ -97,7 +97,7 @@ xquery_functions.cpp xmldatamanager.cpp staticcollectionmanager.cpp - static_context.cpp + test_static_context.cpp ) # multithread_simple.cpp === renamed file 'test/unit/static_context.cpp' => 'test/unit/static_context.cpp.THIS' === added file 'test/unit/test_static_context.cpp' --- test/unit/test_static_context.cpp 1970-01-01 00:00:00 + +++ test/unit/test_static_context.cpp 2012-06-15 20:03:19 + @@ -0,0 +1,358 @@ +/* + * Copyright 2006-2012 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. + */ + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +using namespace std; +using namespace zorba; +#ifndef ZORBA_NO_FULL_TEXT +using namespace zorba::locale; +#endif /* ZORBA_NO_FULL_TEXT */ + +bool +sctx_test_1(Zorba* const zorba) +{ + StaticContext_t lSctx = zorba->createStaticContext(); + + Zorba_CompilerHints_t lHints; + + std::stringstream lProlog; + lProlog << "declare namespace foo = 'http://www.example.com';"; + + lSctx->loadProlog(lProlog.str(), lHints); + + NsBindings lBindings; + lSctx->getNamespaceBindings(lBindings); + + bool lFooFound = false; + + for (NsBindings::const_iterator lIter = lBindings.begin(); + lIter != lBindings.end(); ++lIter) + { +std::cout << "prefix: " << lIter->first << " bound to " + << lIter->second << std::endl; + +if (lIter->first.compare("foo") == 0) +{ + lFooFound = true; +} + } + + return lFooFound && lBindings.size() == 6; +} + +bool +sctx_test_2(Zorba* const zorba) +{ + StaticContext_t lSctx = zorba->createStaticContext(); + + Zorba_CompilerHints_t lHints; + + try + { +Item lFetched = lSctx->fetch("http://www.zorba-xquery.com/modules/fetch";, "MODULE"); + +return !lFetched.isNull(); + } + catch (ZorbaException& e) + { +std::cerr << e << std::endl; + } + return false; +} + + +bool sctx_test_3(Zorba* zorba) +{ + StaticContext_t sctx = zorba->createStaticContext(); + + try + { +Zorba_CompilerHints_t hints; +std::stringstream prolog; +prolog << "declare variable $prologVariable := World!;"; +sctx->loadProlog(prolog.str(), hints); + +// compile the main query using the populated static context +XQuery_t query = zorba->compileQuery("declare variable $queryVar := foo; $prologVariable ", sctx); + +// execute the query and make sure that the result is correct +Zorba_SerializerOptions lSerOptions; +lSerOptions.omit_xml_declaration = ZORBA_OMIT_XML_DECLARATION_YES; +std::stringstream result; +query->execute(result, &lSerOptions); +std::cout << "Print prolog variable: " << result.str() << std::endl; + +if (result.str() != "World!") + return false; + } + catch (XQueryException &e) + { +std::cerr << e << std::endl; +return false; + } + + return true; +} + + +bool +sctx_test_4(Zorba* const zorba) +{ + StaticContext_t lSctx = zorba->createStaticContext(); + + Zorba_CompilerHints_t lHints; + + try + { +Item lFetched = lSctx->fetchBinary("http://www.zorba-xquery.com/modules/fetch";, "MODULE"); + +size_t s; +return !lFetched.isNull() && lFetched.getBase64BinaryValue(s); + } + catch (ZorbaException& e) + { +std::cerr << e << std::endl; + } + return false; +} + + +bool +sctx_test_5(Zorba* zorba) +{ + std::stringstream queryString1; + std::stringstream queryString2; + + queryString1 +<< "import module namespace ddl = " +<< "\"http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl\";"; +<< std::endl +<< "ddl:create(xs:QName(\"ddl:coll1\"));" +<< std::endl; + + queryString2 +<< "import module namespace ddl = " +<< "\"http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl\";"; +<< std::endl +<<
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 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/markos-scratch2 into lp:zorba
Validation queue job markos-scratch2-2012-06-14T13-31-18.051Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 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/markos-scratch2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch2-2012-06-14T13-31-18.051Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 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/markos-scratch2 into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in ChangeLog -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 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/markos-scratch2 into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in ChangeLog -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 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/markos-scratch2 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/markos-scratch2 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 markos-scratch2-2012-06-14T07-50-18.082Z 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/~zorba-coders/zorba/markos-scratch2/+merge/107797 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/markos-scratch2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch2-2012-06-14T07-50-18.082Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 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/markos-scratch2 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 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/markos-scratch2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/107797 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