Merge lp:~zorba-coders/zorba/unregister-delete-or-destroy into lp:zorba

[Ghislain Fourny]

Differentiating between two reasons why references are unregistered.

Differentiating between two reasons why references are unregistered.

[Zorba Build Bot (zorba-buildbot)]

No approved revision specified.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/unregister-delete-or-destroy-2012-04-04T16-12-59.472Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/unregister-delete-or-destroy 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 unregister-delete-or-destroy-2012-04-04T16-12-59.472Z
  is finished. The final status was:

  71 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/unregister-delete-or-destroy-2012-06-20T16-08-59.225Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/unregister-delete-or-destroy 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 unregister-delete-or-destroy-2012-06-20T16-08-59.225Z
  is finished. The final status was:

  87 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/unregister-delete-or-destroy-2012-06-21T09-46-00.606Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job unregister-delete-or-destroy-2012-06-21T09-46-00.606Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 2 Pending.

[Markos Zaharioudakis (markos-za)]

This doesn't make sense to me at all!

[Markos Zaharioudakis (markos-za)]

review: Needs Fixing

[Ghislain Fourny (gislenius)]

Thanks Markos, the function is now virtual ;-)

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/unregister-delete-or-destroy-2012-07-03T09-39-05.169Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job unregister-delete-or-destroy-2012-07-03T09-39-05.169Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 2 Needs Fixing.

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/unregister-delete-or-destroy-2012-07-03T15-05-59.471Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job unregister-delete-or-destroy-2012-07-03T15-05-59.471Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/store/naive/node_items.cpp'
--- src/store/naive/node_items.cpp	2012-06-29 18:19:56 +0000
+++ src/store/naive/node_items.cpp	2012-07-03 09:40:26 +0000
@@ -144,7 +144,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-void XmlTree::free()
+void XmlTree::destroy() throw()
 {
   // std::cout << "Deleting Xml Tree: " << this << std::endl;
 
@@ -171,6 +171,15 @@
 }
 
 
+/*******************************************************************************
+
+********************************************************************************/
+void XmlTree::free()
+{
+  destroy();
+}
+
+
 #ifndef EMBEDED_TYPE
 
 /*******************************************************************************
@@ -880,11 +889,21 @@
 #endif
 
   if (haveReference())
-    GET_STORE().unregisterNode(this);
+    GET_STORE().unregisterReferenceToUnusedNode(this);
 
   delete this;
 }
 
+/*******************************************************************************
+
+********************************************************************************/
+void XmlNode::unregisterReferencesToDeletedSubtree()
+{
+  if (haveReference())
+    GET_STORE().unregisterReferenceToDeletedNode(this);
+}
+
+
 
 /////////////////////////////////////////////////////////////////////////////////
 //                                                                             //
@@ -1723,6 +1742,23 @@
 }
 
 
+/*******************************************************************************
+
+********************************************************************************/
+void InternalNode::unregisterReferencesToDeletedSubtree()
+{
+  std::for_each(
+      childrenBegin(), childrenEnd(),
+      std::mem_fun(&XmlNode::unregisterReferencesToDeletedSubtree));
+
+  std::for_each(
+      attrsBegin(), attrsEnd(),
+      std::mem_fun(&XmlNode::unregisterReferencesToDeletedSubtree));
+
+  XmlNode::unregisterReferencesToDeletedSubtree();
+}
+
+
 /////////////////////////////////////////////////////////////////////////////////
 //                                                                             //
 //  class DocumentNode                                                         //
 
=== modified file 'src/store/naive/node_items.h'
--- src/store/naive/node_items.h	2012-06-29 18:19:56 +0000
+++ src/store/naive/node_items.h	2012-07-03 09:40:26 +0000
@@ -189,6 +189,8 @@
 
   void free();
 
+  void destroy() throw();
+
   long getRefCount() const { return theRefCount; }
 
   long& getRefCount()      { return theRefCount; }
