Author: manik.surtani(a)jboss.com
Date: 2008-04-14 10:50:48 -0400 (Mon, 14 Apr 2008)
New Revision: 5554
Modified:
core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java
core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.java
Log:
Removed unused method ids
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java 2008-04-14
14:50:03 UTC (rev 5553)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java 2008-04-14
14:50:48 UTC (rev 5554)
@@ -153,7 +153,7 @@
// We stored the fqn in the transactions map during the prepare phase
fqn = transactions.remove(args[0]);
break;
- case MethodDeclarations.getPartialStateMethod_id:
+// case MethodDeclarations.getPartialStateMethod_id:
case MethodDeclarations.dataGravitationMethod_id:
case MethodDeclarations.evictNodeMethodLocal_id:
case MethodDeclarations.evictVersionedNodeMethodLocal_id:
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.java 2008-04-14
14:50:03 UTC (rev 5553)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.java 2008-04-14
14:50:48 UTC (rev 5554)
@@ -9,8 +9,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.CacheException;
-import org.jboss.cache.CacheSPI;
-import org.jboss.cache.Fqn;
import org.jboss.cache.util.BitEncodedIntegerSet;
import java.lang.reflect.Method;
@@ -153,15 +151,15 @@
* This method does not have a corresponding lang.Method as it was only used
internally within the _remove
* method for rolling back.
*/
- public static final int addChildMethodLocal_id = 15;
+// public static final int addChildMethodLocal_id = 15;
public static final int existsMethod_id = 16;
- public static final int releaseAllLocksMethodLocal_id = 17;
+// public static final int releaseAllLocksMethodLocal_id = 17;
public static final int optimisticPrepareMethod_id = 18;
- public static final int getPartialStateMethod_id = 19;
+// public static final int getPartialStateMethod_id = 19;
public static final int clusteredGetMethod_id = 22;
@@ -182,9 +180,9 @@
/* Method id added as they did not exist before refactoring */
public static final int getNodeMethodLocal_id = 31;
- public static final int printMethodLocal_id = 32;
+// public static final int printMethodLocal_id = 32;
- public static final int lockMethodLocal_id = 33;
+// public static final int lockMethodLocal_id = 33;
public static final int dataGravitationCleanupMethod_id = 34;
@@ -219,73 +217,108 @@
static
{
- try
- {
- // these methods need to return values even to remote callers.
- methodsThatNeedToReturnValuesToRemoteCallers.add(dataGravitationMethod_id);
- methodsThatNeedToReturnValuesToRemoteCallers.add(clusteredGetMethod_id);
+// try
+// {
+ // these methods need to return values even to remote callers.
+ methodsThatNeedToReturnValuesToRemoteCallers.add(dataGravitationMethod_id);
+ methodsThatNeedToReturnValuesToRemoteCallers.add(clusteredGetMethod_id);
+ /*done*/
+ getDataMapMethodLocal = null;//=
CacheImpl.class.getDeclaredMethod("_getData", Fqn.class);
+ /*done*/
+ existsMethod = null;//= CacheImpl.class.getDeclaredMethod("exists",
Fqn.class);
+ /*done*/
+ putDataMethodLocal = null;//CacheImpl.class.getDeclaredMethod("_put",
GlobalTransaction.class, Fqn.class, Map.class, boolean.class);
+ /*done*/
+ putDataEraseMethodLocal =
null;//CacheImpl.class.getDeclaredMethod("_put", GlobalTransaction.class,
Fqn.class, Map.class, boolean.class, boolean.class);
+ /*done*/
+ putKeyValMethodLocal = null;//CacheImpl.class.getDeclaredMethod("_put",
GlobalTransaction.class, Fqn.class, Object.class, Object.class, boolean.class);
+ /*done*/
+ putForExternalReadMethodLocal =
null;//CacheImpl.class.getDeclaredMethod("_putForExternalRead",
GlobalTransaction.class, Fqn.class, Object.class, Object.class);
+ /*done*/
+ removeNodeMethodLocal =
null;//CacheImpl.class.getDeclaredMethod("_remove", GlobalTransaction.class,
Fqn.class, boolean.class, boolean.class);
+ /*done*/
+ removeKeyMethodLocal =
null;//CacheImpl.class.getDeclaredMethod("_remove", GlobalTransaction.class,
Fqn.class, Object.class, boolean.class);
+ /* done*/
+ removeDataMethodLocal =
null;//CacheImpl.class.getDeclaredMethod("_removeData", GlobalTransaction.class,
Fqn.class, boolean.class);
+ /* done*/
+ evictNodeMethodLocal = null;//("_evict", Fqn.class);
+ /* done*/
+ evictVersionedNodeMethodLocal = null;//("_evict", Fqn.class,
DataVersion.class);
- /*done*/getDataMapMethodLocal = null;//=
CacheImpl.class.getDeclaredMethod("_getData", Fqn.class);
- /*done*/existsMethod = null;//=
CacheImpl.class.getDeclaredMethod("exists", Fqn.class);
- /*done*/putDataMethodLocal =
null;//CacheImpl.class.getDeclaredMethod("_put", GlobalTransaction.class,
Fqn.class, Map.class, boolean.class);
- /*done*/putDataEraseMethodLocal =
null;//CacheImpl.class.getDeclaredMethod("_put", GlobalTransaction.class,
Fqn.class, Map.class, boolean.class, boolean.class);
- /*done*/putKeyValMethodLocal =
null;//CacheImpl.class.getDeclaredMethod("_put", GlobalTransaction.class,
Fqn.class, Object.class, Object.class, boolean.class);
- /*done*/putForExternalReadMethodLocal =
null;//CacheImpl.class.getDeclaredMethod("_putForExternalRead",
GlobalTransaction.class, Fqn.class, Object.class, Object.class);
- /*done*/removeNodeMethodLocal =
null;//CacheImpl.class.getDeclaredMethod("_remove", GlobalTransaction.class,
Fqn.class, boolean.class, boolean.class);
- /*done*/removeKeyMethodLocal =
null;//CacheImpl.class.getDeclaredMethod("_remove", GlobalTransaction.class,
Fqn.class, Object.class, boolean.class);
- /* done*/removeDataMethodLocal =
null;//CacheImpl.class.getDeclaredMethod("_removeData", GlobalTransaction.class,
Fqn.class, boolean.class);
- /* done*/evictNodeMethodLocal = null;//("_evict", Fqn.class);
- /* done*/evictVersionedNodeMethodLocal = null;//("_evict", Fqn.class,
DataVersion.class);
+ /* done*/
+ prepareMethod = null;//("prepare", GlobalTransaction.class, List.class,
Address.class, boolean.class);
+ /* done*/
+ commitMethod = null;//("commit", GlobalTransaction.class);
+ /* done*/
+ rollbackMethod = null;//("rollback", GlobalTransaction.class);
+ /* done*/
+ optimisticPrepareMethod = null;//("optimisticPrepare",
GlobalTransaction.class, List.class, Map.class, Address.class, boolean.class);
- /* done*/prepareMethod = null;//("prepare", GlobalTransaction.class,
List.class, Address.class, boolean.class);
- /* done*/commitMethod = null;//("commit", GlobalTransaction.class);
- /* done*/rollbackMethod = null;//("rollback",
GlobalTransaction.class);
- /* done*/optimisticPrepareMethod = null;//("optimisticPrepare",
GlobalTransaction.class, List.class, Map.class, Address.class, boolean.class);
+ /* done*/
+ replicateMethod =
null;//RemoteCacheInvocationDelegate.class.getDeclaredMethod("_replicate",
MethodCall.class);
+ /* done*/
+ replicateAllMethod =
null;//RemoteCacheInvocationDelegate.class.getDeclaredMethod("_replicate",
List.class);
- /* done*/replicateMethod =
null;//RemoteCacheInvocationDelegate.class.getDeclaredMethod("_replicate",
MethodCall.class);
- /* done*/replicateAllMethod =
null;//RemoteCacheInvocationDelegate.class.getDeclaredMethod("_replicate",
List.class);
+ /** done*/
+ remoteAnnounceBuddyPoolNameMethod =
null;//RemoteCacheInvocationDelegate.class.getDeclaredMethod("announceBuddyPoolName",
Address.class, String.class);
+ /** done*/
+ remoteRemoveFromBuddyGroupMethod =
null;//RemoteCacheInvocationDelegate.class.getDeclaredMethod("removeFromBuddyGroup",
String.class);
+ /** done*/
+ remoteAssignToBuddyGroupMethod =
null;//RemoteCacheInvocationDelegate.class.getDeclaredMethod("assignToBuddyGroup",
BuddyGroup.class, Map.class);
+ /** done */
+ dataGravitationCleanupMethod =
null;//RemoteCacheInvocationDelegate.class.getDeclaredMethod("dataGravitationCleanup",
Fqn.class, Fqn.class);
+ /** done */
+ clusteredGetMethod =
null;//RemoteCacheInvocationDelegate.class.getDeclaredMethod("clusteredGet",
MethodCall.class, Boolean.class);
- /** done*/ remoteAnnounceBuddyPoolNameMethod =
null;//RemoteCacheInvocationDelegate.class.getDeclaredMethod("announceBuddyPoolName",
Address.class, String.class);
- /** done*/ remoteRemoveFromBuddyGroupMethod =
null;//RemoteCacheInvocationDelegate.class.getDeclaredMethod("removeFromBuddyGroup",
String.class);
- /** done*/ remoteAssignToBuddyGroupMethod =
null;//RemoteCacheInvocationDelegate.class.getDeclaredMethod("assignToBuddyGroup",
BuddyGroup.class, Map.class);
- /** done */ dataGravitationCleanupMethod =
null;//RemoteCacheInvocationDelegate.class.getDeclaredMethod("dataGravitationCleanup",
Fqn.class, Fqn.class);
- /** done */ clusteredGetMethod =
null;//RemoteCacheInvocationDelegate.class.getDeclaredMethod("clusteredGet",
MethodCall.class, Boolean.class);
+ /* done*/
+ getKeyValueMethodLocal = null;//("_get", Fqn.class, Object.class,
boolean.class);
+ /* done*/
+ getNodeMethodLocal = null;//("_get", Fqn.class);
+ /* done*/
+ getKeysMethodLocal = null;//("_getKeys", Fqn.class);
- /* done*/getKeyValueMethodLocal = null;//("_get", Fqn.class,
Object.class, boolean.class);
- /* done*/getNodeMethodLocal = null;//("_get", Fqn.class);
- /* done*/getKeysMethodLocal = null;//("_getKeys", Fqn.class);
+ /* done*/
+ getChildrenNamesMethodLocal = null;//("_getChildrenNames", Fqn.class);
+ // ------------ buddy replication
- /* done*/getChildrenNamesMethodLocal = null;//("_getChildrenNames",
Fqn.class);
+ /*done*/
+ dataGravitationMethod =
null;//CacheSPI.class.getDeclaredMethod("gravitateData", Fqn.class,
boolean.class);
- // ------------ buddy replication
+ // ------------ move() api
+ /* done*/
+ moveMethodLocal = null;//("_move", Fqn.class, Fqn.class);
+ /* done*/
+ blockChannelMethodLocal = null;//("_block");
+ /* done*/
+ unblockChannelMethodLocal = null;//("_unblock");
- /*done*/dataGravitationMethod =
CacheSPI.class.getDeclaredMethod("gravitateData", Fqn.class, boolean.class);
+ // ------------ version-aware methods - see JBCACHE-843
+ /**done**/
+ putDataVersionedMethodLocal = null;//("_put", GlobalTransaction.class,
Fqn.class, Map.class, boolean.class, DataVersion.class);
+ /**done*/
+ putDataEraseVersionedMethodLocal = null;//("_put",
GlobalTransaction.class, Fqn.class, Map.class, boolean.class, boolean.class,
DataVersion.class);
+ /**done */
+ putKeyValVersionedMethodLocal = null;//("_put", GlobalTransaction.class,
Fqn.class, Object.class, Object.class, boolean.class, DataVersion.class);
+ /*done*/
+ putForExternalReadVersionedMethodLocal = null;//("_putForExternalRead",
GlobalTransaction.class, Fqn.class, Object.class, Object.class, DataVersion.class);
+ /** done*/
+ removeNodeVersionedMethodLocal = null;//("_remove",
GlobalTransaction.class, Fqn.class, boolean.class, DataVersion.class);
+ /* done*/
+ removeKeyVersionedMethodLocal = null;//("_remove",
GlobalTransaction.class, Fqn.class, Object.class, boolean.class, DataVersion.class);
+ /*done */
+ removeDataVersionedMethodLocal = null;//("_removeData",
GlobalTransaction.class, Fqn.class, boolean.class, DataVersion.class);
- // ------------ move() api
- /* done*/moveMethodLocal = null;//("_move", Fqn.class, Fqn.class);
- /* done*/blockChannelMethodLocal = null;//("_block");
- /* done*/unblockChannelMethodLocal = null;//("_unblock");
+ /*done */
+ invalidateMethodLocal = null;//("invalidate", Fqn.class,
DataVersion.class);
+// }
+// catch (NoSuchMethodException e)
+// {
+// throw new ExceptionInInitializerError(e);
+// }
- // ------------ version-aware methods - see JBCACHE-843
- /**done**/putDataVersionedMethodLocal = null;//("_put",
GlobalTransaction.class, Fqn.class, Map.class, boolean.class, DataVersion.class);
- /**done*/putDataEraseVersionedMethodLocal = null;//("_put",
GlobalTransaction.class, Fqn.class, Map.class, boolean.class, boolean.class,
DataVersion.class);
- /**done */putKeyValVersionedMethodLocal = null;//("_put",
GlobalTransaction.class, Fqn.class, Object.class, Object.class, boolean.class,
DataVersion.class);
- /*done*/putForExternalReadVersionedMethodLocal =
null;//("_putForExternalRead", GlobalTransaction.class, Fqn.class, Object.class,
Object.class, DataVersion.class);
- /** done*/removeNodeVersionedMethodLocal = null;//("_remove",
GlobalTransaction.class, Fqn.class, boolean.class, DataVersion.class);
- /* done*/removeKeyVersionedMethodLocal = null;//("_remove",
GlobalTransaction.class, Fqn.class, Object.class, boolean.class, DataVersion.class);
- /*done */removeDataVersionedMethodLocal = null;//("_removeData",
GlobalTransaction.class, Fqn.class, boolean.class, DataVersion.class);
-
- /*done */ invalidateMethodLocal = null;//("invalidate", Fqn.class,
DataVersion.class);
-
- }
- catch (NoSuchMethodException e)
- {
- throw new ExceptionInInitializerError(e);
- }
-
methods[putDataMethodLocal_id] = putDataMethodLocal;
methods[putDataEraseMethodLocal_id] = putDataEraseMethodLocal;
methods[putKeyValMethodLocal_id] = putKeyValMethodLocal;