cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [7/8] git commit: remove generification from DecoratedKey patch by dbrosius; reviewed by jbellis for CASSANDRA-3978
Date Fri, 02 Mar 2012 18:32:37 GMT
remove generification from DecoratedKey
patch by dbrosius; reviewed by jbellis for CASSANDRA-3978


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

Branch: refs/heads/trunk
Commit: 7e4ef1cc29d472db773375802cb1e70e95fe9556
Parents: 4299d07
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Mar 2 12:09:17 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Mar 2 12:09:17 2012 -0600

----------------------------------------------------------------------
 .../org/apache/cassandra/db/ColumnFamilyStore.java |    4 +-
 src/java/org/apache/cassandra/db/DecoratedKey.java |    8 +++---
 .../apache/cassandra/db/HintedHandOffManager.java  |    2 +-
 src/java/org/apache/cassandra/db/Row.java          |    4 +-
 .../cassandra/db/SliceByNamesReadCommand.java      |    2 +-
 .../apache/cassandra/db/SliceFromReadCommand.java  |    2 +-
 src/java/org/apache/cassandra/db/Table.java        |    6 ++--
 .../db/compaction/AbstractCompactedRow.java        |    4 +-
 .../cassandra/db/compaction/PrecompactedRow.java   |    4 +-
 .../org/apache/cassandra/db/filter/IFilter.java    |    6 ++--
 .../cassandra/db/filter/NamesQueryFilter.java      |    6 ++--
 .../apache/cassandra/db/filter/QueryFilter.java    |   16 +++++++-------
 .../cassandra/db/filter/SliceQueryFilter.java      |    6 ++--
 .../db/index/PerColumnSecondaryIndex.java          |    6 ++--
 .../cassandra/db/index/PerRowSecondaryIndex.java   |    2 +-
 .../cassandra/db/index/SecondaryIndexBuilder.java  |    2 +-
 .../cassandra/db/index/SecondaryIndexManager.java  |   12 +++++-----
 .../apache/cassandra/db/index/keys/KeysIndex.java  |    6 ++--
 .../apache/cassandra/db/migration/Migration.java   |    2 +-
 .../dht/AbstractByteOrderedPartitioner.java        |    8 +++---
 .../org/apache/cassandra/dht/IPartitioner.java     |    4 +-
 .../org/apache/cassandra/dht/LocalPartitioner.java |    6 ++--
 .../cassandra/dht/OrderPreservingPartitioner.java  |    8 +++---
 .../apache/cassandra/dht/RandomPartitioner.java    |    8 +++---
 .../apache/cassandra/io/sstable/IndexSummary.java  |   10 ++++----
 .../apache/cassandra/io/sstable/KeyIterator.java   |    4 +-
 .../cassandra/io/sstable/ReducingKeyIterator.java  |    6 ++--
 .../org/apache/cassandra/io/sstable/SSTable.java   |    2 +-
 .../io/sstable/SSTableIdentityIterator.java        |   12 +++++-----
 .../apache/cassandra/io/sstable/SSTableReader.java |   16 +++++++-------
 .../cassandra/io/sstable/SSTableScanner.java       |    2 +-
 .../apache/cassandra/io/sstable/SSTableWriter.java |   14 ++++++------
 .../cassandra/service/AbstractRowResolver.java     |    2 +-
 .../cassandra/service/DigestMismatchException.java |    2 +-
 .../cassandra/service/RowRepairResolver.java       |    2 +-
 .../org/apache/cassandra/db/KeyCollisionTest.java  |    6 ++--
 36 files changed, 106 insertions(+), 106 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index e14db96..a982a2a 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1598,10 +1598,10 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
         return cfses;
     }
 
-    public Iterable<DecoratedKey<?>> keySamples(Range<Token> range)
+    public Iterable<DecoratedKey> keySamples(Range<Token> range)
     {
         Collection<SSTableReader> sstables = getSSTables();
-        Iterable<DecoratedKey<?>>[] samples = new Iterable[sstables.size()];
+        Iterable<DecoratedKey>[] samples = new Iterable[sstables.size()];
         int i = 0;
         for (SSTableReader sstable: sstables)
         {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/db/DecoratedKey.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DecoratedKey.java b/src/java/org/apache/cassandra/db/DecoratedKey.java
index 81ead8c..391b4c9 100644
--- a/src/java/org/apache/cassandra/db/DecoratedKey.java
+++ b/src/java/org/apache/cassandra/db/DecoratedKey.java
@@ -35,7 +35,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
  * if this matters, you can subclass RP to use a stronger hash, or use a non-lossy tokenization scheme (as in the
  * OrderPreservingPartitioner classes).
  */
-public class DecoratedKey<T extends Token> extends RowPosition
+public class DecoratedKey extends RowPosition
 {
     private static final IPartitioner partitioner = StorageService.getPartitioner();
 
@@ -47,10 +47,10 @@ public class DecoratedKey<T extends Token> extends RowPosition
         }
     };
 
-    public final T token;
+    public final Token token;
     public final ByteBuffer key;
 
-    public DecoratedKey(T token, ByteBuffer key)
+    public DecoratedKey(Token token, ByteBuffer key)
     {
         assert token != null && key != null && key.remaining() > 0;
         this.token = token;
@@ -108,7 +108,7 @@ public class DecoratedKey<T extends Token> extends RowPosition
         return "DecoratedKey(" + token + ", " + keystring + ")";
     }
 
-    public T getToken()
+    public Token getToken()
     {
         return token;
     }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 7fcc12b..0789726 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -293,7 +293,7 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean
         Token<?> token = StorageService.instance.getTokenMetadata().getToken(endpoint);
         logger_.info("Started hinted handoff for token: {} with IP: {}", token, endpoint);
         ByteBuffer tokenBytes = StorageService.getPartitioner().getTokenFactory().toByteArray(token);
-        DecoratedKey<?> epkey =  StorageService.getPartitioner().decorateKey(tokenBytes);
+        DecoratedKey epkey =  StorageService.getPartitioner().decorateKey(tokenBytes);
         int rowsReplayed = 0;
         ByteBuffer startColumn = ByteBufferUtil.EMPTY_BYTE_BUFFER;
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/db/Row.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Row.java b/src/java/org/apache/cassandra/db/Row.java
index 8856acd..72fb5f5 100644
--- a/src/java/org/apache/cassandra/db/Row.java
+++ b/src/java/org/apache/cassandra/db/Row.java
@@ -34,10 +34,10 @@ public class Row
         return serializer;
     }
 
