Author: gdusbabek
Date: Wed Dec 15 15:24:14 2010
New Revision: 1049589
URL: http://svn.apache.org/viewvc?rev=1049589&view=rev
Log:
merge from 0.7
Modified:
cassandra/trunk/ (props changed)
cassandra/trunk/CHANGES.txt
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
(props changed)
cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java
cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
Propchange: cassandra/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 15 15:24:14 2010
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6:922689-1044118
-/cassandra/branches/cassandra-0.7:1026517-1049323
+/cassandra/branches/cassandra-0.7:1026517-1049588
/incubator/cassandra/branches/cassandra-0.3:774578-796573
/incubator/cassandra/branches/cassandra-0.4:810145-834239,834349-834350
/incubator/cassandra/branches/cassandra-0.5:888872-915439
Modified: cassandra/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1049589&r1=1049588&r2=1049589&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Wed Dec 15 15:24:14 2010
@@ -13,6 +13,8 @@
column families (CASSANDRA-1835)
* unregister index MBeans when index is dropped (CASSANDRA-1843)
* make ByteBufferUtil.clone thread-safe (CASSANDRA-1847)
+ * change exception for read requests during bootstrap from
+ InvalidRequest to Unavailable (CASSANDRA-1862)
* deleted columns resurrected after a flush on slice read path
(CASSANDRA-1837)
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 15 15:24:14 2010
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1044118
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026517-1049323
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026517-1049588
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Cassandra.java:810145-834239,834349-834350
/incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/Cassandra.java:888872-903502
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 15 15:24:14 2010
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1044118
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026517-1049323
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026517-1049588
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/column_t.java:774578-792198
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Column.java:810145-834239,834349-834350
/incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/Column.java:888872-903502
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 15 15:24:14 2010
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-1044118
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026517-1049323
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026517-1049588
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:774578-796573
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:810145-834239,834349-834350
/incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:888872-903502
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 15 15:24:14 2010
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:922689-1044118
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026517-1049323
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026517-1049588
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:774578-796573
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:810145-834239,834349-834350
/incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:888872-903502
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 15 15:24:14 2010
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:922689-1044118
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026517-1049323
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026517-1049588
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:774578-792198
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:810145-834239,834349-834350
/incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:888872-903502
Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java?rev=1049589&r1=1049588&r2=1049589&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java Wed Dec
15 15:24:14 2010
@@ -317,16 +317,16 @@ public class CliUserHelp {
{
state.out.println("List of all CLI commands:");
state.out.println("?
Display this message.");
- state.out.println("help;
Display this help.");
- state.out.println("help <command>;
Display detailed, command-specific help.");
- state.out.println("connect <hostname>/<port>;
Connect to thrift service.");
- state.out.println("use <keyspace> [<username> 'password'];
Switch to a keyspace.");
- state.out.println("describe keyspace <keyspacename>;
Describe keyspace.");
- state.out.println("exit;
Exit CLI.");
- state.out.println("quit;
Exit CLI.");
- state.out.println("show cluster name;
Display cluster name.");
- state.out.println("show keyspaces;
Show list of keyspaces.");
- state.out.println("show api version;
Show server API version.");
+ state.out.println("help;
Display this help.");
+ state.out.println("help <command>; Display
detailed, command-specific help.");
+ state.out.println("connect <hostname>/<port>;
Connect to thrift service.");
+ state.out.println("use <keyspace> [<username> 'password'];
Switch to a keyspace.");
+ state.out.println("describe keyspace <keyspacename>;
Describe keyspace.");
+ state.out.println("exit;
Exit CLI.");
+ state.out.println("quit;
Exit CLI.");
+ state.out.println("show cluster name;
Display cluster name.");
+ state.out.println("show keyspaces;
Show list of keyspaces.");
+ state.out.println("show api version;
Show server API version.");
state.out.println("create keyspace <keyspace> [with
<att1>=<value1> [and <att2>=<value2> ...]];");
state.out.println(" Add a new keyspace with the
specified attribute(s) and value(s).");
state.out.println("update keyspace <keyspace> [with
<att1>=<value1> [and <att2>=<value2> ...]];");
@@ -335,29 +335,30 @@ public class CliUserHelp {
state.out.println(" Create a new column family with the
specified attribute(s) and value(s).");
state.out.println("update column family <cf> [with <att1>=<value1>
[and <att2>=<value2> ...]];");
state.out.println(" Update a column family with the
specified attribute(s) and value(s).");
- state.out.println("drop keyspace <keyspace>;
Delete a keyspace.");
- state.out.println("drop column family <cf>;
Delete a column family.");
- state.out.println("get <cf>['<key>'];
Get a slice of columns.");
- state.out.println("get <cf>['<key>']['<super>'];
Get a slice of sub columns.");
- state.out.println("get <cf> where <column> = <value> [and <column>
> <value> and ...] [limit int]; ");
- state.out.println("get <cf>['<key>']['<col>'] (as <type>)*;
Get a column value.");
- state.out.println("get <cf>['<key>']['<super>']['<col>'] (as
<type>)*; Get a sub column value.");
- state.out.println("set <cf>['<key>']['<col>'] = <value> (with ttl
= <secs>)*; Set a column.");
- state.out.println("set <cf>['<key>']['<super>']['<col>'] = <value>
(with ttl = <secs>)*; Set a sub column.");
- state.out.println("del <cf>['<key>'];
Delete record.");
- state.out.println("del <cf>['<key>']['<col>'];
Delete column.");
- state.out.println("del <cf>['<key>']['<super>']['<col>'];
Delete sub column.");
- state.out.println("count <cf>['<key>'];
Count columns in record.");
- state.out.println("count <cf>['<key>']['<super>'];
Count columns in a super column.");
- state.out.println("truncate <column_family>;
Truncate specified column family.");
+ state.out.println("drop keyspace <keyspace>;
Delete a keyspace.");
+ state.out.println("drop column family <cf>;
Delete a column family.");
+ state.out.println("get <cf>['<key>'];
Get a slice of columns.");
+ state.out.println("get <cf>['<key>']['<super>'];
Get a slice of sub columns.");
+ state.out.println("get <cf> where <column> = <value> [and <column>
> <value> and ...] [limit int]; ");
+ state.out.println("get <cf>['<key>']['<col>'] (as <type>)*;
Get a column value.");
+ state.out.println("get <cf>['<key>']['<super>']['<col>'] (as
<type>)*; Get a sub column value.");
+ state.out.println("set <cf>['<key>']['<col>'] = <value> (with ttl
= <secs>)*; Set a column.");
+ state.out.println("set <cf>['<key>']['<super>']['<col>'] = <value>
(with ttl = <secs>)*;");
+ state.out.println("
Set a sub column.");
+ state.out.println("del <cf>['<key>'];
Delete record.");
+ state.out.println("del <cf>['<key>']['<col>'];
Delete column.");
+ state.out.println("del <cf>['<key>']['<super>']['<col>'];
Delete sub column.");
+ state.out.println("count <cf>['<key>'];
Count columns in record.");
+ state.out.println("count <cf>['<key>']['<super>'];
Count columns in a super column.");
+ state.out.println("truncate <column_family>;
Truncate specified column family.");
state.out.println("assume <column_family> <attribute> as <type>;");
- state.out.println(" Assume one of the attributes of the given
column family to match specified type.");
- state.out.println("list <cf>;
List all rows in the column family.");
+ state.out.println(" Assume a given column family
attributes to match a specified type.");
+ state.out.println("list <cf>;
List all rows in the column family.");
state.out.println("list <cf>[<startKey>:];");
- state.out.println(" List rows in the column
family beginning with <startKey>.");
+ state.out.println(" List rows in the column
family beginning with <startKey>.");
state.out.println("list <cf>[<startKey>:<endKey>];");
- state.out.println(" List rows in the column family in the
range from <startKey> to <endKey>.");
- state.out.println("list ... limit N;
Limit the list results to N.");
+ state.out.println(" List rows in the column family in the
range from <startKey> to <endKey>.");
+ state.out.println("list ... limit N;
Limit the list results to N.");
}
}
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1049589&r1=1049588&r2=1049589&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java Wed
Dec 15 15:24:14 2010
@@ -216,7 +216,7 @@ public class StorageProxy implements Sto
throws IOException, UnavailableException, TimeoutException,
InvalidRequestException
{
if (StorageService.instance.isBootstrapMode())
- throw new InvalidRequestException("This node cannot accept reads
until it has bootstrapped");
+ throw new UnavailableException();
long startTime = System.nanoTime();
List<Row> rows;
