Author: jbellis
Date: Mon Mar 1 20:02:34 2010
New Revision: 917685
URL: http://svn.apache.org/viewvc?rev=917685&view=rev
Log:
merge from 0.6
Added:
incubator/cassandra/trunk/lib/libthrift-r917130.jar
- copied unchanged from r917571,
incubator/cassandra/branches/cassandra-0.6/lib/libthrift-r917130.jar
Removed:
incubator/cassandra/trunk/lib/libthrift-r894924.jar
Modified:
incubator/cassandra/trunk/ (props changed)
incubator/cassandra/trunk/CHANGES.txt
incubator/cassandra/trunk/NEWS.txt
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
(contents, props changed)
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
(contents, props changed)
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
(contents, props changed)
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
(contents, props changed)
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
(contents, props changed)
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java
incubator/cassandra/trunk/test/system/test_thrift_server.py
Propchange: incubator/cassandra/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 1 20:02:34 2010
@@ -1,4 +1,4 @@
/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
-/incubator/cassandra/branches/cassandra-0.6:911237-916976
+/incubator/cassandra/branches/cassandra-0.6:911237-917571
Modified: incubator/cassandra/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/CHANGES.txt?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/CHANGES.txt (original)
+++ incubator/cassandra/trunk/CHANGES.txt Mon Mar 1 20:02:34 2010
@@ -38,6 +38,7 @@
(CASSANDRA-799)
* use while loop instead of recursion when trimming sstables compaction list
to avoid blowing stack in pathological cases (CASSANDRA-804)
+ * basic Hadoop map/reduce support (CASSANDRA-342)
0.5.1
Modified: incubator/cassandra/trunk/NEWS.txt
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/NEWS.txt?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/NEWS.txt (original)
+++ incubator/cassandra/trunk/NEWS.txt Mon Mar 1 20:02:34 2010
@@ -13,7 +13,7 @@
--------
- row caching: configure with the RowsCached attribute in
ColumnFamily definition
- - Hadoop map/reduce support see contrib/word_count for an example
+ - Hadoop map/reduce support: see contrib/word_count for an example
- experimental authentication support, described under
Authenticator in storage.conf
Modified:
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
---
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
(original)
+++
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
Mon Mar 1 20:02:34 2010
@@ -253,13 +253,14 @@
int lastComparison = 0;
AuthenticationException typedOther = (AuthenticationException)other;
- lastComparison = Boolean.valueOf(isSetWhy()).compareTo(isSetWhy());
+ lastComparison =
Boolean.valueOf(isSetWhy()).compareTo(typedOther.isSetWhy());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(why, typedOther.why);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetWhy()) { lastComparison = TBaseHelper.compareTo(why,
typedOther.why);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
return 0;
}
@@ -273,21 +274,18 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- case WHY:
- if (field.type == TType.STRING) {
- this.why = iprot.readString();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- }
- iprot.readFieldEnd();
+ switch (field.id) {
+ case 1: // WHY
+ if (field.type == TType.STRING) {
+ this.why = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Modified:
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
---
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
(original)
+++
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
Mon Mar 1 20:02:34 2010
@@ -279,33 +279,30 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- case CREDENTIALS:
- if (field.type == TType.MAP) {
+ switch (field.id) {
+ case 1: // CREDENTIALS
+ if (field.type == TType.MAP) {
+ {
+ TMap _map16 = iprot.readMapBegin();
+ this.credentials = new HashMap<String,String>(2*_map16.size);
+ for (int _i17 = 0; _i17 < _map16.size; ++_i17)
{
- TMap _map16 = iprot.readMapBegin();
- this.credentials = new HashMap<String,String>(2*_map16.size);
- for (int _i17 = 0; _i17 < _map16.size; ++_i17)
- {
- String _key18;
- String _val19;
- _key18 = iprot.readString();
- _val19 = iprot.readString();
- this.credentials.put(_key18, _val19);
- }
- iprot.readMapEnd();
+ String _key18;
+ String _val19;
+ _key18 = iprot.readString();
+ _val19 = iprot.readString();
+ this.credentials.put(_key18, _val19);
}
- } else {
- TProtocolUtil.skip(iprot, field.type);
+ iprot.readMapEnd();
}
- break;
- }
- iprot.readFieldEnd();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Modified:
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
---
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
(original)
+++
incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
Mon Mar 1 20:02:34 2010
@@ -253,13 +253,14 @@
int lastComparison = 0;
AuthorizationException typedOther = (AuthorizationException)other;
- lastComparison = Boolean.valueOf(isSetWhy()).compareTo(isSetWhy());
+ lastComparison =
Boolean.valueOf(isSetWhy()).compareTo(typedOther.isSetWhy());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(why, typedOther.why);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetWhy()) { lastComparison = TBaseHelper.compareTo(why,
typedOther.why);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
return 0;
}
@@ -273,21 +274,18 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- case WHY:
- if (field.type == TType.STRING) {
- this.why = iprot.readString();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- }
- iprot.readFieldEnd();
+ switch (field.id) {
+ case 1: // WHY
+ if (field.type == TType.STRING) {
+ this.why = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
