cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r802640 [1/4] - in /incubator/cassandra/trunk: interface/ interface/gen-java/org/apache/cassandra/service/ src/java/org/apache/cassandra/cli/ src/java/org/apache/cassandra/db/ src/java/org/apache/cassandra/db/filter/ src/java/org/apache/cas...
Date Mon, 10 Aug 2009 02:51:36 GMT
Author: jbellis
Date: Mon Aug 10 02:51:35 2009
New Revision: 802640

URL: http://svn.apache.org/viewvc?rev=802640&view=rev
Log:
Combine thrift slice methods.  Now we have one get() method, one get_slice(), and one get_count().
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-329

Added:
    incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnOrSuperColumn.java
      - copied, changed from r802639, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPathOrParent.java
    incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SlicePredicate.java
    incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SliceRange.java
Removed:
    incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPathOrParent.java
    incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumnPath.java
Modified:
    incubator/cassandra/trunk/interface/cassandra.thrift
    incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java
    incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPath.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SliceFromReadCommand.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryPath.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftValidation.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=802640&r1=802639&r2=802640&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/cassandra.thrift (original)
+++ incubator/cassandra/trunk/interface/cassandra.thrift Mon Aug 10 02:51:35 2009
@@ -108,32 +108,35 @@
 struct ColumnPath {
     3: string          column_family,
     4: optional binary super_column,
-    5: binary          column,
+    5: optional binary column,
 }
 
-struct SuperColumnPath {
-    3: string          column_family,
-    4: binary          super_column,
+struct SliceRange {
+    1: binary          start,
+    2: binary          finish,
+    3: bool            is_ascending=1,
+    4: i32             count=100,
 }
 
-struct ColumnPathOrParent {
-    3: string          column_family,
-    4: optional binary super_column,
-    5: optional binary column,
+struct SlicePredicate {
+    1: optional list<binary> column_names,
+    2: optional SliceRange   slice_range,
+}
+
+struct ColumnOrSuperColumn {
+    1: optional Column column,
+    2: optional SuperColumn super_column,
 }
 
 
 service Cassandra {
-  list<Column> get_slice_by_names(1:string keyspace, 2:string key, 3:ColumnParent column_parent,
4:list<binary> column_names, 5:ConsistencyLevel consistency_level=1)
-  throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
-  
-  list<Column> get_slice(1:string keyspace, 2:string key, 3:ColumnParent column_parent,
4:binary start, 5:binary finish, 6:bool is_ascending, 7:i32 count=100, 8:ConsistencyLevel
consistency_level=1)
+  list<ColumnOrSuperColumn> get_slice(1:string keyspace, 2:string key, 3:ColumnParent
column_parent, 4:SlicePredicate predicate, 5:ConsistencyLevel consistency_level=1)
   throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
 
-  Column       get_column(1:string keyspace, 2:string key, 3:ColumnPath column_path, 4:ConsistencyLevel
consistency_level=1)
+  ColumnOrSuperColumn get(1:string keyspace, 2:string key, 3:ColumnPath column_path, 4:ConsistencyLevel
consistency_level=1)
   throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
 
-  i32            get_column_count(1:string keyspace, 2:string key, 3:ColumnParent column_parent,
5:ConsistencyLevel consistency_level=1)
+  i32 get_count(1:string keyspace, 2:string key, 3:ColumnParent column_parent, 5:ConsistencyLevel
consistency_level=1)
   throws (1: InvalidRequestException ire),
 
   void     insert(1:string keyspace, 2:string key, 3:ColumnPath column_path, 4:binary value,
5:i64 timestamp, 6:ConsistencyLevel consistency_level=0)
@@ -142,18 +145,9 @@
   void     batch_insert(1:string keyspace, 2:BatchMutation batch_mutation, 3:ConsistencyLevel
consistency_level=0)
   throws (1: InvalidRequestException ire, 2: UnavailableException ue),
 
-  void           remove(1:string keyspace, 2:string key, 3:ColumnPathOrParent column_path_or_parent,
4:i64 timestamp, 5:ConsistencyLevel consistency_level=0)
+  void           remove(1:string keyspace, 2:string key, 3:ColumnPath column_path, 4:i64
timestamp, 5:ConsistencyLevel consistency_level=0)
   throws (1: InvalidRequestException ire, 2: UnavailableException ue),
 
-  list<SuperColumn> get_slice_super(1:string keyspace, 2:string key, 3:string column_family,
4:binary start, 5:binary finish, 6:bool is_ascending, 7:i32 count=100, 8:ConsistencyLevel
consistency_level=1)
-  throws (1: InvalidRequestException ire),
-
-  list<SuperColumn> get_slice_super_by_names(1:string keyspace, 2:string key, 3:string
column_family, 4:list<binary> super_column_names, 5:ConsistencyLevel consistency_level=1)
-  throws (1: InvalidRequestException ire),
-
-  SuperColumn  get_super_column(1:string keyspace, 2:string key, 3:SuperColumnPath super_column_path,
4:ConsistencyLevel consistency_level=1)
-  throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
-
   void     batch_insert_super_column(1:string keyspace, 2:BatchMutationSuper batch_mutation_super,
3:ConsistencyLevel consistency_level=0)
   throws (1: InvalidRequestException ire, 2: UnavailableException ue),
 



Mime
View raw message