JBoss Cache SVN: r5592 - core/tags/2.1.1.CR2.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-18 10:17:49 -0400 (Fri, 18 Apr 2008)
New Revision: 5592
Modified:
core/tags/2.1.1.CR2/pom.xml
Log:
Modified: core/tags/2.1.1.CR2/pom.xml
===================================================================
--- core/tags/2.1.1.CR2/pom.xml 2008-04-18 14:17:09 UTC (rev 5591)
+++ core/tags/2.1.1.CR2/pom.xml 2008-04-18 14:17:49 UTC (rev 5592)
@@ -217,17 +217,17 @@
<formats>
<format>
<formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-pdf.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
<finalName>userguide_en.pdf</finalName>
</format>
<format>
<formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
<format>
<formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/nochunk-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
</formats>
@@ -258,17 +258,17 @@
<formats>
<format>
<formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-pdf.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
<finalName>tutorial_en.pdf</finalName>
</format>
<format>
<formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
<format>
<formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/nochunk-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
</formats>
@@ -299,17 +299,17 @@
<formats>
<format>
<formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-pdf.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
<finalName>faq_en.pdf</finalName>
</format>
<format>
<formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
<format>
<formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/nochunk-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
</formats>
16 years, 2 months
- 1
- 0
JBoss Cache SVN: r5591 - core/tags/2.1.1.CR1.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-18 10:17:09 -0400 (Fri, 18 Apr 2008)
New Revision: 5591
Modified:
core/tags/2.1.1.CR1/pom.xml
Log:
Modified: core/tags/2.1.1.CR1/pom.xml
===================================================================
--- core/tags/2.1.1.CR1/pom.xml 2008-04-18 14:15:28 UTC (rev 5590)
+++ core/tags/2.1.1.CR1/pom.xml 2008-04-18 14:17:09 UTC (rev 5591)
@@ -217,17 +217,17 @@
<formats>
<format>
<formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-pdf.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
<finalName>userguide_en.pdf</finalName>
</format>
<format>
<formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
<format>
<formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/nochunk-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
</formats>
@@ -258,17 +258,17 @@
<formats>
<format>
<formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-pdf.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
<finalName>tutorial_en.pdf</finalName>
</format>
<format>
<formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
<format>
<formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/nochunk-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
</formats>
@@ -299,17 +299,17 @@
<formats>
<format>
<formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-pdf.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
<finalName>faq_en.pdf</finalName>
</format>
<format>
<formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
<format>
<formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/nochunk-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
</formats>
16 years, 2 months
- 1
- 0
JBoss Cache SVN: r5590 - core/tags/2.1.0.GA.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-18 10:15:28 -0400 (Fri, 18 Apr 2008)
New Revision: 5590
Modified:
core/tags/2.1.0.GA/pom.xml
Log:
Modified: core/tags/2.1.0.GA/pom.xml
===================================================================
--- core/tags/2.1.0.GA/pom.xml 2008-04-18 13:06:53 UTC (rev 5589)
+++ core/tags/2.1.0.GA/pom.xml 2008-04-18 14:15:28 UTC (rev 5590)
@@ -211,17 +211,17 @@
<formats>
<format>
<formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-pdf.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
<finalName>userguide_en.pdf</finalName>
</format>
<format>
<formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
<format>
<formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/nochunk-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
</formats>
@@ -252,17 +252,17 @@
<formats>
<format>
<formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-pdf.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
<finalName>tutorial_en.pdf</finalName>
</format>
<format>
<formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
<format>
<formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/nochunk-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
</formats>
@@ -293,17 +293,17 @@
<formats>
<format>
<formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-pdf.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
<finalName>faq_en.pdf</finalName>
</format>
<format>
<formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
<format>
<formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/nochunk-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
</formats>
16 years, 2 months
- 1
- 0
JBoss Cache SVN: r5589 - in core/trunk/src/main/java/org/jboss/cache/commands: cachedata and 3 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-18 09:06:53 -0400 (Fri, 18 Apr 2008)
New Revision: 5589
Modified:
core/trunk/src/main/java/org/jboss/cache/commands/BaseCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/cachedata/EvictNodeCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetChildrenNamesCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetDataMapCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeyValueCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeysCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetNodeCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/cachedata/InvalidateCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/cachedata/MoveCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutKeyValueCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveDataCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveKeyCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/channel/BlockChannelCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/channel/UnblockChannelCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/remote/AnnounceBuddyPoolNameCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/remote/AssignToBuddyGroupCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/remote/GravitateDataCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/remote/RemoteExistsNodeCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/remote/RemoveFromBuddyGroupCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/remote/ReplicateCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/tx/BaseGlobalTransactionCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/tx/OptimisticPrepareCommand.java
Log:
Added consistent toString impls
Modified: core/trunk/src/main/java/org/jboss/cache/commands/BaseCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/BaseCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/BaseCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -1,7 +1,5 @@
package org.jboss.cache.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.commands.functional.MarshallableCommand;
import org.jboss.cache.factories.annotations.CacheInjectionMethods;
@@ -16,16 +14,13 @@
public abstract class BaseCommand implements MarshallableCommand
{
protected static final Object[] EMPTY_OBJECT_ARRAY = new Object[]{};
- protected Log log = LogFactory.getLog(getClass());
protected Notifier notifier;
protected CacheSPI spi;
- protected static boolean trace;
@Inject
public void init(Notifier notifier, CacheSPI spi)
{
this.notifier = notifier;
this.spi = spi;
- trace = log.isTraceEnabled();
}
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/EvictNodeCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/EvictNodeCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/EvictNodeCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -40,4 +40,13 @@
{
return VERSIONED_METHOD_ID == id;
}
+
+ @Override
+ public String toString()
+ {
+ return "EvictNodeCommand{" +
+ "fqn=" + fqn +
+ ", dataVersion=" + dataVersion +
+ "}";
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetChildrenNamesCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetChildrenNamesCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetChildrenNamesCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -60,4 +60,12 @@
{
return METHOD_ID;
}
+
+ @Override
+ public String toString()
+ {
+ return "GetChildrenNamesCommand{" +
+ "fqn=" + fqn +
+ "}";
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetDataMapCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetDataMapCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetDataMapCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -3,8 +3,8 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.NodeSPI;
-import org.jboss.cache.commands.BaseCommand;
import org.jboss.cache.commands.CommandsVisitor;
+import org.jboss.cache.commands.state.BaseCacheDataCommand;
import org.jboss.cache.factories.annotations.Inject;
import org.jboss.cache.invocation.CacheData;
@@ -14,7 +14,7 @@
* @author Mircea.Markus(a)jboss.com
* @since 2.2
*/
-public class GetDataMapCommand extends BaseCommand implements CacheDataCommand
+public class GetDataMapCommand extends BaseCacheDataCommand
{
public static final int METHOD_ID = 24;
@@ -49,40 +49,17 @@
return handler.handleGetDataMapCommand(ctx, this);
}
- public Fqn getFqn()
- {
- return fqn;
- }
-
public int getCommandId()
{
return METHOD_ID;
}
- public Object[] getParameters()
+ @Override
+ public String toString()
{
- return new Object[]{fqn};
+ return "GetDataMapCommand{" +
+ "cacheData=" + cacheData +
+ ", fqn=" + fqn +
+ '}';
}
-
- public void setState(int commandId, Object[] args)
- {
- fqn = (Fqn) args[0];
- }
-
- public boolean equals(Object o)
- {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- GetDataMapCommand that = (GetDataMapCommand) o;
-
- if (fqn != null ? !fqn.equals(that.fqn) : that.fqn != null) return false;
-
- return true;
- }
-
- public int hashCode()
- {
- return (fqn != null ? fqn.hashCode() : 0);
- }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeyValueCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeyValueCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeyValueCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -1,5 +1,7 @@
package org.jboss.cache.commands.cachedata;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.NodeSPI;
@@ -15,16 +17,20 @@
public class GetKeyValueCommand extends BaseCacheDataCommand
{
public static final int METHOD_ID = 26;
+ private static Log log = LogFactory.getLog(GetKeyValueCommand.class);
+ private static boolean trace;
private Object key;
boolean sendNodeEvent;
public GetKeyValueCommand()
{
+ trace = log.isTraceEnabled();
}
public GetKeyValueCommand(Fqn<?> fqn, Object key, boolean sendNodeEvent)
{
+ this();
this.fqn = fqn;
this.key = key;
this.sendNodeEvent = sendNodeEvent;
@@ -112,7 +118,7 @@
return result;
}
-
+ @Override
public String toString()
{
return "GetKeyValueCommand{" +
Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeysCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeysCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeysCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -48,4 +48,12 @@
{
return METHOD_ID;
}
+
+ @Override
+ public String toString()
+ {
+ return "GetKeysCommand{" +
+ "fqn=" + fqn +
+ "}";
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetNodeCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetNodeCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetNodeCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -38,4 +38,12 @@
{
return METHOD_ID;
}
+
+ @Override
+ public String toString()
+ {
+ return "GetNodeCommand{" +
+ "fqn=" + fqn +
+ "}";
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/InvalidateCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/InvalidateCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/InvalidateCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -1,5 +1,7 @@
package org.jboss.cache.commands.cachedata;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.cache.CacheException;
import org.jboss.cache.Fqn;
import org.jboss.cache.InvocationContext;
@@ -31,6 +33,8 @@
public class InvalidateCommand extends EvictNodeCommand
{
public static final int METHOD_ID = 47;
+ private static Log log = LogFactory.getLog(InvalidateCommand.class);
+ private static boolean trace;
/* dependencies*/
private boolean isOptimisticLocking;
@@ -39,11 +43,13 @@
public InvalidateCommand()
{
super(null);
+ trace = log.isTraceEnabled();
}
public InvalidateCommand(Fqn fqn)
{
super(fqn);
+ trace = log.isTraceEnabled();
}
@Inject
@@ -168,11 +174,12 @@
return METHOD_ID;
}
+ @Override
public String toString()
{
return "InvalidateCommand{" +
- "dataVersion=" + dataVersion +
- ", fqn=" + fqn +
+ "fqn=" + fqn +
+ ", dataVersion=" + dataVersion +
'}';
}
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/MoveCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/MoveCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/MoveCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -7,8 +7,6 @@
import org.jboss.cache.commands.CommandsVisitor;
import org.jboss.cache.commands.functional.TxCacheCommand;
import org.jboss.cache.commands.state.BaseCacheDataCommand;
-import org.jboss.cache.factories.annotations.Inject;
-import org.jboss.cache.transaction.TransactionTable;
/**
* Implements functionality defined by {@link org.jboss.cache.Cache#move(org.jboss.cache.Fqn, org.jboss.cache.Fqn)}
@@ -20,8 +18,6 @@
{
public static final int METHOD_ID = 36;
- private TransactionTable transactionTable;
-
/* params */
private Fqn to;
@@ -35,12 +31,6 @@
this.to = to;
}
- @Inject
- public void initialize(TransactionTable txTable)
- {
- this.transactionTable = txTable;
- }
-
public Object perform(InvocationContext ctx)
{
_move(fqn, to, false, ctx);
@@ -145,4 +135,13 @@
result = 31 * result + (to != null ? to.hashCode() : 0);
return result;
}
+
+ @Override
+ public String toString()
+ {
+ return "MoveCommand{" +
+ "fqn=" + fqn +
+ "to=" + to +
+ '}';
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -1,5 +1,7 @@
package org.jboss.cache.commands.cachedata;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.NodeSPI;
@@ -26,6 +28,9 @@
public static final int VERSIONED_METHOD_ID = 37;
public static final int ERASE_VERSIONED_METHOD_ID = 38;
+ private static Log log = LogFactory.getLog(PutDataMapCommand.class);
+ private static boolean trace;
+
/* dependencies*/
private GlobalTransaction globalTransaction;
@@ -37,10 +42,12 @@
public PutDataMapCommand()
{
+ trace = log.isTraceEnabled();
}
public PutDataMapCommand(GlobalTransaction globalTransaction, Fqn fqn, Map data, boolean createUndoOps, boolean eraseContents)
{
+ this();
this.globalTransaction = globalTransaction;
this.fqn = fqn;
this.data = data;
@@ -177,7 +184,7 @@
return result;
}
-
+ @Override
public String toString()
{
return "PutDataMapCommand{" +
Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutKeyValueCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutKeyValueCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutKeyValueCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -1,5 +1,7 @@
package org.jboss.cache.commands.cachedata;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.cache.CacheException;
import org.jboss.cache.Fqn;
import org.jboss.cache.InvocationContext;
@@ -8,11 +10,9 @@
import org.jboss.cache.commands.functional.TxCacheCommand;
import org.jboss.cache.commands.state.BaseDataVersionCommand;
import org.jboss.cache.commands.state.GlobalTransactionCommand;
-import org.jboss.cache.factories.annotations.Inject;
import org.jboss.cache.notifications.event.NodeModifiedEvent;
import org.jboss.cache.optimistic.DataVersion;
import org.jboss.cache.transaction.GlobalTransaction;
-import org.jboss.cache.transaction.TransactionTable;
import java.util.Collections;
import java.util.Map;
@@ -30,8 +30,8 @@
public static final int PUT_FOR_EXT_READ_METHOD_ID = 45;
public static final int PUT_FOR_EXT_READ_VERSIONED_METHOD_ID = 46;
- /* dependencies*/
- private TransactionTable transactionTable;
+ private static Log log = LogFactory.getLog(PutKeyValueCommand.class);
+ private static boolean trace;
/* parametres */
private GlobalTransaction globalTransaction;
@@ -43,10 +43,12 @@
public PutKeyValueCommand()
{
+ trace = log.isTraceEnabled();
}
public PutKeyValueCommand(GlobalTransaction gtx, Fqn fqn, Object key, Object value, boolean createUndoOps, boolean isPutForExternalRead)
{
+ this();
this.globalTransaction = gtx;
this.fqn = fqn;
this.key = key;
@@ -55,12 +57,6 @@
this.isPutForExternalRead = isPutForExternalRead;
}
- @Inject
- public void initialize(TransactionTable transactionTable)
- {
- this.transactionTable = transactionTable;
- }
-
public Object perform(InvocationContext ctx)
{
if (trace)
@@ -211,4 +207,18 @@
return commandId == PUT_FOR_EXT_READ_VERSIONED_METHOD_ID || commandId == VERSIONED_METHOD_ID;
}
+ @Override
+ public String toString()
+ {
+ return "PutKeyValueCommand{" +
+ "fqn=" + fqn +
+ ", dataVersion=" + dataVersion +
+ ", globalTransaction=" + globalTransaction +
+ ", key=" + key +
+ ", value=" + value +
+ ", createUndoOps=" + createUndoOps +
+ ", isPutForExternalRead=" + isPutForExternalRead +
+ ", oldValue=" + oldValue +
+ '}';
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveDataCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveDataCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveDataCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -1,5 +1,7 @@
package org.jboss.cache.commands.cachedata;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.NodeSPI;
@@ -7,11 +9,9 @@
import org.jboss.cache.commands.functional.TxCacheCommand;
import org.jboss.cache.commands.state.BaseDataVersionCommand;
import org.jboss.cache.commands.state.GlobalTransactionCommand;
-import org.jboss.cache.factories.annotations.Inject;
import org.jboss.cache.notifications.event.NodeModifiedEvent;
import org.jboss.cache.optimistic.DataVersion;
import org.jboss.cache.transaction.GlobalTransaction;
-import org.jboss.cache.transaction.TransactionTable;
import java.util.HashMap;
import java.util.Map;
@@ -27,8 +27,8 @@
public static final int METHOD_ID = 7;
public static final int VERSIONED_METHOD_ID = 42;
- /* dependencies*/
- private TransactionTable transactionTable;
+ private static Log log = LogFactory.getLog(RemoveDataCommand.class);
+ private static boolean trace;
/* parameters*/
private GlobalTransaction globalTransaction;
@@ -39,16 +39,12 @@
public RemoveDataCommand()
{
+ trace = log.isTraceEnabled();
}
- @Inject
- public void initialize(TransactionTable transactionTable)
- {
- this.transactionTable = transactionTable;
- }
-
public RemoveDataCommand(GlobalTransaction gtx, Fqn fqn, boolean createUndoops, boolean sendNodeEvent, boolean eviction)
{
+ this();
this.globalTransaction = gtx;
this.fqn = fqn;
this.createUndoops = createUndoops;
@@ -212,4 +208,18 @@
{
return id == VERSIONED_METHOD_ID;
}
+
+ @Override
+ public String toString()
+ {
+ return "RemoveDataCommand{" +
+ "fqn=" + fqn +
+ ", dataVersion=" + dataVersion +
+ ", globalTransaction=" + globalTransaction +
+ ", createUndoops=" + createUndoops +
+ ", sendNodeEvent=" + sendNodeEvent +
+ ", eviction=" + eviction +
+ ", originalData=" + originalData +
+ '}';
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveKeyCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveKeyCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveKeyCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -1,5 +1,7 @@
package org.jboss.cache.commands.cachedata;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.NodeSPI;
@@ -7,11 +9,9 @@
import org.jboss.cache.commands.functional.TxCacheCommand;
import org.jboss.cache.commands.state.BaseDataVersionCommand;
import org.jboss.cache.commands.state.GlobalTransactionCommand;
-import org.jboss.cache.factories.annotations.Inject;
import org.jboss.cache.notifications.event.NodeModifiedEvent;
import org.jboss.cache.optimistic.DataVersion;
import org.jboss.cache.transaction.GlobalTransaction;
-import org.jboss.cache.transaction.TransactionTable;
import java.util.Collections;
import java.util.Map;
@@ -27,8 +27,8 @@
public static final int METHOD_ID = 6;
public static final int VERSIONED_METHOD_ID = 41;
- /* dependencies */
- private TransactionTable transactionTable;
+ private static Log log = LogFactory.getLog(RemoveKeyCommand.class);
+ private static boolean trace;
/* parameters */
private GlobalTransaction globalTransaction;
@@ -38,22 +38,18 @@
public RemoveKeyCommand()
{
+ trace = log.isTraceEnabled();
}
public RemoveKeyCommand(GlobalTransaction gtx, Fqn fqn, Object key, boolean createUndoOps)
{
+ this();
this.globalTransaction = gtx;
this.fqn = fqn;
this.key = key;
this.createUndoOps = createUndoOps;
}
- @Inject
- public void initialize(TransactionTable transactionTable)
- {
- this.transactionTable = transactionTable;
- }
-
public Object perform(InvocationContext ctx)
{
if (trace) log.trace("perform(" + globalTransaction + ", \"" + fqn + "\", key=" + key + ")");
@@ -164,4 +160,17 @@
{
return id == VERSIONED_METHOD_ID;
}
+
+ @Override
+ public String toString()
+ {
+ return "RemoveKeyCommand{" +
+ "fqn=" + fqn +
+ ", dataVersion=" + dataVersion +
+ ", globalTransaction=" + globalTransaction +
+ ", key=" + key +
+ ", createUndoOps=" + createUndoOps +
+ ", oldValue=" + oldValue +
+ '}';
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -1,5 +1,7 @@
package org.jboss.cache.commands.cachedata;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.NodeSPI;
@@ -11,7 +13,6 @@
import org.jboss.cache.factories.annotations.Inject;
import org.jboss.cache.optimistic.DataVersion;
import org.jboss.cache.transaction.GlobalTransaction;
-import org.jboss.cache.transaction.TransactionTable;
/**
* Implements functionality defined by {@link org.jboss.cache.CacheSPI#removeNode(org.jboss.cache.Fqn)}
@@ -23,9 +24,10 @@
{
public static final int METHOD_ID = 5;
public static final int VERSIONED_METHOD_ID = 40;
+ private static Log log = LogFactory.getLog(RemoveNodeCommand.class);
+ private static boolean trace;
private boolean isOptimistic;
- private TransactionTable transactionTable;
/*parameters*/
private GlobalTransaction globalTransaction;
@@ -37,10 +39,12 @@
public RemoveNodeCommand()
{
+ trace = log.isTraceEnabled();
}
public RemoveNodeCommand(GlobalTransaction globalTransaction, Fqn fqn, boolean createUndoOps, boolean skipSendingNodeEvents, boolean eviction)
{
+ this();
this.globalTransaction = globalTransaction;
this.fqn = fqn;
this.createUndoOps = createUndoOps;
@@ -49,9 +53,8 @@
}
@Inject
- public void initialize(TransactionTable txTable, Configuration configuration)
+ public void initialize(Configuration configuration)
{
- this.transactionTable = txTable;
this.isOptimistic = configuration.isNodeLockingOptimistic();
}
@@ -248,4 +251,19 @@
{
this.skipSendingNodeEvents = skipSendingNodeEvents;
}
+
+ @Override
+ public String toString()
+ {
+ return "RemoveNodeCommand{" +
+ "fqn=" + fqn +
+ ", dataVersion=" + dataVersion +
+ ", globalTransaction=" + globalTransaction +
+ ", createUndoOps=" + createUndoOps +
+ ", skipSendingNodeEvents=" + skipSendingNodeEvents +
+ ", eviction=" + eviction +
+ ", parentFqn=" + parentFqn +
+ ", targetNode=" + targetNode +
+ '}';
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/channel/BlockChannelCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/channel/BlockChannelCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/channel/BlockChannelCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -44,4 +44,10 @@
{
// no op
}
+
+ @Override
+ public String toString()
+ {
+ return "BlockChannelCommand{}";
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/channel/UnblockChannelCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/channel/UnblockChannelCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/channel/UnblockChannelCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -45,4 +45,10 @@
{
// no op
}
+
+ @Override
+ public String toString()
+ {
+ return "UnblockChannelCommand{}";
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/AnnounceBuddyPoolNameCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/remote/AnnounceBuddyPoolNameCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/remote/AnnounceBuddyPoolNameCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -104,4 +104,14 @@
result = 31 * result + (buddyPoolName != null ? buddyPoolName.hashCode() : 0);
return result;
}
+
+ @Override
+ public String toString()
+ {
+ return "AnnounceBuddyPoolNameCommand{" +
+ "buddyManager=" + buddyManager +
+ ", address=" + address +
+ ", buddyPoolName='" + buddyPoolName + '\'' +
+ '}';
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/AssignToBuddyGroupCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/remote/AssignToBuddyGroupCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/remote/AssignToBuddyGroupCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -7,6 +7,7 @@
import org.jboss.cache.commands.CommandsVisitor;
import org.jboss.cache.factories.annotations.Inject;
+import java.util.Arrays;
import java.util.Map;
/**
@@ -43,8 +44,6 @@
{
if (buddyManager != null)
buddyManager.handleAssignToBuddyGroup(group, state);
- else if (log.isWarnEnabled())
- log.warn("Received assignToBuddyGroup call from group owner [" + group.getDataOwner() + "] but buddy replication is not enabled on this node!");
return null;
}
@@ -103,4 +102,14 @@
result = 31 * result + (state != null ? state.hashCode() : 0);
return result;
}
+
+ @Override
+ public String toString()
+ {
+ return "AssignToBuddyGroupCommand{" +
+ "buddyManager=" + buddyManager +
+ ", group=" + group +
+ ", state=" + (state == null ? null : Arrays.asList(state)) +
+ '}';
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -1,9 +1,10 @@
package org.jboss.cache.commands.remote;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.commands.CommandsVisitor;
import org.jboss.cache.commands.cachedata.CacheDataCommand;
-import org.jboss.cache.commands.remote.RemoteExistsNodeCommand;
import org.jboss.cache.commands.cachedata.GetChildrenNamesCommand;
import org.jboss.cache.commands.cachedata.GetDataMapCommand;
import org.jboss.cache.factories.annotations.Inject;
@@ -27,12 +28,17 @@
private CacheData cacheData;
private InterceptorChain interceptorChain;
+ private static Log log = LogFactory.getLog(ClusteredGetCommand.class);
+ private static boolean trace;
+
public ClusteredGetCommand()
{
+ trace = log.isTraceEnabled();
}
public ClusteredGetCommand(Boolean searchBackupSubtrees, CacheDataCommand cacheDataComand)
{
+ this();
this.searchBackupSubtrees = searchBackupSubtrees;
this.cacheDataComand = cacheDataComand;
}
@@ -162,4 +168,15 @@
result = 31 * result + (searchBackupSubtrees != null ? searchBackupSubtrees.hashCode() : 0);
return result;
}
+
+ @Override
+ public String toString()
+ {
+ return "ClusteredGetCommand{" +
+ "cacheDataComand=" + cacheDataComand +
+ ", searchBackupSubtrees=" + searchBackupSubtrees +
+ ", cacheData=" + cacheData +
+ ", interceptorChain=" + interceptorChain +
+ '}';
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -1,5 +1,7 @@
package org.jboss.cache.commands.remote;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.NodeSPI;
@@ -12,7 +14,6 @@
import org.jboss.cache.commands.state.BaseCacheDataCommand;
import org.jboss.cache.commands.state.GlobalTransactionCommand;
import org.jboss.cache.factories.annotations.Inject;
-import org.jboss.cache.invocation.CacheData;
import org.jboss.cache.invocation.CacheTransactionHelper;
import org.jboss.cache.invocation.InterceptorChain;
import org.jboss.cache.transaction.GlobalTransaction;
@@ -36,18 +37,22 @@
private CacheTransactionHelper transactionHelper;
private InterceptorChain invoker;
private CommandsFactory commandsFactory;
- private CacheData cacheData;
+ private static Log log = LogFactory.getLog(DataGravitationCleanupCommand.class);
+ private static boolean trace;
+
/* parameters */
private GlobalTransaction globalTransaction;
private Fqn backup;
public DataGravitationCleanupCommand()
{
+ trace = log.isTraceEnabled();
}
public DataGravitationCleanupCommand(Fqn primary, Fqn backup)
{
+ this();
this.fqn = primary;
this.backup = backup;
}
@@ -207,4 +212,17 @@
result = 31 * result + (backup != null ? backup.hashCode() : 0);
return result;
}
+
+ @Override
+ public String toString()
+ {
+ return "DataGravitationCleanupCommand{" +
+ "buddyManager=" + buddyManager +
+ ", transactionHelper=" + transactionHelper +
+ ", invoker=" + invoker +
+ ", commandsFactory=" + commandsFactory +
+ ", globalTransaction=" + globalTransaction +
+ ", backup=" + backup +
+ '}';
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/GravitateDataCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/remote/GravitateDataCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/remote/GravitateDataCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -1,5 +1,7 @@
package org.jboss.cache.commands.remote;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.Node;
@@ -35,12 +37,17 @@
/* parametres */
private boolean searchSubtrees;
+ private static Log log = LogFactory.getLog(GravitateDataCommand.class);
+ private static boolean trace;
+
public GravitateDataCommand()
{
+ trace = log.isTraceEnabled();
}
public GravitateDataCommand(Fqn fqn, boolean searchSubtrees)
{
+ this();
this.fqn = fqn;
this.searchSubtrees = searchSubtrees;
}
@@ -201,4 +208,13 @@
result = 31 * result + (searchSubtrees ? 1 : 0);
return result;
}
+
+ @Override
+ public String toString()
+ {
+ return "GravitateDataCommand{" +
+ "rpcManager=" + rpcManager +
+ ", searchSubtrees=" + searchSubtrees +
+ '}';
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/RemoteExistsNodeCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/remote/RemoteExistsNodeCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/remote/RemoteExistsNodeCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -14,7 +14,7 @@
*
* @author Mircea.Markus(a)jboss.com
* @since 2.2
- * todo - this is only used when remote cache calls exists, nut sure it is necessary to have it as a command
+ * todo - this is only used when remote cache calls exists, nut sure it is necessary to have it as a command
*/
public class RemoteExistsNodeCommand extends BaseCacheDataCommand
{
@@ -44,4 +44,10 @@
{
return METHOD_ID;
}
+
+ @Override
+ public String toString()
+ {
+ return "RemoteExistsNodeCommand{}";
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/RemoveFromBuddyGroupCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/remote/RemoveFromBuddyGroupCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/remote/RemoveFromBuddyGroupCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -36,8 +36,6 @@
{
if (buddyManager != null)
buddyManager.handleRemoveFromBuddyGroup(groupName);
- else if (log.isWarnEnabled())
- log.warn("Received removeFromBuddyGroup call for group name [" + groupName + "] but buddy replication is not enabled on this node!");
return null;
}
@@ -84,4 +82,13 @@
{
return (groupName != null ? groupName.hashCode() : 0);
}
+
+ @Override
+ public String toString()
+ {
+ return "RemoveFromBuddyGroupCommand{" +
+ "buddyManager=" + buddyManager +
+ ", groupName='" + groupName + '\'' +
+ '}';
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/ReplicateCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/remote/ReplicateCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/remote/ReplicateCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -1,5 +1,7 @@
package org.jboss.cache.commands.remote;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.commands.CacheCommand;
import org.jboss.cache.commands.CommandsVisitor;
@@ -23,6 +25,9 @@
private InterceptorChain invoker;
+ private static Log log = LogFactory.getLog(ReplicateCommand.class);
+ private static boolean trace;
+
/**
* optimisation - rather than constructing a new list each for scenarios where a single modification needs
* to be replicated rather use this instance.
@@ -32,10 +37,12 @@
public ReplicateCommand()
{
+ trace = log.isTraceEnabled();
}
public ReplicateCommand(List<MarshallableCommand> modifications)
{
+ this();
if (modifications != null && modifications.size() == 1)
{
singleModification = modifications.get(0);
@@ -48,6 +55,7 @@
public ReplicateCommand(MarshallableCommand command)
{
+ this();
this.singleModification = command;
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/tx/BaseGlobalTransactionCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/tx/BaseGlobalTransactionCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/tx/BaseGlobalTransactionCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -64,4 +64,12 @@
{
return (globalTransaction != null ? globalTransaction.hashCode() : 0);
}
+
+ @Override
+ public String toString()
+ {
+ return getClass().getSimpleName() + "{" +
+ "globalTransaction=" + globalTransaction +
+ '}';
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/tx/OptimisticPrepareCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/tx/OptimisticPrepareCommand.java 2008-04-18 11:37:42 UTC (rev 5588)
+++ core/trunk/src/main/java/org/jboss/cache/commands/tx/OptimisticPrepareCommand.java 2008-04-18 13:06:53 UTC (rev 5589)
@@ -25,10 +25,6 @@
public OptimisticPrepareCommand(GlobalTransaction gtx, List<? extends CacheCommand> modifications, Map data, Address address, boolean onePhaseCommit)
{
super(gtx, modifications, address, onePhaseCommit);
- if (log.isTraceEnabled())
- {
- log.trace("Building optimistic prepare command with modification list: " + modifications);
- }
this.data = data;
}
@@ -86,7 +82,7 @@
result = 31 * result + (data != null ? data.hashCode() : 0);
return result;
}
-
+
@Override
public String toString()
{
16 years, 2 months
- 1
- 0
JBoss Cache SVN: r5588 - core/trunk/src/test/java/org/jboss/cache/transaction.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-18 07:37:42 -0400 (Fri, 18 Apr 2008)
New Revision: 5588
Modified:
core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitContentionTest.java
Log:
implemented missing bits
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitContentionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitContentionTest.java 2008-04-18 11:09:55 UTC (rev 5587)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitContentionTest.java 2008-04-18 11:37:42 UTC (rev 5588)
@@ -6,6 +6,9 @@
import org.jboss.cache.RPCManager;
import org.jboss.cache.RPCManagerImpl;
import org.jboss.cache.commands.CacheCommand;
+import org.jboss.cache.commands.remote.ReplicateCommand;
+import org.jboss.cache.commands.tx.CommitCommand;
+import org.jboss.cache.commands.tx.PrepareCommand;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.ComponentRegistry;
import org.jboss.cache.misc.TestingUtil;
@@ -193,17 +196,29 @@
private boolean isCommitMethod(CacheCommand call)
{
- //todo reimplement
-// return call.getMethodId() == CommitCommand.METHOD_ID ||
-// (call.getMethodId() == MethodDeclarations.replicateMethod_id && isCommitMethod((MethodCall) call.getArgs()[0]));
+ if (call instanceof CommitCommand) return true;
+ if (call instanceof ReplicateCommand)
+ {
+ ReplicateCommand rCom = (ReplicateCommand) call;
+ if (rCom.isSingleCommand())
+ {
+ return rCom.getSingleModification() instanceof CommitCommand;
+ }
+ }
return false;
}
private boolean isPrepareMethod(CacheCommand call)
{
- //todo reimplement
-// return call.getMethodId() == MethodDeclarations.prepareMethod_id ||
-// (call.getMethodId() == MethodDeclarations.replicateMethod_id && isPrepareMethod((MethodCall) call.getArgs()[0]));
+ if (call instanceof PrepareCommand) return true;
+ if (call instanceof ReplicateCommand)
+ {
+ ReplicateCommand rCom = (ReplicateCommand) call;
+ if (rCom.isSingleCommand())
+ {
+ return rCom.getSingleModification() instanceof PrepareCommand;
+ }
+ }
return false;
}
}
16 years, 2 months
- 1
- 0
JBoss Cache SVN: r5587 - in core/trunk/src/main/java/org/jboss/cache: invocation and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-18 07:09:55 -0400 (Fri, 18 Apr 2008)
New Revision: 5587
Modified:
core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
Log:
Reverted Mircea's changes
Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-04-18 09:50:57 UTC (rev 5586)
+++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-04-18 11:09:55 UTC (rev 5587)
@@ -222,7 +222,8 @@
public Map getDataDirect()
{
if (data == null) return Collections.emptyMap();
- return Collections.unmodifiableMap(data);
+// return Collections.unmodifiableMap(data);
+ return data;
}
public Object put(Object key, Object value)
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-04-18 09:50:57 UTC (rev 5586)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-04-18 11:09:55 UTC (rev 5587)
@@ -333,7 +333,6 @@
public void move(Fqn<?> nodeToMove, Fqn<?> newParent) throws NodeNotExistsException
{
- checkState();
MoveCommand command = commandsFactory.buildMoveCommand(nodeToMove, newParent);
invoke(command);
}
@@ -355,7 +354,6 @@
public void evict(Fqn<?> fqn, boolean recursive)
{
- checkState();
List<Fqn> nodesToEvict = cacheData.getNodesForEviction(fqn, recursive);
for (Fqn aFqn : nodesToEvict)
{
@@ -370,7 +368,6 @@
public V get(Fqn<?> fqn, K key)
{
- checkState();
GetKeyValueCommand command = commandsFactory.buildGetKeyValueCommand(fqn, key, true);
return (V) invoke(command);
}
@@ -382,7 +379,6 @@
public boolean removeNode(Fqn<?> fqn)
{
- checkState();
// special case if we are removing the root. Remove all children instead.
if (fqn.isRoot())
{
@@ -410,11 +406,6 @@
}
}
- private void checkState()
- {
- if (!getCacheStatus().allowInvocations()) throw new IllegalStateException("Cache is not in STARTED state");
- }
-
public boolean removeNode(String fqn)
{
return removeNode(Fqn.fromString(fqn));
@@ -422,7 +413,6 @@
public NodeSPI<K, V> getNode(Fqn<?> fqn)
{
- checkState();
GetNodeCommand command = commandsFactory.buildGetNodeCommand(fqn);
return (NodeSPI) invoke(command);
}
@@ -434,7 +424,6 @@
public V remove(Fqn<?> fqn, K key) throws CacheException
{
- checkState();
GlobalTransaction tx = transactionHelper.getCurrentTransaction();
RemoveKeyCommand command = commandsFactory.buildRemoveKeyCommand(tx, fqn, key, true);
return (V) invoke(command);
@@ -447,7 +436,6 @@
public void put(Fqn<?> fqn, Map<K, V> data)
{
- checkState();
PutDataMapCommand command = commandsFactory.buildPutDataMapCommand(null, fqn, data, true, false);
invoke(command);
}
@@ -459,7 +447,6 @@
public void putForExternalRead(Fqn<?> fqn, K key, V value)
{
- checkState();
// if the node exists then this should be a no-op.
if (peek(fqn, false, false) == null)
{
@@ -477,7 +464,6 @@
public V put(Fqn<?> fqn, K key, V value)
{
- checkState();
GlobalTransaction tx = transactionHelper.getCurrentTransaction();
PutKeyValueCommand command = commandsFactory.buildPutKeyValueCommand(tx, fqn, key, value, false, false);
return (V) invoke(command);
@@ -512,7 +498,6 @@
*/
public Map<K, V> getData(Fqn<?> fqn)
{
- checkState();
GetDataMapCommand command = commandsFactory.buildGetDataMapCommand(fqn);
return (Map<K, V>) invoke(command);
}
@@ -538,7 +523,6 @@
*/
public Set<K> getKeys(Fqn<?> fqn)
{
- checkState();
GetKeysCommand command = commandsFactory.buildGetKeysCommand(fqn);
return (Set<K>) invoke(command);
}
@@ -556,7 +540,6 @@
*/
public void clearData(Fqn fqn)
{
- checkState();
GlobalTransaction tx = getCurrentTransaction();
invoke(commandsFactory.buildRemoveDataCommand(tx, fqn, true, false, false));
}
16 years, 2 months
- 1
- 0
JBoss Cache SVN: r5586 - core/trunk/src/main/java/org/jboss/cache.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-04-18 05:50:57 -0400 (Fri, 18 Apr 2008)
New Revision: 5586
Modified:
core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
Log:
JBCACHE-1222 - bug fixing - made the return data immutable
Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-04-18 09:32:50 UTC (rev 5585)
+++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-04-18 09:50:57 UTC (rev 5586)
@@ -222,8 +222,7 @@
public Map getDataDirect()
{
if (data == null) return Collections.emptyMap();
-// return Collections.unmodifiableMap(data);
- return data;
+ return Collections.unmodifiableMap(data);
}
public Object put(Object key, Object value)
16 years, 2 months
- 1
- 0
JBoss Cache SVN: r5585 - core/trunk/src/main/java/org/jboss/cache/invocation.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-04-18 05:32:50 -0400 (Fri, 18 Apr 2008)
New Revision: 5585
Modified:
core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
Log:
JBCACHE-1222 - bug fixing - check state before executing commands
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-04-17 18:07:17 UTC (rev 5584)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-04-18 09:32:50 UTC (rev 5585)
@@ -333,6 +333,7 @@
public void move(Fqn<?> nodeToMove, Fqn<?> newParent) throws NodeNotExistsException
{
+ checkState();
MoveCommand command = commandsFactory.buildMoveCommand(nodeToMove, newParent);
invoke(command);
}
@@ -354,6 +355,7 @@
public void evict(Fqn<?> fqn, boolean recursive)
{
+ checkState();
List<Fqn> nodesToEvict = cacheData.getNodesForEviction(fqn, recursive);
for (Fqn aFqn : nodesToEvict)
{
@@ -368,6 +370,7 @@
public V get(Fqn<?> fqn, K key)
{
+ checkState();
GetKeyValueCommand command = commandsFactory.buildGetKeyValueCommand(fqn, key, true);
return (V) invoke(command);
}
@@ -379,6 +382,7 @@
public boolean removeNode(Fqn<?> fqn)
{
+ checkState();
// special case if we are removing the root. Remove all children instead.
if (fqn.isRoot())
{
@@ -406,6 +410,11 @@
}
}
+ private void checkState()
+ {
+ if (!getCacheStatus().allowInvocations()) throw new IllegalStateException("Cache is not in STARTED state");
+ }
+
public boolean removeNode(String fqn)
{
return removeNode(Fqn.fromString(fqn));
@@ -413,6 +422,7 @@
public NodeSPI<K, V> getNode(Fqn<?> fqn)
{
+ checkState();
GetNodeCommand command = commandsFactory.buildGetNodeCommand(fqn);
return (NodeSPI) invoke(command);
}
@@ -424,6 +434,7 @@
public V remove(Fqn<?> fqn, K key) throws CacheException
{
+ checkState();
GlobalTransaction tx = transactionHelper.getCurrentTransaction();
RemoveKeyCommand command = commandsFactory.buildRemoveKeyCommand(tx, fqn, key, true);
return (V) invoke(command);
@@ -436,6 +447,7 @@
public void put(Fqn<?> fqn, Map<K, V> data)
{
+ checkState();
PutDataMapCommand command = commandsFactory.buildPutDataMapCommand(null, fqn, data, true, false);
invoke(command);
}
@@ -447,6 +459,7 @@
public void putForExternalRead(Fqn<?> fqn, K key, V value)
{
+ checkState();
// if the node exists then this should be a no-op.
if (peek(fqn, false, false) == null)
{
@@ -464,6 +477,7 @@
public V put(Fqn<?> fqn, K key, V value)
{
+ checkState();
GlobalTransaction tx = transactionHelper.getCurrentTransaction();
PutKeyValueCommand command = commandsFactory.buildPutKeyValueCommand(tx, fqn, key, value, false, false);
return (V) invoke(command);
@@ -498,6 +512,7 @@
*/
public Map<K, V> getData(Fqn<?> fqn)
{
+ checkState();
GetDataMapCommand command = commandsFactory.buildGetDataMapCommand(fqn);
return (Map<K, V>) invoke(command);
}
@@ -523,6 +538,7 @@
*/
public Set<K> getKeys(Fqn<?> fqn)
{
+ checkState();
GetKeysCommand command = commandsFactory.buildGetKeysCommand(fqn);
return (Set<K>) invoke(command);
}
@@ -540,6 +556,7 @@
*/
public void clearData(Fqn fqn)
{
+ checkState();
GlobalTransaction tx = getCurrentTransaction();
invoke(commandsFactory.buildRemoveDataCommand(tx, fqn, true, false, false));
}
16 years, 2 months
- 1
- 0
JBoss Cache SVN: r5584 - in core/trunk/src: main/java/org/jboss/cache/commands/cachedata and 4 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-17 14:07:17 -0400 (Thu, 17 Apr 2008)
New Revision: 5584
Modified:
core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeyValueCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java
core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyAssignmentStateTransferTest.java
Log:
Updated data gravitation code
Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-04-17 16:32:43 UTC (rev 5583)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-04-17 18:07:17 UTC (rev 5584)
@@ -558,7 +558,6 @@
// create the backup region anyway
Option o = cache.getInvocationContext().getOptionOverrides();
o.setSkipCacheStatusCheck(true);
- Node root = cache.getRoot();
o = cache.getInvocationContext().getOptionOverrides();
o.setCacheModeLocal(true);
o.setSkipCacheStatusCheck(true);
@@ -574,6 +573,7 @@
Fqn fqn = entry.getKey();
if (!regionManager.isInactive(fqn))
{
+ if (trace) log.trace("Integrating state for region " + fqn);
//ClassLoader cl = (marshaller == null) ? null : marshaller.getClassLoader(fqnS);
Fqn integrationRoot = Fqn.fromRelativeFqn(integrationBase, fqn);
@@ -609,6 +609,10 @@
}
}
}
+ else
+ {
+ log.trace("Received state for region " + fqn + " but region is inactive");
+ }
}
}
}
@@ -819,6 +823,10 @@
}
}
}
+ else
+ {
+ if (trace) log.trace("Not configured to provide state!");
+ }
// now broadcast a message to the newly assigned buddies.
AssignToBuddyGroupCommand membershipCall = commandsFactory.buildAssignToBuddyGroupCommand(buddyGroup, stateMap);
Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeyValueCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeyValueCommand.java 2008-04-17 16:32:43 UTC (rev 5583)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeyValueCommand.java 2008-04-17 18:07:17 UTC (rev 5584)
@@ -111,4 +111,14 @@
result = 31 * result + (sendNodeEvent ? 1 : 0);
return result;
}
+
+
+ public String toString()
+ {
+ return "GetKeyValueCommand{" +
+ "fqn=" + fqn +
+ ", key=" + key +
+ ", sendNodeEvent=" + sendNodeEvent +
+ '}';
+ }
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java 2008-04-17 16:32:43 UTC (rev 5583)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java 2008-04-17 18:07:17 UTC (rev 5584)
@@ -181,7 +181,8 @@
public String toString()
{
return "PutDataMapCommand{" +
- "eraseContents=" + eraseContents +
+ "fqn=" + fqn +
+ ", eraseContents=" + eraseContents +
", createUndoOps=" + createUndoOps +
", dataVersion=" + dataVersion +
", data=" + data +
Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java 2008-04-17 16:32:43 UTC (rev 5583)
+++ core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java 2008-04-17 18:07:17 UTC (rev 5584)
@@ -27,7 +27,7 @@
* todo this calls other commands through the invocation chain, check wheter direct call is not okay
* todo it is not natural for this command to extend TxCC, revisit
*/
-public class DataGravitationCleanupCommand extends BaseCacheDataCommand implements TxCacheCommand, GlobalTransactionCommand
+public class DataGravitationCleanupCommand extends BaseCacheDataCommand implements TxCacheCommand, GlobalTransactionCommand, DirectCommand
{
public static final int METHOD_ID = 34;
@@ -62,8 +62,13 @@
this.commandsFactory = commandsFactory;
}
- public Object perform(InvocationContext ctx) throws Throwable
+ public Object perform(InvocationContext ctx)
{
+ throw new UnsupportedOperationException("Direct commands are not meant to be passed up the interceptor chain!");
+ }
+
+ public Object performDirectly() throws Throwable
+ {
if (buddyManager.isDataGravitationRemoveOnFind())
{
if (trace)
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor.java 2008-04-17 16:32:43 UTC (rev 5583)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor.java 2008-04-17 18:07:17 UTC (rev 5584)
@@ -96,21 +96,40 @@
protected void replicateCall(InvocationContext ctx, List<Address> recipients, CacheCommand c, boolean sync, Option o, boolean wrapCacheCommandInReplicateMethod, boolean useOutOfBandMessage) throws Throwable
{
+ long syncReplTimeout = config.getSyncReplTimeout();
+
+ // test for option overrides
+ if (o != null)
+ {
+ if (o.isForceAsynchronous()) sync = false;
+ else if (o.isForceSynchronous()) sync = true;
+
+ if (o.getSyncReplTimeout() > 0) syncReplTimeout = o.getSyncReplTimeout();
+ }
+
+ // tx-level overrides are more important
+ Transaction tx = ctx.getTransaction();
+ if (tx != null)
+ {
+ GlobalTransaction gtx = ctx.getGlobalTransaction();
+ TransactionEntry te = txTable.get(gtx);
+ if (te != null)
+ {
+ if (te.isForceAsyncReplication()) sync = false;
+ else if (te.isForceSyncReplication()) sync = true;
+ }
+ }
+
+ replicateCall(recipients, c, sync, wrapCacheCommandInReplicateMethod, useOutOfBandMessage, false, (int) syncReplTimeout);
+ }
+
+ protected void replicateCall(List<Address> recipients, CacheCommand c, boolean sync, boolean wrapCacheCommandInReplicateMethod, boolean useOutOfBandMessage, boolean isBroadcast, int timeout) throws Throwable
+ {
if (c instanceof MarshallableCommand)
{
MarshallableCommand call = (MarshallableCommand) c;
if (trace) log.trace("Broadcasting call " + call + " to recipient list " + recipients);
- Transaction tx = ctx.getTransaction();
- if (tx != null)
- {
- GlobalTransaction gtx = ctx.getGlobalTransaction();
- TransactionEntry te = txTable.get(gtx);
- if (te != null)
- {
- if (te.isForceAsyncReplication()) sync = false;
- else if (te.isForceSyncReplication()) sync = true;
- }
- }
+
if (!sync && replicationQueue != null && !usingBuddyReplication)
{
if (log.isDebugEnabled()) log.debug("Putting call " + call + " on the replication queue.");
@@ -118,26 +137,23 @@
}
else
{
- if (usingBuddyReplication) call = buddyManager.transformFqns(call);
+ if (usingBuddyReplication && !isBroadcast) call = buddyManager.transformFqns(call);
List<Address> callRecipients = recipients;
if (callRecipients == null)
{
- callRecipients = usingBuddyReplication ? buddyManager.getBuddyAddresses() : rpcManager.getMembers();
+ callRecipients = usingBuddyReplication && !isBroadcast ? buddyManager.getBuddyAddresses() : rpcManager.getMembers();
if (trace)
log.trace("Setting call recipients to " + callRecipients + " since the original list of recipients passed in is null.");
}
- long syncReplTimeout = o.getSyncReplTimeout();
- if (syncReplTimeout < 0) syncReplTimeout = config.getSyncReplTimeout();
-
CacheCommand toCall = wrapCacheCommandInReplicateMethod ? commandsFactory.buildReplicateCommand(call) : call;
List rsps = rpcManager.callRemoteMethods(callRecipients,
toCall,
sync, // is synchronised?
true, // ignore self?
- (int) syncReplTimeout,
+ timeout,
useOutOfBandMessage
);
if (trace) log.trace("responses=" + rsps);
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java 2008-04-17 16:32:43 UTC (rev 5583)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java 2008-04-17 18:07:17 UTC (rev 5584)
@@ -25,8 +25,6 @@
import org.jboss.cache.commands.remote.GravitateDataCommand;
import org.jboss.cache.commands.remote.RemoteExistsNodeCommand;
import org.jboss.cache.commands.tx.CommitCommand;
-import org.jboss.cache.commands.tx.OptimisticPrepareCommand;
-import org.jboss.cache.commands.tx.PrepareCommand;
import org.jboss.cache.commands.tx.RollbackCommand;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.annotations.Inject;
@@ -40,6 +38,7 @@
import org.jgroups.blocks.RspFilter;
import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -56,6 +55,12 @@
* See the JBoss Cache User Guide for more details on configuration options.
* There is a section dedicated to Buddy Replication in the Replication
* chapter.
+ * <p/>
+ * In terms of functionality, if a gravitation call has occured and a cleanup call is needed (based on
+ * how BR is configured), a cleanup call will be broadcast immediately after the gravitation call (no txs)
+ * or if txs are used, an <i>asynchronous</i> call is made to perform the cleanup <i>outside</i> the scope
+ * of the tx that caused the gravitation event.
+ * <p/>
*
* @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
*/
@@ -63,12 +68,17 @@
{
private BuddyManager buddyManager;
private boolean syncCommunications = false;
- private Map<GlobalTransaction, CacheCommand> transactionMods = new ConcurrentHashMap<GlobalTransaction, CacheCommand>();
+ /**
+ * Map that contains commands that need cleaning up. This is keyed on global transaction, and contains a list of
+ * cleanup commands corresponding to all gravitate calls made during the course of the transaction in question.
+ */
+ private Map<GlobalTransaction, List<CacheCommand>> cleanupCommands = new ConcurrentHashMap<GlobalTransaction, List<CacheCommand>>();
private CacheData cacheData;
private Configuration config;
private CommandsFactory commandsFactory;
private CacheSPI cacheSPI;
private boolean usingOptimisticLocking;
+ private boolean needToCleanup;
@Inject
public void injectComponents(BuddyManager buddyManager, Configuration config, CacheData cacheData, CommandsFactory commandsFactory, CacheSPI cacheSPI)
@@ -85,6 +95,7 @@
{
syncCommunications = config.getCacheMode() == Configuration.CacheMode.REPL_SYNC || config.getCacheMode() == Configuration.CacheMode.INVALIDATION_SYNC;
usingOptimisticLocking = config.isNodeLockingOptimistic();
+ needToCleanup = config.getBuddyReplicationConfig().isDataGravitationRemoveOnFind();
}
@Override
@@ -124,67 +135,30 @@
}
@Override
- public Object handlePrepareCommand(InvocationContext ctx, PrepareCommand command) throws Throwable
- {
- try
- {
- Object returnValue = invokeNextInterceptor(ctx, command);
- doPrepare(ctx.getGlobalTransaction(), ctx);
- return returnValue;
- }
- catch (Throwable throwable)
- {
- transactionMods.remove(ctx.getGlobalTransaction());
- throw throwable;
-
- }
- }
-
- @Override
- public Object handleOptimisticPrepareCommand(InvocationContext ctx, OptimisticPrepareCommand command) throws Throwable
- {
- try
- {
- Object returnValue = invokeNextInterceptor(ctx, command);
- doPrepare(ctx.getGlobalTransaction(), ctx);
- return returnValue;
- }
- catch (Throwable throwable)
- {
- transactionMods.remove(ctx.getGlobalTransaction());
- throw throwable;
-
- }
- }
-
- @Override
public Object handleRollbackCommand(InvocationContext ctx, RollbackCommand command) throws Throwable
{
try
{
- transactionMods.remove(ctx.getGlobalTransaction());
return invokeNextInterceptor(ctx, command);
}
- catch (Throwable throwable)
+ finally
{
- transactionMods.remove(ctx.getGlobalTransaction());
- throw throwable;
+ cleanupCommands.remove(ctx.getGlobalTransaction());
}
}
@Override
public Object handleCommitCommand(InvocationContext ctx, CommitCommand command) throws Throwable
{
+ GlobalTransaction gtx = ctx.getGlobalTransaction();
try
{
- doCommit(ctx.getGlobalTransaction(), ctx);
- transactionMods.remove(ctx.getGlobalTransaction());
+ doCommit(gtx);
return invokeNextInterceptor(ctx, command);
}
- catch (Throwable throwable)
+ finally
{
- transactionMods.remove(ctx.getGlobalTransaction());
- throw throwable;
+ cleanupCommands.remove(gtx);
}
}
@@ -202,6 +176,8 @@
{
if (cacheData.peek(command.getFqn(), false, false) == null)
{
+ // gravitation is necessary.
+
if (trace) log.trace("Gravitating from local backup tree");
BackupData data = localBackupGet(command.getFqn(), ctx);
@@ -214,20 +190,16 @@
if (data != null)
{
- // create node locally so I don't gravitate again
- // when I do the put() call to the cluster!
- //createNode(data.backupData, true);
- // Make sure I replicate to my buddies.
if (trace)
log.trace("Passing the put call locally to make sure state is persisted and ownership is correctly established.");
- createNode(ctx, data.backupData, false);
+ // store the gravitated node locally. This will cause it being backed up in the current instance's buddy.
+ createNode(data.backupData);
- // very strange, the invocation contexts get twisted up here, and will need preservation.
- // a bit crappy and hacky, all will be solved when we move to JBoss AOP in 2.1.0
- //ctx.setMethodCall(m);
-
- // Clean up the other nodes
- cleanBackupData(data, ctx.getGlobalTransaction(), ctx);
+ if (needToCleanup)
+ {
+ // Clean up the previous data owner and backups made in the name of the previous owner.
+ cleanBackupData(data, ctx);
+ }
}
}
else
@@ -259,44 +231,30 @@
return enabled;
}
- private void doPrepare(GlobalTransaction gtx, InvocationContext ctx) throws Throwable
+ private void doCommit(GlobalTransaction gtx) throws Throwable
{
- CacheCommand cleanup = transactionMods.get(gtx);
- if (trace) log.trace("Broadcasting prepare for cleanup ops " + cleanup);
- if (cleanup != null)
+ if (cleanupCommands.containsKey(gtx))
{
- CacheCommand prepare;
- if (usingOptimisticLocking)
+ if (trace) log.trace("Broadcasting cleanup commands for gtx " + gtx);
+
+ for (CacheCommand command : cleanupCommands.get(gtx))
{
- prepare = commandsFactory.buildOptimisticPrepareCommand(gtx, cleanup);
+ try
+ {
+ doCleanup(command);
+ }
+ catch (Throwable th)
+ {
+ log.warn("Problems performing gravitation cleanup. Cleanup command: " + command, th);
+ }
}
- else
- {
- prepare = commandsFactory.buildPrepareCommand(gtx, cleanup, !syncCommunications);
- }
-
- replicateCall(ctx, buddyManager.getMembersOutsideBuddyGroup(), prepare, syncCommunications, ctx.getOptionOverrides());
}
else
{
- if (trace) log.trace("Nothing to broadcast in prepare phase for gtx " + gtx);
+ if (trace) log.trace("No cleanups to broadcast in commit phase for gtx " + gtx);
}
}
- private void doCommit(GlobalTransaction gtx, InvocationContext ctx) throws Throwable
- {
- if (transactionMods.containsKey(gtx))
- {
- if (trace) log.trace("Broadcasting commit for gtx " + gtx);
- CommitCommand call = commandsFactory.buildCommitCommand(gtx);
- replicateCall(ctx, buddyManager.getMembersOutsideBuddyGroup(), call, syncCommunications, ctx.getOptionOverrides(), true, true);
- }
- else
- {
- if (trace) log.trace("Nothing to broadcast in commit phase for gtx " + gtx);
- }
- }
-
private BackupData remoteBackupGet(Fqn name) throws Exception
{
BackupData result = null;
@@ -313,32 +271,46 @@
return result;
}
- private void cleanBackupData(BackupData backup, GlobalTransaction gtx, InvocationContext ctx) throws Throwable
+ private void cleanBackupData(BackupData backup, InvocationContext ctx) throws Throwable
{
DataGravitationCleanupCommand cleanupCommand = commandsFactory.buildDataGravitationCleanupCommand(backup.primaryFqn, backup.backupFqn);
+ GlobalTransaction gtx = ctx.getGlobalTransaction();
- if (trace) log.trace("Performing cleanup on [" + backup.primaryFqn + "]");
if (gtx == null)
{
// broadcast removes
// remove main Fqn
- if (trace) log.trace("Performing cleanup on [" + backup.backupFqn + "]");
+ if (trace) log.trace("Performing cleanup on [" + backup.primaryFqn + "]");
// remove backup Fqn
- replicateCall(ctx, rpcManager.getMembers(), cleanupCommand, syncCommunications, ctx.getOptionOverrides(), false, false);
+ doCleanup(cleanupCommand);
}
else
{
if (trace)
+ log.trace("Data gravitation performed under global transaction " + gtx + ". Not broadcasting cleanups until the tx commits. Recording cleanup command for later use.");
+ List<CacheCommand> commands;
+ if (cleanupCommands.containsKey(gtx))
{
- log.trace("Data gravitation performed under global transaction " + gtx + ". Not broadcasting cleanups until the tx commits. Adding to tx mod list instead.");
+ commands = cleanupCommands.get(gtx);
}
- transactionMods.put(gtx, cleanupCommand);
- TransactionEntry te = getTransactionEntry(gtx);
- te.addModification(cleanupCommand);
+ else
+ {
+ commands = new LinkedList<CacheCommand>();
+ }
+
+ commands.add(cleanupCommand);
+ cleanupCommands.put(gtx, commands);
}
}
+ private void doCleanup(CacheCommand cleanupCommand) throws Throwable
+ {
+ // cleanup commands are always ASYNCHRONOUS and is broadcast to *everyone* (even members of the current buddy
+ // group as they may be members of > 1 buddy group)
+ replicateCall(null, cleanupCommand, false, false, false, true, -1);
+ }
+
private GravitateResult gravitateData(Fqn fqn) throws Exception
{
if (trace) log.trace("Requesting data gravitation for Fqn " + fqn);
@@ -391,22 +363,11 @@
}
@SuppressWarnings("unchecked")
- private void createNode(InvocationContext ctx, List<NodeData> nodeData, boolean localOnly) throws CacheException
+ private void createNode(List<NodeData> nodeData) throws CacheException
{
for (NodeData data : nodeData)
{
- if (localOnly)
- {
-// if (cache.peek(data.getFqn(), false) == null)
- if (cacheData.peek(data.getFqn(), false, false) == null)
- {
- cacheData.createNodesLocally((Fqn<?>) data.getFqn(), (Map<?, ?>) data.getAttributes());
- }
- }
- else
- {
- cacheSPI.put(data.getFqn(), data.getAttributes());
- }
+ cacheSPI.put(data.getFqn(), data.getAttributes());
}
}
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-04-17 16:32:43 UTC (rev 5583)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-04-17 18:07:17 UTC (rev 5584)
@@ -333,7 +333,6 @@
public void move(Fqn<?> nodeToMove, Fqn<?> newParent) throws NodeNotExistsException
{
- checkState();
MoveCommand command = commandsFactory.buildMoveCommand(nodeToMove, newParent);
invoke(command);
}
@@ -355,7 +354,6 @@
public void evict(Fqn<?> fqn, boolean recursive)
{
- checkState();
List<Fqn> nodesToEvict = cacheData.getNodesForEviction(fqn, recursive);
for (Fqn aFqn : nodesToEvict)
{
@@ -370,7 +368,6 @@
public V get(Fqn<?> fqn, K key)
{
- checkState();
GetKeyValueCommand command = commandsFactory.buildGetKeyValueCommand(fqn, key, true);
return (V) invoke(command);
}
@@ -382,7 +379,6 @@
public boolean removeNode(Fqn<?> fqn)
{
- checkState();
// special case if we are removing the root. Remove all children instead.
if (fqn.isRoot())
{
@@ -410,11 +406,6 @@
}
}
- private void checkState()
- {
- if (!getCacheStatus().allowInvocations()) throw new IllegalStateException("Cache is not in STARTED state");
- }
-
public boolean removeNode(String fqn)
{
return removeNode(Fqn.fromString(fqn));
@@ -422,7 +413,6 @@
public NodeSPI<K, V> getNode(Fqn<?> fqn)
{
- checkState();
GetNodeCommand command = commandsFactory.buildGetNodeCommand(fqn);
return (NodeSPI) invoke(command);
}
@@ -434,7 +424,6 @@
public V remove(Fqn<?> fqn, K key) throws CacheException
{
- checkState();
GlobalTransaction tx = transactionHelper.getCurrentTransaction();
RemoveKeyCommand command = commandsFactory.buildRemoveKeyCommand(tx, fqn, key, true);
return (V) invoke(command);
@@ -447,7 +436,6 @@
public void put(Fqn<?> fqn, Map<K, V> data)
{
- checkState();
PutDataMapCommand command = commandsFactory.buildPutDataMapCommand(null, fqn, data, true, false);
invoke(command);
}
@@ -459,7 +447,6 @@
public void putForExternalRead(Fqn<?> fqn, K key, V value)
{
- checkState();
// if the node exists then this should be a no-op.
if (peek(fqn, false, false) == null)
{
@@ -477,7 +464,6 @@
public V put(Fqn<?> fqn, K key, V value)
{
- checkState();
GlobalTransaction tx = transactionHelper.getCurrentTransaction();
PutKeyValueCommand command = commandsFactory.buildPutKeyValueCommand(tx, fqn, key, value, false, false);
return (V) invoke(command);
@@ -512,7 +498,6 @@
*/
public Map<K, V> getData(Fqn<?> fqn)
{
- checkState();
GetDataMapCommand command = commandsFactory.buildGetDataMapCommand(fqn);
return (Map<K, V>) invoke(command);
}
@@ -538,7 +523,6 @@
*/
public Set<K> getKeys(Fqn<?> fqn)
{
- checkState();
GetKeysCommand command = commandsFactory.buildGetKeysCommand(fqn);
return (Set<K>) invoke(command);
}
@@ -556,7 +540,6 @@
*/
public void clearData(Fqn fqn)
{
- checkState();
GlobalTransaction tx = getCurrentTransaction();
invoke(commandsFactory.buildRemoveDataCommand(tx, fqn, true, false, false));
}
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyAssignmentStateTransferTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyAssignmentStateTransferTest.java 2008-04-17 16:32:43 UTC (rev 5583)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyAssignmentStateTransferTest.java 2008-04-17 18:07:17 UTC (rev 5584)
@@ -45,7 +45,7 @@
Fqn<String> test = BuddyFqnTransformer.getBackupFqn(caches.get(0).getLocalAddress(), main);
- assertEquals("State transferred", "Joe", caches.get(1).get(test, "name"));
+ assertEquals("State not transferred", "Joe", caches.get(1).get(test, "name"));
caches.add(createCache(1, "TEST", false, true));
16 years, 2 months
- 1
- 0
JBoss Cache SVN: r5583 - demos/core-demo-gui/tags.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-04-17 12:32:43 -0400 (Thu, 17 Apr 2008)
New Revision: 5583
Added:
demos/core-demo-gui/tags/1.0.GA/
Log:
Copied: demos/core-demo-gui/tags/1.0.GA (from rev 5582, demos/core-demo-gui/trunk)
16 years, 2 months
- 1
- 0