[jbosscache-commits] JBoss Cache SVN: r6893 - in core/branches/flat/src/main/java/org/jboss: cache/marshall and 5 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Thu Oct 9 05:27:59 EDT 2008
Author: manik.surtani at jboss.com
Date: 2008-10-09 05:27:58 -0400 (Thu, 09 Oct 2008)
New Revision: 6893
Modified:
core/branches/flat/src/main/java/org/jboss/cache/RPCManagerImpl.java
core/branches/flat/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java
core/branches/flat/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java
core/branches/flat/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java
core/branches/flat/src/main/java/org/jboss/cache/marshall/InactiveRegionAwareRpcDispatcher.java
core/branches/flat/src/main/java/org/jboss/cache/marshall/RegionalizedMethodCall.java
core/branches/flat/src/main/java/org/jboss/starobrno/CacheDelegate.java
core/branches/flat/src/main/java/org/jboss/starobrno/commands/CommandsFactory.java
core/branches/flat/src/main/java/org/jboss/starobrno/commands/CommandsFactoryImpl.java
core/branches/flat/src/main/java/org/jboss/starobrno/commands/read/GetKeyValueCommand.java
core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/PutKeyValueCommand.java
core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/RemoveCommand.java
core/branches/flat/src/main/java/org/jboss/starobrno/factories/ComponentRegistry.java
Log:
Several pints of Starobrno
Modified: core/branches/flat/src/main/java/org/jboss/cache/RPCManagerImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/cache/RPCManagerImpl.java 2008-10-09 08:56:47 UTC (rev 6892)
+++ core/branches/flat/src/main/java/org/jboss/cache/RPCManagerImpl.java 2008-10-09 09:27:58 UTC (rev 6893)
@@ -32,7 +32,6 @@
import org.jboss.cache.lock.LockManager;
import org.jboss.cache.lock.TimeoutException;
import org.jboss.cache.marshall.CommandAwareRpcDispatcher;
-import org.jboss.cache.marshall.InactiveRegionAwareRpcDispatcher;
import org.jboss.cache.marshall.Marshaller;
import org.jboss.cache.remoting.jgroups.ChannelMessageListener;
import org.jboss.cache.statetransfer.DefaultStateTransferManager;
@@ -305,7 +304,7 @@
channel.setOpt(Channel.AUTO_RECONNECT, true);
channel.setOpt(Channel.AUTO_GETSTATE, fetchState);
channel.setOpt(Channel.BLOCK, true);
-
+ /*
if (configuration.isUseRegionBasedMarshalling())
{
rpcDispatcher = new InactiveRegionAwareRpcDispatcher(channel, messageListener, new MembershipListenerAdaptor(),
@@ -316,6 +315,7 @@
rpcDispatcher = new CommandAwareRpcDispatcher(channel, messageListener, new MembershipListenerAdaptor(),
invocationContextContainer, invocationContextContainer, interceptorChain, componentRegistry);
}
+ */
checkAppropriateConfig();
rpcDispatcher.setRequestMarshaller(marshaller);
rpcDispatcher.setResponseMarshaller(marshaller);
@@ -452,7 +452,7 @@
throw new TimeoutException("State retrieval timed out waiting for flush unblock.");
}
useOutOfBandMessage = false;
- RspList rsps = rpcDispatcher.invokeRemoteCommands(recipients, command, modeToUse, timeout, isUsingBuddyReplication, useOutOfBandMessage, responseFilter);
+ RspList rsps = null;//rpcDispatcher.invokeRemoteCommands(recipients, command, modeToUse, timeout, isUsingBuddyReplication, useOutOfBandMessage, responseFilter);
if (mode == GroupRequest.GET_NONE) return Collections.emptyList();// async case
if (trace)
log.trace("(" + getLocalAddress() + "): responses for method " + command.getClass().getSimpleName() + ":\n" + rsps);
Modified: core/branches/flat/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java 2008-10-09 08:56:47 UTC (rev 6892)
+++ core/branches/flat/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java 2008-10-09 09:27:58 UTC (rev 6893)
@@ -25,37 +25,16 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.RegionManager;
-import org.jboss.cache.commands.DataCommand;
-import org.jboss.cache.commands.ReplicableCommand;
-import org.jboss.cache.commands.WriteCommand;
-import org.jboss.cache.commands.read.ExistsCommand;
-import org.jboss.cache.commands.read.GetChildrenNamesCommand;
-import org.jboss.cache.commands.read.GetDataMapCommand;
-import org.jboss.cache.commands.read.GetKeyValueCommand;
-import org.jboss.cache.commands.read.GetKeysCommand;
-import org.jboss.cache.commands.read.GravitateDataCommand;
-import org.jboss.cache.commands.remote.AnnounceBuddyPoolNameCommand;
-import org.jboss.cache.commands.remote.AssignToBuddyGroupCommand;
-import org.jboss.cache.commands.remote.ClusteredGetCommand;
-import org.jboss.cache.commands.remote.DataGravitationCleanupCommand;
-import org.jboss.cache.commands.remote.RemoveFromBuddyGroupCommand;
-import org.jboss.cache.commands.remote.ReplicateCommand;
-import org.jboss.cache.commands.tx.AbstractTransactionCommand;
-import org.jboss.cache.commands.tx.CommitCommand;
-import org.jboss.cache.commands.tx.PrepareCommand;
-import org.jboss.cache.commands.tx.RollbackCommand;
-import org.jboss.cache.commands.write.EvictCommand;
-import org.jboss.cache.commands.write.InvalidateCommand;
import org.jboss.cache.io.ByteBuffer;
-import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.starobrno.commands.ReplicableCommand;
import org.jboss.starobrno.config.Configuration;
import org.jboss.starobrno.factories.annotations.Inject;
import org.jboss.starobrno.factories.annotations.Start;
+import org.jboss.starobrno.transaction.GlobalTransaction;
import org.jgroups.util.Buffer;
import java.io.InputStream;
import java.io.ObjectInputStream;
-import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -143,6 +122,9 @@
protected Fqn extractFqn(ReplicableCommand cmd)
{
+ throw new UnsupportedOperationException("fix me"); // todo fix me!
+ /*
+
if (cmd == null) throw new NullPointerException("Command is null");
Fqn fqn = null;
@@ -214,5 +196,6 @@
if (trace) log.trace("extract(): received " + cmd + "extracted fqn: " + fqn);
return fqn;
+ */
}
}
Modified: core/branches/flat/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java 2008-10-09 08:56:47 UTC (rev 6892)
+++ core/branches/flat/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java 2008-10-09 09:27:58 UTC (rev 6893)
@@ -25,13 +25,13 @@
import org.jboss.cache.Region;
import org.jboss.cache.Region.Status;
import org.jboss.cache.buddyreplication.GravitateResult;
-import org.jboss.cache.commands.CommandsFactory;
-import org.jboss.cache.commands.ReplicableCommand;
-import org.jboss.cache.transaction.GlobalTransaction;
import org.jboss.cache.util.FastCopyHashMap;
import org.jboss.cache.util.Immutables;
import org.jboss.starobrno.CacheException;
+import org.jboss.starobrno.commands.CommandsFactory;
+import org.jboss.starobrno.commands.ReplicableCommand;
import org.jboss.starobrno.factories.annotations.Inject;
+import org.jboss.starobrno.transaction.GlobalTransaction;
import org.jgroups.Address;
import org.jgroups.stack.IpAddress;
@@ -691,7 +691,7 @@
for (int i = 0; i < numArgs; i++) args[i] = unmarshallObject(in, refMap);
}
- return commandsFactory.fromStream(methodId, args);
+ return commandsFactory.fromStream((byte) methodId, args);
}
private GlobalTransaction unmarshallGlobalTransaction(ObjectInputStream in, UnmarshalledReferences refMap) throws Exception
Modified: core/branches/flat/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java 2008-10-09 08:56:47 UTC (rev 6892)
+++ core/branches/flat/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java 2008-10-09 09:27:58 UTC (rev 6893)
@@ -21,17 +21,17 @@
*/
package org.jboss.cache.marshall;
-import org.jboss.cache.InvocationContext;
-import org.jboss.cache.commands.ReplicableCommand;
-import org.jboss.cache.commands.VisitableCommand;
-import org.jboss.cache.commands.remote.AnnounceBuddyPoolNameCommand;
-import org.jboss.cache.commands.remote.AssignToBuddyGroupCommand;
-import org.jboss.cache.commands.remote.RemoveFromBuddyGroupCommand;
-import org.jboss.cache.interceptors.InterceptorChain;
-import org.jboss.cache.invocation.InvocationContextContainer;
import org.jboss.cache.util.concurrent.WithinThreadExecutor;
+import org.jboss.starobrno.commands.ReplicableCommand;
+import org.jboss.starobrno.commands.VisitableCommand;
+import org.jboss.starobrno.commands.remote.AnnounceBuddyPoolNameCommand;
+import org.jboss.starobrno.commands.remote.AssignToBuddyGroupCommand;
+import org.jboss.starobrno.commands.remote.RemoveFromBuddyGroupCommand;
import org.jboss.starobrno.config.Configuration;
+import org.jboss.starobrno.context.InvocationContext;
import org.jboss.starobrno.factories.ComponentRegistry;
+import org.jboss.starobrno.interceptors.InterceptorChain;
+import org.jboss.starobrno.invocation.InvocationContextContainer;
import org.jgroups.Address;
import org.jgroups.Channel;
import org.jgroups.MembershipListener;
Modified: core/branches/flat/src/main/java/org/jboss/cache/marshall/InactiveRegionAwareRpcDispatcher.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/cache/marshall/InactiveRegionAwareRpcDispatcher.java 2008-10-09 08:56:47 UTC (rev 6892)
+++ core/branches/flat/src/main/java/org/jboss/cache/marshall/InactiveRegionAwareRpcDispatcher.java 2008-10-09 09:27:58 UTC (rev 6893)
@@ -21,10 +21,10 @@
*/
package org.jboss.cache.marshall;
-import org.jboss.cache.commands.ReplicableCommand;
-import org.jboss.cache.interceptors.InterceptorChain;
-import org.jboss.cache.invocation.InvocationContextContainer;
+import org.jboss.starobrno.commands.ReplicableCommand;
import org.jboss.starobrno.factories.ComponentRegistry;
+import org.jboss.starobrno.interceptors.InterceptorChain;
+import org.jboss.starobrno.invocation.InvocationContextContainer;
import org.jgroups.Channel;
import org.jgroups.MembershipListener;
import org.jgroups.Message;
Modified: core/branches/flat/src/main/java/org/jboss/cache/marshall/RegionalizedMethodCall.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/cache/marshall/RegionalizedMethodCall.java 2008-10-09 08:56:47 UTC (rev 6892)
+++ core/branches/flat/src/main/java/org/jboss/cache/marshall/RegionalizedMethodCall.java 2008-10-09 09:27:58 UTC (rev 6893)
@@ -22,7 +22,7 @@
package org.jboss.cache.marshall;
import org.jboss.cache.Fqn;
-import org.jboss.cache.commands.ReplicableCommand;
+import org.jboss.starobrno.commands.ReplicableCommand;
/**
* A regionalized MethodCall object, created when {@link Marshaller#regionalizedMethodCallFromByteBuffer(byte[])} or
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/CacheDelegate.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/CacheDelegate.java 2008-10-09 08:56:47 UTC (rev 6892)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/CacheDelegate.java 2008-10-09 09:27:58 UTC (rev 6893)
@@ -125,7 +125,8 @@
public boolean containsKey(Object key)
{
GetKeyValueCommand command = commandsFactory.buildGetKeyValueCommand(key);
- return (Boolean) invoker.invoke(buildCtx(), command);
+ Object response = invoker.invoke(buildCtx(), command);
+ return response != null;
}
public boolean containsValue(Object value)
@@ -227,12 +228,12 @@
public void start()
{
- //TODO: Autogenerated. Implement me properly
+ componentRegistry.start();
}
public void stop()
{
- //TODO: Autogenerated. Implement me properly
+ componentRegistry.stop();
}
private InvocationContext buildCtx()
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/CommandsFactory.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/commands/CommandsFactory.java 2008-10-09 08:56:47 UTC (rev 6892)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/CommandsFactory.java 2008-10-09 09:27:58 UTC (rev 6893)
@@ -21,17 +21,22 @@
*/
package org.jboss.starobrno.commands;
-import org.jboss.starobrno.commands.write.*;
+import org.jboss.starobrno.commands.read.GetKeyValueCommand;
import org.jboss.starobrno.commands.read.SizeCommand;
-import org.jboss.starobrno.commands.read.GetKeyValueCommand;
+import org.jboss.starobrno.commands.tx.CommitCommand;
import org.jboss.starobrno.commands.tx.PrepareCommand;
import org.jboss.starobrno.commands.tx.RollbackCommand;
-import org.jboss.starobrno.commands.tx.CommitCommand;
+import org.jboss.starobrno.commands.write.ClearCommand;
+import org.jboss.starobrno.commands.write.EvictCommand;
+import org.jboss.starobrno.commands.write.PutKeyValueCommand;
+import org.jboss.starobrno.commands.write.PutMapCommand;
+import org.jboss.starobrno.commands.write.RemoveCommand;
+import org.jboss.starobrno.commands.write.ReplaceCommand;
import org.jboss.starobrno.transaction.GlobalTransaction;
import org.jgroups.Address;
+import java.util.List;
import java.util.Map;
-import java.util.List;
/**
* @author Mircea.Markus at jboss.com
@@ -59,4 +64,6 @@
CommitCommand buildCommitCommand(GlobalTransaction gtx);
RollbackCommand buildRollbackCommand(GlobalTransaction gtx);
+
+ ReplicableCommand fromStream(byte methodId, Object[] args);
}
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/CommandsFactoryImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/commands/CommandsFactoryImpl.java 2008-10-09 08:56:47 UTC (rev 6892)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/CommandsFactoryImpl.java 2008-10-09 09:27:58 UTC (rev 6893)
@@ -21,6 +21,7 @@
*/
package org.jboss.starobrno.commands;
+import org.jboss.starobrno.CacheException;
import org.jboss.starobrno.commands.read.GetKeyValueCommand;
import org.jboss.starobrno.commands.read.SizeCommand;
import org.jboss.starobrno.commands.tx.CommitCommand;
@@ -110,4 +111,65 @@
{
return new RollbackCommand(gtx);
}
+
+ public ReplicableCommand fromStream(byte id, Object[] parameters)
+ {
+ ReplicableCommand command;
+ switch (id)
+ {
+ case PutKeyValueCommand.METHOD_ID:
+ {
+ PutKeyValueCommand c = new PutKeyValueCommand();
+ command = c;
+ break;
+ }
+ case RemoveCommand.METHOD_ID:
+ {
+ RemoveCommand c = new RemoveCommand();
+ command = c;
+ break;
+ }
+ case ReplaceCommand.METHOD_ID:
+ {
+ ReplaceCommand c = new ReplaceCommand();
+ command = c;
+ break;
+ }
+ case GetKeyValueCommand.METHOD_ID:
+ {
+ GetKeyValueCommand c = new GetKeyValueCommand();
+ command = c;
+ break;
+ }
+ case ClearCommand.METHOD_ID:
+ {
+ ClearCommand c = new ClearCommand();
+ command = c;
+ break;
+ }
+ case PrepareCommand.METHOD_ID:
+ {
+ PrepareCommand c = new PrepareCommand();
+ command = c;
+ break;
+ }
+ case CommitCommand.METHOD_ID:
+ {
+ CommitCommand c = new CommitCommand();
+ command = c;
+ break;
+ }
+ case RollbackCommand.METHOD_ID:
+ {
+ RollbackCommand c = new RollbackCommand();
+ command = c;
+ break;
+ }
+ default:
+ throw new CacheException("Unknown command id " + id + "!");
+ }
+
+ command.setParameters(id, parameters);
+ return command;
+ }
}
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/read/GetKeyValueCommand.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/commands/read/GetKeyValueCommand.java 2008-10-09 08:56:47 UTC (rev 6892)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/read/GetKeyValueCommand.java 2008-10-09 09:27:58 UTC (rev 6893)
@@ -47,6 +47,10 @@
this.notifier = notifier;
}
+ public GetKeyValueCommand()
+ {
+ }
+
public Object acceptVisitor(InvocationContext ctx, Visitor visitor) throws Throwable
{
return visitor.visitGetKeyValueCommand(ctx, this);
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/PutKeyValueCommand.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/PutKeyValueCommand.java 2008-10-09 08:56:47 UTC (rev 6892)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/PutKeyValueCommand.java 2008-10-09 09:27:58 UTC (rev 6893)
@@ -46,6 +46,10 @@
this.putIfAbsent = putIfAbsent;
}
+ public PutKeyValueCommand()
+ {
+ }
+
public Object acceptVisitor(InvocationContext ctx, Visitor visitor) throws Throwable
{
return visitor.visitPutKeyValueCommand(ctx, this);
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/RemoveCommand.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/RemoveCommand.java 2008-10-09 08:56:47 UTC (rev 6892)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/RemoveCommand.java 2008-10-09 09:27:58 UTC (rev 6893)
@@ -30,7 +30,7 @@
/**
* @author Mircea.Markus at jboss.com
*/
-public class RemoveCommand extends AbstractDataCommand
+public class RemoveCommand extends AbstractDataCommand
{
public static final int METHOD_ID = 6;
@@ -42,6 +42,10 @@
this.value = value;
}
+ public RemoveCommand()
+ {
+ }
+
public Object acceptVisitor(InvocationContext ctx, Visitor visitor) throws Throwable
{
return visitor.visitRemoveCommand(ctx, this);
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/factories/ComponentRegistry.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/factories/ComponentRegistry.java 2008-10-09 08:56:47 UTC (rev 6892)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/factories/ComponentRegistry.java 2008-10-09 09:27:58 UTC (rev 6893)
@@ -38,6 +38,7 @@
import org.jboss.starobrno.factories.annotations.NonVolatile;
import org.jboss.starobrno.factories.annotations.Start;
import org.jboss.starobrno.factories.annotations.Stop;
+import org.jboss.starobrno.lifecycle.Lifecycle;
import javax.management.MBeanServerFactory;
import java.lang.reflect.Method;
@@ -78,7 +79,7 @@
* @since 2.1.0
*/
@NonVolatile
-public class ComponentRegistry
+public class ComponentRegistry implements Lifecycle
{
/**
* Contains class definitions of component factories that can be used to construct certain components
More information about the jbosscache-commits
mailing list