@@ -545,6 +547,8 @@
 
   bool isConnectorNode() const { return (theFlags & IsConnectorNode) != 0; }
 
+  virtual void unregisterReferencesToDeletedSubtree();
+
 #ifndef ZORBA_NO_FULL_TEXT
   FTTokenIterator_t getTokens( 
       TokenizerProvider const&,
@@ -831,6 +835,8 @@
 
   void finalizeNode();
 
+  virtual void unregisterReferencesToDeletedSubtree();
+
 protected:
   csize findChild(const XmlNode* child) const;
 
 
=== modified file 'src/store/naive/pul_primitives.cpp'
--- src/store/naive/pul_primitives.cpp	2012-06-28 04:14:03 +0000
+++ src/store/naive/pul_primitives.cpp	2012-07-03 09:40:26 +0000
@@ -163,6 +163,9 @@
   {
     theParent->deleteChild(*this);
   }
+  
+  static_cast<zorba::simplestore::XmlNode*>(theTarget.getp())
+        ->unregisterReferencesToDeletedSubtree();
 }
 
 
 
=== modified file 'src/store/naive/simple_store.cpp'
--- src/store/naive/simple_store.cpp	2012-06-28 21:54:08 +0000
+++ src/store/naive/simple_store.cpp	2012-07-03 09:40:26 +0000
@@ -363,7 +363,7 @@
   @param node XDM node
   @return whether the node was registered or not.
 ********************************************************************************/
-bool SimpleStore::unregisterNode(XmlNode* node)
+bool SimpleStore::unregisterReferenceToUnusedNode(XmlNode* node)
 {
   if (!node->haveReference())
     return false;
@@ -386,6 +386,34 @@
   }
 }
 
+/*******************************************************************************
+  Does nothing in the simple store.
+
+  @param node XDM node
+  @return whether the node was registered or not.
+********************************************************************************/
+bool SimpleStore::unregisterReferenceToDeletedNode(XmlNode* node)
+{
+  // Does nothing, since there is no persistency layer. A deleted node can still
+  // be retrieved with a reference, so its reference may not be removed from the
+  // cache.
+  // Merely returns true if entry found, false otherwise.
+  
+  if (!node->haveReference())
+    return false;
+
+  NodeRefMap::iterator resIt;
+
+  if ((resIt = theNodeToReferencesMap.find(node)) != theNodeToReferencesMap.end())
+  {
+    return true;
+  }
+  else
+  {
+    return false;
+  }
+}
+
 
 #ifdef ZORBA_WITH_JSON
 /*******************************************************************************
 
=== modified file 'src/store/naive/simple_store.h'
--- src/store/naive/simple_store.h	2012-06-28 21:54:08 +0000
+++ src/store/naive/simple_store.h	2012-07-03 09:40:26 +0000
@@ -98,7 +98,9 @@
 
   void destroyTreeIdGeneratorFactory(TreeIdGeneratorFactory* g) const;
 
-  bool unregisterNode(XmlNode* node);
+  bool unregisterReferenceToUnusedNode(XmlNode* node);
+
+  bool unregisterReferenceToDeletedNode(XmlNode* node);
 
   //
   // Store api methods
 
=== modified file 'src/store/naive/store.h'
--- src/store/naive/store.h	2012-06-28 04:14:03 +0000
+++ src/store/naive/store.h	2012-07-03 09:40:26 +0000
@@ -418,7 +418,12 @@
 
   virtual bool getNodeByReference(store::Item_t& result, const zstring& ref) = 0;
 
-  virtual bool unregisterNode(XmlNode* node) = 0;
+  // Unregisters a reference to an unused node (upon its destruction in
+  // the memory).
+  virtual bool unregisterReferenceToUnusedNode(XmlNode* node) = 0;
+
+  // Unregisters a reference to a node that was deleted (by XQUF).
+  virtual bool unregisterReferenceToDeletedNode(XmlNode* node) = 0;
 
 /*----------------------- Temp Sequence Management ---------------------------*/
 public: