Author: jbellis
Date: Tue Sep 1 01:52:03 2009
New Revision: 809793
URL: http://svn.apache.org/viewvc?rev=809793&view=rev
Log:
inline BatchMutation into batch_insert params
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-403
Removed:
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/BatchMutation.java
Modified:
incubator/cassandra/trunk/interface/cassandra.thrift
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java
incubator/cassandra/trunk/test/system/test_server.py
Modified: incubator/cassandra/trunk/interface/cassandra.thrift
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/cassandra.thrift?rev=809793&r1=809792&r2=809793&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/cassandra.thrift (original)
+++ incubator/cassandra/trunk/interface/cassandra.thrift Tue Sep 1 01:52:03
2009
@@ -107,11 +107,6 @@
2: optional SliceRange slice_range,
}
-struct BatchMutation {
- 1: required string key,
- 2: required map<string, list<ColumnOrSuperColumn>> cfmap,
-}
-
service Cassandra {
# retrieval methods
@@ -138,7 +133,7 @@
void insert(1:string keyspace, 2:string key, 3:ColumnPath column_path,
4:binary value, 5:i64 timestamp, 6:ConsistencyLevel consistency_level=0)
throws (1: InvalidRequestException ire, 2: UnavailableException ue),
- void batch_insert(1:string keyspace, 2:BatchMutation batch_mutation,
3:ConsistencyLevel consistency_level=0)
+ void batch_insert(1:string keyspace, 2:string key, 3:map<string,
list<ColumnOrSuperColumn>> cfmap, 4:ConsistencyLevel consistency_level=0)
throws (1: InvalidRequestException ire, 2: UnavailableException ue),
void remove(1:string keyspace, 2:string key, 3:ColumnPath column_path, 4:i64
timestamp, 5:ConsistencyLevel consistency_level=0)
