JBoss Cache SVN: r8211 - enterprise-docs/tags/JBoss_EAP_5_0_0/Cache_Tutorial/en-US.
by jbosscache-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2009-08-26 21:31:54 -0400 (Wed, 26 Aug 2009)
New Revision: 8211
Modified:
enterprise-docs/tags/JBoss_EAP_5_0_0/Cache_Tutorial/en-US/JBoss_Cache_Tutorial.xml
Log:
removed reference to community api docs
Modified: enterprise-docs/tags/JBoss_EAP_5_0_0/Cache_Tutorial/en-US/JBoss_Cache_Tutorial.xml
===================================================================
--- enterprise-docs/tags/JBoss_EAP_5_0_0/Cache_Tutorial/en-US/JBoss_Cache_Tutorial.xml 2009-08-27 01:16:29 UTC (rev 8210)
+++ enterprise-docs/tags/JBoss_EAP_5_0_0/Cache_Tutorial/en-US/JBoss_Cache_Tutorial.xml 2009-08-27 01:31:54 UTC (rev 8211)
@@ -185,14 +185,14 @@
root.removeChild(childFqn2); // will recursively remove child3 as well.
]]></programlisting>
- <para>
+ <!-- <para>
In addition to the above, you should refer to the
<literal>Cache</literal>
and
<literal>Node</literal>
<ulink url="http://labs.jboss.org/portal/jbosscache/docs/index.html">API docs</ulink>
and try out the APIs in the BeanShell script.
- </para>
+ </para>-->
</section>
<section>
14 years, 7 months
JBoss Cache SVN: r8210 - enterprise-docs/tags/JBoss_EAP_5_0_0/Cache_FAQ/en-US.
by jbosscache-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2009-08-26 21:16:29 -0400 (Wed, 26 Aug 2009)
New Revision: 8210
Modified:
enterprise-docs/tags/JBoss_EAP_5_0_0/Cache_FAQ/en-US/General_FAQ.xml
enterprise-docs/tags/JBoss_EAP_5_0_0/Cache_FAQ/en-US/JBoss_Cache_Frequently_Asked_Questions.xml
Log:
updated to remove application server reference and make buildable
Modified: enterprise-docs/tags/JBoss_EAP_5_0_0/Cache_FAQ/en-US/General_FAQ.xml
===================================================================
--- enterprise-docs/tags/JBoss_EAP_5_0_0/Cache_FAQ/en-US/General_FAQ.xml 2009-08-26 14:26:49 UTC (rev 8209)
+++ enterprise-docs/tags/JBoss_EAP_5_0_0/Cache_FAQ/en-US/General_FAQ.xml 2009-08-27 01:16:29 UTC (rev 8210)
@@ -149,14 +149,13 @@
<qandaentry>
<question>
- <para>Can I run JBoss Cache outside of JBoss Application
- Server?
+ <para>Can I run JBoss Cache outside of the JBoss Enterprise Application Platform?
</para>
</question>
<answer>
<para>
- Absolutely! Even though JBoss Cache comes integrated with JBoss Application Server,
+ Absolutely! Even though JBoss Cache comes integrated with the JBoss Enterprise Application Platform,
it can also be used in any other Java EE server such as BEA WebLogic, IBM Websphere or Tomcat.
It
can also run in a standalone Java process, completely outside of an application server. See the
Modified: enterprise-docs/tags/JBoss_EAP_5_0_0/Cache_FAQ/en-US/JBoss_Cache_Frequently_Asked_Questions.xml
===================================================================
--- enterprise-docs/tags/JBoss_EAP_5_0_0/Cache_FAQ/en-US/JBoss_Cache_Frequently_Asked_Questions.xml 2009-08-26 14:26:49 UTC (rev 8209)
+++ enterprise-docs/tags/JBoss_EAP_5_0_0/Cache_FAQ/en-US/JBoss_Cache_Frequently_Asked_Questions.xml 2009-08-27 01:16:29 UTC (rev 8210)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
]>
-<book id="JBoss_Cache_FAQ" lang="en">
+<book id="JBoss_Cache_FAQ">
<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="General_FAQ.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="TreeCache_FAQ.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
14 years, 7 months
JBoss Cache SVN: r8209 - in core/trunk: src/main/java/org/jboss/cache and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-08-26 10:26:49 -0400 (Wed, 26 Aug 2009)
New Revision: 8209
Modified:
core/trunk/pom.xml
core/trunk/src/main/java/org/jboss/cache/Version.java
Log:
Version update
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2009-08-26 13:15:46 UTC (rev 8208)
+++ core/trunk/pom.xml 2009-08-26 14:26:49 UTC (rev 8209)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <jbosscache-core-version>3.2.0-SNAPSHOT</jbosscache-core-version>
+ <jbosscache-core-version>3.2.1-SNAPSHOT</jbosscache-core-version>
<!-- By default only run tests in the "unit" group -->
<defaultTestGroup>unit</defaultTestGroup>
<!-- By default only generate Javadocs when we install the module. -->
@@ -485,7 +485,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<properties>
- <jbosscache-core-version>3.2.0-SNAPSHOT-JBossAS</jbosscache-core-version>
+ <jbosscache-core-version>3.2.1-SNAPSHOT-JBossAS</jbosscache-core-version>
<defaultTestGroup>functional,unit</defaultTestGroup>
<protocol.stack>tcp</protocol.stack>
</properties>
Modified: core/trunk/src/main/java/org/jboss/cache/Version.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/Version.java 2009-08-26 13:15:46 UTC (rev 8208)
+++ core/trunk/src/main/java/org/jboss/cache/Version.java 2009-08-26 14:26:49 UTC (rev 8209)
@@ -32,10 +32,10 @@
@Immutable
public class Version
{
- public static final String version = "3.2.0-SNAPSHOT";
+ public static final String version = "3.2.1-SNAPSHOT";
public static final String codename = "Malagueta";
//public static final String cvs = "$Id$";
- static final byte[] version_id = {'0', '3', '2', '0', 'S'};
+ static final byte[] version_id = {'0', '3', '2', '1', 'S'};
private static final int MAJOR_SHIFT = 11;
private static final int MINOR_SHIFT = 6;
14 years, 7 months
JBoss Cache SVN: r8208 - in core/trunk/src: test/java/org/jboss/cache/eviction and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-08-26 09:15:46 -0400 (Wed, 26 Aug 2009)
New Revision: 8208
Modified:
core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java
core/trunk/src/main/java/org/jboss/cache/RegionRegistry.java
core/trunk/src/test/java/org/jboss/cache/eviction/RegionManagerTest.java
Log:
[JBCACHE-1536] (Improve efficiency of RegionManagerImpl.getRegion)
Modified: core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java 2009-08-26 12:01:23 UTC (rev 8207)
+++ core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java 2009-08-26 13:15:46 UTC (rev 8208)
@@ -221,18 +221,10 @@
}
if (trace) log.trace("Contents of RegionsRegistry: " + regionsRegistry);
- Fqn fqnToUse = fqn;
- if (fqnToUse != null)
- {
- // Truncate Fqn as an optimization
- int largestFqnLength = regionsRegistry.getLargestFqnLength();
- if (fqnToUse.size() > largestFqnLength) fqnToUse = fqnToUse.getSubFqn(0, largestFqnLength);
- }
-
- if (DEFAULT_REGION.equals(fqnToUse)) fqnToUse = Fqn.ROOT;
+ if (DEFAULT_REGION.equals(fqn)) fqn = Fqn.ROOT;
// first see if a region for this specific Fqn exists
- Region r = regionsRegistry.get(fqnToUse);
+ Region r = regionsRegistry.get(fqn);
if (r != null)
{
// this is a very poor way of telling whether a region is a marshalling one or an eviction one. :-(
@@ -248,10 +240,10 @@
// if not, attempt to create one ...
if (createIfAbsent)
{
- r = new RegionImpl(fqnToUse, this);
+ r = new RegionImpl(fqn, this);
// could be created concurrently; so make sure we use appropriate methods on regionsRegistry for this.
- Region previous = regionsRegistry.putIfAbsent(fqnToUse, r);
+ Region previous = regionsRegistry.putIfAbsent(fqn, r);
if (previous != null) r = previous;
if (type == MARSHALLING)
{
@@ -263,11 +255,16 @@
// else try and find a parent which has a defined region, may return null if nothing is defined.
Region nextBestThing = null;
- Fqn nextFqn = fqnToUse;
+ if (fqn == null || fqn.isRoot()) return null;
+ Fqn nextFqn = fqn;
+ // Truncate Fqn as an optimization
+ int largestFqnLength = regionsRegistry.getLargestFqnLength();
+ if (nextFqn.size() > largestFqnLength) nextFqn = nextFqn.getSubFqn(0, largestFqnLength);
+
+
while (nextBestThing == null)
{
- nextFqn = nextFqn.getParent();
r = regionsRegistry.get(nextFqn);
if (r != null)
{
@@ -283,6 +280,7 @@
}
}
if (nextFqn.isRoot()) break;
+ nextFqn = nextFqn.getParent();
}
// test if the default region has been defined. If not, and if the request
Modified: core/trunk/src/main/java/org/jboss/cache/RegionRegistry.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RegionRegistry.java 2009-08-26 12:01:23 UTC (rev 8207)
+++ core/trunk/src/main/java/org/jboss/cache/RegionRegistry.java 2009-08-26 13:15:46 UTC (rev 8208)
@@ -49,6 +49,30 @@
return super.put(f, r);
}
+ @Override
+ public Region putIfAbsent(Fqn f, Region r)
+ {
+ Region rV = super.putIfAbsent(f, r);
+ if (rV == null) largestFqnLength = Math.max(largestFqnLength, f.size());
+ return rV;
+ }
+
+ @Override
+ public Region replace(Fqn f, Region r)
+ {
+ Region rV = super.replace(f, r);
+ if (rV != null) largestFqnLength = Math.max(largestFqnLength, f.size());
+ return rV;
+ }
+
+ @Override
+ public boolean replace(Fqn f, Region oldR, Region newR)
+ {
+ boolean rV = super.replace(f, oldR, newR);
+ if (rV) largestFqnLength = Math.max(largestFqnLength, f.size());
+ return rV;
+ }
+
public int getLargestFqnLength()
{
return largestFqnLength;
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/RegionManagerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/RegionManagerTest.java 2009-08-26 12:01:23 UTC (rev 8207)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/RegionManagerTest.java 2009-08-26 13:15:46 UTC (rev 8208)
@@ -32,7 +32,8 @@
public void testCreateRegion()
{
RegionManager regionManager = new RegionManagerImpl();
- ((RegionManagerImpl) regionManager).injectDependencies(null, null, null, null, null, new RegionRegistry());
+ RegionRegistry rr = new RegionRegistry();
+ ((RegionManagerImpl) regionManager).injectDependencies(null, null, null, null, null, rr);
regionManager.setUsingEvictions(true);
regionManager.getRegion(DEFAULT_REGION, true).setEvictionRegionConfig(config);
regionManager.getRegion(A_B_C, true).setEvictionRegionConfig(config);
@@ -40,6 +41,7 @@
regionManager.getRegion(AOP, true).setEvictionRegionConfig(config);
List<Region> regions = regionManager.getAllRegions(Region.Type.ANY);
+ System.out.println("RegionRegistry: " + rr);
assertEquals("Region size ", 4, regions.size());
}
14 years, 8 months
JBoss Cache SVN: r8207 - in core/trunk/src: test/java/org/jboss/cache and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-08-26 08:01:23 -0400 (Wed, 26 Aug 2009)
New Revision: 8207
Modified:
core/trunk/src/main/java/org/jboss/cache/Fqn.java
core/trunk/src/main/java/org/jboss/cache/StringFqn.java
core/trunk/src/test/java/org/jboss/cache/FqnTest.java
Log:
[JBCACHE-1537] (Fqn now backed by an array for greater efficiency)
Modified: core/trunk/src/main/java/org/jboss/cache/Fqn.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/Fqn.java 2009-08-26 11:12:12 UTC (rev 8206)
+++ core/trunk/src/main/java/org/jboss/cache/Fqn.java 2009-08-26 12:01:23 UTC (rev 8207)
@@ -24,28 +24,25 @@
import net.jcip.annotations.Immutable;
import org.jboss.cache.annotations.Compat;
-import org.jboss.cache.util.Immutables;
+import org.jboss.cache.util.Util;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
/**
- * A Fully Qualified Name (Fqn) is a list of names (typically Strings but can be any Object),
- * which represent a path to a particular {@link Node} or sometimes a {@link Region} in a {@link Cache}.
+ * A Fully Qualified Name (Fqn) is a list of names (typically Strings but can be any Object), which represent a path to
+ * a particular {@link Node} or sometimes a {@link Region} in a {@link Cache}.
* <p/>
- * This name can be absolute (i.e., relative from the root node - {@link #ROOT}), or relative to any node in the cache. Reading the
- * documentation on each API call that makes use of {@link org.jboss.cache.Fqn}s will tell you whether the API expects a
- * relative or absolute Fqn.
+ * This name can be absolute (i.e., relative from the root node - {@link #ROOT}), or relative to any node in the cache.
+ * Reading the documentation on each API call that makes use of {@link org.jboss.cache.Fqn}s will tell you whether the
+ * API expects a relative or absolute Fqn.
* <p/>
- * For instance, using this class to fetch a particular node might look like
- * this. (Here data on "Joe" is kept under the "Smith" surname node, under
- * the "people" tree.)
+ * For instance, using this class to fetch a particular node might look like this. (Here data on "Joe" is kept under
+ * the "Smith" surname node, under the "people" tree.)
* <pre>
* Fqn<String> abc = Fqn.fromString("/people/Smith/Joe/");
* Node joesmith = Cache.getRoot().getChild(abc);
@@ -66,44 +63,30 @@
* <p/>
* The former will result in a single Fqn, called "/a/b/c" which hangs directly under Fqn.ROOT.
* <p/>
- * The latter will result in 3 Fqns, called "a", "b" and "c", where "c" is a child of "b", "b" is a child of "a", and "a" hangs off Fqn.ROOT.
+ * The latter will result in 3 Fqns, called "a", "b" and "c", where "c" is a child of "b", "b" is a child of "a", and
+ * "a" hangs off Fqn.ROOT.
* <p/>
- * Another way to look at it is that the "/" separarator is only parsed when it forms
- * part of a String passed in to Fqn.fromString() and not otherwise.
+ * Another way to look at it is that the "/" separarator is only parsed when it forms part of a String passed in to
+ * Fqn.fromString() and not otherwise.
* <p/>
- * <B>Best practices</B>: Always creating Fqns - even when using some factory methods - can be expensive in the long run,
- * and as far as possible we recommend that client code holds on to their Fqn references and reuse them. E.g.:
- * <code>
- * // BAD!!
- * for (int i=0; i<someBigNumber; i++)
- * {
- * cache.get(Fqn.fromString("/a/b/c"), "key" + i);
- * }
- * </code>
- * instead, do:
- * <code>
- * // Much better
- * Fqn f = Fqn.fromString("/a/b/c");
- * for (int i=0; i<someBigNumber; i++)
- * {
- * cache.get(f, "key" + i);
- * }
- * </code>
+ * <B>Best practices</B>: Always creating Fqns - even when using some factory methods - can be expensive in the long
+ * run, and as far as possible we recommend that client code holds on to their Fqn references and reuse them. E.g.:
+ * <code> // BAD!! for (int i=0; i<someBigNumber; i++) { cache.get(Fqn.fromString("/a/b/c"), "key" + i); } </code>
+ * instead, do: <code> // Much better Fqn f = Fqn.fromString("/a/b/c"); for (int i=0; i<someBigNumber; i++) {
+ * cache.get(f, "key" + i); } </code>
*
* @version $Revision$
*/
@Immutable
@Compat(notes = "The generics, while originally intended to be removed in 3.0, have been retained for backward compat.")
-public class Fqn<E> implements Comparable<Fqn<?>>, Externalizable
-{
+public class Fqn<E> implements Comparable<Fqn<?>>, Externalizable {
/**
* Separator between FQN elements.
*/
public static final String SEPARATOR = "/";
- protected List<E> elements;
+ protected Object[] elements;
private transient int hash_code = 0;
- protected int size = 0;
/**
* Immutable root Fqn.
@@ -120,10 +103,8 @@
/**
* Public to satisfy Externalization. // TODO: Remove this ctor as well as Externalization!!
*/
- public Fqn()
- {
- elements = Collections.emptyList();
- size = 0;
+ public Fqn() {
+ elements = new Object[]{};
}
// --- deprecated compat stuff
@@ -136,10 +117,9 @@
*/
@Deprecated
@Compat
- public Fqn(List<? extends E> names)
- {
+ public Fqn(List<? extends E> names) {
// the list is unsafe - may be referenced externally
- this(names, false);
+ this(names.toArray(), true);
}
/**
@@ -150,10 +130,9 @@
*/
@Deprecated
@Compat
- public Fqn(E... names)
- {
+ public Fqn(E... names) {
// safe - the list is created here.
- this(Arrays.asList(names), true);
+ this(names, true);
}
/**
@@ -165,9 +144,9 @@
*/
@Deprecated
@Compat
- public Fqn(Fqn<? extends E> base, Fqn<? extends E> relative)
- {
- this(base, relative.elements);
+ @SuppressWarnings("unchecked")
+ public Fqn(Fqn<? extends E> base, Fqn<? extends E> relative) {
+ this(base, (E[]) relative.elements);
}
/**
@@ -179,46 +158,41 @@
*/
@Deprecated
@Compat
- public Fqn(Fqn<? extends E> base, E... childNames)
- {
- this(base, Arrays.asList(childNames));
+ public Fqn(Fqn<? extends E> base, E... childNames) {
+ elements = new Object[base.elements.length + childNames.length];
+ System.arraycopy(base.elements, 0, elements, 0, base.elements.length);
+ System.arraycopy(childNames, 0, elements, base.elements.length, childNames.length);
}
// --- end deprecated stuff
/**
* If safe is false, Collections.unmodifiableList() is used to wrap the list passed in. This is an optimisation so
- * Fqn.fromString(), probably the most frequently used factory method, doesn't end up needing to use the unmodifiableList()
- * since it creates the list internally.
+ * Fqn.fromString(), probably the most frequently used factory method, doesn't end up needing to use the
+ * unmodifiableList() since it creates the list internally.
*
* @param names List of names
* @param safe whether this list is referenced externally (safe = false) or not (safe = true).
- * @deprecated use {@link #fromList(java.util.List)} instead. The boolean "safety" hint is calculated internally. This constructor will be removed in 3.0.0.
+ * @deprecated use {@link #fromList(java.util.List)} instead. The boolean "safety" hint is calculated internally.
+ * This constructor will be removed in 3.0.0.
*/
@Deprecated
@Compat(notes = "Not truly deprecated, this constructor should really be protected and not public. Marked as deprecated for anyone using it as a public API.")
@SuppressWarnings("unchecked")
- protected Fqn(List<? extends E> names, boolean safe)
- {
- if (names != null)
- {
+ protected Fqn(Object[] names, boolean safe) {
+ if (names != null) {
// if not safe make a defensive copy
- elements = safe ? (List<E>) names : Immutables.immutableListCopy(names);
- size = elements.size();
+ if (safe)
+ elements = names;
+ else {
+ elements = new Object[names.length];
+ System.arraycopy(names, 0, elements, 0, names.length);
+ }
+ } else {
+ elements = new Object[]{};
}
- else
- {
- elements = Collections.emptyList();
- size = 0;
- }
}
- protected Fqn(Fqn<? extends E> base, List<? extends E> relative)
- {
- elements = Immutables.immutableListMerge(base.elements, relative);
- size = elements.size();
- }
-
// ----------------- END: Private constructors for use by factory methods only. ----------------------
/**
@@ -229,25 +203,25 @@
* @since 2.2.0
*/
@SuppressWarnings("unchecked")
- public static <T> Fqn<T> fromList(List<? extends T> names)
- {
- return new Fqn<T>(names, false);
+ public static <T> Fqn<T> fromList(List<? extends T> names) {
+ return new Fqn<T>(names.toArray(), true);
}
/**
* Retrieves an Fqn that represents the list of elements passed in.
*
* @param names list of elements that comprise the Fqn
- * @param safe if true, the list passed in is not defensively copied but used directly. <b>Use with care.</b> Make sure
- * you know what you are doing before you pass in a <tt>true</tt> value to <tt>safe</tt>, as it can have adverse effects on
- * performance or correctness. The defensive copy of list elements is not just for safety but also for performance as
- * an appropriare List implementation is used, which works well with Fqn operations.
+ * @param safe if true, the list passed in is not defensively copied but used directly. <b>Use with care.</b> Make
+ * sure you know what you are doing before you pass in a <tt>true</tt> value to <tt>safe</tt>, as it can
+ * have adverse effects on performance or correctness. The defensive copy of list elements is not just
+ * for safety but also for performance as an appropriare List implementation is used, which works well
+ * with Fqn operations.
* @return an Fqn
*/
@SuppressWarnings("unchecked")
- public static <T> Fqn<T> fromList(List<? extends T> names, boolean safe)
- {
- return new Fqn<T>(names, safe);
+ @Compat
+ public static <T> Fqn<T> fromList(List<? extends T> names, boolean safe) {
+ return new Fqn<T>(names.toArray(), true); // this will always be safe!!
}
/**
@@ -257,9 +231,8 @@
* @return an Fqn
* @since 2.2.0
*/
- public static <T> Fqn<T> fromElements(T... elements)
- {
- return new Fqn<T>(Arrays.asList(elements), true);
+ public static <T> Fqn<T> fromElements(T... elements) {
+ return new Fqn<T>(elements, true);
}
/**
@@ -270,9 +243,9 @@
* @return an Fqn
* @since 2.2.0
*/
- public static <T> Fqn<T> fromRelativeFqn(Fqn<? extends T> base, Fqn<? extends T> relative)
- {
- return new Fqn<T>(base, relative.elements);
+ @SuppressWarnings("unchecked")
+ public static <T> Fqn<T> fromRelativeFqn(Fqn<? extends T> base, Fqn<? extends T> relative) {
+ return new Fqn<T>(base, (T[]) relative.elements);
}
/**
@@ -283,9 +256,9 @@
* @return an Fqn
* @since 2.2.0
*/
- public static <T> Fqn<T> fromRelativeList(Fqn<? extends T> base, List<? extends T> relativeElements)
- {
- return new Fqn<T>(base, relativeElements);
+ @SuppressWarnings("unchecked")
+ public static <T> Fqn<T> fromRelativeList(Fqn<? extends T> base, List<? extends T> relativeElements) {
+ return new Fqn<T>(base, (T[]) relativeElements.toArray());
}
/**
@@ -296,15 +269,13 @@
* @return an Fqn
* @since 2.2.0
*/
- public static <T> Fqn<T> fromRelativeElements(Fqn<? extends T> base, T... relativeElements)
- {
- return new Fqn<T>(base, Arrays.asList(relativeElements));
+ public static <T> Fqn<T> fromRelativeElements(Fqn<? extends T> base, T... relativeElements) {
+ return new Fqn<T>(base, relativeElements);
}
/**
- * Returns a new Fqn from a string, where the elements are deliminated by
- * one or more separator ({@link #SEPARATOR}) characters.<br><br>
- * Example use:<br>
+ * Returns a new Fqn from a string, where the elements are deliminated by one or more separator ({@link #SEPARATOR})
+ * characters.<br><br> Example use:<br>
* <pre>
* Fqn.fromString("/a/b/c/");
* </pre><br>
@@ -317,18 +288,18 @@
* @return an Fqn<String> constructed from the string representation passed in
*/
@SuppressWarnings("unchecked")
- public static Fqn<String> fromString(String stringRepresentation)
- {
+ public static Fqn<String> fromString(String stringRepresentation) {
if (stringRepresentation == null || stringRepresentation.equals(SEPARATOR) || stringRepresentation.equals(""))
return root();
String toMatch = stringRepresentation.startsWith(SEPARATOR) ? stringRepresentation.substring(1) : stringRepresentation;
Object[] el = toMatch.split(SEPARATOR);
- return new Fqn(Immutables.immutableListWrap(el), true);
+ return new Fqn(el, true);
}
/**
- * Retrieves an Fqn read from an object input stream, typically written to using {@link #writeExternal(java.io.ObjectOutput)}.
+ * Retrieves an Fqn read from an object input stream, typically written to using {@link
+ * #writeExternal(java.io.ObjectOutput)}.
*
* @param in input stream
* @return an Fqn
@@ -336,8 +307,7 @@
* @throws ClassNotFoundException in the event of classes that comprise the element list of this Fqn not being found
* @since 2.2.0
*/
- public static Fqn<?> fromExternalStream(ObjectInput in) throws IOException, ClassNotFoundException
- {
+ public static Fqn<?> fromExternalStream(ObjectInput in) throws IOException, ClassNotFoundException {
Fqn<?> f = new Fqn<Object>();
f.readExternal(in);
return f;
@@ -345,30 +315,15 @@
/**
- * Obtains an ancestor of the current Fqn. Literally performs <code>elements.subList(0, generation)</code>
- * such that if
- * <code>
- * generation == Fqn.size()
- * </code>
- * then the return value is the Fqn itself (current generation), and if
- * <code>
- * generation == Fqn.size() - 1
- * </code>
- * then the return value is the same as
- * <code>
- * Fqn.getParent()
- * </code>
- * i.e., just one generation behind the current generation.
- * <code>
- * generation == 0
- * </code>
- * would return Fqn.ROOT.
+ * Obtains an ancestor of the current Fqn. Literally performs <code>elements.subList(0, generation)</code> such that
+ * if <code> generation == Fqn.size() </code> then the return value is the Fqn itself (current generation), and if
+ * <code> generation == Fqn.size() - 1 </code> then the return value is the same as <code> Fqn.getParent() </code>
+ * i.e., just one generation behind the current generation. <code> generation == 0 </code> would return Fqn.ROOT.
*
* @param generation the generation of the ancestor to retrieve
* @return an ancestor of the current Fqn
*/
- public Fqn<E> getAncestor(int generation)
- {
+ public Fqn<E> getAncestor(int generation) {
if (generation == 0) return root();
return getSubFqn(0, generation);
}
@@ -380,119 +335,110 @@
* @param endIndex end index
* @return a subFqn
*/
- public Fqn<E> getSubFqn(int startIndex, int endIndex)
- {
- List<E> el = elements.subList(startIndex, endIndex);
- return new Fqn<E>(el, true);
+ public Fqn<E> getSubFqn(int startIndex, int endIndex) {
+ if (endIndex < startIndex) throw new IllegalArgumentException("End index cannot be less than start index!");
+ int len = endIndex - startIndex;
+ Object[] subElements = new Object[len];
+ System.arraycopy(elements, startIndex, subElements, 0, len);
+ return new Fqn<E>(subElements, true);
}
/**
* @return the number of elements in the Fqn. The root node contains zero.
*/
- public int size()
- {
- return size;
+ public int size() {
+ return elements.length;
}
/**
* @param n index of the element to return
* @return Returns the nth element in the Fqn.
*/
- public Object get(int n)
- {
- return elements.get(n);
+ public Object get(int n) {
+ return elements[n];
}
/**
* @return the last element in the Fqn.
* @see #getLastElementAsString
*/
- public Object getLastElement()
- {
+ public Object getLastElement() {
if (isRoot()) return null;
- return elements.get(size - 1);
+ return elements[elements.length - 1];
}
/**
* @param element element to find
* @return true if the Fqn contains this element, false otherwise.
*/
- public boolean hasElement(Object element)
- {
- return elements.indexOf(element) != -1;
+ public boolean hasElement(Object element) {
+ return indexOf(element) != -1;
}
/**
* Returns true if obj is a Fqn with the same elements.
*/
@Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
+ public boolean equals(Object obj) {
+ if (this == obj) {
return true;
}
- if (!(obj instanceof Fqn))
- {
+ if (!(obj instanceof Fqn)) {
return false;
}
Fqn<?> other = (Fqn<?>) obj;
- return size == other.size() && elements.equals(other.elements);
+ if (elements.length != other.elements.length) return false;
+ // compare elements in *reverse*!
+ for (int i=elements.length - 1; i>=0; i--)
+ {
+ if (!Util.safeEquals(elements[i], other.elements[i])) return false;
+ }
+ return true;
}
/**
* Returns a hash code with Fqn elements.
*/
@Override
- public int hashCode()
- {
- if (hash_code == 0)
- {
+ public int hashCode() {
+ if (hash_code == 0) {
hash_code = calculateHashCode();
}
return hash_code;
}
/**
- * Returns this Fqn as a string, prefixing the first element with a {@link Fqn#SEPARATOR} and
- * joining each subsequent element with a {@link Fqn#SEPARATOR}.
- * If this is the root Fqn, returns {@link Fqn#SEPARATOR}.
- * Example:
+ * Returns this Fqn as a string, prefixing the first element with a {@link Fqn#SEPARATOR} and joining each subsequent
+ * element with a {@link Fqn#SEPARATOR}. If this is the root Fqn, returns {@link Fqn#SEPARATOR}. Example:
* <pre>
* new Fqn(new Object[] { "a", "b", "c" }).toString(); // "/a/b/c"
* Fqn.ROOT.toString(); // "/"
* </pre>
*/
@Override
- public String toString()
- {
- if (stringRepresentation == null)
- {
+ public String toString() {
+ if (stringRepresentation == null) {
stringRepresentation = getStringRepresentation(elements);
}
return stringRepresentation;
}
- public void writeExternal(ObjectOutput out) throws IOException
- {
- out.writeShort(size);
- for (Object element : elements)
- {
+ public void writeExternal(ObjectOutput out) throws IOException {
+ out.writeShort(elements.length);
+ for (Object element : elements) {
out.writeObject(element);
}
}
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
- {
- size = in.readShort();
- this.elements = new ArrayList<E>(size);
- for (int i = 0; i < size; i++) elements.add((E) in.readObject());
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ int size = in.readShort();
+ this.elements = new Object[size];
+ for (int i = 0; i < size; i++) elements[i] = in.readObject();
}
/**
- * Returns true if this Fqn is child of parentFqn.
- * Example usage:
+ * Returns true if this Fqn is child of parentFqn. Example usage:
* <pre>
* Fqn<String> f1 = Fqn.fromString("/a/b");
* Fqn<String> f2 = Fqn.fromString("/a/b/c");
@@ -504,9 +450,8 @@
* @param parentFqn candidate parent to test against
* @return true if the target is a child of parentFqn
*/
- public boolean isChildOf(Fqn<? super E> parentFqn)
- {
- return parentFqn.size() != size && isChildOrEquals(parentFqn);
+ public boolean isChildOf(Fqn<? super E> parentFqn) {
+ return parentFqn.size() != elements.length && isChildOrEquals(parentFqn);
}
@@ -516,14 +461,12 @@
* @param parentFqn parentFqn to compare with
* @return true if this is a direct child, false otherwise.
*/
- public boolean isDirectChildOf(Fqn<? super E> parentFqn)
- {
- return size == parentFqn.size() + 1 && isChildOf(parentFqn);
+ public boolean isDirectChildOf(Fqn<? super E> parentFqn) {
+ return elements.length == parentFqn.size() + 1 && isChildOf(parentFqn);
}
/**
- * Returns true if this Fqn is equals or the child of parentFqn.
- * Example usage:
+ * Returns true if this Fqn is equals or the child of parentFqn. Example usage:
* <pre>
* Fqn<String> f1 = Fqn.fromString("/a/b");
* Fqn<String> f2 = Fqn.fromString("/a/b/c");
@@ -535,17 +478,13 @@
* @param parentFqn candidate parent to test against
* @return true if this Fqn is equals or the child of parentFqn.
*/
- public boolean isChildOrEquals(Fqn<? super E> parentFqn)
- {
- List<? super E> parentList = parentFqn.elements;
- if (parentList.size() > size)
- {
+ public boolean isChildOrEquals(Fqn<? super E> parentFqn) {
+ Object[] parentElems = parentFqn.elements;
+ if (parentElems.length > elements.length) {
return false;
}
- for (int i = parentList.size() - 1; i >= 0; i--)
- {
- if (!parentList.get(i).equals(elements.get(i)))
- {
+ for (int i = parentElems.length - 1; i >= 0; i--) {
+ if (!parentElems[i].equals(elements[i])) {
return false;
}
}
@@ -557,22 +496,22 @@
*
* @return a calculated hashcode
*/
- protected int calculateHashCode()
- {
+ protected int calculateHashCode() {
int hashCode = 19;
for (Object o : elements) hashCode = 31 * hashCode + (o == null ? 0 : o.hashCode());
if (hashCode == 0) hashCode = 0xDEADBEEF; // degenerate case
return hashCode;
}
- protected String getStringRepresentation(List<E> elements)
- {
+ protected String getStringRepresentation(List<E> elements) {
+ return getStringRepresentation(elements.toArray());
+ }
+
+ protected String getStringRepresentation(Object[] elements) {
StringBuilder builder = new StringBuilder();
- for (Object e : elements)
- {
+ for (Object e : elements) {
// incase user element 'e' does not implement equals() properly, don't rely on their implementation.
- if (!SEPARATOR.equals(e) && !"".equals(e))
- {
+ if (!SEPARATOR.equals(e) && !"".equals(e)) {
builder.append(SEPARATOR);
builder.append(e);
}
@@ -582,9 +521,7 @@
/**
- * Returns the parent of this Fqn.
- * The parent of the root node is {@link #ROOT}.
- * Examples:
+ * Returns the parent of this Fqn. The parent of the root node is {@link #ROOT}. Examples:
* <pre>
* Fqn<String> f1 = Fqn.fromString("/a");
* Fqn<String> f2 = Fqn.fromString("/a/b");
@@ -595,15 +532,13 @@
*
* @return the parent Fqn
*/
- public Fqn<E> getParent()
- {
- switch (size)
- {
+ public Fqn<E> getParent() {
+ switch (elements.length) {
case 0:
case 1:
return root();
default:
- return new Fqn(elements.subList(0, size - 1), true);
+ return getSubFqn(0, elements.length - 1);
}
}
@@ -617,9 +552,8 @@
*
* @return true if the Fqn is Fqn.ROOT.
*/
- public boolean isRoot()
- {
- return size == 0;
+ public boolean isRoot() {
+ return elements.length == 0;
}
/**
@@ -627,14 +561,10 @@
*
* @return a String representation of the last element that makes up this Fqn.
*/
- public String getLastElementAsString()
- {
- if (isRoot())
- {
+ public String getLastElementAsString() {
+ if (isRoot()) {
return SEPARATOR;
- }
- else
- {
+ } else {
Object last = getLastElement();
if (last instanceof String)
return (String) last;
@@ -644,21 +574,33 @@
}
/**
- * Peeks into the elements that build up this Fqn. The list returned is
- * read-only, to maintain the immutable nature of Fqn.
+ * Peeks into the elements that build up this Fqn. The list returned is read-only, to maintain the immutable nature
+ * of Fqn.
*
* @return an unmodifiable list
*/
- public List<E> peekElements()
- {
- return elements;
+ @SuppressWarnings("unchecked")
+ public List<E> peekElements() {
+ return (List<E>) Arrays.asList(elements);
}
+ private int indexOf(Object o) {
+ if (o == null) {
+ for (int i = 0; i < elements.length; i++)
+ if (elements[i] == null)
+ return i;
+ } else {
+ for (int i = 0; i < elements.length; i++)
+ if (o.equals(elements[i]))
+ return i;
+ }
+ return -1;
+ }
+
/**
* Compares this Fqn to another using {@link FqnComparator}.
*/
- public int compareTo(Fqn<?> fqn)
- {
+ public int compareTo(Fqn<?> fqn) {
return FqnComparator.INSTANCE.compare(this, fqn);
}
@@ -669,8 +611,7 @@
* @param newAncestor nw ancestor to replace with
* @return a new Fqn with ancestors replaced.
*/
- public Fqn<E> replaceAncestor(Fqn<E> oldAncestor, Fqn<E> newAncestor)
- {
+ public Fqn<E> replaceAncestor(Fqn<E> oldAncestor, Fqn<E> newAncestor) {
if (!isChildOf(oldAncestor))
throw new IllegalArgumentException("Old ancestor must be an ancestor of the current Fqn!");
Fqn<E> subFqn = this.getSubFqn(oldAncestor.size(), size());
Modified: core/trunk/src/main/java/org/jboss/cache/StringFqn.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/StringFqn.java 2009-08-26 11:12:12 UTC (rev 8206)
+++ core/trunk/src/main/java/org/jboss/cache/StringFqn.java 2009-08-26 12:01:23 UTC (rev 8207)
@@ -52,7 +52,7 @@
protected StringFqn(StringFqn base, List<String> elements)
{
super(base, (List) elements);
- String elementStringRep = getStringRepresentation((List) elements);
+ String elementStringRep = getStringRepresentation(elements);
stringRepresentation = base.isRoot() ? elementStringRep : base.stringRepresentation + elementStringRep;
}
Modified: core/trunk/src/test/java/org/jboss/cache/FqnTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/FqnTest.java 2009-08-26 11:12:12 UTC (rev 8206)
+++ core/trunk/src/test/java/org/jboss/cache/FqnTest.java 2009-08-26 12:01:23 UTC (rev 8207)
@@ -394,7 +394,8 @@
Fqn newParent = Fqn.fromString("/hot/dog");
Fqn expectedNewChild = Fqn.fromString("/hot/dog/b/c");
- assert expectedNewChild.equals(fqn.replaceAncestor(fqn.getParent().getParent(), newParent));
+ Fqn replaced = fqn.replaceAncestor(fqn.getParent().getParent(), newParent);
+ assert expectedNewChild.equals(replaced) : "Expected " + expectedNewChild + " but was " + replaced;
}
public void testDifferentFactories()
14 years, 8 months
JBoss Cache SVN: r8206 - core/trunk/src/main/java/org/jboss/cache.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-08-26 07:12:12 -0400 (Wed, 26 Aug 2009)
New Revision: 8206
Modified:
core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java
core/trunk/src/main/java/org/jboss/cache/RegionRegistry.java
Log:
[JBCACHE-1536] (Improve efficiency of RegionManagerImpl.getRegion)
Modified: core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java 2009-08-26 10:52:18 UTC (rev 8205)
+++ core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java 2009-08-26 11:12:12 UTC (rev 8206)
@@ -222,12 +222,19 @@
if (trace) log.trace("Contents of RegionsRegistry: " + regionsRegistry);
Fqn fqnToUse = fqn;
+
+ if (fqnToUse != null)
+ {
+ // Truncate Fqn as an optimization
+ int largestFqnLength = regionsRegistry.getLargestFqnLength();
+ if (fqnToUse.size() > largestFqnLength) fqnToUse = fqnToUse.getSubFqn(0, largestFqnLength);
+ }
+
if (DEFAULT_REGION.equals(fqnToUse)) fqnToUse = Fqn.ROOT;
// first see if a region for this specific Fqn exists
- if (regionsRegistry.containsKey(fqnToUse))
+ Region r = regionsRegistry.get(fqnToUse);
+ if (r != null)
{
- Region r = regionsRegistry.get(fqnToUse);
-
// this is a very poor way of telling whether a region is a marshalling one or an eviction one. :-(
// mandates that class loaders be registered for marshalling regions.
if (type == ANY
@@ -241,7 +248,7 @@
// if not, attempt to create one ...
if (createIfAbsent)
{
- Region r = new RegionImpl(fqnToUse, this);
+ r = new RegionImpl(fqnToUse, this);
// could be created concurrently; so make sure we use appropriate methods on regionsRegistry for this.
Region previous = regionsRegistry.putIfAbsent(fqnToUse, r);
@@ -261,9 +268,9 @@
while (nextBestThing == null)
{
nextFqn = nextFqn.getParent();
- if (regionsRegistry.containsKey(nextFqn))
+ r = regionsRegistry.get(nextFqn);
+ if (r != null)
{
- Region r = regionsRegistry.get(nextFqn);
if (trace) log.trace("Trying next region " + nextFqn + " and got " + r);
// this is a very poor way of telling whether a region is a marshalling one or an eviction one. :-(
Modified: core/trunk/src/main/java/org/jboss/cache/RegionRegistry.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RegionRegistry.java 2009-08-26 10:52:18 UTC (rev 8205)
+++ core/trunk/src/main/java/org/jboss/cache/RegionRegistry.java 2009-08-26 11:12:12 UTC (rev 8206)
@@ -34,9 +34,23 @@
@NonVolatile
public class RegionRegistry extends ConcurrentHashMap<Fqn, Region>
{
+ private volatile int largestFqnLength;
+
public RegionRegistry()
{
// default CHM constructor. Potentially fine-tune later?
super();
}
+
+ @Override
+ public Region put(Fqn f, Region r)
+ {
+ largestFqnLength = Math.max(largestFqnLength, f.size());
+ return super.put(f, r);
+ }
+
+ public int getLargestFqnLength()
+ {
+ return largestFqnLength;
+ }
}
14 years, 8 months