-    public final DecoratedKey<?> key;
+    public final DecoratedKey key;
     public final ColumnFamily cf;
 
-    public Row(DecoratedKey<?> key, ColumnFamily cf)
+    public Row(DecoratedKey key, ColumnFamily cf)
     {
         assert key != null;
         // cf may be null, indicating no data

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java b/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
index 33b1cd5..3f613e0 100644
--- a/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
+++ b/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
@@ -54,7 +54,7 @@ public class SliceByNamesReadCommand extends ReadCommand
 
     public Row getRow(Table table) throws IOException
     {
-        DecoratedKey<?> dk = StorageService.getPartitioner().decorateKey(key);
+        DecoratedKey dk = StorageService.getPartitioner().decorateKey(key);
         return table.getRow(QueryFilter.getNamesFilter(dk, queryPath, columnNames));
     }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/db/SliceFromReadCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SliceFromReadCommand.java b/src/java/org/apache/cassandra/db/SliceFromReadCommand.java
index 58b5e22..f4fd212 100644
--- a/src/java/org/apache/cassandra/db/SliceFromReadCommand.java
+++ b/src/java/org/apache/cassandra/db/SliceFromReadCommand.java
@@ -65,7 +65,7 @@ public class SliceFromReadCommand extends ReadCommand
 
     public Row getRow(Table table) throws IOException
     {
-        DecoratedKey<?> dk = StorageService.getPartitioner().decorateKey(key);
+        DecoratedKey dk = StorageService.getPartitioner().decorateKey(key);
         return table.getRow(QueryFilter.getSliceFilter(dk, queryPath, start, finish, reversed, count));
     }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/db/Table.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Table.java b/src/java/org/apache/cassandra/db/Table.java
index 51e8258..93db1c3 100644
--- a/src/java/org/apache/cassandra/db/Table.java
+++ b/src/java/org/apache/cassandra/db/Table.java
@@ -383,7 +383,7 @@ public class Table
             if (writeCommitLog)
                 CommitLog.instance.add(mutation);
 
-            DecoratedKey<?> key = StorageService.getPartitioner().decorateKey(mutation.key());
+            DecoratedKey key = StorageService.getPartitioner().decorateKey(mutation.key());
             for (ColumnFamily cf : mutation.getColumnFamilies())
             {
                 ColumnFamilyStore cfs = columnFamilyStores.get(cf.id());
@@ -490,7 +490,7 @@ public class Table
         }
     }
 
