[Zorba-coders] [Merge] lp:~zorba-coders/zorba/abstract-collection-set into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/abstract-collection-set into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 -- https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
Validation queue job abstract-collection-set-2012-02-28T15-43-11.328Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 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/abstract-collection-set 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/~zorba-coders/zorba/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/abstract-collection-set into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 -- https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/abstract-collection-set-2012-02-28T15-43-11.328Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/abstract-collection-set into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 -- https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/abstract-collection-set into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 -- https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
Review: Needs Fixing One last and very small change request. The indentation in line 512 of the diff is broken. -- https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/abstract-collection-set into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 -- https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/abstract-collection-set 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 abstract-collection-set-2012-02-23T20-39-04.769Z 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/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/abstract-collection-set-2012-02-23T20-39-04.769Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/abstract-collection-set into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 -- https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
Review: Needs Fixing - Did you forget to add file simple_collection_set.h - I would keep the CollectionSet in the simplestore namespace because it's a component defined by the simplestore and not the store api (i.e. a file in store/api) -- https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/abstract-collection-set into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 -- https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/abstract-collection-set 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 abstract-collection-set-2012-02-23T14-54-58.415Z 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/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/abstract-collection-set-2012-02-23T14-54-58.415Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/abstract-collection-set into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 -- https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384 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/abstract-collection-set into lp:zorba
Ghislain Fourny has proposed merging
lp:~zorba-coders/zorba/abstract-collection-set into lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384
Refactored CollectionSet class. zorba::store::CollectionSet is abstract,
zorba::simplestore::SimpleCollectionSet is its implementation for the simple
store.
--
https://code.launchpad.net/~zorba-coders/zorba/abstract-collection-set/+merge/94384
Your team Zorba Coders is subscribed to branch lp:zorba.
=== renamed file 'src/store/naive/collection_set.h' => 'src/store/api/collection_set.h'
--- src/store/naive/collection_set.h 2011-06-14 17:26:33 +
+++ src/store/api/collection_set.h 2012-02-23 14:28:19 +
@@ -23,88 +23,64 @@
namespace zorba {
- namespace simplestore {
+ namespace store {
class CollectionIterator;
/***
Collections container to ease the implementation of stores which contain
- a different kind of memory management. For the simplestore, the Collections
- is only a wrapper class around an ItemPointerHashMap.
+ a different kind of memory management.
/
class CollectionSet
{
public:
- typedef ItemPointerHashMap Set;
- static const ulong DEFAULT_COLLECTION_MAP_SIZE;
-
-protected:
- Set theCollections;
-
-public:
- CollectionSet();
-
- // needs to be virtual to allow implementation of additional stores
+ virtual ~CollectionSet() {}
+
virtual void
- clear();
+ clear() = 0;
- // needs to be virtual to allow implementation of additional stores
virtual bool
insert(
- const store::Item* aName,
- store::Collection_t& aCollection);
+ const Item* aName,
+ Collection_t& aCollection) = 0;
- // needs to be virtual to allow implementation of additional stores
virtual bool
get(
const store::Item* aName,
- store::Collection_t& aCollection,
- bool aDynamicCollection = false);
+ Collection_t& aCollection,
+ bool aDynamicCollection = false) = 0;
- // needs to be virtual to allow implementation of additional stores
virtual bool
- remove(const store::Item* aName, bool aDynamicCollection = false);
-
- // needs to be virtual to allow implementation of additional stores
- virtual store::Iterator_t
- names(bool aDynamicCollection = false);
-
- // needs to be virtual to allow implementation of additional stores
- virtual CollectionIterator_t
- collections(bool aDynamicCollection = false);
+ remove(const Item* aName, bool aDynamicCollection = false) = 0;
+
+ virtual Iterator_t
+ names(bool aDynamicCollection = false) = 0;
+
+ virtual CollectionSetIterator_t
+ collections(bool aDynamicCollection = false) = 0;
}; /* class CollectionSet */
/***
- Collection iterator
+ Collection set iterator
Returned by the CollectionSet::collections function
/
-class CollectionIterator : public SimpleRCObject
+class CollectionSetIterator : public SimpleRCObject
{
-protected:
- CollectionSet::Set* theCollections;
- CollectionSet::Set::iterator theIterator;
- bool theOpened;
- bool theDynamicCollections;
-
public:
- CollectionIterator(
- CollectionSet::Set* aCollections,
- bool aDynamicCollections);
-
- virtual ~CollectionIterator();
+ virtual ~CollectionSetIterator() {}
virtual void
- open();
+ open() = 0;
virtual bool
- next(store::Collection_t&);
-
- virtual void
- reset();
-
- virtual void
- close();
+ next(Collection_t&) = 0;
+
+ virtual void
+ reset() = 0;
+
+ virtual void
+ close() = 0;
};
} /* namespace simplestore */
=== modified file 'src/store/api/shared_types.h'
--- src/store/api/shared_types.h 2011-12-21 14:40:33 +
+++ src/store/api/shared_types.h 2012-02-23 14:28:19 +
@@ -68,6 +68,11 @@
class Collection;
typedef rchandle Collection_t;
+class CollectionSet;
+
+class CollectionSetIterator;
+typedef rchandle CollectionSetIterator_t;
+
class Index;
typedef rchandle Index_t;
=== modified file 'src/store/naive/CMakeLists.txt'
--- src/store/naive/CMakeLists.txt 2011-06-22 17:30:15 +
+++ src/store/naive/CMakeLists.txt 2012-02-23 14:28:19 +
@@ -31,7 +31,7 @@
simple_store.cpp
