[jboss-cvs] JBossCache/src/org/jboss/cache/optimistic ...

[Manik Surtani]

  User: msurtani
  Date: 06/12/14 12:18:48

  Modified:    src/org/jboss/cache/optimistic   WorkspaceNodeImpl.java
                        WorkspaceNode.java
  Log:
  The beginnings of porting JBCACHE-871 and JBCACHE-875 as well as rearranging the Node/Cache object model to something sensible
  
  Revision  Changes    Path
  1.31      +26 -32    JBossCache/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WorkspaceNodeImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- WorkspaceNodeImpl.java	12 Dec 2006 14:51:44 -0000	1.30
  +++ WorkspaceNodeImpl.java	14 Dec 2006 17:18:48 -0000	1.31
  @@ -8,6 +8,7 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  +import org.jboss.cache.AbstractNode;
   import org.jboss.cache.CacheSPI;
   import org.jboss.cache.DataNode;
   import org.jboss.cache.Fqn;
  @@ -37,7 +38,7 @@
    * @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
    * @author Steve Woodcock (<a href="mailto:stevew at jofti.com">stevew at jofti.com</a>)
    */
  -public class WorkspaceNodeImpl implements WorkspaceNode, NodeSPI
  +public class WorkspaceNodeImpl extends AbstractNode implements WorkspaceNode
   {
   
      private static Log log = LogFactory.getLog(WorkspaceNodeImpl.class);
  @@ -45,7 +46,6 @@
      private Node node;
      private TransactionWorkspace workspace;
      private DataVersion version = DefaultDataVersion.ZERO;
  -   private boolean deleted;
      private boolean dirty;
      private boolean created;
      private Map<Object, Node> optimisticChildNodeMap;
  @@ -67,8 +67,10 @@
         optimisticChildNodeMap = new ConcurrentHashMap(node.getNodeSPI().getChildrenMap());
         this.version = ((OptimisticTreeNode) node).getVersion();
         if (version == null)
  +      {
            throw new IllegalStateException("OptimisticTreeNode version null");
      }
  +   }
   
      /**
       * Returns true if this node is dirty.
  @@ -263,41 +265,31 @@
         return optimisticChildNodeMap;
      }
   
  -//    private Map mergeMaps(OptimisticMap opMap)
  -//    {
  -//        Map temp = new HashMap(opMap.getOriginalMap());
  -//        //first remove all removed keys
  -//        for (Iterator it = opMap.getRemovedMap().keySet().iterator(); it.hasNext();)
  -//        {
  -//            temp.remove(it.next());
  -//        }
  -//        // then add in changed stuff
  -//        for (Iterator it = opMap.getLocalMap().entrySet().iterator(); it.hasNext();)
  -//        {
  -//            Map.Entry entry = (Map.Entry) it.next();
  -//            temp.put(entry.getKey(), entry.getValue());
  -//        }
  -//        return temp;
  -//        TODO: MANIK: BN: Does this need to be a copy?!??
  -//        return new HashMap(opMap.getLocalMap());
  -//        return opMap.getLocalMap();
  -//    }
  +   //    private Map mergeMaps(OptimisticMap opMap)
  +   //    {
  +   //        Map temp = new HashMap(opMap.getOriginalMap());
  +   //        //first remove all removed keys
  +   //        for (Iterator it = opMap.getRemovedMap().keySet().iterator(); it.hasNext();)
  +   //        {
  +   //            temp.remove(it.next());
  +   //        }
  +   //        // then add in changed stuff
  +   //        for (Iterator it = opMap.getLocalMap().entrySet().iterator(); it.hasNext();)
  +   //        {
  +   //            Map.Entry entry = (Map.Entry) it.next();
  +   //            temp.put(entry.getKey(), entry.getValue());
  +   //        }
  +   //        return temp;
  +   //        TODO: MANIK: BN: Does this need to be a copy?!??
  +   //        return new HashMap(opMap.getLocalMap());
  +   //        return opMap.getLocalMap();
  +   //    }
   
      public Map getMergedData()
      {
         return optimisticDataMap;
      }
   
  -   public void markAsDeleted()
  -   {
  -      deleted = true;
  -   }
  -
  -   public boolean isDeleted()
  -   {
  -      return deleted;
  -   }
  -
      public Object getName()
      {
         return node.getFqn().getLast();
  @@ -467,7 +459,9 @@
      public Node addChild(Fqn f)
      {
         if (log.isTraceEnabled())
  +      {
            log.trace("Adding child " + f + " to " + getFqn());
  +      }
         CacheSPI cache = getCache();
         if (cache.getInvocationContext().getOptionOverrides().isBypassInterceptorChain())
         {
  @@ -559,7 +553,7 @@
   
      public NodeSPI getNodeSPI()
      {
  -      return this; // node.getNodeSPI();
  +      return this;// node.getNodeSPI();
      }
   
      public Node getOrCreateChild(Object name, GlobalTransaction tx)
  
  
  
  1.17      +0 -4      JBossCache/src/org/jboss/cache/optimistic/WorkspaceNode.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WorkspaceNode.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/optimistic/WorkspaceNode.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- WorkspaceNode.java	12 Dec 2006 14:51:44 -0000	1.16
  +++ WorkspaceNode.java	14 Dec 2006 17:18:48 -0000	1.17
  @@ -39,10 +39,6 @@
   
      public Set getChildrenNames();
   
  -   public boolean isDeleted();
  -
  -   public void markAsDeleted();
  -
      public TransactionWorkspace getTransactionWorkspace();
   
      public boolean isCreated();