-    private static ColumnFamily readCurrentIndexedColumns(DecoratedKey<?> key, ColumnFamilyStore cfs, SortedSet<ByteBuffer> mutatedIndexedColumns)
+    private static ColumnFamily readCurrentIndexedColumns(DecoratedKey key, ColumnFamilyStore cfs, SortedSet<ByteBuffer> mutatedIndexedColumns)
     {
         QueryFilter filter = QueryFilter.getNamesFilter(key, new QueryPath(cfs.getColumnFamilyName()), mutatedIndexedColumns);
         return cfs.getColumnFamily(filter);
@@ -506,7 +506,7 @@ public class Table
      * @param cfs ColumnFamily to index row in
      * @param indexedColumns columns to index, in comparator order
      */
-    public static void indexRow(DecoratedKey<?> key, ColumnFamilyStore cfs, SortedSet<ByteBuffer> indexedColumns)
+    public static void indexRow(DecoratedKey key, ColumnFamilyStore cfs, SortedSet<ByteBuffer> indexedColumns)
     {
         if (logger.isDebugEnabled())
             logger.debug("Indexing row {} ", cfs.metadata.getKeyValidator().getString(key.key));

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java
index 40c4e97..283784d 100644
--- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java
@@ -34,9 +34,9 @@ import org.apache.cassandra.db.DecoratedKey;
  */
 public abstract class AbstractCompactedRow
 {
-    public final DecoratedKey<?> key;
+    public final DecoratedKey key;
 
-    public AbstractCompactedRow(DecoratedKey<?> key)
+    public AbstractCompactedRow(DecoratedKey key)
     {
         this.key = key;
     }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
index 8ea4639..6401e3f 100644
--- a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
@@ -49,13 +49,13 @@ public class PrecompactedRow extends AbstractCompactedRow
     private final ColumnFamily compactedCf;
 
     /** it is caller's responsibility to call removeDeleted + removeOldShards from the cf before calling this constructor */
-    public PrecompactedRow(DecoratedKey<?> key, ColumnFamily cf)
+    public PrecompactedRow(DecoratedKey key, ColumnFamily cf)
     {
         super(key);
         compactedCf = cf;
     }
 
-    public static ColumnFamily removeDeletedAndOldShards(DecoratedKey<?> key, CompactionController controller, ColumnFamily cf)
+    public static ColumnFamily removeDeletedAndOldShards(DecoratedKey key, CompactionController controller, ColumnFamily cf)
     {
         assert key != null;
         assert controller != null;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/db/filter/IFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/IFilter.java b/src/java/org/apache/cassandra/db/filter/IFilter.java
index de26e83..09aac8f 100644
--- a/src/java/org/apache/cassandra/db/filter/IFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/IFilter.java
@@ -42,7 +42,7 @@ public interface IFilter
      * returns an iterator that returns columns from the given memtable
      * matching the Filter criteria in sorted order.
      */
-    public abstract IColumnIterator getMemtableColumnIterator(ColumnFamily cf, DecoratedKey<?> key);
+    public abstract IColumnIterator getMemtableColumnIterator(ColumnFamily cf, DecoratedKey key);
 
     /**
      * Get an iterator that returns columns from the given SSTable using the opened file
@@ -51,13 +51,13 @@ public interface IFilter
      * @param file Already opened file data input, saves us opening another one
      * @param key The key of the row we are about to iterate over
      */
-    public abstract IColumnIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey<?> key);
+    public abstract IColumnIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey key);
 
     /**
      * returns an iterator that returns columns from the given SSTable
      * matching the Filter criteria in sorted order.
      */
-    public abstract IColumnIterator getSSTableColumnIterator(SSTableReader sstable, DecoratedKey<?> key);
+    public abstract IColumnIterator getSSTableColumnIterator(SSTableReader sstable, DecoratedKey key);
 
     /**
      * collects columns from reducedColumns into returnCF.  Termination is determined

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/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 d6ab552..03ccac2 100644
--- a/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
@@ -50,17 +50,17 @@ public class NamesQueryFilter implements IFilter
         this(FBUtilities.singleton(column));
     }
 
-    public IColumnIterator getMemtableColumnIterator(ColumnFamily cf, DecoratedKey<?> key)
+    public IColumnIterator getMemtableColumnIterator(ColumnFamily cf, DecoratedKey key)
     {
         return Memtable.getNamesIterator(key, cf, this);
     }
 
-    public IColumnIterator getSSTableColumnIterator(SSTableReader sstable, DecoratedKey<?> key)
+    public IColumnIterator getSSTableColumnIterator(SSTableReader sstable, DecoratedKey key)
     {
         return new SSTableNamesIterator(sstable, key, columns);
     }
 
-    public IColumnIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey<?> key)
+    public IColumnIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey key)
     {
         return new SSTableNamesIterator(sstable, file, key, columns);
     }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/db/filter/QueryFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/QueryFilter.java b/src/java/org/apache/cassandra/db/filter/QueryFilter.java
index b075f41..ee1d10b 100644
--- a/src/java/org/apache/cassandra/db/filter/QueryFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/QueryFilter.java
@@ -42,12 +42,12 @@ public class QueryFilter
 {
     private static final Logger logger = LoggerFactory.getLogger(QueryFilter.class);
 
-    public final DecoratedKey<?> key;
+    public final DecoratedKey key;
     public final QueryPath path;
     public final IFilter filter;
     private final IFilter superFilter;
 
-    public QueryFilter(DecoratedKey<?> key, QueryPath path, IFilter filter)
+    public QueryFilter(DecoratedKey key, QueryPath path, IFilter filter)
     {
         this.key = key;
         this.path = path;
@@ -63,7 +63,7 @@ public class QueryFilter
         return getMemtableColumnIterator(cf, key);
     }
 
-    public IColumnIterator getMemtableColumnIterator(ColumnFamily cf, DecoratedKey<?> key)
+    public IColumnIterator getMemtableColumnIterator(ColumnFamily cf, DecoratedKey key)
     {
         assert cf != null;
         if (path.superColumnName == null)
@@ -79,7 +79,7 @@ public class QueryFilter
         return superFilter.getSSTableColumnIterator(sstable, key);
     }
 
-    public IColumnIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey<?> key)
+    public IColumnIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey key)
     {
         if (path.superColumnName == null)
             return filter.getSSTableColumnIterator(sstable, file, key);
@@ -162,7 +162,7 @@ public class QueryFilter
      * @param reversed true to start with the largest column (as determined by configured sort order) instead of smallest
      * @param limit maximum number of non-deleted columns to return
      */
-    public static QueryFilter getSliceFilter(DecoratedKey<?> key, QueryPath path, ByteBuffer start, ByteBuffer finish, boolean reversed, int limit)
+    public static QueryFilter getSliceFilter(DecoratedKey key, QueryPath path, ByteBuffer start, ByteBuffer finish, boolean reversed, int limit)
     {
         return new QueryFilter(key, path, new SliceQueryFilter(start, finish, reversed, limit));
     }
@@ -171,7 +171,7 @@ public class QueryFilter
      * return a QueryFilter object that includes every column in the row.
      * This is dangerous on large rows; avoid except for test code.
      */
-    public static QueryFilter getIdentityFilter(DecoratedKey<?> key, QueryPath path)
+    public static QueryFilter getIdentityFilter(DecoratedKey key, QueryPath path)
     {
         return new QueryFilter(key, path, new IdentityQueryFilter());
     }
@@ -182,7 +182,7 @@ public class QueryFilter
      * @param path path to the level to slice at (CF or SuperColumn)
      * @param columns the column names to restrict the results to, sorted in comparator order
      */
-    public static QueryFilter getNamesFilter(DecoratedKey<?> key, QueryPath path, SortedSet<ByteBuffer> columns)
+    public static QueryFilter getNamesFilter(DecoratedKey key, QueryPath path, SortedSet<ByteBuffer> columns)
     {
         return new QueryFilter(key, path, new NamesQueryFilter(columns));
     }
@@ -203,7 +203,7 @@ public class QueryFilter
     /**
      * convenience method for creating a name filter matching a single column
      */
-    public static QueryFilter getNamesFilter(DecoratedKey<?> key, QueryPath path, ByteBuffer column)
+    public static QueryFilter getNamesFilter(DecoratedKey key, QueryPath path, ByteBuffer column)
     {
         return new QueryFilter(key, path, new NamesQueryFilter(column));
     }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/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 e6372c2..e93204a 100644
--- a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
@@ -55,17 +55,17 @@ public class SliceQueryFilter implements IFilter
         this.count = count;
     }
 
-    public IColumnIterator getMemtableColumnIterator(ColumnFamily cf, DecoratedKey<?> key)
+    public IColumnIterator getMemtableColumnIterator(ColumnFamily cf, DecoratedKey key)
     {
         return Memtable.getSliceIterator(key, cf, this);
     }
 
-    public IColumnIterator getSSTableColumnIterator(SSTableReader sstable, DecoratedKey<?> key)
+    public IColumnIterator getSSTableColumnIterator(SSTableReader sstable, DecoratedKey key)
     {
         return new SSTableSliceIterator(sstable, key, start, finish, reversed);
     }
 
-    public IColumnIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey<?> key)
+    public IColumnIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey key)
     {
         return new SSTableSliceIterator(sstable, file, key, start, finish, reversed);
     }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/db/index/PerColumnSecondaryIndex.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/PerColumnSecondaryIndex.java b/src/java/org/apache/cassandra/db/index/PerColumnSecondaryIndex.java
