You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/01/18 17:22:40 UTC
svn commit: r1060447 - in /cassandra/branches/cassandra-0.7:
contrib/client_only/ src/java/org/apache/cassandra/avro/
src/java/org/apache/cassandra/service/ src/java/org/apache/cassandra/thrift/
Author: jbellis
Date: Tue Jan 18 16:22:40 2011
New Revision: 1060447
URL: http://svn.apache.org/viewvc?rev=1060447&view=rev
Log:
r/m unused code and rename "readProtocol" to "read"
Modified:
cassandra/branches/cassandra-0.7/contrib/client_only/ClientOnlyExample.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/avro/CassandraServer.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/thrift/CassandraServer.java
Modified: cassandra/branches/cassandra-0.7/contrib/client_only/ClientOnlyExample.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/contrib/client_only/ClientOnlyExample.java?rev=1060447&r1=1060446&r2=1060447&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/contrib/client_only/ClientOnlyExample.java (original)
+++ cassandra/branches/cassandra-0.7/contrib/client_only/ClientOnlyExample.java Tue Jan 18 16:22:40 2011
@@ -89,7 +89,7 @@ public class ClientOnlyExample
new QueryPath("Standard1", null, null), cols);
readCommand.setDigestQuery(false);
commands.add(readCommand);
- List<Row> rows = StorageProxy.readProtocol(commands, ConsistencyLevel.ONE);
+ List<Row> rows = StorageProxy.read(commands, ConsistencyLevel.ONE);
assert rows.size() == 1;
Row row = rows.get(0);
ColumnFamily cf = row.cf;
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/avro/CassandraServer.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/avro/CassandraServer.java?rev=1060447&r1=1060446&r2=1060447&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/avro/CassandraServer.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/avro/CassandraServer.java Tue Jan 18 16:22:40 2011
@@ -154,7 +154,7 @@ public class CassandraServer implements
try
{
schedule();
- rows = StorageProxy.readProtocol(commands, thriftConsistencyLevel(consistency));
+ rows = StorageProxy.read(commands, thriftConsistencyLevel(consistency));
}
catch (TimeoutException e)
{
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1060447&r1=1060446&r2=1060447&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java Tue Jan 18 16:22:40 2011
@@ -294,7 +294,7 @@ public class StorageProxy implements Sto
* Performs the actual reading of a row out of the StorageService, fetching
* a specific set of column names from a given column family.
*/
- public static List<Row> readProtocol(List<ReadCommand> commands, ConsistencyLevel consistency_level)
+ public static List<Row> read(List<ReadCommand> commands, ConsistencyLevel consistency_level)
throws IOException, UnavailableException, TimeoutException, InvalidRequestException
{
if (StorageService.instance.isBootstrapMode())
@@ -342,7 +342,6 @@ public class StorageProxy implements Sto
InetAddress dataPoint = StorageService.instance.findSuitableEndpoint(command.table, command.key);
List<InetAddress> endpoints = StorageService.instance.getLiveNaturalEndpoints(command.table, command.key);
- AbstractReplicationStrategy rs = Table.open(command.table).getReplicationStrategy();
ReadResponseResolver resolver = new ReadResponseResolver(command.table, command.key);
ReadCallback<Row> handler = getReadCallback(resolver, command.table, consistency_level);
handler.assureSufficientLiveNodes(endpoints);
@@ -745,7 +744,6 @@ public class StorageProxy implements Sto
// collect replies and resolve according to consistency level
RangeSliceResponseResolver resolver = new RangeSliceResponseResolver(keyspace, liveEndpoints);
- AbstractReplicationStrategy rs = Table.open(keyspace).getReplicationStrategy();
ReadCallback<List<Row>> handler = getReadCallback(resolver, keyspace, consistency_level);
// bail early if live endpoints can't satisfy requested consistency level
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/thrift/CassandraServer.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/thrift/CassandraServer.java?rev=1060447&r1=1060446&r2=1060447&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/thrift/CassandraServer.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/thrift/CassandraServer.java Tue Jan 18 16:22:40 2011
@@ -95,7 +95,7 @@ public class CassandraServer implements
try
{
schedule();
- rows = StorageProxy.readProtocol(commands, consistency_level);
+ rows = StorageProxy.read(commands, consistency_level);
}
finally
{