Optimize marshalled size of cache keys used for distributed EJBs.

Optimize marshalled size of client mappings.
wildfly · Sep 9, 2015 · 55cecb3 · 55cecb3
1 parent 94b35af
commit 55cecb3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/...ispan/src/main/java/org/wildfly/clustering/ejb/infinispan/BasicSessionIDExternalizer.java b/...ispan/src/main/java/org/wildfly/clustering/ejb/infinispan/BasicSessionIDExternalizer.java
@@ -23,13 +23,14 @@
 package org.wildfly.clustering.ejb.infinispan;
 
 import org.jboss.ejb.client.BasicSessionID;
+import org.wildfly.clustering.marshalling.jboss.IndexExternalizer;
 
 /**
  * @author Paul Ferraro
  */
 public class BasicSessionIDExternalizer extends SessionIDExternalizer {
 
     public BasicSessionIDExternalizer() {
-        super(BasicSessionID.class);
+        super(BasicSessionID.class, IndexExternalizer.UNSIGNED_BYTE);
     }
 }
diff --git a/...nispan/src/main/java/org/wildfly/clustering/ejb/infinispan/ClientMappingExternalizer.java b/...nispan/src/main/java/org/wildfly/clustering/ejb/infinispan/ClientMappingExternalizer.java
@@ -28,6 +28,7 @@
 
 import org.jboss.as.network.ClientMapping;
 import org.wildfly.clustering.marshalling.Externalizer;
+import org.wildfly.clustering.marshalling.jboss.IndexExternalizer;
 
 /**
  * @author Paul Ferraro
@@ -37,21 +38,21 @@ public class ClientMappingExternalizer implements Externalizer<ClientMapping> {
     @Override
     public void writeObject(ObjectOutput output, ClientMapping mapping) throws IOException {
         byte[] address = mapping.getSourceNetworkAddress().getAddress();
-        output.writeInt(address.length);
+        IndexExternalizer.UNSIGNED_BYTE.writeData(output, address.length);
         output.write(address);
-        output.writeInt(mapping.getSourceNetworkMaskBits());
+        IndexExternalizer.UNSIGNED_BYTE.writeData(output, mapping.getSourceNetworkMaskBits());
         output.writeUTF(mapping.getDestinationAddress());
-        output.writeInt(mapping.getDestinationPort());
+        IndexExternalizer.UNSIGNED_SHORT.writeData(output, mapping.getDestinationPort());
     }
 
     @Override
     public ClientMapping readObject(ObjectInput input) throws IOException {
-        byte[] sourceAddress = new byte[input.readInt()];
+        byte[] sourceAddress = new byte[IndexExternalizer.UNSIGNED_BYTE.readData(input)];
         input.readFully(sourceAddress);
-        int sourcePort = input.readInt();
+        int sourceNetworkMaskBits = IndexExternalizer.UNSIGNED_BYTE.readData(input);
         String destAddress = input.readUTF();
-        int destPort = input.readInt();
+        int destPort = IndexExternalizer.UNSIGNED_SHORT.readData(input);
-        return new ClientMapping(InetAddress.getByAddress(sourceAddress), sourcePort, destAddress, destPort);
+        return new ClientMapping(InetAddress.getByAddress(sourceAddress), sourceNetworkMaskBits, destAddress, destPort);
     }
 
     @Override

diff --git a/...infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/SessionIDExternalizer.java b/...infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/SessionIDExternalizer.java
@@ -34,21 +34,23 @@
 public class SessionIDExternalizer implements Externalizer<SessionID> {
 
     private final Class<? extends SessionID> targetClass;
+    private final Externalizer<Integer> externalizer;
 
-    SessionIDExternalizer(Class<? extends SessionID> targetClass) {
+    SessionIDExternalizer(Class<? extends SessionID> targetClass, Externalizer<Integer> externalizer) {
         this.targetClass = targetClass;
+        this.externalizer = externalizer;
     }
 
     @Override
     public void writeObject(ObjectOutput output, SessionID id) throws IOException {
         byte[] encoded = id.getEncodedForm();
-        output.writeInt(encoded.length);
+        this.externalizer.writeObject(output, encoded.length);
         output.write(encoded);
     }
 
     @Override
-    public SessionID readObject(ObjectInput input) throws IOException {
+    public SessionID readObject(ObjectInput input) throws IOException, ClassNotFoundException {
-        byte[] encoded = new byte[input.readInt()];
+        byte[] encoded = new byte[this.externalizer.readObject(input)];
         input.readFully(encoded);
         return SessionID.createSessionID(encoded);
     }

diff --git a/...pan/src/main/java/org/wildfly/clustering/ejb/infinispan/UnknownSessionIDExternalizer.java b/...pan/src/main/java/org/wildfly/clustering/ejb/infinispan/UnknownSessionIDExternalizer.java
@@ -23,13 +23,14 @@
 package org.wildfly.clustering.ejb.infinispan;
 
 import org.jboss.ejb.client.UnknownSessionID;
+import org.wildfly.clustering.marshalling.jboss.IndexExternalizer;
 
 /**
  * @author Paul Ferraro
  */
 public class UnknownSessionIDExternalizer extends SessionIDExternalizer {
 
     public UnknownSessionIDExternalizer() {
-        super(UnknownSessionID.class);
+        super(UnknownSessionID.class, IndexExternalizer.VARIABLE);
     }
 }