You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2012/01/10 21:47:48 UTC
[1/3] git commit: Upgrade Thrift to 0.7.0
Updated Branches:
refs/heads/trunk d48a6c14f -> 7c8c57041
Upgrade Thrift to 0.7.0
Patch by jfarrell; reviewed by tjake for CASSANDRA-3213
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7c8c5704
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c8c5704
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c8c5704
Branch: refs/heads/trunk
Commit: 7c8c57041bb739ab87377171f581f1dd85fd1b1f
Parents: d48a6c1
Author: T Jake Luciani <ja...@gmail.com>
Authored: Tue Jan 10 15:46:22 2012 -0500
Committer: T Jake Luciani <ja...@gmail.com>
Committed: Tue Jan 10 15:46:22 2012 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +-
build.xml | 4 +-
.../cassandra/thrift/AuthenticationException.java | 4 +-
.../cassandra/thrift/AuthenticationRequest.java | 8 +-
.../cassandra/thrift/AuthorizationException.java | 4 +-
.../org/apache/cassandra/thrift/Cassandra.java | 2622 +++++----------
.../org/apache/cassandra/thrift/CfDef.java | 72 +-
.../org/apache/cassandra/thrift/Column.java | 14 +-
.../org/apache/cassandra/thrift/ColumnDef.java | 16 +-
.../cassandra/thrift/ColumnOrSuperColumn.java | 10 +-
.../org/apache/cassandra/thrift/ColumnParent.java | 6 +-
.../org/apache/cassandra/thrift/ColumnPath.java | 8 +-
.../org/apache/cassandra/thrift/Compression.java | 2 +-
.../apache/cassandra/thrift/ConsistencyLevel.java | 2 +-
.../org/apache/cassandra/thrift/Constants.java | 2 +-
.../org/apache/cassandra/thrift/CounterColumn.java | 8 +-
.../cassandra/thrift/CounterSuperColumn.java | 8 +-
.../org/apache/cassandra/thrift/CqlMetadata.java | 18 +-
.../apache/cassandra/thrift/CqlPreparedResult.java | 10 +-
.../org/apache/cassandra/thrift/CqlResult.java | 14 +-
.../org/apache/cassandra/thrift/CqlResultType.java | 2 +-
.../org/apache/cassandra/thrift/CqlRow.java | 8 +-
.../org/apache/cassandra/thrift/Deletion.java | 10 +-
.../apache/cassandra/thrift/EndpointDetails.java | 8 +-
.../org/apache/cassandra/thrift/IndexClause.java | 12 +-
.../apache/cassandra/thrift/IndexExpression.java | 8 +-
.../org/apache/cassandra/thrift/IndexOperator.java | 2 +-
.../org/apache/cassandra/thrift/IndexType.java | 2 +-
.../cassandra/thrift/InvalidRequestException.java | 4 +-
.../org/apache/cassandra/thrift/KeyCount.java | 8 +-
.../org/apache/cassandra/thrift/KeyRange.java | 18 +-
.../org/apache/cassandra/thrift/KeySlice.java | 8 +-
.../org/apache/cassandra/thrift/KsDef.java | 24 +-
.../org/apache/cassandra/thrift/Mutation.java | 6 +-
.../apache/cassandra/thrift/NotFoundException.java | 2 +-
.../thrift/SchemaDisagreementException.java | 2 +-
.../apache/cassandra/thrift/SlicePredicate.java | 8 +-
.../org/apache/cassandra/thrift/SliceRange.java | 14 +-
.../org/apache/cassandra/thrift/SuperColumn.java | 8 +-
.../apache/cassandra/thrift/TimedOutException.java | 2 +-
.../org/apache/cassandra/thrift/TokenRange.java | 18 +-
.../cassandra/thrift/UnavailableException.java | 2 +-
lib/libthrift-0.6.jar | Bin 295890 -> 0 bytes
lib/libthrift-0.7.0.jar | Bin 0 -> 301547 bytes
lib/licenses/libthrift-0.5.txt | 202 --
lib/licenses/libthrift-0.7.txt | 202 ++
46 files changed, 1193 insertions(+), 2221 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3de58df..eccb32d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -41,7 +41,7 @@
in LeveledManifest (CASSANDRA-3691)
* finer-grained control over data directories (CASSANDRA-2749)
* Fix ClassCastException during hinted handoff (CASSANDRA-3694)
-
+ * Upgrade Thrift to 0.7 (CASSANDRA-3213)
1.0.7
* fix regression in HH page size calculation (CASSANDRA-3624)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 23f69aa..d9648f8 100644
--- a/build.xml
+++ b/build.xml
@@ -369,9 +369,7 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision}
<exclusion groupId="org.apache.velocity" artifactId="velocity"/>
</dependency>
- <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.6.1">
- <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
- </dependency>
+ <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.7.0"/>
<dependency groupId="com.thoughtworks.paranamer" artifactId="paranamer-ant" version="2.1"/>
<dependency groupId="junit" artifactId="junit" version="4.6" />
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
index 2ad54d6..5d88cd9 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -50,7 +50,7 @@ public class AuthenticationException extends Exception implements org.apache.thr
private static final org.apache.thrift.protocol.TField WHY_FIELD_DESC = new org.apache.thrift.protocol.TField("why", org.apache.thrift.protocol.TType.STRING, (short)1);
- public String why;
+ public String why; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
index 08fc094..0f68426 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -50,7 +50,7 @@ public class AuthenticationRequest implements org.apache.thrift.TBase<Authentica
private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.MAP, (short)1);
- public Map<String,String> credentials;
+ public Map<String,String> credentials; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -312,8 +312,8 @@ public class AuthenticationRequest implements org.apache.thrift.TBase<Authentica
this.credentials = new HashMap<String,String>(2*_map36.size);
for (int _i37 = 0; _i37 < _map36.size; ++_i37)
{
- String _key38;
- String _val39;
+ String _key38; // required
+ String _val39; // required
_key38 = iprot.readString();
_val39 = iprot.readString();
this.credentials.put(_key38, _val39);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
index 8ff9d44..76bc061 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -50,7 +50,7 @@ public class AuthorizationException extends Exception implements org.apache.thri
private static final org.apache.thrift.protocol.TField WHY_FIELD_DESC = new org.apache.thrift.protocol.TField("why", org.apache.thrift.protocol.TType.STRING, (short)1);
- public String why;
+ public String why; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {