Author: eevans
Date: Thu Sep 2 18:22:44 2010
New Revision: 992043
URL: http://svn.apache.org/viewvc?rev=992043&view=rev
Log:
avro: make ConsistencyLevel required for consistency
And add missing exceptions to protocol schema.
Patch by eevans
Modified:
cassandra/trunk/interface/cassandra.genavro
cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
Modified: cassandra/trunk/interface/cassandra.genavro
URL:
http://svn.apache.org/viewvc/cassandra/trunk/interface/cassandra.genavro?rev=992043&r1=992042&r2=992043&view=diff
==============================================================================
--- cassandra/trunk/interface/cassandra.genavro (original)
+++ cassandra/trunk/interface/cassandra.genavro Thu Sep 2 18:22:44 2010
@@ -369,5 +369,6 @@ protocol Cassandra {
array<KeySlice> get_range_slices(ColumnParent column_parent,
SlicePredicate predicate,
KeyRange range,
- union { ConsistencyLevel, null }
consistency_level);
+ ConsistencyLevel consistency_level)
+ throws InvalidRequestException, UnavailableException, TimedOutException;
}
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=992043&r1=992042&r2=992043&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java Thu
Sep 2 18:22:44 2010
@@ -1067,12 +1067,6 @@ public class CassandraServer implements
public List<KeySlice> get_range_slices(ColumnParent column_parent,
SlicePredicate slice_predicate, KeyRange range, ConsistencyLevel
consistency_level)
throws InvalidRequestException, TimedOutException
{
- //Mirrors default CL value in thrift
- if (consistency_level == null)
- {
- consistency_level = ConsistencyLevel.ONE;
- }
-
String keyspace = clientState.getKeyspace();
try
{
