[exo-jcr-commits] exo-jcr SVN: r3999 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2011-02-21 13:34:50 -0500 (Mon, 21 Feb 2011)
New Revision: 3999

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheKey.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheNodesId.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CachePropsId.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheQPath.java
Log:
EXOJCR-970: Ensure the collocation of the data related to the same node when it is possible

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheKey.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheKey.java	2011-02-21 16:20:08 UTC (rev 3998)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheKey.java	2011-02-21 18:34:50 UTC (rev 3999)
@@ -43,6 +43,12 @@
       this.hash = id.hashCode();
    }
 
+   CacheKey(String id, int hash)
+   {
+      this.id = id;
+      this.hash = hash;
+   }
+
    /**
     * {@inheritDoc}
     */

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheNodesId.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheNodesId.java	2011-02-21 16:20:08 UTC (rev 3998)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheNodesId.java	2011-02-21 18:34:50 UTC (rev 3999)
@@ -31,11 +31,9 @@
 public class CacheNodesId extends CacheKey
 {
 
-   public static final String PREFIX = "N";
-
    CacheNodesId(String id)
    {
-      super(PREFIX + id);
+      super(id);
    }
 
    @Override

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CachePropsId.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CachePropsId.java	2011-02-21 16:20:08 UTC (rev 3998)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CachePropsId.java	2011-02-21 18:34:50 UTC (rev 3999)
@@ -31,11 +31,9 @@
 public class CachePropsId extends CacheKey
 {
 
-   public static final String PREFIX = "P";
-
    CachePropsId(String id)
    {
-      super(PREFIX + id);
+      super(id);
    }
 
    @Override

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheQPath.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheQPath.java	2011-02-21 16:20:08 UTC (rev 3998)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheQPath.java	2011-02-21 18:34:50 UTC (rev 3999)
@@ -35,28 +35,15 @@
  */
 class CacheQPath extends CacheKey
 {
-
-   private final String parentId;
-
-   private final QPath path;
-
    CacheQPath(String parentId, QPath path, ItemType itemType)
    {
-      super(new StringBuilder().append(parentId != null ? parentId : Constants.ROOT_PARENT_UUID)
-         .append(path.getEntries()[path.getEntries().length - 1].getAsString(true)).append(itemType.toString())
-         .toString());
-
-      this.parentId = parentId;
-      this.path = path;
+      this(parentId, path.getEntries()[path.getEntries().length - 1], itemType);
    }
 
    CacheQPath(String parentId, QPathEntry name, ItemType itemType)
    {
       super(new StringBuilder().append(parentId != null ? parentId : Constants.ROOT_PARENT_UUID)
-         .append(name.getAsString(true)).append(itemType.toString()).toString());
-
-      this.parentId = parentId;
-      this.path = null;
+         .append(name.getAsString(true)).append(itemType.toString()).toString(), parentId.hashCode());
    }
 
    @Override
@@ -65,23 +52,11 @@
       if (obj instanceof CacheQPath)
       {
          CacheQPath cacheQPath = (CacheQPath)obj;
-         return (cacheQPath.hashCode() == hash && cacheQPath.id.equals(id));
+         return (cacheQPath.hash == hash && cacheQPath.id.equals(id));
       }
       else
       {
          return false;
       }
    }
-
-   @Override
-   public String toString()
-   {
-      final StringBuilder s = new StringBuilder();
-      s.append((this.parentId != null ? this.parentId : Constants.ROOT_PARENT_UUID));
-      s.append((path != null ? path.getEntries()[path.getEntries().length - 1] : "null"));
-      s.append(", ");
-      s.append(id);
-      return s.toString();
-   }
-
 }