Author: jbellis
Date: Fri May 7 19:45:31 2010
New Revision: 942191
URL: http://svn.apache.org/viewvc?rev=942191&view=rev
Log:
r/m deprecated batch_insert, get_range_slice methods
patch by jbellis; reviewed by Brandon Williams for CASSANDRA-1065
Modified:
cassandra/trunk/CHANGES.txt
cassandra/trunk/interface/cassandra.thrift
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
cassandra/trunk/test/system/test_thrift_server.py
Modified: cassandra/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=942191&r1=942190&r2=942191&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Fri May 7 19:45:31 2010
@@ -20,6 +20,7 @@ dev
* Added preload_row_cache option (CASSANDRA-946)
* add CRC to commitlog header (CASSANDRA-999)
* removed multiget thrift method (CASSANDRA-739)
+ * removed deprecated batch_insert and get_range_slice methods (CASSANDRA-1065)
0.6.2
Modified: cassandra/trunk/interface/cassandra.thrift
URL:
http://svn.apache.org/viewvc/cassandra/trunk/interface/cassandra.thrift?rev=942191&r1=942190&r2=942191&view=diff
==============================================================================
--- cassandra/trunk/interface/cassandra.thrift (original)
+++ cassandra/trunk/interface/cassandra.thrift Fri May 7 19:45:31 2010
@@ -46,7 +46,7 @@ namespace rb CassandraThrift
# for every edit that doesn't result in a change to major/minor.
#
# See the Semantic Versioning Specification (SemVer) http://semver.org.
-const string VERSION = "5.0.0"
+const string VERSION = "6.0.0"
#
# data structures
@@ -383,18 +383,6 @@ service Cassandra {
/**
returns a subset of columns for a range of keys.
- @Deprecated. Use get_range_slices instead
- */
- list<KeySlice> get_range_slice(1:required ColumnParent column_parent,
- 2:required SlicePredicate predicate,
- 3:required binary start_key,
- 4:required binary finish_key,
- 5:required i32 row_count=100,
- 6:required ConsistencyLevel
consistency_level=ONE)
- throws (1:InvalidRequestException ire, 2:UnavailableException
ue, 3:TimedOutException te),
-
- /**
- returns a subset of columns for a range of keys.
*/
list<KeySlice> get_range_slices(1:required ColumnParent column_parent,
2:required SlicePredicate predicate,
@@ -414,17 +402,6 @@ service Cassandra {
throws (1:InvalidRequestException ire, 2:UnavailableException ue,
3:TimedOutException te),
/**
- Insert Columns or SuperColumns across different Column Families for the
same row key. batch_mutation is a
- map<string, list<ColumnOrSuperColumn>> -- a map which pairs column family
names with the relevant ColumnOrSuperColumn
- objects to insert.
- @deprecated; use batch_mutate instead
- */
- void batch_insert(1:required binary key,
- 2:required map<string, list<ColumnOrSuperColumn>> cfmap,
- 3:required ConsistencyLevel consistency_level=ONE)
- throws (1:InvalidRequestException ire, 2:UnavailableException ue,
3:TimedOutException te),
-
- /**
Remove data from the row specified by key at the granularity specified by
column_path, and the given timestamp. Note
that all the values in column_path besides column_path.column_family are
truly optional: you can remove the entire
row by just specifying the ColumnFamily, or you can remove a SuperColumn
or a single Column by specifying those levels too.