index ba7360d..f8fe19e 100644
--- a/src/java/org/apache/cassandra/db/index/PerColumnSecondaryIndex.java
+++ b/src/java/org/apache/cassandra/db/index/PerColumnSecondaryIndex.java
@@ -36,7 +36,7 @@ public abstract class PerColumnSecondaryIndex extends SecondaryIndex
      * @param rowKey the underlying row key which is indexed
      * @param col all the column info
      */
-    public abstract void deleteColumn(DecoratedKey<?> valueKey, ByteBuffer rowKey, IColumn col) throws IOException;
+    public abstract void deleteColumn(DecoratedKey valueKey, ByteBuffer rowKey, IColumn col) throws IOException;
 
     /**
      * insert a column to the index
@@ -45,7 +45,7 @@ public abstract class PerColumnSecondaryIndex extends SecondaryIndex
      * @param rowKey the underlying row key which is indexed
      * @param col all the column info
      */
-    public abstract void insertColumn(DecoratedKey<?> valueKey, ByteBuffer rowKey, IColumn col) throws IOException;
+    public abstract void insertColumn(DecoratedKey valueKey, ByteBuffer rowKey, IColumn col) throws IOException;
 
     /**
      * update a column from the index
@@ -54,7 +54,7 @@ public abstract class PerColumnSecondaryIndex extends SecondaryIndex
      * @param rowKey the underlying row key which is indexed
      * @param col all the column info
      */
-    public abstract void updateColumn(DecoratedKey<?> valueKey, ByteBuffer rowKey, IColumn col) throws IOException;
+    public abstract void updateColumn(DecoratedKey valueKey, ByteBuffer rowKey, IColumn col) throws IOException;
 
     public String getNameForSystemTable(ByteBuffer column)
     {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java b/src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java
index df5a41d..d9201d8 100644
--- a/src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java
+++ b/src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java
@@ -55,7 +55,7 @@ public abstract class PerRowSecondaryIndex extends SecondaryIndex
      * @param key
      * @param indexedColumnsInRow
      */
-    public abstract void deleteFromIndex(DecoratedKey<?> key, List<IColumn> indexedColumnsInRow);
+    public abstract void deleteFromIndex(DecoratedKey key, List<IColumn> indexedColumnsInRow);
 
 
     @Override

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java b/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java
index 037245e..c638dac 100644
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java
@@ -61,7 +61,7 @@ public class SecondaryIndexBuilder extends CompactionInfo.Holder
         {
             if (isStopped())
                 throw new CompactionInterruptedException(getCompactionInfo());
-            DecoratedKey<?> key = iter.next();
+            DecoratedKey key = iter.next();
             Table.indexRow(key, cfs, columns);
         }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
index be62206..aa61f9d 100644
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@ -289,9 +289,9 @@ public class SecondaryIndexManager
      * @param value column value
      * @return decorated key
      */
-    public DecoratedKey<LocalToken> getIndexKeyFor(ByteBuffer name, ByteBuffer value)
+    public DecoratedKey getIndexKeyFor(ByteBuffer name, ByteBuffer value)
     {
-        return new DecoratedKey<LocalToken>(new LocalToken(baseCfs.metadata.getColumnDefinition(name).getValidator(), value), value);
+        return new DecoratedKey(new LocalToken(baseCfs.metadata.getColumnDefinition(name).getValidator(), value), value);
     }
 
 
@@ -455,7 +455,7 @@ public class SecondaryIndexManager
                 }
                 else
                 {
-                    DecoratedKey<LocalToken> valueKey = getIndexKeyFor(columnName, column.value());
+                    DecoratedKey valueKey = getIndexKeyFor(columnName, column.value());
 
                     ((PerColumnSecondaryIndex)index).deleteColumn(valueKey, rowKey, column);
                 }
@@ -487,7 +487,7 @@ public class SecondaryIndexManager
             }
             else
             {
-                DecoratedKey<LocalToken> valueKey = getIndexKeyFor(columnName, column.value());
+                DecoratedKey valueKey = getIndexKeyFor(columnName, column.value());
 
                 ((PerColumnSecondaryIndex)index).insertColumn(valueKey, rowKey, column);
             }
@@ -499,7 +499,7 @@ public class SecondaryIndexManager
      * @param key the row key
      * @param indexedColumnsInRow all column names in row
      */
-    public void deleteFromIndexes(DecoratedKey<?> key, List<IColumn> indexedColumnsInRow) throws IOException
+    public void deleteFromIndexes(DecoratedKey key, List<IColumn> indexedColumnsInRow) throws IOException
     {
 
         // Identify the columns with isRowLevelIndex == true
@@ -524,7 +524,7 @@ public class SecondaryIndexManager
             }
             else
             {
-                DecoratedKey<LocalToken> valueKey = getIndexKeyFor(column.name(), column.value());
+                DecoratedKey valueKey = getIndexKeyFor(column.name(), column.value());
                 ((PerColumnSecondaryIndex) index).deleteColumn(valueKey, key.key, column);
             }
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java b/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java
index fa663ca..80270f3 100644
--- a/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java
+++ b/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java
@@ -71,7 +71,7 @@ public class KeysIndex extends PerColumnSecondaryIndex
                : new LocalByPartionerType(StorageService.getPartitioner());
     }
 
-    public void deleteColumn(DecoratedKey<?> valueKey, ByteBuffer rowKey, IColumn column)
+    public void deleteColumn(DecoratedKey valueKey, ByteBuffer rowKey, IColumn column)
     {
         if (column.isMarkedForDelete())
             return;
@@ -84,7 +84,7 @@ public class KeysIndex extends PerColumnSecondaryIndex
             logger.debug("removed index entry for cleaned-up value {}:{}", valueKey, cfi);
     }
 
-    public void insertColumn(DecoratedKey<?> valueKey, ByteBuffer rowKey, IColumn column)
+    public void insertColumn(DecoratedKey valueKey, ByteBuffer rowKey, IColumn column)
     {
         ColumnFamily cfi = ColumnFamily.create(indexCfs.metadata);
         if (column instanceof ExpiringColumn)
@@ -102,7 +102,7 @@ public class KeysIndex extends PerColumnSecondaryIndex
         indexCfs.apply(valueKey, cfi);
     }
 
