Author: jbellis
Date: Tue Apr 27 15:16:54 2010
New Revision: 938504
URL: http://svn.apache.org/viewvc?rev=938504&view=rev
Log:
clean out bogus @deprecation warnings and unused code
Modified:
cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java
cassandra/trunk/src/java/org/apache/cassandra/dht/IPartitioner.java
Modified:
cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java?rev=938504&r1=938503&r2=938504&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java Tue
Apr 27 15:16:54 2010
@@ -43,7 +43,6 @@ import org.apache.cassandra.service.Stor
import static org.apache.cassandra.utils.FBUtilities.UTF8;
import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.utils.Bytes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.cassandra.avro.AvroRecordFactory.*;
@@ -55,7 +54,6 @@ public class CassandraServer implements
private final static GenericArray<Column> EMPTY_SUBCOLUMNS = new
GenericData.Array<Column>(0, Schema.parse("{\"type\":\"array\",\"items\":" +
Column.SCHEMA$ + "}"));
private final static Utf8 API_VERSION = new Utf8("0.0.0");
- @Override
public ColumnOrSuperColumn get(Utf8 keyspace, Utf8 key, ColumnPath
columnPath, ConsistencyLevel consistencyLevel)
throws AvroRemoteException, InvalidRequestException, NotFoundException,
UnavailableException, TimedOutException {
if (logger.isDebugEnabled())
@@ -223,7 +221,6 @@ public class CassandraServer implements
return avroColumns;
}
- @Override
public Void insert(Utf8 keyspace, Utf8 key, ColumnPath cp, ByteBuffer
value, long timestamp, ConsistencyLevel consistencyLevel)
throws AvroRemoteException, InvalidRequestException, UnavailableException,
TimedOutException
{
@@ -277,7 +274,6 @@ public class CassandraServer implements
}
}
- @Override
public Void batch_insert(Utf8 keyspace, Utf8 key, Map<Utf8,
GenericArray<ColumnOrSuperColumn>> cfmap, ConsistencyLevel consistency)
throws AvroRemoteException, InvalidRequestException, UnavailableException,
TimedOutException
{
@@ -328,9 +324,8 @@ public class CassandraServer implements
return rm;
}
- @Override
public Void batch_mutate(Utf8 keyspace, Map<Utf8, Map<Utf8,
GenericArray<Mutation>>> mutationMap, ConsistencyLevel consistencyLevel)
- throws AvroRemoteException, InvalidRequestException, UnavailableException,
TimedOutException
+ throws AvroRemoteException, UnavailableException, TimedOutException
{
if (logger.isDebugEnabled())
logger.debug("batch_mutate");
@@ -447,7 +442,6 @@ public class CassandraServer implements
return null;
}
- @Override
public Utf8 get_api_version() throws AvroRemoteException
{
return API_VERSION;
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java?rev=938504&r1=938503&r2=938504&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java Tue Apr
27 15:16:54 2010
@@ -40,8 +40,6 @@ public abstract class ReadCommand
public static final byte CMD_TYPE_GET_SLICE_BY_NAMES = 1;
public static final byte CMD_TYPE_GET_SLICE = 2;
- public static final String EMPTY_CF = "";
-
private static ReadCommandSerializer serializer = new
ReadCommandSerializer();
public static ReadCommandSerializer serializer()
Modified: cassandra/trunk/src/java/org/apache/cassandra/dht/IPartitioner.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/dht/IPartitioner.java?rev=938504&r1=938503&r2=938504&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/dht/IPartitioner.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/dht/IPartitioner.java Tue Apr
27 15:16:54 2010
@@ -45,7 +45,6 @@ public interface IPartitioner<T extends
* @param key the raw, client-facing key
* @return decorated version of key
*/
- @Deprecated
public DecoratedKey<T> decorateKey(byte[] key);
/**
