cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject git commit: r/m unused code
Date Thu, 14 Mar 2013 16:48:38 GMT
Updated Branches:
  refs/heads/trunk 346ac0c64 -> 585619443


r/m unused code


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58561944
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58561944
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58561944

Branch: refs/heads/trunk
Commit: 585619443baae8ec9cfc6051ad37cd086457c0b0
Parents: 346ac0c
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Mar 14 11:47:59 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Mar 14 11:48:22 2013 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/db/RowIndexEntry.java     |   16 +-------------
 1 files changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/58561944/src/java/org/apache/cassandra/db/RowIndexEntry.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/RowIndexEntry.java b/src/java/org/apache/cassandra/db/RowIndexEntry.java
index e9f08b2..6bf3e43 100644
--- a/src/java/org/apache/cassandra/db/RowIndexEntry.java
+++ b/src/java/org/apache/cassandra/db/RowIndexEntry.java
@@ -66,7 +66,7 @@ public class RowIndexEntry
 
     public List<IndexHelper.IndexInfo> columnsIndex()
     {
-        return Collections.<IndexHelper.IndexInfo>emptyList();
+        return Collections.emptyList();
     }
 
     public IFilter bloomFilter()
@@ -81,7 +81,7 @@ public class RowIndexEntry
             dos.writeLong(rie.position);
             if (rie.isIndexed())
             {
-                dos.writeInt(((IndexedEntry)rie).serializedSize());
+                dos.writeInt(rie.serializedSize());
                 DeletionInfo.serializer().serializeForSSTable(rie.deletionInfo(), dos);
                 dos.writeInt(rie.columnsIndex().size());
                 for (IndexHelper.IndexInfo info : rie.columnsIndex())
@@ -94,18 +94,6 @@ public class RowIndexEntry
             }
         }
 
-        public RowIndexEntry deserializePositionOnly(DataInput dis, Descriptor.Version version)
throws IOException
-        {
-            long position = dis.readLong();
-            if (version.hasPromotedIndexes)
-            {
-                int size = dis.readInt();
-                if (size > 0)
-                    FileUtils.skipBytesFully(dis, size);
-            }
-            return new RowIndexEntry(position);
-        }
-
         public RowIndexEntry deserialize(DataInput dis, Descriptor.Version version) throws
IOException
         {
             long position = dis.readLong();


Mime
View raw message