cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/4] rename dis -> in, dos -> out
Date Wed, 27 Mar 2013 04:14:39 GMT
http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java b/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
index acbe7f6..6ef43d5 100644
--- a/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
@@ -140,32 +140,32 @@ public class NamesQueryFilter implements IDiskAtomFilter
 
     public static class Serializer implements IVersionedSerializer<NamesQueryFilter>
     {
-        public void serialize(NamesQueryFilter f, DataOutput dos, int version) throws IOException
+        public void serialize(NamesQueryFilter f, DataOutput out, int version) throws IOException
         {
-            dos.writeInt(f.columns.size());
+            out.writeInt(f.columns.size());
             for (ByteBuffer cName : f.columns)
             {
-                ByteBufferUtil.writeWithShortLength(cName, dos);
+                ByteBufferUtil.writeWithShortLength(cName, out);
             }
             // If we talking against an older node, we have no way to tell him that we want to count CQL3 rows. This does mean that
             // this node may return less data than required. The workaround being to upgrade all nodes.
             if (version >= MessagingService.VERSION_12)
-                dos.writeBoolean(f.countCQL3Rows);
+                out.writeBoolean(f.countCQL3Rows);
         }
 
-        public NamesQueryFilter deserialize(DataInput dis, int version) throws IOException
+        public NamesQueryFilter deserialize(DataInput in, int version) throws IOException
         {
             throw new UnsupportedOperationException();
         }
 
-        public NamesQueryFilter deserialize(DataInput dis, int version, AbstractType comparator) throws IOException
+        public NamesQueryFilter deserialize(DataInput in, int version, AbstractType comparator) throws IOException
         {
-            int size = dis.readInt();
+            int size = in.readInt();
             SortedSet<ByteBuffer> columns = new TreeSet<ByteBuffer>(comparator);
             for (int i = 0; i < size; ++i)
-                columns.add(ByteBufferUtil.readWithShortLength(dis));
+                columns.add(ByteBufferUtil.readWithShortLength(in));
             boolean countCQL3Rows = version >= MessagingService.VERSION_12
-                                  ? dis.readBoolean()
+                                  ? in.readBoolean()
                                   : false;
             return new NamesQueryFilter(columns, countCQL3Rows);
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/db/filter/QueryPath.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/QueryPath.java b/src/java/org/apache/cassandra/db/filter/QueryPath.java
index 022631e..26d15a1 100644
--- a/src/java/org/apache/cassandra/db/filter/QueryPath.java
+++ b/src/java/org/apache/cassandra/db/filter/QueryPath.java
@@ -55,14 +55,14 @@ public class QueryPath
                ')';
     }
 
-    public void serialize(DataOutput dos) throws IOException
+    public void serialize(DataOutput out) throws IOException
     {
         assert !"".equals(columnFamilyName);
         assert superColumnName == null || superColumnName.remaining() > 0;
         assert columnName == null || columnName.remaining() > 0;
-        dos.writeUTF(columnFamilyName == null ? "" : columnFamilyName);
-        ByteBufferUtil.writeWithShortLength(superColumnName == null ? ByteBufferUtil.EMPTY_BYTE_BUFFER : superColumnName, dos);
-        ByteBufferUtil.writeWithShortLength(columnName == null ? ByteBufferUtil.EMPTY_BYTE_BUFFER : columnName, dos);
+        out.writeUTF(columnFamilyName == null ? "" : columnFamilyName);
+        ByteBufferUtil.writeWithShortLength(superColumnName == null ? ByteBufferUtil.EMPTY_BYTE_BUFFER : superColumnName, out);
+        ByteBufferUtil.writeWithShortLength(columnName == null ? ByteBufferUtil.EMPTY_BYTE_BUFFER : columnName, out);
     }
 
     public static QueryPath deserialize(DataInput din) throws IOException

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
index 7213402..4f8a316 100644
--- a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
@@ -246,50 +246,50 @@ public class SliceQueryFilter implements IDiskAtomFilter
 
     public static class Serializer implements IVersionedSerializer<SliceQueryFilter>
     {
-        public void serialize(SliceQueryFilter f, DataOutput dos, int version) throws IOException
+        public void serialize(SliceQueryFilter f, DataOutput out, int version) throws IOException
         {
             if (version < MessagingService.VERSION_12)
             {
                 // It's kind of lame, but probably better than throwing an exception
                 ColumnSlice slice = new ColumnSlice(f.start(), f.finish());
-                ColumnSlice.serializer.serialize(slice, dos, version);
+                ColumnSlice.serializer.serialize(slice, out, version);
             }
             else
             {
-                dos.writeInt(f.slices.length);
+                out.writeInt(f.slices.length);
                 for (ColumnSlice slice : f.slices)
-                    ColumnSlice.serializer.serialize(slice, dos, version);
+                    ColumnSlice.serializer.serialize(slice, out, version);
             }
-            dos.writeBoolean(f.reversed);
+            out.writeBoolean(f.reversed);
             int count = f.count;
             if (f.compositesToGroup > 0 && version < MessagingService.VERSION_12)
                 count *= f.countMutliplierForCompatibility;
-            dos.writeInt(count);
+            out.writeInt(count);
 
             if (version < MessagingService.VERSION_12)
                 return;
 
-            dos.writeInt(f.compositesToGroup);
+            out.writeInt(f.compositesToGroup);
         }
 
-        public SliceQueryFilter deserialize(DataInput dis, int version) throws IOException
+        public SliceQueryFilter deserialize(DataInput in, int version) throws IOException
         {
             ColumnSlice[] slices;
             if (version < MessagingService.VERSION_12)
             {
-                slices = new ColumnSlice[]{ ColumnSlice.serializer.deserialize(dis, version) };
+                slices = new ColumnSlice[]{ ColumnSlice.serializer.deserialize(in, version) };
             }
             else
             {
-                slices = new ColumnSlice[dis.readInt()];
+                slices = new ColumnSlice[in.readInt()];
                 for (int i = 0; i < slices.length; i++)
-                    slices[i] = ColumnSlice.serializer.deserialize(dis, version);
+                    slices[i] = ColumnSlice.serializer.deserialize(in, version);
             }
-            boolean reversed = dis.readBoolean();
-            int count = dis.readInt();
+            boolean reversed = in.readBoolean();
+            int count = in.readInt();
             int compositesToGroup = -1;
             if (version >= MessagingService.VERSION_12)
-                compositesToGroup = dis.readInt();
+                compositesToGroup = in.readInt();
 
             return new SliceQueryFilter(slices, reversed, count, compositesToGroup, 1);
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/dht/Token.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/Token.java b/src/java/org/apache/cassandra/dht/Token.java
index d392972..771f833 100644
--- a/src/java/org/apache/cassandra/dht/Token.java
+++ b/src/java/org/apache/cassandra/dht/Token.java
@@ -83,19 +83,19 @@ public abstract class Token<T> implements RingPosition<Token<T>>, Serializable
 
     public static class TokenSerializer implements ISerializer<Token>
     {
-        public void serialize(Token token, DataOutput dos) throws IOException
+        public void serialize(Token token, DataOutput out) throws IOException
         {
             IPartitioner p = StorageService.getPartitioner();
             ByteBuffer b = p.getTokenFactory().toByteArray(token);
-            ByteBufferUtil.writeWithLength(b, dos);
+            ByteBufferUtil.writeWithLength(b, out);
         }
 
-        public Token deserialize(DataInput dis) throws IOException
+        public Token deserialize(DataInput in) throws IOException
         {
             IPartitioner p = StorageService.getPartitioner();
-            int size = dis.readInt();
+            int size = in.readInt();
             byte[] bytes = new byte[size];
-            dis.readFully(bytes);
+            in.readFully(bytes);
             return p.getTokenFactory().fromByteArray(ByteBuffer.wrap(bytes));
         }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/gms/EndpointState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/EndpointState.java b/src/java/org/apache/cassandra/gms/EndpointState.java
index fc6c1ab..c6575cd 100644
--- a/src/java/org/apache/cassandra/gms/EndpointState.java
+++ b/src/java/org/apache/cassandra/gms/EndpointState.java
@@ -113,33 +113,33 @@ public class EndpointState
 
 class EndpointStateSerializer implements IVersionedSerializer<EndpointState>
 {
-    public void serialize(EndpointState epState, DataOutput dos, int version) throws IOException
+    public void serialize(EndpointState epState, DataOutput out, int version) throws IOException
     {
         /* serialize the HeartBeatState */
         HeartBeatState hbState = epState.getHeartBeatState();
-        HeartBeatState.serializer.serialize(hbState, dos, version);
+        HeartBeatState.serializer.serialize(hbState, out, version);
 
         /* serialize the map of ApplicationState objects */
         int size = epState.applicationState.size();
-        dos.writeInt(size);
+        out.writeInt(size);
         for (Map.Entry<ApplicationState, VersionedValue> entry : epState.applicationState.entrySet())
         {
             VersionedValue value = entry.getValue();
-            dos.writeInt(entry.getKey().ordinal());
-            VersionedValue.serializer.serialize(value, dos, version);
+            out.writeInt(entry.getKey().ordinal());
+            VersionedValue.serializer.serialize(value, out, version);
         }
     }
 
-    public EndpointState deserialize(DataInput dis, int version) throws IOException
+    public EndpointState deserialize(DataInput in, int version) throws IOException
     {
-        HeartBeatState hbState = HeartBeatState.serializer.deserialize(dis, version);
+        HeartBeatState hbState = HeartBeatState.serializer.deserialize(in, version);
         EndpointState epState = new EndpointState(hbState);
 
-        int appStateSize = dis.readInt();
+        int appStateSize = in.readInt();
         for (int i = 0; i < appStateSize; ++i)
         {
-            int key = dis.readInt();
-            VersionedValue value = VersionedValue.serializer.deserialize(dis, version);
+            int key = in.readInt();
+            VersionedValue value = VersionedValue.serializer.deserialize(in, version);
             epState.addApplicationState(Gossiper.STATES[key], value);
         }
         return epState;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/gms/GossipDigest.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/GossipDigest.java b/src/java/org/apache/cassandra/gms/GossipDigest.java
index ec2ce50..0191dad 100644
--- a/src/java/org/apache/cassandra/gms/GossipDigest.java
+++ b/src/java/org/apache/cassandra/gms/GossipDigest.java
@@ -79,18 +79,18 @@ public class GossipDigest implements Comparable<GossipDigest>
 
 class GossipDigestSerializer implements IVersionedSerializer<GossipDigest>
 {
-    public void serialize(GossipDigest gDigest, DataOutput dos, int version) throws IOException
+    public void serialize(GossipDigest gDigest, DataOutput out, int version) throws IOException
     {
-        CompactEndpointSerializationHelper.serialize(gDigest.endpoint, dos);
-        dos.writeInt(gDigest.generation);
-        dos.writeInt(gDigest.maxVersion);
+        CompactEndpointSerializationHelper.serialize(gDigest.endpoint, out);
+        out.writeInt(gDigest.generation);
+        out.writeInt(gDigest.maxVersion);
     }
 
-    public GossipDigest deserialize(DataInput dis, int version) throws IOException
+    public GossipDigest deserialize(DataInput in, int version) throws IOException
     {
-        InetAddress endpoint = CompactEndpointSerializationHelper.deserialize(dis);
-        int generation = dis.readInt();
-        int maxVersion = dis.readInt();
+        InetAddress endpoint = CompactEndpointSerializationHelper.deserialize(in);
+        int generation = in.readInt();
+        int maxVersion = in.readInt();
         return new GossipDigest(endpoint, generation, maxVersion);
     }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/gms/GossipDigestAck.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/GossipDigestAck.java b/src/java/org/apache/cassandra/gms/GossipDigestAck.java
index 01d2f6e..61244c8 100644
--- a/src/java/org/apache/cassandra/gms/GossipDigestAck.java
+++ b/src/java/org/apache/cassandra/gms/GossipDigestAck.java
@@ -60,32 +60,32 @@ public class GossipDigestAck
 
 class GossipDigestAckSerializer implements IVersionedSerializer<GossipDigestAck>
 {
-    public void serialize(GossipDigestAck gDigestAckMessage, DataOutput dos, int version) throws IOException
+    public void serialize(GossipDigestAck gDigestAckMessage, DataOutput out, int version) throws IOException
     {
-        GossipDigestSerializationHelper.serialize(gDigestAckMessage.gDigestList, dos, version);
+        GossipDigestSerializationHelper.serialize(gDigestAckMessage.gDigestList, out, version);
         if (version < MessagingService.VERSION_12)
-            dos.writeBoolean(true); // 0.6 compatibility
-        dos.writeInt(gDigestAckMessage.epStateMap.size());
+            out.writeBoolean(true); // 0.6 compatibility
+        out.writeInt(gDigestAckMessage.epStateMap.size());
         for (Map.Entry<InetAddress, EndpointState> entry : gDigestAckMessage.epStateMap.entrySet())
         {
             InetAddress ep = entry.getKey();
-            CompactEndpointSerializationHelper.serialize(ep, dos);
-            EndpointState.serializer.serialize(entry.getValue(), dos, version);
+            CompactEndpointSerializationHelper.serialize(ep, out);
+            EndpointState.serializer.serialize(entry.getValue(), out, version);
         }
     }
 
-    public GossipDigestAck deserialize(DataInput dis, int version) throws IOException
+    public GossipDigestAck deserialize(DataInput in, int version) throws IOException
     {
-        List<GossipDigest> gDigestList = GossipDigestSerializationHelper.deserialize(dis, version);
+        List<GossipDigest> gDigestList = GossipDigestSerializationHelper.deserialize(in, version);
         if (version < MessagingService.VERSION_12)
-            dis.readBoolean(); // 0.6 compatibility
-        int size = dis.readInt();
+            in.readBoolean(); // 0.6 compatibility
+        int size = in.readInt();
         Map<InetAddress, EndpointState> epStateMap = new HashMap<InetAddress, EndpointState>(size);
 
         for (int i = 0; i < size; ++i)
         {
-            InetAddress ep = CompactEndpointSerializationHelper.deserialize(dis);
-            EndpointState epState = EndpointState.serializer.deserialize(dis, version);
+            InetAddress ep = CompactEndpointSerializationHelper.deserialize(in);
+            EndpointState epState = EndpointState.serializer.deserialize(in, version);
             epStateMap.put(ep, epState);
         }
         return new GossipDigestAck(gDigestList, epStateMap);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/gms/GossipDigestAck2.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/GossipDigestAck2.java b/src/java/org/apache/cassandra/gms/GossipDigestAck2.java
index d29bd4a..c7c81d4 100644
--- a/src/java/org/apache/cassandra/gms/GossipDigestAck2.java
+++ b/src/java/org/apache/cassandra/gms/GossipDigestAck2.java
@@ -49,26 +49,26 @@ public class GossipDigestAck2
 
 class GossipDigestAck2Serializer implements IVersionedSerializer<GossipDigestAck2>
 {
-    public void serialize(GossipDigestAck2 ack2, DataOutput dos, int version) throws IOException
+    public void serialize(GossipDigestAck2 ack2, DataOutput out, int version) throws IOException
     {
-        dos.writeInt(ack2.epStateMap.size());
+        out.writeInt(ack2.epStateMap.size());
         for (Map.Entry<InetAddress, EndpointState> entry : ack2.epStateMap.entrySet())
         {
             InetAddress ep = entry.getKey();
-            CompactEndpointSerializationHelper.serialize(ep, dos);
-            EndpointState.serializer.serialize(entry.getValue(), dos, version);
+            CompactEndpointSerializationHelper.serialize(ep, out);
+            EndpointState.serializer.serialize(entry.getValue(), out, version);
         }
     }
 
-    public GossipDigestAck2 deserialize(DataInput dis, int version) throws IOException
+    public GossipDigestAck2 deserialize(DataInput in, int version) throws IOException
     {
-        int size = dis.readInt();
+        int size = in.readInt();
         Map<InetAddress, EndpointState> epStateMap = new HashMap<InetAddress, EndpointState>(size);
 
         for (int i = 0; i < size; ++i)
         {
-            InetAddress ep = CompactEndpointSerializationHelper.deserialize(dis);
-            EndpointState epState = EndpointState.serializer.deserialize(dis, version);
+            InetAddress ep = CompactEndpointSerializationHelper.deserialize(in);
+            EndpointState epState = EndpointState.serializer.deserialize(in, version);
             epStateMap.put(ep, epState);
         }
         return new GossipDigestAck2(epStateMap);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/gms/GossipDigestSyn.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/GossipDigestSyn.java b/src/java/org/apache/cassandra/gms/GossipDigestSyn.java
index 06cb3da..fce764b 100644
--- a/src/java/org/apache/cassandra/gms/GossipDigestSyn.java
+++ b/src/java/org/apache/cassandra/gms/GossipDigestSyn.java
@@ -52,19 +52,19 @@ public class GossipDigestSyn
 
 class GossipDigestSerializationHelper
 {
-    static void serialize(List<GossipDigest> gDigestList, DataOutput dos, int version) throws IOException
+    static void serialize(List<GossipDigest> gDigestList, DataOutput out, int version) throws IOException
     {
-        dos.writeInt(gDigestList.size());
+        out.writeInt(gDigestList.size());
         for (GossipDigest gDigest : gDigestList)
-            GossipDigest.serializer.serialize(gDigest, dos, version);
+            GossipDigest.serializer.serialize(gDigest, out, version);
     }
 
-    static List<GossipDigest> deserialize(DataInput dis, int version) throws IOException
+    static List<GossipDigest> deserialize(DataInput in, int version) throws IOException
     {
-        int size = dis.readInt();
+        int size = in.readInt();
         List<GossipDigest> gDigests = new ArrayList<GossipDigest>(size);
         for (int i = 0; i < size; ++i)
-            gDigests.add(GossipDigest.serializer.deserialize(dis, version));
+            gDigests.add(GossipDigest.serializer.deserialize(in, version));
         return gDigests;
     }
 
@@ -79,21 +79,21 @@ class GossipDigestSerializationHelper
 
 class GossipDigestSynSerializer implements IVersionedSerializer<GossipDigestSyn>
 {
-    public void serialize(GossipDigestSyn gDigestSynMessage, DataOutput dos, int version) throws IOException
+    public void serialize(GossipDigestSyn gDigestSynMessage, DataOutput out, int version) throws IOException
     {
-        dos.writeUTF(gDigestSynMessage.clusterId);
+        out.writeUTF(gDigestSynMessage.clusterId);
         if (version >= MessagingService.VERSION_12)
-            dos.writeUTF(gDigestSynMessage.partioner);
-        GossipDigestSerializationHelper.serialize(gDigestSynMessage.gDigests, dos, version);
+            out.writeUTF(gDigestSynMessage.partioner);
+        GossipDigestSerializationHelper.serialize(gDigestSynMessage.gDigests, out, version);
     }
 
-    public GossipDigestSyn deserialize(DataInput dis, int version) throws IOException
+    public GossipDigestSyn deserialize(DataInput in, int version) throws IOException
     {
-        String clusterId = dis.readUTF();
+        String clusterId = in.readUTF();
         String partioner = null;
         if (version >= MessagingService.VERSION_12)
-            partioner = dis.readUTF();
-        List<GossipDigest> gDigests = GossipDigestSerializationHelper.deserialize(dis, version);
+            partioner = in.readUTF();
+        List<GossipDigest> gDigests = GossipDigestSerializationHelper.deserialize(in, version);
         return new GossipDigestSyn(clusterId, partioner, gDigests);
     }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/gms/HeartBeatState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/HeartBeatState.java b/src/java/org/apache/cassandra/gms/HeartBeatState.java
index 269c4b4..b2fcdc8 100644
--- a/src/java/org/apache/cassandra/gms/HeartBeatState.java
+++ b/src/java/org/apache/cassandra/gms/HeartBeatState.java
@@ -66,15 +66,15 @@ class HeartBeatState
 
 class HeartBeatStateSerializer implements IVersionedSerializer<HeartBeatState>
 {
-    public void serialize(HeartBeatState hbState, DataOutput dos, int version) throws IOException
+    public void serialize(HeartBeatState hbState, DataOutput out, int version) throws IOException
     {
-        dos.writeInt(hbState.getGeneration());
-        dos.writeInt(hbState.getHeartBeatVersion());
+        out.writeInt(hbState.getGeneration());
+        out.writeInt(hbState.getHeartBeatVersion());
     }
 
-    public HeartBeatState deserialize(DataInput dis, int version) throws IOException
+    public HeartBeatState deserialize(DataInput in, int version) throws IOException
     {
-        return new HeartBeatState(dis.readInt(), dis.readInt());
+        return new HeartBeatState(in.readInt(), in.readInt());
     }
 
     public long serializedSize(HeartBeatState state, int version)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/gms/TokenSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/TokenSerializer.java b/src/java/org/apache/cassandra/gms/TokenSerializer.java
index 5d01aff..ea745c7 100644
--- a/src/java/org/apache/cassandra/gms/TokenSerializer.java
+++ b/src/java/org/apache/cassandra/gms/TokenSerializer.java
@@ -34,28 +34,28 @@ public class TokenSerializer
 {
     private static final Logger logger = LoggerFactory.getLogger(TokenSerializer.class);
 
-    public static void serialize(IPartitioner partitioner, Collection<Token> tokens, DataOutput dos) throws IOException
+    public static void serialize(IPartitioner partitioner, Collection<Token> tokens, DataOutput out) throws IOException
     {
         for (Token<?> token : tokens)
         {
             byte[] bintoken = partitioner.getTokenFactory().toByteArray(token).array();
-            dos.writeInt(bintoken.length);
-            dos.write(bintoken);
+            out.writeInt(bintoken.length);
+            out.write(bintoken);
         }
-        dos.writeInt(0);
+        out.writeInt(0);
     }
 
-    public static Collection<Token> deserialize(IPartitioner partitioner, DataInput dis) throws IOException
+    public static Collection<Token> deserialize(IPartitioner partitioner, DataInput in) throws IOException
     {
         Collection<Token> tokens = new ArrayList<Token>();
         while (true)
         {
-            int size = dis.readInt();
+            int size = in.readInt();
             if (size < 1)
                 break;
             logger.trace("Reading token of {} bytes", size);
             byte[] bintoken = new byte[size];
-            dis.readFully(bintoken);
+            in.readFully(bintoken);
             tokens.add(partitioner.getTokenFactory().fromByteArray(ByteBuffer.wrap(bintoken)));
         }
         return tokens;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/gms/VersionedValue.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/VersionedValue.java b/src/java/org/apache/cassandra/gms/VersionedValue.java
index 4f1d275..c6e726d 100644
--- a/src/java/org/apache/cassandra/gms/VersionedValue.java
+++ b/src/java/org/apache/cassandra/gms/VersionedValue.java
@@ -173,10 +173,10 @@ public class VersionedValue implements Comparable<VersionedValue>
         public VersionedValue tokens(Collection<Token> tokens)
         {
             ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            DataOutputStream dos = new DataOutputStream(bos);
+            DataOutputStream out = new DataOutputStream(bos);
             try
             {
-                TokenSerializer.serialize(partitioner, tokens, dos);
+                TokenSerializer.serialize(partitioner, tokens, out);
             }
             catch (IOException e)
             {
@@ -243,10 +243,10 @@ public class VersionedValue implements Comparable<VersionedValue>
 
     private static class VersionedValueSerializer implements IVersionedSerializer<VersionedValue>
     {
-        public void serialize(VersionedValue value, DataOutput dos, int version) throws IOException
+        public void serialize(VersionedValue value, DataOutput out, int version) throws IOException
         {
-            dos.writeUTF(outValue(value, version));
-            dos.writeInt(value.version);
+            out.writeUTF(outValue(value, version));
+            out.writeInt(value.version);
         }
 
         private String outValue(VersionedValue value, int version)
@@ -282,10 +282,10 @@ public class VersionedValue implements Comparable<VersionedValue>
             return outValue;
         }
 
-        public VersionedValue deserialize(DataInput dis, int version) throws IOException
+        public VersionedValue deserialize(DataInput in, int version) throws IOException
         {
-            String value = dis.readUTF();
-            int valVersion = dis.readInt();
+            String value = in.readUTF();
+            int valVersion = in.readInt();
             return new VersionedValue(value, valVersion);
         }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/io/ISSTableSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/ISSTableSerializer.java b/src/java/org/apache/cassandra/io/ISSTableSerializer.java
index 0a6c9db..5e501ae 100644
--- a/src/java/org/apache/cassandra/io/ISSTableSerializer.java
+++ b/src/java/org/apache/cassandra/io/ISSTableSerializer.java
@@ -29,18 +29,18 @@ public interface ISSTableSerializer<T>
      * Serialize the specified type into the specified DataOutputStream
      * instance in the format suited for SSTables.
      * @param t type that needs to be serialized
-     * @param dos DataOutput into which serialization needs to happen.
+     * @param out DataOutput into which serialization needs to happen.
      * @throws java.io.IOException
      */
-    public void serializeForSSTable(T t, DataOutput dos) throws IOException;
+    public void serializeForSSTable(T t, DataOutput out) throws IOException;
 
     /**
      * Deserialize into the specified DataInputStream instance in the format
      * suited for SSTables.
-     * @param dis DataInput from which deserialization needs to happen.
+     * @param in DataInput from which deserialization needs to happen.
      * @param version the version for the sstable we're reading from
      * @throws IOException
      * @return the type that was deserialized
      */
-    public T deserializeFromSSTable(DataInput dis, Descriptor.Version version) throws IOException;
+    public T deserializeFromSSTable(DataInput in, Descriptor.Version version) throws IOException;
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/io/ISerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/ISerializer.java b/src/java/org/apache/cassandra/io/ISerializer.java
index 346b122..a72d17d 100644
--- a/src/java/org/apache/cassandra/io/ISerializer.java
+++ b/src/java/org/apache/cassandra/io/ISerializer.java
@@ -28,18 +28,18 @@ public interface ISerializer<T>
     /**
      * Serialize the specified type into the specified DataOutput instance.
      * @param t type that needs to be serialized
-     * @param dos DataOutput into which serialization needs to happen.
+     * @param out DataOutput into which serialization needs to happen.
      * @throws java.io.IOException
      */
-    public void serialize(T t, DataOutput dos) throws IOException;
+    public void serialize(T t, DataOutput out) throws IOException;
 
     /**
      * Deserialize from the specified DataInput instance.
-     * @param dis DataInput from which deserialization needs to happen.
+     * @param in DataInput from which deserialization needs to happen.
      * @throws IOException
      * @return the type that was deserialized
      */
-    public T deserialize(DataInput dis) throws IOException;
+    public T deserialize(DataInput in) throws IOException;
 
     public long serializedSize(T t, TypeSizes type);
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/IndexHelper.java b/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
index ef25a4f..f322337 100644
--- a/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
@@ -182,12 +182,12 @@ public class IndexHelper
             this.width = width;
         }
 
-        public void serialize(DataOutput dos) throws IOException
+        public void serialize(DataOutput out) throws IOException
         {
-            ByteBufferUtil.writeWithShortLength(firstName, dos);
-            ByteBufferUtil.writeWithShortLength(lastName, dos);
-            dos.writeLong(offset);
-            dos.writeLong(width);
+            ByteBufferUtil.writeWithShortLength(firstName, out);
+            ByteBufferUtil.writeWithShortLength(lastName, out);
+            out.writeLong(offset);
+            out.writeLong(width);
         }
 
         public int serializedSize(TypeSizes typeSizes)
@@ -199,9 +199,9 @@ public class IndexHelper
                    typeSizes.sizeof(offset) + typeSizes.sizeof(width);
         }
 
-        public static IndexInfo deserialize(DataInput dis) throws IOException
+        public static IndexInfo deserialize(DataInput in) throws IOException
         {
-            return new IndexInfo(ByteBufferUtil.readWithShortLength(dis), ByteBufferUtil.readWithShortLength(dis), dis.readLong(), dis.readLong());
+            return new IndexInfo(ByteBufferUtil.readWithShortLength(in), ByteBufferUtil.readWithShortLength(in), in.readLong(), in.readLong());
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/IndexSummary.java b/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
index ccb8208..56b0726 100644
--- a/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
@@ -103,28 +103,28 @@ public class IndexSummary
 
     public static class IndexSummarySerializer
     {
-        public void serialize(IndexSummary t, DataOutput dos) throws IOException
+        public void serialize(IndexSummary t, DataOutput out) throws IOException
         {
             assert t.keys.size() == t.positions.size() : "keysize and the position sizes are not same.";
-            dos.writeInt(t.indexInterval);
-            dos.writeInt(t.keys.size());
+            out.writeInt(t.indexInterval);
+            out.writeInt(t.keys.size());
             for (int i = 0; i < t.keys.size(); i++)
             {
-                dos.writeLong(t.positions.get(i));
-                ByteBufferUtil.writeWithLength(t.keys.get(i).key, dos);
+                out.writeLong(t.positions.get(i));
+                ByteBufferUtil.writeWithLength(t.keys.get(i).key, out);
             }
         }
 
-        public IndexSummary deserialize(DataInput dis, IPartitioner partitioner) throws IOException
+        public IndexSummary deserialize(DataInput in, IPartitioner partitioner) throws IOException
         {
             IndexSummary summary = new IndexSummary();
-            summary.indexInterval = dis.readInt();
+            summary.indexInterval = in.readInt();
 
-            int size = dis.readInt();
+            int size = in.readInt();
             for (int i = 0; i < size; i++)
             {
-                long location = dis.readLong();
-                ByteBuffer key = ByteBufferUtil.readWithLength(dis);
+                long location = in.readLong();
+                ByteBuffer key = ByteBufferUtil.readWithLength(in);
                 summary.addEntry(partitioner.decorateKey(key), location);
             }
             return summary;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java b/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java
index 45e9f0c..46ae7f5 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java
@@ -299,24 +299,24 @@ public class SSTableMetadata
     {
         private static final Logger logger = LoggerFactory.getLogger(SSTableMetadataSerializer.class);
 
-        public void serialize(SSTableMetadata sstableStats, DataOutput dos) throws IOException
+        public void serialize(SSTableMetadata sstableStats, DataOutput out) throws IOException
         {
             assert sstableStats.partitioner != null;
 
-            EstimatedHistogram.serializer.serialize(sstableStats.estimatedRowSize, dos);
-            EstimatedHistogram.serializer.serialize(sstableStats.estimatedColumnCount, dos);
-            ReplayPosition.serializer.serialize(sstableStats.replayPosition, dos);
-            dos.writeLong(sstableStats.minTimestamp);
-            dos.writeLong(sstableStats.maxTimestamp);
-            dos.writeInt(sstableStats.maxLocalDeletionTime);
-            dos.writeDouble(sstableStats.bloomFilterFPChance);
-            dos.writeDouble(sstableStats.compressionRatio);
-            dos.writeUTF(sstableStats.partitioner);
-            dos.writeInt(sstableStats.ancestors.size());
+            EstimatedHistogram.serializer.serialize(sstableStats.estimatedRowSize, out);
+            EstimatedHistogram.serializer.serialize(sstableStats.estimatedColumnCount, out);
+            ReplayPosition.serializer.serialize(sstableStats.replayPosition, out);
+            out.writeLong(sstableStats.minTimestamp);
+            out.writeLong(sstableStats.maxTimestamp);
+            out.writeInt(sstableStats.maxLocalDeletionTime);
+            out.writeDouble(sstableStats.bloomFilterFPChance);
+            out.writeDouble(sstableStats.compressionRatio);
+            out.writeUTF(sstableStats.partitioner);
+            out.writeInt(sstableStats.ancestors.size());
             for (Integer g : sstableStats.ancestors)
-                dos.writeInt(g);
-            StreamingHistogram.serializer.serialize(sstableStats.estimatedTombstoneDropTime, dos);
-            dos.writeInt(sstableStats.sstableLevel);
+                out.writeInt(g);
+            StreamingHistogram.serializer.serialize(sstableStats.estimatedTombstoneDropTime, out);
+            out.writeInt(sstableStats.sstableLevel);
         }
 
         /**
@@ -327,38 +327,38 @@ public class SSTableMetadata
          *
          * @param sstableStats
          * @param legacyDesc
-         * @param dos
+         * @param out
          * @throws IOException
          */
         @Deprecated
-        public void legacySerialize(SSTableMetadata sstableStats, Descriptor legacyDesc, DataOutput dos) throws IOException
+        public void legacySerialize(SSTableMetadata sstableStats, Descriptor legacyDesc, DataOutput out) throws IOException
         {
-            EstimatedHistogram.serializer.serialize(sstableStats.estimatedRowSize, dos);
-            EstimatedHistogram.serializer.serialize(sstableStats.estimatedColumnCount, dos);
+            EstimatedHistogram.serializer.serialize(sstableStats.estimatedRowSize, out);
+            EstimatedHistogram.serializer.serialize(sstableStats.estimatedColumnCount, out);
             if (legacyDesc.version.metadataIncludesReplayPosition)
-                ReplayPosition.serializer.serialize(sstableStats.replayPosition, dos);
+                ReplayPosition.serializer.serialize(sstableStats.replayPosition, out);
             if (legacyDesc.version.tracksMinTimestamp)
-                dos.writeLong(sstableStats.minTimestamp);
+                out.writeLong(sstableStats.minTimestamp);
             if (legacyDesc.version.tracksMaxTimestamp)
-                dos.writeLong(sstableStats.maxTimestamp);
+                out.writeLong(sstableStats.maxTimestamp);
             if (legacyDesc.version.tracksMaxLocalDeletionTime)
-                dos.writeInt(sstableStats.maxLocalDeletionTime);
+                out.writeInt(sstableStats.maxLocalDeletionTime);
             if (legacyDesc.version.hasBloomFilterFPChance)
-                dos.writeDouble(sstableStats.bloomFilterFPChance);
+                out.writeDouble(sstableStats.bloomFilterFPChance);
             if (legacyDesc.version.hasCompressionRatio)
-                dos.writeDouble(sstableStats.compressionRatio);
+                out.writeDouble(sstableStats.compressionRatio);
             if (legacyDesc.version.hasPartitioner)
-                dos.writeUTF(sstableStats.partitioner);
+                out.writeUTF(sstableStats.partitioner);
             if (legacyDesc.version.hasAncestors)
             {
-                dos.writeInt(sstableStats.ancestors.size());
+                out.writeInt(sstableStats.ancestors.size());
                 for (Integer g : sstableStats.ancestors)
-                    dos.writeInt(g);
+                    out.writeInt(g);
             }
             if (legacyDesc.version.tracksTombstones)
-                StreamingHistogram.serializer.serialize(sstableStats.estimatedTombstoneDropTime, dos);
+                StreamingHistogram.serializer.serialize(sstableStats.estimatedTombstoneDropTime, out);
 
-            dos.writeInt(sstableStats.sstableLevel);
+            out.writeInt(sstableStats.sstableLevel);
         }
 
         public SSTableMetadata deserialize(Descriptor descriptor) throws IOException
@@ -376,27 +376,27 @@ public class SSTableMetadata
                 return new SSTableMetadata();
             }
 
-            DataInputStream dis = new DataInputStream(new BufferedInputStream(new FileInputStream(statsFile)));
+            DataInputStream in = new DataInputStream(new BufferedInputStream(new FileInputStream(statsFile)));
             try
             {
-                return deserialize(dis, descriptor, loadSSTableLevel);
+                return deserialize(in, descriptor, loadSSTableLevel);
             }
             finally
             {
-                FileUtils.closeQuietly(dis);
+                FileUtils.closeQuietly(in);
             }
         }
-        public SSTableMetadata deserialize(DataInputStream dis, Descriptor desc) throws IOException
+        public SSTableMetadata deserialize(DataInputStream in, Descriptor desc) throws IOException
         {
-            return deserialize(dis, desc, true);
+            return deserialize(in, desc, true);
         }
 
-        public SSTableMetadata deserialize(DataInputStream dis, Descriptor desc, boolean loadSSTableLevel) throws IOException
+        public SSTableMetadata deserialize(DataInputStream in, Descriptor desc, boolean loadSSTableLevel) throws IOException
         {
-            EstimatedHistogram rowSizes = EstimatedHistogram.serializer.deserialize(dis);
-            EstimatedHistogram columnCounts = EstimatedHistogram.serializer.deserialize(dis);
+            EstimatedHistogram rowSizes = EstimatedHistogram.serializer.deserialize(in);
+            EstimatedHistogram columnCounts = EstimatedHistogram.serializer.deserialize(in);
             ReplayPosition replayPosition = desc.version.metadataIncludesReplayPosition
-                                          ? ReplayPosition.serializer.deserialize(dis)
+                                          ? ReplayPosition.serializer.deserialize(in)
                                           : ReplayPosition.NONE;
             if (!desc.version.metadataIncludesModernReplayPosition)
             {
@@ -404,25 +404,25 @@ public class SSTableMetadata
                 // make sure we don't omit replaying something that we should.  see CASSANDRA-4782
                 replayPosition = ReplayPosition.NONE;
             }
-            long minTimestamp = desc.version.tracksMinTimestamp ? dis.readLong() : Long.MIN_VALUE;
-            long maxTimestamp = desc.version.containsTimestamp() ? dis.readLong() : Long.MAX_VALUE;
+            long minTimestamp = desc.version.tracksMinTimestamp ? in.readLong() : Long.MIN_VALUE;
+            long maxTimestamp = desc.version.containsTimestamp() ? in.readLong() : Long.MAX_VALUE;
             if (!desc.version.tracksMaxTimestamp) // see javadoc to Descriptor.containsTimestamp
                 maxTimestamp = Long.MAX_VALUE;
-            int maxLocalDeletionTime = desc.version.tracksMaxLocalDeletionTime ? dis.readInt() : Integer.MAX_VALUE;
-            double bloomFilterFPChance = desc.version.hasBloomFilterFPChance ? dis.readDouble() : NO_BLOOM_FLITER_FP_CHANCE;
-            double compressionRatio = desc.version.hasCompressionRatio ? dis.readDouble() : NO_COMPRESSION_RATIO;
-            String partitioner = desc.version.hasPartitioner ? dis.readUTF() : null;
-            int nbAncestors = desc.version.hasAncestors ? dis.readInt() : 0;
+            int maxLocalDeletionTime = desc.version.tracksMaxLocalDeletionTime ? in.readInt() : Integer.MAX_VALUE;
+            double bloomFilterFPChance = desc.version.hasBloomFilterFPChance ? in.readDouble() : NO_BLOOM_FLITER_FP_CHANCE;
+            double compressionRatio = desc.version.hasCompressionRatio ? in.readDouble() : NO_COMPRESSION_RATIO;
+            String partitioner = desc.version.hasPartitioner ? in.readUTF() : null;
+            int nbAncestors = desc.version.hasAncestors ? in.readInt() : 0;
             Set<Integer> ancestors = new HashSet<Integer>(nbAncestors);
             for (int i = 0; i < nbAncestors; i++)
-                ancestors.add(dis.readInt());
+                ancestors.add(in.readInt());
             StreamingHistogram tombstoneHistogram = desc.version.tracksTombstones
-                                                   ? StreamingHistogram.serializer.deserialize(dis)
+                                                   ? StreamingHistogram.serializer.deserialize(in)
                                                    : defaultTombstoneDropTimeHistogram();
             int sstableLevel = 0;
 
-            if (loadSSTableLevel && dis.available() > 0)
-                sstableLevel = dis.readInt();
+            if (loadSSTableLevel && in.available() > 0)
+                sstableLevel = in.readInt();
 
             return new SSTableMetadata(rowSizes,
                                        columnCounts,

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java b/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
index cb812bc..a978c19 100644
--- a/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
+++ b/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
@@ -207,23 +207,23 @@ public class MmappedSegmentedFile extends SegmentedFile
         }
 
         @Override
-        public void serializeBounds(DataOutput dos) throws IOException
+        public void serializeBounds(DataOutput out) throws IOException
         {
-            super.serializeBounds(dos);
-            dos.writeInt(boundaries.size());
+            super.serializeBounds(out);
+            out.writeInt(boundaries.size());
             for (long position: boundaries)
-                dos.writeLong(position);
+                out.writeLong(position);
         }
 
         @Override
-        public void deserializeBounds(DataInput dis) throws IOException
+        public void deserializeBounds(DataInput in) throws IOException
         {
-            super.deserializeBounds(dis);
+            super.deserializeBounds(in);
             List<Long> temp = new ArrayList<Long>();
 
-            int size = dis.readInt();
+            int size = in.readInt();
             for (int i = 0; i < size; i++)
-                temp.add(dis.readLong());
+                temp.add(in.readLong());
 
             boundaries = temp;
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/io/util/SegmentedFile.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/SegmentedFile.java b/src/java/org/apache/cassandra/io/util/SegmentedFile.java
index 1dfc1bc..d0b2032 100644
--- a/src/java/org/apache/cassandra/io/util/SegmentedFile.java
+++ b/src/java/org/apache/cassandra/io/util/SegmentedFile.java
@@ -110,14 +110,14 @@ public abstract class SegmentedFile
          */
         public abstract SegmentedFile complete(String path);
 
-        public void serializeBounds(DataOutput dos) throws IOException
+        public void serializeBounds(DataOutput out) throws IOException
         {
-            dos.writeUTF(DatabaseDescriptor.getDiskAccessMode().name());
+            out.writeUTF(DatabaseDescriptor.getDiskAccessMode().name());
         }
 
-        public void deserializeBounds(DataInput dis) throws IOException
+        public void deserializeBounds(DataInput in) throws IOException
         {
-            if (!dis.readUTF().equals(DatabaseDescriptor.getDiskAccessMode().name()))
+            if (!in.readUTF().equals(DatabaseDescriptor.getDiskAccessMode().name()))
                 throw new IOException("Cannot deserialize SSTable Summary component because the DiskAccessMode was changed!");
         }
     }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/net/CompactEndpointSerializationHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/CompactEndpointSerializationHelper.java b/src/java/org/apache/cassandra/net/CompactEndpointSerializationHelper.java
index c42f683..83bbbf3 100644
--- a/src/java/org/apache/cassandra/net/CompactEndpointSerializationHelper.java
+++ b/src/java/org/apache/cassandra/net/CompactEndpointSerializationHelper.java
@@ -24,17 +24,17 @@ import java.net.InetAddress;
 
 public class CompactEndpointSerializationHelper
 {
-    public static void serialize(InetAddress endpoint, DataOutput dos) throws IOException
+    public static void serialize(InetAddress endpoint, DataOutput out) throws IOException
     {
         byte[] buf = endpoint.getAddress();
-        dos.writeByte(buf.length);
-        dos.write(buf);
+        out.writeByte(buf.length);
+        out.write(buf);
     }
 
-    public static InetAddress deserialize(DataInput dis) throws IOException
+    public static InetAddress deserialize(DataInput in) throws IOException
     {
-        byte[] bytes = new byte[dis.readByte()];
-        dis.readFully(bytes, 0, bytes.length);
+        byte[] bytes = new byte[in.readByte()];
+        in.readFully(bytes, 0, bytes.length);
         return InetAddress.getByAddress(bytes);
     }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/service/ActiveRepairService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java b/src/java/org/apache/cassandra/service/ActiveRepairService.java
index 4f8c77f..4a9eefb 100644
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@ -420,18 +420,18 @@ public class ActiveRepairService
 
         public static class ValidatorSerializer implements IVersionedSerializer<Validator>
         {
-            public void serialize(Validator validator, DataOutput dos, int version) throws IOException
+            public void serialize(Validator validator, DataOutput out, int version) throws IOException
             {
-                TreeRequest.serializer.serialize(validator.request, dos, version);
-                MerkleTree.serializer.serialize(validator.tree, dos, version);
+                TreeRequest.serializer.serialize(validator.request, out, version);
+                MerkleTree.serializer.serialize(validator.tree, out, version);
             }
 
-            public Validator deserialize(DataInput dis, int version) throws IOException
+            public Validator deserialize(DataInput in, int version) throws IOException
             {
-                final TreeRequest request = TreeRequest.serializer.deserialize(dis, version);
+                final TreeRequest request = TreeRequest.serializer.deserialize(in, version);
                 try
                 {
-                    return new Validator(request, MerkleTree.serializer.deserialize(dis, version));
+                    return new Validator(request, MerkleTree.serializer.deserialize(in, version));
                 }
                 catch(Exception e)
                 {
@@ -545,22 +545,22 @@ public class ActiveRepairService
 
         public static class TreeRequestSerializer implements IVersionedSerializer<TreeRequest>
         {
-            public void serialize(TreeRequest request, DataOutput dos, int version) throws IOException
+            public void serialize(TreeRequest request, DataOutput out, int version) throws IOException
             {
-                dos.writeUTF(request.sessionid);
-                CompactEndpointSerializationHelper.serialize(request.endpoint, dos);
-                dos.writeUTF(request.cf.left);
-                dos.writeUTF(request.cf.right);
-                AbstractBounds.serializer.serialize(request.range, dos, version);
+                out.writeUTF(request.sessionid);
+                CompactEndpointSerializationHelper.serialize(request.endpoint, out);
+                out.writeUTF(request.cf.left);
+                out.writeUTF(request.cf.right);
+                AbstractBounds.serializer.serialize(request.range, out, version);
             }
 
-            public TreeRequest deserialize(DataInput dis, int version) throws IOException
+            public TreeRequest deserialize(DataInput in, int version) throws IOException
             {
-                String sessId = dis.readUTF();
-                InetAddress endpoint = CompactEndpointSerializationHelper.deserialize(dis);
-                CFPair cfpair = new CFPair(dis.readUTF(), dis.readUTF());
+                String sessId = in.readUTF();
+                InetAddress endpoint = CompactEndpointSerializationHelper.deserialize(in);
+                CFPair cfpair = new CFPair(in.readUTF(), in.readUTF());
                 Range<Token> range;
-                range = (Range<Token>) AbstractBounds.serializer.deserialize(dis, version);
+                range = (Range<Token>) AbstractBounds.serializer.deserialize(in, version);
 
                 return new TreeRequest(sessId, endpoint, range, cfpair);
             }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 9b3d18a..0b29cdf 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -639,14 +639,14 @@ public class StorageProxy implements StorageProxyMBean
 
         // Add all the other destinations of the same message as a FORWARD_HEADER entry
         FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
-        DataOutputStream dos = new DataOutputStream(bos);
-        dos.writeInt(targets.size() - 1);
+        DataOutputStream out = new DataOutputStream(bos);
+        out.writeInt(targets.size() - 1);
         while (iter.hasNext())
         {
             InetAddress destination = iter.next();
-            CompactEndpointSerializationHelper.serialize(destination, dos);
+            CompactEndpointSerializationHelper.serialize(destination, out);
             int id = MessagingService.instance().addCallback(handler, message, destination, message.getTimeout());
-            dos.writeInt(id);
+            out.writeInt(id);
             logger.trace("Adding FWD message to {}@{}", id, destination);
         }
         message = message.withParameter(RowMutation.FORWARD_TO, bos.toByteArray());

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java b/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
index de69fc6..c552105 100644
--- a/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
+++ b/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
@@ -110,10 +110,10 @@ public class IncomingStreamReader
             }
 
             assert remoteFile.estimatedKeys > 0;
-            DataInput dis = new DataInputStream(underliningStream);
+            DataInput in = new DataInputStream(underliningStream);
             try
             {
-                SSTableReader reader = streamIn(dis, localFile, remoteFile);
+                SSTableReader reader = streamIn(in, localFile, remoteFile);
                 session.finished(remoteFile, reader);
             }
             catch (IOException ex)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/streaming/PendingFile.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/PendingFile.java b/src/java/org/apache/cassandra/streaming/PendingFile.java
index 3597b6c..7474bd6 100644
--- a/src/java/org/apache/cassandra/streaming/PendingFile.java
+++ b/src/java/org/apache/cassandra/streaming/PendingFile.java
@@ -120,47 +120,47 @@ public class PendingFile
 
     public static class PendingFileSerializer implements IVersionedSerializer<PendingFile>
     {
-        public void serialize(PendingFile sc, DataOutput dos, int version) throws IOException
+        public void serialize(PendingFile sc, DataOutput out, int version) throws IOException
         {
             if (sc == null)
             {
-                dos.writeUTF("");
+                out.writeUTF("");
                 return;
             }
 
-            dos.writeUTF(sc.desc.filenameFor(sc.component));
-            dos.writeUTF(sc.component);
-            dos.writeInt(sc.sections.size());
+            out.writeUTF(sc.desc.filenameFor(sc.component));
+            out.writeUTF(sc.component);
+            out.writeInt(sc.sections.size());
             for (Pair<Long,Long> section : sc.sections)
             {
-                dos.writeLong(section.left);
-                dos.writeLong(section.right);
+                out.writeLong(section.left);
+                out.writeLong(section.right);
             }
-            dos.writeUTF(sc.type.name());
-            dos.writeLong(sc.estimatedKeys);
+            out.writeUTF(sc.type.name());
+            out.writeLong(sc.estimatedKeys);
             if (version > MessagingService.VERSION_11)
-                CompressionInfo.serializer.serialize(sc.compressionInfo, dos, version);
+                CompressionInfo.serializer.serialize(sc.compressionInfo, out, version);
         }
 
-        public PendingFile deserialize(DataInput dis, int version) throws IOException
+        public PendingFile deserialize(DataInput in, int version) throws IOException
         {
-            String filename = dis.readUTF();
+            String filename = in.readUTF();
             if (filename.isEmpty())
                 return null;
 
             Descriptor desc = Descriptor.fromFilename(filename);
-            String component = dis.readUTF();
-            int count = dis.readInt();
+            String component = in.readUTF();
+            int count = in.readInt();
             List<Pair<Long,Long>> sections = new ArrayList<Pair<Long,Long>>(count);
             for (int i = 0; i < count; i++)
-                sections.add(Pair.create(dis.readLong(), dis.readLong()));
+                sections.add(Pair.create(in.readLong(), in.readLong()));
             // this controls the way indexes are rebuilt when streaming in.
             OperationType type = OperationType.RESTORE_REPLICA_COUNT;
-            type = OperationType.valueOf(dis.readUTF());
-            long estimatedKeys = dis.readLong();
+            type = OperationType.valueOf(in.readUTF());
+            long estimatedKeys = in.readLong();
             CompressionInfo info = null;
             if (version > MessagingService.VERSION_11)
-                info = CompressionInfo.serializer.deserialize(dis, version);
+                info = CompressionInfo.serializer.deserialize(in, version);
             return new PendingFile(null, desc, component, sections, type, estimatedKeys, info);
         }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/streaming/StreamHeader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamHeader.java b/src/java/org/apache/cassandra/streaming/StreamHeader.java
index 7f3e654..a0bf832 100644
--- a/src/java/org/apache/cassandra/streaming/StreamHeader.java
+++ b/src/java/org/apache/cassandra/streaming/StreamHeader.java
@@ -57,26 +57,26 @@ public class StreamHeader
 
     private static class StreamHeaderSerializer implements IVersionedSerializer<StreamHeader>
     {
-        public void serialize(StreamHeader sh, DataOutput dos, int version) throws IOException
+        public void serialize(StreamHeader sh, DataOutput out, int version) throws IOException
         {
-            dos.writeUTF(sh.table);
-            UUIDSerializer.serializer.serialize(sh.sessionId, dos, MessagingService.current_version);
-            PendingFile.serializer.serialize(sh.file, dos, version);
-            dos.writeInt(sh.pendingFiles.size());
+            out.writeUTF(sh.table);
+            UUIDSerializer.serializer.serialize(sh.sessionId, out, MessagingService.current_version);
+            PendingFile.serializer.serialize(sh.file, out, version);
+            out.writeInt(sh.pendingFiles.size());
             for (PendingFile file : sh.pendingFiles)
-                PendingFile.serializer.serialize(file, dos, version);
+                PendingFile.serializer.serialize(file, out, version);
         }
 
-        public StreamHeader deserialize(DataInput dis, int version) throws IOException
+        public StreamHeader deserialize(DataInput in, int version) throws IOException
         {
-            String table = dis.readUTF();
-            UUID sessionId = UUIDSerializer.serializer.deserialize(dis, MessagingService.current_version);
-            PendingFile file = PendingFile.serializer.deserialize(dis, version);
-            int size = dis.readInt();
+            String table = in.readUTF();
+            UUID sessionId = UUIDSerializer.serializer.deserialize(in, MessagingService.current_version);
+            PendingFile file = PendingFile.serializer.deserialize(in, version);
+            int size = in.readInt();
 
             List<PendingFile> pendingFiles = new ArrayList<PendingFile>(size);
             for (int i = 0; i < size; i++)
-                pendingFiles.add(PendingFile.serializer.deserialize(dis, version));
+                pendingFiles.add(PendingFile.serializer.deserialize(in, version));
             return new StreamHeader(table, sessionId, file, pendingFiles);
         }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/streaming/StreamReply.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamReply.java b/src/java/org/apache/cassandra/streaming/StreamReply.java
index eee8e37..d54e9cc 100644
--- a/src/java/org/apache/cassandra/streaming/StreamReply.java
+++ b/src/java/org/apache/cassandra/streaming/StreamReply.java
@@ -68,18 +68,18 @@ public class StreamReply
 
     private static class FileStatusSerializer implements IVersionedSerializer<StreamReply>
     {
-        public void serialize(StreamReply reply, DataOutput dos, int version) throws IOException
+        public void serialize(StreamReply reply, DataOutput out, int version) throws IOException
         {
-            UUIDSerializer.serializer.serialize(reply.sessionId, dos, MessagingService.current_version);
-            dos.writeUTF(reply.file);
-            dos.writeInt(reply.action.ordinal());
+            UUIDSerializer.serializer.serialize(reply.sessionId, out, MessagingService.current_version);
+            out.writeUTF(reply.file);
+            out.writeInt(reply.action.ordinal());
         }
 
-        public StreamReply deserialize(DataInput dis, int version) throws IOException
+        public StreamReply deserialize(DataInput in, int version) throws IOException
         {
-            UUID sessionId = UUIDSerializer.serializer.deserialize(dis, MessagingService.current_version);
-            String targetFile = dis.readUTF();
-            Status action = Status.values()[dis.readInt()];
+            UUID sessionId = UUIDSerializer.serializer.deserialize(in, MessagingService.current_version);
+            String targetFile = in.readUTF();
+            Status action = Status.values()[in.readInt()];
             return new StreamReply(targetFile, sessionId, action);
         }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/streaming/StreamRequest.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamRequest.java b/src/java/org/apache/cassandra/streaming/StreamRequest.java
index b49fb36..465d8bf 100644
--- a/src/java/org/apache/cassandra/streaming/StreamRequest.java
+++ b/src/java/org/apache/cassandra/streaming/StreamRequest.java
@@ -118,54 +118,54 @@ public class StreamRequest
 
     private static class StreamRequestSerializer implements IVersionedSerializer<StreamRequest>
     {
-        public void serialize(StreamRequest srm, DataOutput dos, int version) throws IOException
+        public void serialize(StreamRequest srm, DataOutput out, int version) throws IOException
         {
-            UUIDSerializer.serializer.serialize(srm.sessionId, dos, MessagingService.current_version);
-            CompactEndpointSerializationHelper.serialize(srm.target, dos);
+            UUIDSerializer.serializer.serialize(srm.sessionId, out, MessagingService.current_version);
+            CompactEndpointSerializationHelper.serialize(srm.target, out);
             if (srm.file != null)
             {
-                dos.writeBoolean(true);
-                PendingFile.serializer.serialize(srm.file, dos, version);
+                out.writeBoolean(true);
+                PendingFile.serializer.serialize(srm.file, out, version);
             }
             else
             {
-                dos.writeBoolean(false);
-                dos.writeUTF(srm.table);
-                dos.writeInt(srm.ranges.size());
+                out.writeBoolean(false);
+                out.writeUTF(srm.table);
+                out.writeInt(srm.ranges.size());
                 for (Range<Token> range : srm.ranges)
-                    AbstractBounds.serializer.serialize(range, dos, version);
+                    AbstractBounds.serializer.serialize(range, out, version);
 
-                dos.writeUTF(srm.type.name());
+                out.writeUTF(srm.type.name());
 
-                dos.writeInt(Iterables.size(srm.columnFamilies));
+                out.writeInt(Iterables.size(srm.columnFamilies));
                 for (ColumnFamilyStore cfs : srm.columnFamilies)
-                    ColumnFamily.serializer.serializeCfId(cfs.metadata.cfId, dos, version);
+                    ColumnFamily.serializer.serializeCfId(cfs.metadata.cfId, out, version);
             }
         }
 
-        public StreamRequest deserialize(DataInput dis, int version) throws IOException
+        public StreamRequest deserialize(DataInput in, int version) throws IOException
         {
-            UUID sessionId = UUIDSerializer.serializer.deserialize(dis, MessagingService.current_version);
-            InetAddress target = CompactEndpointSerializationHelper.deserialize(dis);
-            boolean singleFile = dis.readBoolean();
+            UUID sessionId = UUIDSerializer.serializer.deserialize(in, MessagingService.current_version);
+            InetAddress target = CompactEndpointSerializationHelper.deserialize(in);
+            boolean singleFile = in.readBoolean();
             if (singleFile)
             {
-                PendingFile file = PendingFile.serializer.deserialize(dis, version);
+                PendingFile file = PendingFile.serializer.deserialize(in, version);
                 return new StreamRequest(target, file, sessionId);
             }
             else
             {
-                String table = dis.readUTF();
-                int size = dis.readInt();
+                String table = in.readUTF();
+                int size = in.readInt();
                 List<Range<Token>> ranges = (size == 0) ? null : new ArrayList<Range<Token>>(size);
                 for (int i = 0; i < size; ++i)
-                    ranges.add((Range<Token>) AbstractBounds.serializer.deserialize(dis, version).toTokenBounds());
-                OperationType type = OperationType.valueOf(dis.readUTF());
+                    ranges.add((Range<Token>) AbstractBounds.serializer.deserialize(in, version).toTokenBounds());
+                OperationType type = OperationType.valueOf(in.readUTF());
 
                 List<ColumnFamilyStore> stores = new ArrayList<ColumnFamilyStore>();
-                int cfsSize = dis.readInt();
+                int cfsSize = in.readInt();
                 for (int i = 0; i < cfsSize; ++i)
-                    stores.add(Table.open(table).getColumnFamilyStore(ColumnFamily.serializer.deserializeCfId(dis, version)));
+                    stores.add(Table.open(table).getColumnFamilyStore(ColumnFamily.serializer.deserializeCfId(in, version)));
 
                 return new StreamRequest(target, ranges, table, stores, sessionId, type);
             }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/streaming/StreamingRepairTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamingRepairTask.java b/src/java/org/apache/cassandra/streaming/StreamingRepairTask.java
index bbc03fb..32e021f 100644
--- a/src/java/org/apache/cassandra/streaming/StreamingRepairTask.java
+++ b/src/java/org/apache/cassandra/streaming/StreamingRepairTask.java
@@ -235,32 +235,32 @@ public class StreamingRepairTask implements Runnable
 
     private static class StreamingRepairTaskSerializer implements IVersionedSerializer<StreamingRepairTask>
     {
-        public void serialize(StreamingRepairTask task, DataOutput dos, int version) throws IOException
+        public void serialize(StreamingRepairTask task, DataOutput out, int version) throws IOException
         {
-            UUIDSerializer.serializer.serialize(task.id, dos, version);
-            CompactEndpointSerializationHelper.serialize(task.owner, dos);
-            CompactEndpointSerializationHelper.serialize(task.src, dos);
-            CompactEndpointSerializationHelper.serialize(task.dst, dos);
-            dos.writeUTF(task.tableName);
-            dos.writeUTF(task.cfName);
-            dos.writeInt(task.ranges.size());
+            UUIDSerializer.serializer.serialize(task.id, out, version);
+            CompactEndpointSerializationHelper.serialize(task.owner, out);
+            CompactEndpointSerializationHelper.serialize(task.src, out);
+            CompactEndpointSerializationHelper.serialize(task.dst, out);
+            out.writeUTF(task.tableName);
+            out.writeUTF(task.cfName);
+            out.writeInt(task.ranges.size());
             for (Range<Token> range : task.ranges)
-                AbstractBounds.serializer.serialize(range, dos, version);
+                AbstractBounds.serializer.serialize(range, out, version);
             // We don't serialize the callback on purpose
         }
 
-        public StreamingRepairTask deserialize(DataInput dis, int version) throws IOException
+        public StreamingRepairTask deserialize(DataInput in, int version) throws IOException
         {
-            UUID id = UUIDSerializer.serializer.deserialize(dis, version);
-            InetAddress owner = CompactEndpointSerializationHelper.deserialize(dis);
-            InetAddress src = CompactEndpointSerializationHelper.deserialize(dis);
-            InetAddress dst = CompactEndpointSerializationHelper.deserialize(dis);
-            String tableName = dis.readUTF();
-            String cfName = dis.readUTF();
-            int rangesCount = dis.readInt();
+            UUID id = UUIDSerializer.serializer.deserialize(in, version);
+            InetAddress owner = CompactEndpointSerializationHelper.deserialize(in);
+            InetAddress src = CompactEndpointSerializationHelper.deserialize(in);
+            InetAddress dst = CompactEndpointSerializationHelper.deserialize(in);
+            String tableName = in.readUTF();
+            String cfName = in.readUTF();
+            int rangesCount = in.readInt();
             List<Range<Token>> ranges = new ArrayList<Range<Token>>(rangesCount);
             for (int i = 0; i < rangesCount; ++i)
-                ranges.add((Range<Token>) AbstractBounds.serializer.deserialize(dis, version).toTokenBounds());
+                ranges.add((Range<Token>) AbstractBounds.serializer.deserialize(in, version).toTokenBounds());
             return new StreamingRepairTask(id, owner, src, dst, tableName, cfName, ranges, makeReplyingCallback(owner, id));
         }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/tools/Shuffle.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/Shuffle.java b/src/java/org/apache/cassandra/tools/Shuffle.java
index 8395776..5cca029 100644
--- a/src/java/org/apache/cassandra/tools/Shuffle.java
+++ b/src/java/org/apache/cassandra/tools/Shuffle.java
@@ -596,7 +596,7 @@ public class Shuffle extends AbstractJmxClient
         sb.append(" ls               List pending relocations").append(String.format("%n"));
         sb.append(" clear            Clear pending relocations").append(String.format("%n"));
         sb.append(" en[able]         Enable shuffling").append(String.format("%n"));
-        sb.append(" dis[able]        Disable shuffling").append(String.format("%n%n"));
+        sb.append(" in[able]        Disable shuffling").append(String.format("%n%n"));
 
         printHelp("shuffle [options] <sub-command>", sb.toString());
     }
@@ -680,7 +680,7 @@ public class Shuffle extends AbstractJmxClient
                 shuffler.ls();
             else if (subCommand.startsWith("en"))
                 shuffler.enable();
-            else if (subCommand.startsWith("dis"))
+            else if (subCommand.startsWith("in"))
                 shuffler.disable();
             else if (subCommand.equals("clear"))
                 shuffler.clear();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java b/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java
index b966c4d..1ec1459 100644
--- a/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java
+++ b/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java
@@ -29,21 +29,21 @@ import org.apache.cassandra.utils.obs.OpenBitSet;
 
 abstract class BloomFilterSerializer implements ISerializer<BloomFilter>
 {
-    public void serialize(BloomFilter bf, DataOutput dos) throws IOException
+    public void serialize(BloomFilter bf, DataOutput out) throws IOException
     {
-        dos.writeInt(bf.hashCount);
-        bf.bitset.serialize(dos);
+        out.writeInt(bf.hashCount);
+        bf.bitset.serialize(out);
     }
 
-    public BloomFilter deserialize(DataInput dis) throws IOException
+    public BloomFilter deserialize(DataInput in) throws IOException
     {
-        return deserialize(dis, false);
+        return deserialize(in, false);
     }
 
-    public BloomFilter deserialize(DataInput dis, boolean offheap) throws IOException
+    public BloomFilter deserialize(DataInput in, boolean offheap) throws IOException
     {
-        int hashes = dis.readInt();
-        IBitSet bs = offheap ? OffHeapBitSet.deserialize(dis) : OpenBitSet.deserialize(dis);
+        int hashes = in.readInt();
+        IBitSet bs = offheap ? OffHeapBitSet.deserialize(in) : OpenBitSet.deserialize(in);
         return createFilter(hashes, bs);
     }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
index 22c452c..54407a4 100644
--- a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
+++ b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
@@ -248,27 +248,27 @@ public class EstimatedHistogram
 
     public static class EstimatedHistogramSerializer implements ISerializer<EstimatedHistogram>
     {
-        public void serialize(EstimatedHistogram eh, DataOutput dos) throws IOException
+        public void serialize(EstimatedHistogram eh, DataOutput out) throws IOException
         {
             long[] offsets = eh.getBucketOffsets();
             long[] buckets = eh.getBuckets(false);
-            dos.writeInt(buckets.length);
+            out.writeInt(buckets.length);
             for (int i = 0; i < buckets.length; i++)
             {
-                dos.writeLong(offsets[i == 0 ? 0 : i - 1]);
-                dos.writeLong(buckets[i]);
+                out.writeLong(offsets[i == 0 ? 0 : i - 1]);
+                out.writeLong(buckets[i]);
             }
         }
 
-        public EstimatedHistogram deserialize(DataInput dis) throws IOException
+        public EstimatedHistogram deserialize(DataInput in) throws IOException
         {
-            int size = dis.readInt();
+            int size = in.readInt();
             long[] offsets = new long[size - 1];
             long[] buckets = new long[size];
 
             for (int i = 0; i < size; i++) {
-                offsets[i == 0 ? 0 : i - 1] = dis.readLong();
-                buckets[i] = dis.readLong();
+                offsets[i == 0 ? 0 : i - 1] = in.readLong();
+                buckets[i] = in.readLong();
             }
             return new EstimatedHistogram(offsets, buckets);
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/utils/IntervalTree.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/IntervalTree.java b/src/java/org/apache/cassandra/utils/IntervalTree.java
index 7598d97..2b81516 100644
--- a/src/java/org/apache/cassandra/utils/IntervalTree.java
+++ b/src/java/org/apache/cassandra/utils/IntervalTree.java
@@ -390,14 +390,14 @@ public class IntervalTree<C, D, I extends Interval<C, D>> implements Iterable<I>
             this.constructor = constructor;
         }
 
-        public void serialize(IntervalTree<C, D, I> it, DataOutput dos, int version) throws IOException
+        public void serialize(IntervalTree<C, D, I> it, DataOutput out, int version) throws IOException
         {
-            dos.writeInt(it.count);
+            out.writeInt(it.count);
             for (Interval<C, D> interval : it)
             {
-                pointSerializer.serialize(interval.min, dos);
-                pointSerializer.serialize(interval.max, dos);
-                dataSerializer.serialize(interval.data, dos);
+                pointSerializer.serialize(interval.min, out);
+                pointSerializer.serialize(interval.max, out);
+                dataSerializer.serialize(interval.data, out);
             }
         }
 
@@ -407,22 +407,22 @@ public class IntervalTree<C, D, I extends Interval<C, D>> implements Iterable<I>
          * tree is to use a custom comparator, as the comparator is *not*
          * serialized.
          */
-        public IntervalTree<C, D, I> deserialize(DataInput dis, int version) throws IOException
+        public IntervalTree<C, D, I> deserialize(DataInput in, int version) throws IOException
         {
-            return deserialize(dis, version, null);
+            return deserialize(in, version, null);
         }
 
-        public IntervalTree<C, D, I> deserialize(DataInput dis, int version, Comparator<C> comparator) throws IOException
+        public IntervalTree<C, D, I> deserialize(DataInput in, int version, Comparator<C> comparator) throws IOException
         {
             try
             {
-                int count = dis.readInt();
+                int count = in.readInt();
                 List<Interval<C, D>> intervals = new ArrayList<Interval<C, D>>(count);
                 for (int i = 0; i < count; i++)
                 {
-                    C min = pointSerializer.deserialize(dis);
-                    C max = pointSerializer.deserialize(dis);
-                    D data = dataSerializer.deserialize(dis);
+                    C min = pointSerializer.deserialize(in);
+                    C max = pointSerializer.deserialize(in);
+                    D data = dataSerializer.deserialize(in);
                     intervals.add(constructor.newInstance(min, max, data));
                 }
                 return new IntervalTree(intervals, comparator);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d9c7f2/src/java/org/apache/cassandra/utils/LegacyBloomFilterSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/LegacyBloomFilterSerializer.java b/src/java/org/apache/cassandra/utils/LegacyBloomFilterSerializer.java
index a0de19b..3faf9cd 100644
--- a/src/java/org/apache/cassandra/utils/LegacyBloomFilterSerializer.java
+++ b/src/java/org/apache/cassandra/utils/LegacyBloomFilterSerializer.java
@@ -22,25 +22,25 @@ import java.util.BitSet;
 
 public class LegacyBloomFilterSerializer
 {
-    public void serialize(LegacyBloomFilter bf, DataOutput dos)
+    public void serialize(LegacyBloomFilter bf, DataOutput out)
             throws IOException
     {
         throw new UnsupportedOperationException("Shouldn't be serializing legacy bloom filters");
-//        dos.writeInt(bf.getHashCount());
-//        ObjectOutputStream oos = new ObjectOutputStream(dos);
+//        out.writeInt(bf.getHashCount());
+//        ObjectOutputStream oos = new ObjectOutputStream(out);
 //        oos.writeObject(bf.getBitSet());
 //        oos.flush();
     }
 
-    public LegacyBloomFilter deserialize(final DataInput dis) throws IOException
+    public LegacyBloomFilter deserialize(final DataInput in) throws IOException
     {
-        int hashes = dis.readInt();
+        int hashes = in.readInt();
         ObjectInputStream ois = new ObjectInputStream(new InputStream()
         {
             @Override
             public int read() throws IOException
             {
-                return dis.readByte() & 0xFF;
+                return in.readByte() & 0xFF;
             }
         });
         try


Mime
View raw message