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 2009/06/05 21:52:30 UTC
svn commit: r782117 [1/3] - in /incubator/cassandra/trunk: ./ interface/
interface/gen-java/org/apache/cassandra/service/ src/java/org/
src/java/org/apache/cassandra/service/ test/unit/org/
Author: jbellis
Date: Fri Jun 5 19:52:29 2009
New Revision: 782117
URL: http://svn.apache.org/viewvc?rev=782117&view=rev
Log:
merge from 0.3 branch
Added:
incubator/cassandra/trunk/BUGS.txt
- copied, changed from r782116, incubator/cassandra/branches/cassandra-0.3/BUGS.txt
Modified:
incubator/cassandra/trunk/ (props changed)
incubator/cassandra/trunk/interface/cassandra.thrift
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java (contents, props changed)
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/CqlResult_t.java (props changed)
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java (props changed)
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java (props changed)
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/batch_mutation_super_t.java (props changed)
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/batch_mutation_t.java (props changed)
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/column_t.java (props changed)
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/superColumn_t.java (props changed)
incubator/cassandra/trunk/src/java/org/ (props changed)
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java
incubator/cassandra/trunk/test/unit/org/ (props changed)
Propchange: incubator/cassandra/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 5 19:52:29 2009
@@ -1 +1 @@
-/incubator/cassandra/branches/cassandra-0.3:774578-782096
+/incubator/cassandra/branches/cassandra-0.3:774578-782116
Copied: incubator/cassandra/trunk/BUGS.txt (from r782116, incubator/cassandra/branches/cassandra-0.3/BUGS.txt)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/BUGS.txt?p2=incubator/cassandra/trunk/BUGS.txt&p1=incubator/cassandra/branches/cassandra-0.3/BUGS.txt&r1=782116&r2=782117&rev=782117&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.3/BUGS.txt (original)
+++ incubator/cassandra/trunk/BUGS.txt Fri Jun 5 19:52:29 2009
@@ -1,7 +1,4 @@
-We consider 0.3 most appropriate for someone who wants to evaluate
-Cassandra without dealing with the highly variable degree of stability
-that a nightly build offers. Here are the known issues you should
-be most concerned about:
+Here are the known issues you should be most concerned about:
1. With enough and large enough keys in a ColumnFamily, Cassandra will
run out of memory trying to perform compactions (data file merges).
@@ -35,16 +32,8 @@
Additionally, row size (that is, all the data associated with a single
-key in a given ColumnFamily) is limited by available memory, for
-two reasons:
+key in a given ColumnFamily) is limited by available memory, because
+compaction deserializes each row before merging.
- 1. get_slice offsets are not indexed. Every time you do a get_slice,
- Cassandra has to deserialize the entire ColumnFamily row into
- memory. (This is already fixed in trunk.)
-
- See https://issues.apache.org/jira/browse/CASSANDRA-172
-
- 2. Compaction deserializes each row before merging.
-
- See https://issues.apache.org/jira/browse/CASSANDRA-16
+See https://issues.apache.org/jira/browse/CASSANDRA-16
Modified: incubator/cassandra/trunk/interface/cassandra.thrift
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/cassandra.thrift?rev=782117&r1=782116&r2=782117&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/cassandra.thrift (original)
+++ incubator/cassandra/trunk/interface/cassandra.thrift Fri Jun 5 19:52:29 2009
@@ -91,44 +91,53 @@
# service api
#
+# CF = ColumnFamily name
+# SC = SuperColumn name
+# C = Column name
+# columnParent: the parent of the columns you are specifying. "CF" or "CF:SC".
+# columnPath: full path to a column. "CF:C" or "CF:SC:C".
+# superColumnPath: full path to a supercolumn. "CF:SC" only.
+# columnPathOrParent: remove will wipe out any layer. "CF" or "CF:C" or "CF:SC" or "CF:SC:C".
+
+
service Cassandra {
- list<column_t> get_slice(1:string tablename, 2:string key, 3:string columnFamily_column, 4:i32 start=-1, 5:i32 count=-1)
+ list<column_t> get_slice(1:string tablename, 2:string key, 3:string columnParent, 4:i32 start=-1, 5:i32 count=-1)
throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
- list<column_t> get_slice_by_name_range(1:string tablename, 2:string key, 3:string columnFamily, 4:string start, 5:string end, 6:i32 count=-1)
+ list<column_t> get_slice_by_name_range(1:string tablename, 2:string key, 3:string columnParent, 4:string start, 5:string end, 6:i32 count=-1)
throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
- list<column_t> get_slice_by_names(1:string tablename, 2:string key, 3:string columnFamily, 4:list<string> columnNames)
+ list<column_t> get_slice_by_names(1:string tablename, 2:string key, 3:string columnParent, 4:list<string> columnNames)
throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
- list<column_t> get_slice_from(1:string tablename, 2:string key, 3:string columnFamily_column, 4:bool isAscending, 5:i32 count)
+ list<column_t> get_slice_from(1:string tablename, 2:string key, 3:string columnParent, 4:bool isAscending, 5:i32 count)
throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
- column_t get_column(1:string tablename, 2:string key, 3:string columnFamily_column)
+ column_t get_column(1:string tablename, 2:string key, 3:string columnPath)
throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
- i32 get_column_count(1:string tablename, 2:string key, 3:string columnFamily_column)
+ i32 get_column_count(1:string tablename, 2:string key, 3:string columnParent)
throws (1: InvalidRequestException ire),
- void insert(1:string tablename, 2:string key, 3:string columnFamily_column, 4:binary cellData, 5:i64 timestamp, 6:i32 block_for=0)
+ void insert(1:string tablename, 2:string key, 3:string columnPath, 4:binary cellData, 5:i64 timestamp, 6:i32 block_for=0)
throws (1: InvalidRequestException ire, 2: UnavailableException ue),
void batch_insert(1: batch_mutation_t batchMutation, 2:i32 block_for=0)
throws (1: InvalidRequestException ire, 2: UnavailableException ue),
- void remove(1:string tablename, 2:string key, 3:string columnFamily_column, 4:i64 timestamp, 5:i32 block_for=0)
+ void remove(1:string tablename, 2:string key, 3:string columnPathOrParent, 4:i64 timestamp, 5:i32 block_for=0)
throws (1: InvalidRequestException ire, 2: UnavailableException ue),
- list<column_t> get_columns_since(1:string tablename, 2:string key, 3:string columnFamily_column, 4:i64 timeStamp)
+ list<column_t> get_columns_since(1:string tablename, 2:string key, 3:string columnParent, 4:i64 timeStamp)
throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
- list<superColumn_t> get_slice_super(1:string tablename, 2:string key, 3:string columnFamily_superColumnName, 4:i32 start=-1, 5:i32 count=-1)
+ list<superColumn_t> get_slice_super(1:string tablename, 2:string key, 3:string columnFamily, 4:i32 start=-1, 5:i32 count=-1)
throws (1: InvalidRequestException ire),
list<superColumn_t> get_slice_super_by_names(1:string tablename, 2:string key, 3:string columnFamily, 4:list<string> superColumnNames)
throws (1: InvalidRequestException ire),
- superColumn_t get_superColumn(1:string tablename, 2:string key, 3:string columnFamily)
+ superColumn_t get_superColumn(1:string tablename, 2:string key, 3:string superColumnPath)
throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
void batch_insert_superColumn(1:batch_mutation_super_t batchMutationSuper, 2:i32 block_for=0)