-    public void updateColumn(DecoratedKey<?> valueKey, ByteBuffer rowKey, IColumn col)
+    public void updateColumn(DecoratedKey valueKey, ByteBuffer rowKey, IColumn col)
     {
         insertColumn(valueKey, rowKey, col);
     }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/db/migration/Migration.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/migration/Migration.java b/src/java/org/apache/cassandra/db/migration/Migration.java
index 4aaad5b..b1cca41 100644
--- a/src/java/org/apache/cassandra/db/migration/Migration.java
+++ b/src/java/org/apache/cassandra/db/migration/Migration.java
@@ -110,7 +110,7 @@ public abstract class Migration
     @Deprecated
     public static UUID getLastMigrationId()
     {
-        DecoratedKey<?> dkey = StorageService.getPartitioner().decorateKey(LAST_MIGRATION_KEY);
+        DecoratedKey dkey = StorageService.getPartitioner().decorateKey(LAST_MIGRATION_KEY);
         Table defs = Table.open(Table.SYSTEM_TABLE);
         ColumnFamilyStore cfStore = defs.getColumnFamilyStore(SCHEMA_CF);
         QueryFilter filter = QueryFilter.getNamesFilter(dkey, new QueryPath(SCHEMA_CF), LAST_MIGRATION_KEY);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java b/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java
index 89c5ac3..ce17d24 100644
--- a/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java
@@ -38,14 +38,14 @@ public abstract class AbstractByteOrderedPartitioner extends AbstractPartitioner
 
     public static final BigInteger BYTE_MASK = new BigInteger("255");
 
-    public DecoratedKey<BytesToken> decorateKey(ByteBuffer key)
+    public DecoratedKey decorateKey(ByteBuffer key)
     {
-        return new DecoratedKey<BytesToken>(getToken(key), key);
+        return new DecoratedKey(getToken(key), key);
     }
 
-    public DecoratedKey<BytesToken> convertFromDiskFormat(ByteBuffer key)
+    public DecoratedKey convertFromDiskFormat(ByteBuffer key)
     {
-        return new DecoratedKey<BytesToken>(getToken(key), key);
+        return new DecoratedKey(getToken(key), key);
     }
 
     public BytesToken midpoint(Token ltoken, Token rtoken)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/dht/IPartitioner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/IPartitioner.java b/src/java/org/apache/cassandra/dht/IPartitioner.java
index 0b8c28c..202eb17 100644
--- a/src/java/org/apache/cassandra/dht/IPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/IPartitioner.java
@@ -33,7 +33,7 @@ public interface IPartitioner<T extends Token>
      * @param key On disk representation
      * @return DecoratedKey object
      */
-    public DecoratedKey<T> convertFromDiskFormat(ByteBuffer key);
+    public DecoratedKey convertFromDiskFormat(ByteBuffer key);
 
     /**
      * Transform key to object representation of the on-disk format.
@@ -41,7 +41,7 @@ public interface IPartitioner<T extends Token>
      * @param key the raw, client-facing key
      * @return decorated version of key
      */
-    public DecoratedKey<T> decorateKey(ByteBuffer key);
+    public DecoratedKey decorateKey(ByteBuffer key);
 
     /**
      * Calculate a Token representing the approximate "middle" of the given

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/dht/LocalPartitioner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/LocalPartitioner.java b/src/java/org/apache/cassandra/dht/LocalPartitioner.java
index b5b9812..7fbac88 100644
--- a/src/java/org/apache/cassandra/dht/LocalPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/LocalPartitioner.java
@@ -37,14 +37,14 @@ public class LocalPartitioner extends AbstractPartitioner<LocalToken>
         this.comparator = comparator;
     }
 
-    public DecoratedKey<LocalToken> convertFromDiskFormat(ByteBuffer key)
+    public DecoratedKey convertFromDiskFormat(ByteBuffer key)
     {
         return decorateKey(key);
     }
 
-    public DecoratedKey<LocalToken> decorateKey(ByteBuffer key)
+    public DecoratedKey decorateKey(ByteBuffer key)
     {
-        return new DecoratedKey<LocalToken>(getToken(key), key);
+        return new DecoratedKey(getToken(key), key);
     }
 
     public Token midpoint(Token left, Token right)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java b/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
index e7d6ad4..ff5cc1b 100644
--- a/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
@@ -37,14 +37,14 @@ public class OrderPreservingPartitioner extends AbstractPartitioner<StringToken>
 
     public static final BigInteger CHAR_MASK = new BigInteger("65535");
 
-    public DecoratedKey<StringToken> decorateKey(ByteBuffer key)
+    public DecoratedKey decorateKey(ByteBuffer key)
     {
-        return new DecoratedKey<StringToken>(getToken(key), key);
+        return new DecoratedKey(getToken(key), key);
     }
 
-    public DecoratedKey<StringToken> convertFromDiskFormat(ByteBuffer key)
+    public DecoratedKey convertFromDiskFormat(ByteBuffer key)
     {
-        return new DecoratedKey<StringToken>(getToken(key), key);
+        return new DecoratedKey(getToken(key), key);
     }
 
     public StringToken midpoint(Token ltoken, Token rtoken)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/dht/RandomPartitioner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/RandomPartitioner.java b/src/java/org/apache/cassandra/dht/RandomPartitioner.java
index 15364d3..e8b3954 100644
--- a/src/java/org/apache/cassandra/dht/RandomPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/RandomPartitioner.java
@@ -42,12 +42,12 @@ public class RandomPartitioner extends AbstractPartitioner<BigIntegerToken>
 
     private static final byte DELIMITER_BYTE = ":".getBytes()[0];
 
-    public DecoratedKey<BigIntegerToken> decorateKey(ByteBuffer key)
+    public DecoratedKey decorateKey(ByteBuffer key)
     {
-        return new DecoratedKey<BigIntegerToken>(getToken(key), key);
+        return new DecoratedKey(getToken(key), key);
     }
 
-    public DecoratedKey<BigIntegerToken> convertFromDiskFormat(ByteBuffer fromdisk)
+    public DecoratedKey convertFromDiskFormat(ByteBuffer fromdisk)
     {
         // find the delimiter position
         int splitPoint = -1;
@@ -73,7 +73,7 @@ public class RandomPartitioner extends AbstractPartitioner<BigIntegerToken>
         }
         ByteBuffer key = fromdisk.duplicate();
         key.position(splitPoint + 1);
-        return new DecoratedKey<BigIntegerToken>(new BigIntegerToken(token), key);
+        return new DecoratedKey(new BigIntegerToken(token), key);
     }
 
     public Token midpoint(Token ltoken, Token rtoken)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/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 1ecb4f0..398ec4e 100644
--- a/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
@@ -35,7 +35,7 @@ import org.apache.cassandra.db.DecoratedKey;
 public class IndexSummary
 {
     private ArrayList<Long> positions;
-    private ArrayList<DecoratedKey<?>> keys;
+    private ArrayList<DecoratedKey> keys;
     private long keysWritten = 0;
 
     public IndexSummary(long expectedKeys)
@@ -45,7 +45,7 @@ public class IndexSummary
             // TODO: that's a _lot_ of keys, or a very low interval
             throw new RuntimeException("Cannot use index_interval of " + DatabaseDescriptor.getIndexInterval() + " with " + expectedKeys + " (expected) keys.");
         positions = new ArrayList<Long>((int)expectedEntries);
-        keys = new ArrayList<DecoratedKey<?>>((int)expectedEntries);
+        keys = new ArrayList<DecoratedKey>((int)expectedEntries);
     }
 
     public void incrementRowid()
@@ -58,20 +58,20 @@ public class IndexSummary
         return keysWritten % DatabaseDescriptor.getIndexInterval() == 0;
     }
 
-    public void addEntry(DecoratedKey<?> key, long indexPosition)
+    public void addEntry(DecoratedKey key, long indexPosition)
     {
         keys.add(SSTable.getMinimalKey(key));
         positions.add(indexPosition);
     }
 
-    public void maybeAddEntry(DecoratedKey<?> decoratedKey, long indexPosition)
+    public void maybeAddEntry(DecoratedKey decoratedKey, long indexPosition)
     {
         if (shouldAddEntry())
             addEntry(decoratedKey, indexPosition);
         incrementRowid();
     }
 
-    public List<DecoratedKey<?>> getKeys()
+    public List<DecoratedKey> getKeys()
     {
         return keys;
     }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/io/sstable/KeyIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/KeyIterator.java b/src/java/org/apache/cassandra/io/sstable/KeyIterator.java
index 7de27af..2d5c584 100644
--- a/src/java/org/apache/cassandra/io/sstable/KeyIterator.java
+++ b/src/java/org/apache/cassandra/io/sstable/KeyIterator.java
@@ -51,13 +51,13 @@ public class KeyIterator extends AbstractIterator<DecoratedKey> implements Close
         }
     }
 
-    protected DecoratedKey<?> computeNext()
+    protected DecoratedKey computeNext()
     {
         try
         {
             if (in.isEOF())
                 return endOfData();
-            DecoratedKey<?> key = SSTableReader.decodeKey(StorageService.getPartitioner(), desc, ByteBufferUtil.readWithShortLength(in));
+            DecoratedKey key = SSTableReader.decodeKey(StorageService.getPartitioner(), desc, ByteBufferUtil.readWithShortLength(in));
             in.readLong(); // skip data position
             return key;
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/io/sstable/ReducingKeyIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/ReducingKeyIterator.java b/src/java/org/apache/cassandra/io/sstable/ReducingKeyIterator.java
index 68e0f8b..56a8ac2 100644
--- a/src/java/org/apache/cassandra/io/sstable/ReducingKeyIterator.java
+++ b/src/java/org/apache/cassandra/io/sstable/ReducingKeyIterator.java
@@ -44,7 +44,7 @@ public class ReducingKeyIterator implements CloseableIterator<DecoratedKey>
             iters.add(new KeyIterator(sstable.descriptor));
         mi = MergeIterator.get(iters, DecoratedKey.comparator, new MergeIterator.Reducer<DecoratedKey,DecoratedKey>()
         {
-            DecoratedKey<?> reduced = null;
+            DecoratedKey reduced = null;
 
             @Override
             public boolean trivialReduceIsTrivial()
@@ -57,7 +57,7 @@ public class ReducingKeyIterator implements CloseableIterator<DecoratedKey>
                 reduced = current;
             }
 
-            protected DecoratedKey<?> getReduced()
+            protected DecoratedKey getReduced()
             {
                 return reduced;
             }
@@ -102,7 +102,7 @@ public class ReducingKeyIterator implements CloseableIterator<DecoratedKey>
         return mi.hasNext();
     }
 
-    public DecoratedKey<?> next()
+    public DecoratedKey next()
     {
         return mi.next();
     }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/io/sstable/SSTable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTable.java b/src/java/org/apache/cassandra/io/sstable/SSTable.java
index aed3c62..a165b17 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTable.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTable.java
@@ -150,7 +150,7 @@ public abstract class SSTable
      * If the given @param key occupies only part of a larger buffer, allocate a new buffer that is only
      * as large as necessary.
      */
-    public static DecoratedKey<?> getMinimalKey(DecoratedKey<?> key)
+    public static DecoratedKey getMinimalKey(DecoratedKey key)
     {
         return key.key.position() > 0 || key.key.hasRemaining()
                                        ? new DecoratedKey(key.token, HeapAllocator.instance.clone(key.key))

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java b/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
index 275f983..9f2a0e5 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
@@ -38,7 +38,7 @@ public class SSTableIdentityIterator implements Comparable<SSTableIdentityIterat
 {
     private static final Logger logger = LoggerFactory.getLogger(SSTableIdentityIterator.class);
 
-    private final DecoratedKey<?> key;
+    private final DecoratedKey key;
     private final DataInput input;
     private final long dataStart;
     public final long dataSize;
@@ -64,7 +64,7 @@ public class SSTableIdentityIterator implements Comparable<SSTableIdentityIterat
      * @param dataSize length of row data
      * @throws IOException
      */
-    public SSTableIdentityIterator(SSTableReader sstable, RandomAccessReader file, DecoratedKey<?> key, long dataStart, long dataSize)
+    public SSTableIdentityIterator(SSTableReader sstable, RandomAccessReader file, DecoratedKey key, long dataStart, long dataSize)
     throws IOException
     {
         this(sstable, file, key, dataStart, dataSize, false);
@@ -80,20 +80,20 @@ public class SSTableIdentityIterator implements Comparable<SSTableIdentityIterat
      * @param checkData if true, do its best to deserialize and check the coherence of row data
      * @throws IOException
      */
-    public SSTableIdentityIterator(SSTableReader sstable, RandomAccessReader file, DecoratedKey<?> key, long dataStart, long dataSize, boolean checkData)
+    public SSTableIdentityIterator(SSTableReader sstable, RandomAccessReader file, DecoratedKey key, long dataStart, long dataSize, boolean checkData)
     throws IOException
     {
         this(sstable.metadata, file, key, dataStart, dataSize, checkData, sstable, IColumnSerializer.Flag.LOCAL);
     }
 
-    public SSTableIdentityIterator(CFMetaData metadata, DataInput file, DecoratedKey<?> key, long dataStart, long dataSize, IColumnSerializer.Flag flag)
+    public SSTableIdentityIterator(CFMetaData metadata, DataInput file, DecoratedKey key, long dataStart, long dataSize, IColumnSerializer.Flag flag)
     throws IOException
     {
         this(metadata, file, key, dataStart, dataSize, false, null, flag);
     }
 
     // sstable may be null *if* deserializeRowHeader is false
-    private SSTableIdentityIterator(CFMetaData metadata, DataInput input, DecoratedKey<?> key, long dataStart, long dataSize, boolean checkData, SSTableReader sstable, IColumnSerializer.Flag flag)
+    private SSTableIdentityIterator(CFMetaData metadata, DataInput input, DecoratedKey key, long dataStart, long dataSize, boolean checkData, SSTableReader sstable, IColumnSerializer.Flag flag)
     throws IOException
     {
         this.input = input;
@@ -156,7 +156,7 @@ public class SSTableIdentityIterator implements Comparable<SSTableIdentityIterat
         }
     }
 
-    public DecoratedKey<?> getKey()
+    public DecoratedKey getKey()
     {
         return key;
     }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index 8c1d540..5737ddb 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@ -487,12 +487,12 @@ public class SSTableReader extends SSTable
     /**
      * @return Approximately 1/INDEX_INTERVALth of the keys in this SSTable.
      */
-    public Collection<DecoratedKey<?>> getKeySamples()
+    public Collection<DecoratedKey> getKeySamples()
     {
         return indexSummary.getKeys();
     }
 
-    private static List<Pair<Integer,Integer>> getSampleIndexesForRanges(List<DecoratedKey<?>> samples, Collection<Range<Token>> ranges)
+    private static List<Pair<Integer,Integer>> getSampleIndexesForRanges(List<DecoratedKey> samples, Collection<Range<Token>> ranges)
     {
         // use the index to determine a minimal section for each range
         List<Pair<Integer,Integer>> positions = new ArrayList<Pair<Integer,Integer>>();
@@ -536,20 +536,20 @@ public class SSTableReader extends SSTable
         return positions;
     }
 
-    public Iterable<DecoratedKey<?>> getKeySamples(final Range<Token> range)
+    public Iterable<DecoratedKey> getKeySamples(final Range<Token> range)
     {
-        final List<DecoratedKey<?>> samples = indexSummary.getKeys();
+        final List<DecoratedKey> samples = indexSummary.getKeys();
 
         final List<Pair<Integer, Integer>> indexRanges = getSampleIndexesForRanges(samples, Collections.singletonList(range));
 
         if (indexRanges.isEmpty())
             return Collections.emptyList();
 
-        return new Iterable<DecoratedKey<?>>()
+        return new Iterable<DecoratedKey>()
         {
-            public Iterator<DecoratedKey<?>> iterator()
+            public Iterator<DecoratedKey> iterator()
             {
-                return new Iterator<DecoratedKey<?>>()
+                return new Iterator<DecoratedKey>()
                 {
                     private Iterator<Pair<Integer, Integer>> rangeIter = indexRanges.iterator();
                     private Pair<Integer, Integer> current;
@@ -576,7 +576,7 @@ public class SSTableReader extends SSTable
                         RowPosition k = samples.get(idx++);
                         // the index should only contain valid row key, we only allow RowPosition in KeyPosition for search purposes
                         assert k instanceof DecoratedKey;
-                        return (DecoratedKey<?>)k;
+                        return (DecoratedKey)k;
                     }
 
                     public void remove()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java b/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
index 5e4f269..b6bff54 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
@@ -170,7 +170,7 @@ public class SSTableScanner implements CloseableIterator<IColumnIterator>
                     file.seek(finishedAt);
                 assert !file.isEOF();
 
-                DecoratedKey<?> key = SSTableReader.decodeKey(sstable.partitioner,
+                DecoratedKey key = SSTableReader.decodeKey(sstable.partitioner,
                                                            sstable.descriptor,
                                                            ByteBufferUtil.readWithShortLength(file));
                 long dataSize = SSTableReader.readRowSize(file, sstable.descriptor);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
index 25c158c..40ab697 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
@@ -48,7 +48,7 @@ public class SSTableWriter extends SSTable
     private IndexWriter iwriter;
     private SegmentedFile.Builder dbuilder;
     private final SequentialWriter dataFile;
-    private DecoratedKey<?> lastWrittenKey;
+    private DecoratedKey lastWrittenKey;
     private FileMark dataMark;
     private SSTableMetadata.Collector sstableMetadataCollector;
 
@@ -123,7 +123,7 @@ public class SSTableWriter extends SSTable
         }
     }
 
-    private long beforeAppend(DecoratedKey<?> decoratedKey) throws IOException
+    private long beforeAppend(DecoratedKey decoratedKey) throws IOException
     {
         if (decoratedKey == null)
         {
@@ -139,7 +139,7 @@ public class SSTableWriter extends SSTable
         return (lastWrittenKey == null) ? 0 : dataFile.getFilePointer();
     }
 
-    private void afterAppend(DecoratedKey<?> decoratedKey, long dataPosition) throws IOException
+    private void afterAppend(DecoratedKey decoratedKey, long dataPosition) throws IOException
     {
         lastWrittenKey = decoratedKey;
         this.last = lastWrittenKey;
@@ -174,7 +174,7 @@ public class SSTableWriter extends SSTable
         return currentPosition;
     }
 
-    public void append(DecoratedKey<?> decoratedKey, ColumnFamily cf) throws IOException
+    public void append(DecoratedKey decoratedKey, ColumnFamily cf) throws IOException
     {
         long startPosition = beforeAppend(decoratedKey);
         ByteBufferUtil.writeWithShortLength(decoratedKey.key, dataFile.stream);
@@ -195,7 +195,7 @@ public class SSTableWriter extends SSTable
         sstableMetadataCollector.addColumnCount(columnCount);
     }
 
-    public void append(DecoratedKey<?> decoratedKey, ByteBuffer value) throws IOException
+    public void append(DecoratedKey decoratedKey, ByteBuffer value) throws IOException
     {
         long currentPosition = beforeAppend(decoratedKey);
         ByteBufferUtil.writeWithShortLength(decoratedKey.key, dataFile.stream);
@@ -205,7 +205,7 @@ public class SSTableWriter extends SSTable
         afterAppend(decoratedKey, currentPosition);
     }
 
-    public long appendFromStream(DecoratedKey<?> key, CFMetaData metadata, long dataSize, DataInput in) throws IOException
+    public long appendFromStream(DecoratedKey key, CFMetaData metadata, long dataSize, DataInput in) throws IOException
     {
         long currentPosition = beforeAppend(key);
         ByteBufferUtil.writeWithShortLength(key.key, dataFile.stream);
@@ -411,7 +411,7 @@ public class SSTableWriter extends SSTable
                : BloomFilter.getFilter(keyCount, fpChance);
         }
 
-        public void afterAppend(DecoratedKey<?> key, long dataPosition) throws IOException
+        public void afterAppend(DecoratedKey key, long dataPosition) throws IOException
         {
             bf.add(key.key);
             long indexPosition = indexFile.getFilePointer();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/service/AbstractRowResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/AbstractRowResolver.java b/src/java/org/apache/cassandra/service/AbstractRowResolver.java
index b4e78ff..22cf210 100644
--- a/src/java/org/apache/cassandra/service/AbstractRowResolver.java
+++ b/src/java/org/apache/cassandra/service/AbstractRowResolver.java
@@ -47,7 +47,7 @@ public abstract class AbstractRowResolver implements IResponseResolver<Row>
 
     protected final String table;
     protected final ConcurrentMap<Message, ReadResponse> replies = new NonBlockingHashMap<Message, ReadResponse>();
-    protected final DecoratedKey<?> key;
+    protected final DecoratedKey key;
 
     public AbstractRowResolver(ByteBuffer key, String table)
     {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/service/DigestMismatchException.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/DigestMismatchException.java b/src/java/org/apache/cassandra/service/DigestMismatchException.java
index fc6bcb7..e3e83ea 100644
--- a/src/java/org/apache/cassandra/service/DigestMismatchException.java
+++ b/src/java/org/apache/cassandra/service/DigestMismatchException.java
@@ -26,7 +26,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
 @SuppressWarnings("serial")
 public class DigestMismatchException extends Exception
 {
-    public DigestMismatchException(DecoratedKey<?> key, ByteBuffer digest1, ByteBuffer digest2)
+    public DigestMismatchException(DecoratedKey key, ByteBuffer digest1, ByteBuffer digest2)
     {
         super(String.format("Mismatch for key %s (%s vs %s)",
                             key.toString(),

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/src/java/org/apache/cassandra/service/RowRepairResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/RowRepairResolver.java b/src/java/org/apache/cassandra/service/RowRepairResolver.java
index 2d8078b..17bbfed 100644
--- a/src/java/org/apache/cassandra/service/RowRepairResolver.java
+++ b/src/java/org/apache/cassandra/service/RowRepairResolver.java
@@ -108,7 +108,7 @@ public class RowRepairResolver extends AbstractRowResolver
      * For each row version, compare with resolved (the superset of all row versions);
      * if it is missing anything, send a mutation to the endpoint it come from.
      */
-    public static List<IAsyncResult> scheduleRepairs(ColumnFamily resolved, String table, DecoratedKey<?> key, List<ColumnFamily> versions, List<InetAddress> endpoints)
+    public static List<IAsyncResult> scheduleRepairs(ColumnFamily resolved, String table, DecoratedKey key, List<ColumnFamily> versions, List<InetAddress> endpoints)
     {
         List<IAsyncResult> results = new ArrayList<IAsyncResult>(versions.size());
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e4ef1cc/test/unit/org/apache/cassandra/db/KeyCollisionTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/KeyCollisionTest.java b/test/unit/org/apache/cassandra/db/KeyCollisionTest.java
index 9c5aadf..0c8b219 100644
--- a/test/unit/org/apache/cassandra/db/KeyCollisionTest.java
+++ b/test/unit/org/apache/cassandra/db/KeyCollisionTest.java
@@ -99,12 +99,12 @@ public class KeyCollisionTest extends CleanupHelper
 
         private static final byte DELIMITER_BYTE = ":".getBytes()[0];
 
-        public DecoratedKey<BigIntegerToken> decorateKey(ByteBuffer key)
+        public DecoratedKey decorateKey(ByteBuffer key)
         {
-            return new DecoratedKey<BigIntegerToken>(getToken(key), key);
+            return new DecoratedKey(getToken(key), key);
         }
 
-        public DecoratedKey<BigIntegerToken> convertFromDiskFormat(ByteBuffer fromdisk)
+        public DecoratedKey convertFromDiskFormat(ByteBuffer fromdisk)
         {
             throw new UnsupportedOperationException();
         }


Mime
View raw message