Merge lp:~zorba-coders/zorba/collection-claim-tree-ownership into lp:zorba

[Ghislain Fourny]

Collections can claim ownership of a node they own but that does not have the pointer.

Collections can claim ownership of a node they own but that does not have the pointer.

[Zorba Build Bot (zorba-buildbot)]

No approved revision specified.

[lp:~zorba-coders/zorba/collection-claim-tree-ownership]

10727. By Ghislain Fourny on 2012-03-20

claimOwnership is now protected.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Till Westmann (tillw)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/collection-claim-tree-ownership-2012-03-20T16-13-02.165Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job collection-claim-tree-ownership-2012-03-20T16-13-02.165Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/store/naive/collection.cpp'
--- src/store/naive/collection.cpp	2012-03-01 14:22:17 +0000
+++ src/store/naive/collection.cpp	2012-03-20 14:26:18 +0000
@@ -26,6 +26,11 @@
 namespace zorba {
 namespace simplestore {
 
+void Collection::claimOwnership(zorba::simplestore::XmlTree* aTree)
+{
+  aTree->claimedByCollection(this);
+}
+
 void Collection::getIndexes(
     const store::Item* name,
     std::vector<store::Index*>& indexes)

=== modified file 'src/store/naive/collection.h'
--- src/store/naive/collection.h	2012-03-08 18:51:25 +0000
+++ src/store/naive/collection.h	2012-03-20 14:26:18 +0000
@@ -110,6 +110,10 @@
 
   void getActiveICs(std::vector<store::IC*>& ics);
 
+  /**************************** Claim of ownership ****************************/
+protected:
+  virtual void claimOwnership(zorba::simplestore::XmlTree* aTree);
+  
 }; /* class Collection */
 
 } /* namespace simplestore */ } /* namespace zorba */

=== modified file 'src/store/naive/node_items.cpp'
--- src/store/naive/node_items.cpp	2012-03-14 15:28:15 +0000
+++ src/store/naive/node_items.cpp	2012-03-20 14:26:18 +0000
@@ -105,6 +105,16 @@
 /*******************************************************************************
 
 ********************************************************************************/
+void XmlTree::claimedByCollection(Collection* collection)
+{
+  ZORBA_ASSERT(collection != NULL);
+  theCollection = collection;
+}
+
+
+/*******************************************************************************
+
+********************************************************************************/
 void XmlTree::setCollection(Collection* collection, xs_integer pos)
 {
   ZORBA_ASSERT(collection == NULL || theCollection == NULL);

=== modified file 'src/store/naive/node_items.h'
--- src/store/naive/node_items.h	2012-03-15 15:30:19 +0000
+++ src/store/naive/node_items.h	2012-03-20 14:26:18 +0000
@@ -180,7 +180,7 @@
   ulong                     theId;
   xs_integer                thePos;
 
-  Collection        * theCollection;
+  Collection              * theCollection;
 
   XmlNode                 * theRootNode;
 
@@ -223,6 +223,13 @@
 
   const Collection* getCollection() const { return theCollection; }
 
+private:
+friend class zorba::simplestore::Collection;
+  // Allows a collection to claim ownership of a node it already owns, but
+  // which does not have the backpointer yet.
+  void claimedByCollection(Collection* coll);
+  
+public:
   void setCollection(Collection* coll, xs_integer pos);
 
   void setPosition(xs_integer pos) { thePos = pos; }