Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: segfault/apache_cassandra
...
head fork: segfault/apache_cassandra
compare: CASSANDRA-2882
Checking mergeability… Don't worry, you can still create the pull request.
  • 6 commits
  • 13 files changed
  • 0 commit comments
  • 1 contributor
View
90 interface/cassandra.thrift
@@ -30,7 +30,7 @@ namespace py cassandra
namespace php cassandra
namespace perl Cassandra
-# Thrift.rb has a bug where top-level modules that include modules
+# Thrift.rb has a bug where top-level modules that include modules
# with the same name are not properly referenced, so we can't do
# Cassandra::Cassandra::Client.
namespace rb CassandraThrift
@@ -46,7 +46,7 @@ namespace rb CassandraThrift
# for every edit that doesn't result in a change to major/minor.
#
# See the Semantic Versioning Specification (SemVer) http://semver.org.
-const string VERSION = "19.13.0"
+const string VERSION = "19.14.0"
#
@@ -57,7 +57,7 @@ const string VERSION = "19.13.0"
* @param name, the name by which this column is set and retrieved. Maximum 64KB long.
* @param value. The data associated with the name. Maximum 2GB long, but in practice you should limit it to small numbers of MB (since Thrift must read the full value into memory to operate on it).
* @param timestamp. The timestamp is used for conflict detection/resolution when two columns with same name need to be compared.
- * @param ttl. An optional, positive delay (in seconds) after which the column will be automatically deleted.
+ * @param ttl. An optional, positive delay (in seconds) after which the column will be automatically deleted.
*/
struct Column {
1: required binary name,
@@ -93,7 +93,7 @@ struct CounterSuperColumn {
in Columns, those values will be in the attribute column. This change was made between 0.3 and 0.4 to standardize on
single query methods that may return either a SuperColumn or Column.
- If the query was on a counter column family, you will either get a counter_column (instead of a column) or a
+ If the query was on a counter column family, you will either get a counter_column (instead of a column) or a
counter_super_column (instead of a super_column)
@param column. The Column returned by get() or get_slice().
@@ -118,7 +118,7 @@ struct ColumnOrSuperColumn {
exception NotFoundException {
}
-/** Invalid request could mean keyspace or column family does not exist, required parameters are missing, or a parameter is malformed.
+/** Invalid request could mean keyspace or column family does not exist, required parameters are missing, or a parameter is malformed.
why contains an associated error message.
*/
exception InvalidRequestException {
@@ -151,11 +151,11 @@ exception SchemaDisagreementException {
#
# service api
#
-/**
+/**
* The ConsistencyLevel is an enum that controls both read and write
* behavior based on the ReplicationFactor of the keyspace. The
* different consistency levels have different meanings, depending on
- * if you're doing a write or read operation.
+ * if you're doing a write or read operation.
*
* If W + R > ReplicationFactor, where W is the number of nodes to
* block for on write, and R the number to block for on reads, you
@@ -165,14 +165,14 @@ exception SchemaDisagreementException {
* still allowing availability in the face of node failures up to half
* of <ReplicationFactor>. Of course if latency is more important than
* consistency then you can use lower values for either or both.
- *
+ *
* Some ConsistencyLevels (ONE, TWO, THREE) refer to a specific number
* of replicas rather than a logical concept that adjusts
* automatically with the replication factor. Of these, only ONE is
* commonly used; TWO and (even more rarely) THREE are only useful
* when you care more about guaranteeing a certain level of
* durability, than consistency.
- *
+ *
* Write consistency levels make the following guarantees before reporting success to the client:
* ANY Ensure that the write has been written once somewhere, including possibly being hinted in a non-target node.
* ONE Ensure that the write has been written to at least 1 node's commit log and memory table
@@ -182,7 +182,7 @@ exception SchemaDisagreementException {
* LOCAL_QUORUM Ensure that the write has been written to <ReplicationFactor> / 2 + 1 nodes, within the local datacenter (requires NetworkTopologyStrategy)
* EACH_QUORUM Ensure that the write has been written to <ReplicationFactor> / 2 + 1 nodes in each datacenter (requires NetworkTopologyStrategy)
* ALL Ensure that the write is written to <code>&lt;ReplicationFactor&gt;</code> nodes before responding to the client.
- *
+ *
* Read consistency levels make the following guarantees before returning successful results to the client:
* ANY Not supported. You probably want ONE instead.
* ONE Returns the record obtained from a single replica.
@@ -342,10 +342,16 @@ struct Mutation {
2: optional Deletion deletion,
}
+struct EndpointDetails {
+ 1: i32 port,
+ 2: string datacenter
+}
+
struct TokenRange {
1: required string start_token,
2: required string end_token,
3: required list<string> endpoints,
+ 4: optional list<EndpointDetails> endpoint_details,
}
/**
@@ -409,7 +415,7 @@ struct KsDef {
3: optional map<string,string> strategy_options,
/** @deprecated */
- 4: optional i32 replication_factor,
+ 4: optional i32 replication_factor,
5: required list<CfDef> cf_defs,
6: optional bool durable_writes=1,
@@ -450,10 +456,10 @@ struct CqlResult {
service Cassandra {
# auth methods
void login(1: required AuthenticationRequest auth_request) throws (1:AuthenticationException authnx, 2:AuthorizationException authzx),
-
+
# set keyspace
void set_keyspace(1: required string keyspace) throws (1:InvalidRequestException ire),
-
+
# retrieval methods
/**
@@ -469,18 +475,18 @@ service Cassandra {
Get the group of columns contained by column_parent (either a ColumnFamily name or a ColumnFamily/SuperColumn name
pair) specified by the given SlicePredicate. If no matching values are found, an empty list is returned.
*/
- list<ColumnOrSuperColumn> get_slice(1:required binary key,
- 2:required ColumnParent column_parent,
- 3:required SlicePredicate predicate,
+ list<ColumnOrSuperColumn> get_slice(1:required binary key,
+ 2:required ColumnParent column_parent,
+ 3:required SlicePredicate predicate,
4:required ConsistencyLevel consistency_level=ConsistencyLevel.ONE)
throws (1:InvalidRequestException ire, 2:UnavailableException ue, 3:TimedOutException te),
/**
- returns the number of columns matching <code>predicate</code> for a particular <code>key</code>,
+ returns the number of columns matching <code>predicate</code> for a particular <code>key</code>,
<code>ColumnFamily</code> and optionally <code>SuperColumn</code>.
*/
- i32 get_count(1:required binary key,
- 2:required ColumnParent column_parent,
+ i32 get_count(1:required binary key,
+ 2:required ColumnParent column_parent,
3:required SlicePredicate predicate,
4:required ConsistencyLevel consistency_level=ConsistencyLevel.ONE)
throws (1:InvalidRequestException ire, 2:UnavailableException ue, 3:TimedOutException te),
@@ -488,9 +494,9 @@ service Cassandra {
/**
Performs a get_slice for column_parent and predicate for the given keys in parallel.
*/
- map<binary,list<ColumnOrSuperColumn>> multiget_slice(1:required list<binary> keys,
- 2:required ColumnParent column_parent,
- 3:required SlicePredicate predicate,
+ map<binary,list<ColumnOrSuperColumn>> multiget_slice(1:required list<binary> keys,
+ 2:required ColumnParent column_parent,
+ 3:required SlicePredicate predicate,
4:required ConsistencyLevel consistency_level=ConsistencyLevel.ONE)
throws (1:InvalidRequestException ire, 2:UnavailableException ue, 3:TimedOutException te),
@@ -506,7 +512,7 @@ service Cassandra {
/**
returns a subset of columns for a contiguous range of keys.
*/
- list<KeySlice> get_range_slices(1:required ColumnParent column_parent,
+ list<KeySlice> get_range_slices(1:required ColumnParent column_parent,
2:required SlicePredicate predicate,
3:required KeyRange range,
4:required ConsistencyLevel consistency_level=ConsistencyLevel.ONE)
@@ -524,7 +530,7 @@ service Cassandra {
/**
* Insert a Column at the given column_parent.column_family and optional column_parent.super_column.
*/
- void insert(1:required binary key,
+ void insert(1:required binary key,
2:required ColumnParent column_parent,
3:required Column column,
4:required ConsistencyLevel consistency_level=ConsistencyLevel.ONE)
@@ -569,27 +575,27 @@ service Cassandra {
void batch_mutate(1:required map<binary, map<string, list<Mutation>>> mutation_map,
2:required ConsistencyLevel consistency_level=ConsistencyLevel.ONE)
throws (1:InvalidRequestException ire, 2:UnavailableException ue, 3:TimedOutException te),
-
+
/**
Truncate will mark and entire column family as deleted.
From the user's perspective a successful call to truncate will result complete data deletion from cfname.
Internally, however, disk space will not be immediatily released, as with all deletes in cassandra, this one
only marks the data as deleted.
- The operation succeeds only if all hosts in the cluster at available and will throw an UnavailableException if
+ The operation succeeds only if all hosts in the cluster at available and will throw an UnavailableException if
some hosts are down.
*/
void truncate(1:required string cfname)
throws (1: InvalidRequestException ire, 2: UnavailableException ue),
-
+
// Meta-APIs -- APIs to get information about the node or cluster,
// rather than user data. The nodeprobe program provides usage examples.
-
- /**
+
+ /**
* for each schema version present in the cluster, returns a list of nodes at that version.
- * hosts that do not respond will be under the key DatabaseDescriptor.INITIAL_VERSION.
- * the cluster is all on the same version if the size of the map is 1.
+ * hosts that do not respond will be under the key DatabaseDescriptor.INITIAL_VERSION.
+ * the cluster is all on the same version if the size of the map is 1.
*/
map<string, list<string>> describe_schema_versions()
throws (1: InvalidRequestException ire),
@@ -608,7 +614,7 @@ service Cassandra {
represented as a set of TokenRange instead of a map from range
to list of endpoints, because you can't use Thrift structs as
map keys:
- https://issues.apache.org/jira/browse/THRIFT-162
+ https://issues.apache.org/jira/browse/THRIFT-162
for the same reason, we can't return a set here, even though
order is neither important nor predictable. */
@@ -625,13 +631,13 @@ service Cassandra {
KsDef describe_keyspace(1:required string keyspace)
throws (1:NotFoundException nfe, 2:InvalidRequestException ire),
- /** experimental API for hadoop/parallel query support.
- may change violently and without warning.
+ /** experimental API for hadoop/parallel query support.
+ may change violently and without warning.
returns list of token strings such that first subrange is (list[0], list[1]],
next is (list[1], list[2]], etc. */
list<string> describe_splits(1:required string cfName,
- 2:required string start_token,
+ 2:required string start_token,
3:required string end_token,
4:required i32 keys_per_split)
throws (1:InvalidRequestException ire),
@@ -639,27 +645,27 @@ service Cassandra {
/** adds a column family. returns the new schema id. */
string system_add_column_family(1:required CfDef cf_def)
throws (1:InvalidRequestException ire, 2:SchemaDisagreementException sde),
-
+
/** drops a column family. returns the new schema id. */
string system_drop_column_family(1:required string column_family)
- throws (1:InvalidRequestException ire, 2:SchemaDisagreementException sde),
-
+ throws (1:InvalidRequestException ire, 2:SchemaDisagreementException sde),
+
/** adds a keyspace and any column families that are part of it. returns the new schema id. */
string system_add_keyspace(1:required KsDef ks_def)
throws (1:InvalidRequestException ire, 2:SchemaDisagreementException sde),
-
+
/** drops a keyspace and any column families that are part of it. returns the new schema id. */
string system_drop_keyspace(1:required string keyspace)
throws (1:InvalidRequestException ire, 2:SchemaDisagreementException sde),
-
+
/** updates properties of a keyspace. returns the new schema id. */
string system_update_keyspace(1:required KsDef ks_def)
throws (1:InvalidRequestException ire, 2:SchemaDisagreementException sde),
-
+
/** updates properties of a column family. returns the new schema id. */
string system_update_column_family(1:required CfDef cf_def)
throws (1:InvalidRequestException ire, 2:SchemaDisagreementException sde),
-
+
/**
* Executes a CQL (Cassandra Query Language) statement and returns a
* CqlResult containing the results.
View
22 interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
@@ -308,15 +308,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 1: // CREDENTIALS
if (field.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map24 = iprot.readMapBegin();
- this.credentials = new HashMap<String,String>(2*_map24.size);
- for (int _i25 = 0; _i25 < _map24.size; ++_i25)
+ org.apache.thrift.protocol.TMap _map28 = iprot.readMapBegin();
+ this.credentials = new HashMap<String,String>(2*_map28.size);
+ for (int _i29 = 0; _i29 < _map28.size; ++_i29)
{
- String _key26;
- String _val27;
- _key26 = iprot.readString();
- _val27 = iprot.readString();
- this.credentials.put(_key26, _val27);
+ String _key30;
+ String _val31;
+ _key30 = iprot.readString();
+ _val31 = iprot.readString();
+ this.credentials.put(_key30, _val31);
}
iprot.readMapEnd();
}
@@ -343,10 +343,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(CREDENTIALS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.credentials.size()));
- for (Map.Entry<String, String> _iter28 : this.credentials.entrySet())
+ for (Map.Entry<String, String> _iter32 : this.credentials.entrySet())
{
- oprot.writeString(_iter28.getKey());
- oprot.writeString(_iter28.getValue());
+ oprot.writeString(_iter32.getKey());
+ oprot.writeString(_iter32.getValue());
}
oprot.writeMapEnd();
}
View
294 interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
@@ -7736,14 +7736,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 0: // SUCCESS
if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list75 = iprot.readListBegin();
- this.success = new ArrayList<ColumnOrSuperColumn>(_list75.size);
- for (int _i76 = 0; _i76 < _list75.size; ++_i76)
+ org.apache.thrift.protocol.TList _list79 = iprot.readListBegin();
+ this.success = new ArrayList<ColumnOrSuperColumn>(_list79.size);
+ for (int _i80 = 0; _i80 < _list79.size; ++_i80)
{
- ColumnOrSuperColumn _elem77;
- _elem77 = new ColumnOrSuperColumn();
- _elem77.read(iprot);
- this.success.add(_elem77);
+ ColumnOrSuperColumn _elem81;
+ _elem81 = new ColumnOrSuperColumn();
+ _elem81.read(iprot);
+ this.success.add(_elem81);
}
iprot.readListEnd();
}
@@ -7793,9 +7793,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size()));
- for (ColumnOrSuperColumn _iter78 : this.success)
+ for (ColumnOrSuperColumn _iter82 : this.success)
{
- _iter78.write(oprot);
+ _iter82.write(oprot);
}
oprot.writeListEnd();
}
@@ -9595,13 +9595,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 1: // KEYS
if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list79 = iprot.readListBegin();
- this.keys = new ArrayList<ByteBuffer>(_list79.size);
- for (int _i80 = 0; _i80 < _list79.size; ++_i80)
+ org.apache.thrift.protocol.TList _list83 = iprot.readListBegin();
+ this.keys = new ArrayList<ByteBuffer>(_list83.size);
+ for (int _i84 = 0; _i84 < _list83.size; ++_i84)
{
- ByteBuffer _elem81;
- _elem81 = iprot.readBinary();
- this.keys.add(_elem81);
+ ByteBuffer _elem85;
+ _elem85 = iprot.readBinary();
+ this.keys.add(_elem85);
}
iprot.readListEnd();
}
@@ -9651,9 +9651,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(KEYS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.keys.size()));
- for (ByteBuffer _iter82 : this.keys)
+ for (ByteBuffer _iter86 : this.keys)
{
- oprot.writeBinary(_iter82);
+ oprot.writeBinary(_iter86);
}
oprot.writeListEnd();
}
@@ -10242,26 +10242,26 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 0: // SUCCESS
if (field.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map83 = iprot.readMapBegin();
- this.success = new HashMap<ByteBuffer,List<ColumnOrSuperColumn>>(2*_map83.size);
- for (int _i84 = 0; _i84 < _map83.size; ++_i84)
+ org.apache.thrift.protocol.TMap _map87 = iprot.readMapBegin();
+ this.success = new HashMap<ByteBuffer,List<ColumnOrSuperColumn>>(2*_map87.size);
+ for (int _i88 = 0; _i88 < _map87.size; ++_i88)
{
- ByteBuffer _key85;
- List<ColumnOrSuperColumn> _val86;
- _key85 = iprot.readBinary();
+ ByteBuffer _key89;
+ List<ColumnOrSuperColumn> _val90;
+ _key89 = iprot.readBinary();
{
- org.apache.thrift.protocol.TList _list87 = iprot.readListBegin();
- _val86 = new ArrayList<ColumnOrSuperColumn>(_list87.size);
- for (int _i88 = 0; _i88 < _list87.size; ++_i88)
+ org.apache.thrift.protocol.TList _list91 = iprot.readListBegin();
+ _val90 = new ArrayList<ColumnOrSuperColumn>(_list91.size);
+ for (int _i92 = 0; _i92 < _list91.size; ++_i92)
{
- ColumnOrSuperColumn _elem89;
- _elem89 = new ColumnOrSuperColumn();
- _elem89.read(iprot);
- _val86.add(_elem89);
+ ColumnOrSuperColumn _elem93;
+ _elem93 = new ColumnOrSuperColumn();
+ _elem93.read(iprot);
+ _val90.add(_elem93);
}
iprot.readListEnd();
}
- this.success.put(_key85, _val86);
+ this.success.put(_key89, _val90);
}
iprot.readMapEnd();
}
@@ -10311,14 +10311,14 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, this.success.size()));
- for (Map.Entry<ByteBuffer, List<ColumnOrSuperColumn>> _iter90 : this.success.entrySet())
+ for (Map.Entry<ByteBuffer, List<ColumnOrSuperColumn>> _iter94 : this.success.entrySet())
{
- oprot.writeBinary(_iter90.getKey());
+ oprot.writeBinary(_iter94.getKey());
{
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter90.getValue().size()));
- for (ColumnOrSuperColumn _iter91 : _iter90.getValue())
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter94.getValue().size()));
+ for (ColumnOrSuperColumn _iter95 : _iter94.getValue())
{
- _iter91.write(oprot);
+ _iter95.write(oprot);
}
oprot.writeListEnd();
}
@@ -10906,13 +10906,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 1: // KEYS
if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list92 = iprot.readListBegin();
- this.keys = new ArrayList<ByteBuffer>(_list92.size);
- for (int _i93 = 0; _i93 < _list92.size; ++_i93)
+ org.apache.thrift.protocol.TList _list96 = iprot.readListBegin();
+ this.keys = new ArrayList<ByteBuffer>(_list96.size);
+ for (int _i97 = 0; _i97 < _list96.size; ++_i97)
{
- ByteBuffer _elem94;
- _elem94 = iprot.readBinary();
- this.keys.add(_elem94);
+ ByteBuffer _elem98;
+ _elem98 = iprot.readBinary();
+ this.keys.add(_elem98);
}
iprot.readListEnd();
}
@@ -10962,9 +10962,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(KEYS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.keys.size()));
- for (ByteBuffer _iter95 : this.keys)
+ for (ByteBuffer _iter99 : this.keys)
{
- oprot.writeBinary(_iter95);
+ oprot.writeBinary(_iter99);
}
oprot.writeListEnd();
}
@@ -11549,15 +11549,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 0: // SUCCESS
if (field.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map96 = iprot.readMapBegin();
- this.success = new HashMap<ByteBuffer,Integer>(2*_map96.size);
- for (int _i97 = 0; _i97 < _map96.size; ++_i97)
+ org.apache.thrift.protocol.TMap _map100 = iprot.readMapBegin();
+ this.success = new HashMap<ByteBuffer,Integer>(2*_map100.size);
+ for (int _i101 = 0; _i101 < _map100.size; ++_i101)
{
- ByteBuffer _key98;
- int _val99;
- _key98 = iprot.readBinary();
- _val99 = iprot.readI32();
- this.success.put(_key98, _val99);
+ ByteBuffer _key102;
+ int _val103;
+ _key102 = iprot.readBinary();
+ _val103 = iprot.readI32();
+ this.success.put(_key102, _val103);
}
iprot.readMapEnd();
}
@@ -11607,10 +11607,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, this.success.size()));
- for (Map.Entry<ByteBuffer, Integer> _iter100 : this.success.entrySet())
+ for (Map.Entry<ByteBuffer, Integer> _iter104 : this.success.entrySet())
{
- oprot.writeBinary(_iter100.getKey());
- oprot.writeI32(_iter100.getValue());
+ oprot.writeBinary(_iter104.getKey());
+ oprot.writeI32(_iter104.getValue());
}
oprot.writeMapEnd();
}
@@ -12794,14 +12794,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 0: // SUCCESS
if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list101 = iprot.readListBegin();
- this.success = new ArrayList<KeySlice>(_list101.size);
- for (int _i102 = 0; _i102 < _list101.size; ++_i102)
+ org.apache.thrift.protocol.TList _list105 = iprot.readListBegin();
+ this.success = new ArrayList<KeySlice>(_list105.size);
+ for (int _i106 = 0; _i106 < _list105.size; ++_i106)
{
- KeySlice _elem103;
- _elem103 = new KeySlice();
- _elem103.read(iprot);
- this.success.add(_elem103);
+ KeySlice _elem107;
+ _elem107 = new KeySlice();
+ _elem107.read(iprot);
+ this.success.add(_elem107);
}
iprot.readListEnd();
}
@@ -12851,9 +12851,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size()));
- for (KeySlice _iter104 : this.success)
+ for (KeySlice _iter108 : this.success)
{
- _iter104.write(oprot);
+ _iter108.write(oprot);
}
oprot.writeListEnd();
}
@@ -14037,14 +14037,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 0: // SUCCESS
if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list105 = iprot.readListBegin();
- this.success = new ArrayList<KeySlice>(_list105.size);
- for (int _i106 = 0; _i106 < _list105.size; ++_i106)
+ org.apache.thrift.protocol.TList _list109 = iprot.readListBegin();
+ this.success = new ArrayList<KeySlice>(_list109.size);
+ for (int _i110 = 0; _i110 < _list109.size; ++_i110)
{
- KeySlice _elem107;
- _elem107 = new KeySlice();
- _elem107.read(iprot);
- this.success.add(_elem107);
+ KeySlice _elem111;
+ _elem111 = new KeySlice();
+ _elem111.read(iprot);
+ this.success.add(_elem111);
}
iprot.readListEnd();
}
@@ -14094,9 +14094,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size()));
- for (KeySlice _iter108 : this.success)
+ for (KeySlice _iter112 : this.success)
{
- _iter108.write(oprot);
+ _iter112.write(oprot);
}
oprot.writeListEnd();
}
@@ -18941,38 +18941,38 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 1: // MUTATION_MAP
if (field.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map109 = iprot.readMapBegin();
- this.mutation_map = new HashMap<ByteBuffer,Map<String,List<Mutation>>>(2*_map109.size);
- for (int _i110 = 0; _i110 < _map109.size; ++_i110)
+ org.apache.thrift.protocol.TMap _map113 = iprot.readMapBegin();
+ this.mutation_map = new HashMap<ByteBuffer,Map<String,List<Mutation>>>(2*_map113.size);
+ for (int _i114 = 0; _i114 < _map113.size; ++_i114)
{
- ByteBuffer _key111;
- Map<String,List<Mutation>> _val112;
- _key111 = iprot.readBinary();
+ ByteBuffer _key115;
+ Map<String,List<Mutation>> _val116;
+ _key115 = iprot.readBinary();
{
- org.apache.thrift.protocol.TMap _map113 = iprot.readMapBegin();
- _val112 = new HashMap<String,List<Mutation>>(2*_map113.size);
- for (int _i114 = 0; _i114 < _map113.size; ++_i114)
+ org.apache.thrift.protocol.TMap _map117 = iprot.readMapBegin();
+ _val116 = new HashMap<String,List<Mutation>>(2*_map117.size);
+ for (int _i118 = 0; _i118 < _map117.size; ++_i118)
{
- String _key115;
- List<Mutation> _val116;
- _key115 = iprot.readString();
+ String _key119;
+ List<Mutation> _val120;
+ _key119 = iprot.readString();
{
- org.apache.thrift.protocol.TList _list117 = iprot.readListBegin();
- _val116 = new ArrayList<Mutation>(_list117.size);
- for (int _i118 = 0; _i118 < _list117.size; ++_i118)
+ org.apache.thrift.protocol.TList _list121 = iprot.readListBegin();
+ _val120 = new ArrayList<Mutation>(_list121.size);
+ for (int _i122 = 0; _i122 < _list121.size; ++_i122)
{
- Mutation _elem119;
- _elem119 = new Mutation();
- _elem119.read(iprot);
- _val116.add(_elem119);
+ Mutation _elem123;
+ _elem123 = new Mutation();
+ _elem123.read(iprot);
+ _val120.add(_elem123);
}
iprot.readListEnd();
}
- _val112.put(_key115, _val116);
+ _val116.put(_key119, _val120);
}
iprot.readMapEnd();
}
- this.mutation_map.put(_key111, _val112);
+ this.mutation_map.put(_key115, _val116);
}
iprot.readMapEnd();
}
@@ -19006,19 +19006,19 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(MUTATION_MAP_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.mutation_map.size()));
- for (Map.Entry<ByteBuffer, Map<String,List<Mutation>>> _iter120 : this.mutation_map.entrySet())
+ for (Map.Entry<ByteBuffer, Map<String,List<Mutation>>> _iter124 : this.mutation_map.entrySet())
{
- oprot.writeBinary(_iter120.getKey());
+ oprot.writeBinary(_iter124.getKey());
{
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, _iter120.getValue().size()));
- for (Map.Entry<String, List<Mutation>> _iter121 : _iter120.getValue().entrySet())
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, _iter124.getValue().size()));
+ for (Map.Entry<String, List<Mutation>> _iter125 : _iter124.getValue().entrySet())
{
- oprot.writeString(_iter121.getKey());
+ oprot.writeString(_iter125.getKey());
{
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter121.getValue().size()));
- for (Mutation _iter122 : _iter121.getValue())
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter125.getValue().size()));
+ for (Mutation _iter126 : _iter125.getValue())
{
- _iter122.write(oprot);
+ _iter126.write(oprot);
}
oprot.writeListEnd();
}
@@ -20833,25 +20833,25 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 0: // SUCCESS
if (field.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map123 = iprot.readMapBegin();
- this.success = new HashMap<String,List<String>>(2*_map123.size);
- for (int _i124 = 0; _i124 < _map123.size; ++_i124)
+ org.apache.thrift.protocol.TMap _map127 = iprot.readMapBegin();
+ this.success = new HashMap<String,List<String>>(2*_map127.size);
+ for (int _i128 = 0; _i128 < _map127.size; ++_i128)
{
- String _key125;
- List<String> _val126;
- _key125 = iprot.readString();
+ String _key129;
+ List<String> _val130;
+ _key129 = iprot.readString();
{
- org.apache.thrift.protocol.TList _list127 = iprot.readListBegin();
- _val126 = new ArrayList<String>(_list127.size);
- for (int _i128 = 0; _i128 < _list127.size; ++_i128)
+ org.apache.thrift.protocol.TList _list131 = iprot.readListBegin();
+ _val130 = new ArrayList<String>(_list131.size);
+ for (int _i132 = 0; _i132 < _list131.size; ++_i132)
{
- String _elem129;
- _elem129 = iprot.readString();
- _val126.add(_elem129);
+ String _elem133;
+ _elem133 = iprot.readString();
+ _val130.add(_elem133);
}
iprot.readListEnd();
}
- this.success.put(_key125, _val126);
+ this.success.put(_key129, _val130);
}
iprot.readMapEnd();
}
@@ -20885,14 +20885,14 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, this.success.size()));
- for (Map.Entry<String, List<String>> _iter130 : this.success.entrySet())
+ for (Map.Entry<String, List<String>> _iter134 : this.success.entrySet())
{
- oprot.writeString(_iter130.getKey());
+ oprot.writeString(_iter134.getKey());
{
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, _iter130.getValue().size()));
- for (String _iter131 : _iter130.getValue())
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, _iter134.getValue().size()));
+ for (String _iter135 : _iter134.getValue())
{
- oprot.writeString(_iter131);
+ oprot.writeString(_iter135);
}
oprot.writeListEnd();
}
@@ -21491,14 +21491,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 0: // SUCCESS
if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list132 = iprot.readListBegin();
- this.success = new ArrayList<KsDef>(_list132.size);
- for (int _i133 = 0; _i133 < _list132.size; ++_i133)
+ org.apache.thrift.protocol.TList _list136 = iprot.readListBegin();
+ this.success = new ArrayList<KsDef>(_list136.size);
+ for (int _i137 = 0; _i137 < _list136.size; ++_i137)
{
- KsDef _elem134;
- _elem134 = new KsDef();
- _elem134.read(iprot);
- this.success.add(_elem134);
+ KsDef _elem138;
+ _elem138 = new KsDef();
+ _elem138.read(iprot);
+ this.success.add(_elem138);
}
iprot.readListEnd();
}
@@ -21532,9 +21532,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size()));
- for (KsDef _iter135 : this.success)
+ for (KsDef _iter139 : this.success)
{
- _iter135.write(oprot);
+ _iter139.write(oprot);
}
oprot.writeListEnd();
}
@@ -23247,14 +23247,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 0: // SUCCESS
if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list136 = iprot.readListBegin();
- this.success = new ArrayList<TokenRange>(_list136.size);
- for (int _i137 = 0; _i137 < _list136.size; ++_i137)
+ org.apache.thrift.protocol.TList _list140 = iprot.readListBegin();
+ this.success = new ArrayList<TokenRange>(_list140.size);
+ for (int _i141 = 0; _i141 < _list140.size; ++_i141)
{
- TokenRange _elem138;
- _elem138 = new TokenRange();
- _elem138.read(iprot);
- this.success.add(_elem138);
+ TokenRange _elem142;
+ _elem142 = new TokenRange();
+ _elem142.read(iprot);
+ this.success.add(_elem142);
}
iprot.readListEnd();
}
@@ -23288,9 +23288,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size()));
- for (TokenRange _iter139 : this.success)
+ for (TokenRange _iter143 : this.success)
{
- _iter139.write(oprot);
+ _iter143.write(oprot);
}
oprot.writeListEnd();
}
@@ -25752,6 +25752,8 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
+ // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+ __isset_bit_vector = new BitSet(1);
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -26092,13 +26094,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 0: // SUCCESS
if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list140 = iprot.readListBegin();
- this.success = new ArrayList<String>(_list140.size);
- for (int _i141 = 0; _i141 < _list140.size; ++_i141)
+ org.apache.thrift.protocol.TList _list144 = iprot.readListBegin();
+ this.success = new ArrayList<String>(_list144.size);
+ for (int _i145 = 0; _i145 < _list144.size; ++_i145)
{
- String _elem142;
- _elem142 = iprot.readString();
- this.success.add(_elem142);
+ String _elem146;
+ _elem146 = iprot.readString();
+ this.success.add(_elem146);
}
iprot.readListEnd();
}
@@ -26132,9 +26134,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.success.size()));
- for (String _iter143 : this.success)
+ for (String _iter147 : this.success)
{
- oprot.writeString(_iter143);
+ oprot.writeString(_iter147);
}
oprot.writeListEnd();
}
View
62 interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
@@ -2377,14 +2377,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 13: // COLUMN_METADATA
if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list34 = iprot.readListBegin();
- this.column_metadata = new ArrayList<ColumnDef>(_list34.size);
- for (int _i35 = 0; _i35 < _list34.size; ++_i35)
+ org.apache.thrift.protocol.TList _list38 = iprot.readListBegin();
+ this.column_metadata = new ArrayList<ColumnDef>(_list38.size);
+ for (int _i39 = 0; _i39 < _list38.size; ++_i39)
{
- ColumnDef _elem36;
- _elem36 = new ColumnDef();
- _elem36.read(iprot);
- this.column_metadata.add(_elem36);
+ ColumnDef _elem40;
+ _elem40 = new ColumnDef();
+ _elem40.read(iprot);
+ this.column_metadata.add(_elem40);
}
iprot.readListEnd();
}
@@ -2510,15 +2510,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 30: // COMPACTION_STRATEGY_OPTIONS
if (field.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map37 = iprot.readMapBegin();
- this.compaction_strategy_options = new HashMap<String,String>(2*_map37.size);
- for (int _i38 = 0; _i38 < _map37.size; ++_i38)
+ org.apache.thrift.protocol.TMap _map41 = iprot.readMapBegin();
+ this.compaction_strategy_options = new HashMap<String,String>(2*_map41.size);
+ for (int _i42 = 0; _i42 < _map41.size; ++_i42)
{
- String _key39;
- String _val40;
- _key39 = iprot.readString();
- _val40 = iprot.readString();
- this.compaction_strategy_options.put(_key39, _val40);
+ String _key43;
+ String _val44;
+ _key43 = iprot.readString();
+ _val44 = iprot.readString();
+ this.compaction_strategy_options.put(_key43, _val44);
}
iprot.readMapEnd();
}
@@ -2537,15 +2537,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 32: // COMPRESSION_OPTIONS
if (field.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map41 = iprot.readMapBegin();
- this.compression_options = new HashMap<String,String>(2*_map41.size);
- for (int _i42 = 0; _i42 < _map41.size; ++_i42)
+ org.apache.thrift.protocol.TMap _map45 = iprot.readMapBegin();
+ this.compression_options = new HashMap<String,String>(2*_map45.size);
+ for (int _i46 = 0; _i46 < _map45.size; ++_i46)
{
- String _key43;
- String _val44;
- _key43 = iprot.readString();
- _val44 = iprot.readString();
- this.compression_options.put(_key43, _val44);
+ String _key47;
+ String _val48;
+ _key47 = iprot.readString();
+ _val48 = iprot.readString();
+ this.compression_options.put(_key47, _val48);
}
iprot.readMapEnd();
}
@@ -2626,9 +2626,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(COLUMN_METADATA_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.column_metadata.size()));
- for (ColumnDef _iter45 : this.column_metadata)
+ for (ColumnDef _iter49 : this.column_metadata)
{
- _iter45.write(oprot);
+ _iter49.write(oprot);
}
oprot.writeListEnd();
}
@@ -2725,10 +2725,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(COMPACTION_STRATEGY_OPTIONS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.compaction_strategy_options.size()));
- for (Map.Entry<String, String> _iter46 : this.compaction_strategy_options.entrySet())
+ for (Map.Entry<String, String> _iter50 : this.compaction_strategy_options.entrySet())
{
- oprot.writeString(_iter46.getKey());
- oprot.writeString(_iter46.getValue());
+ oprot.writeString(_iter50.getKey());
+ oprot.writeString(_iter50.getValue());
}
oprot.writeMapEnd();
}
@@ -2745,10 +2745,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(COMPRESSION_OPTIONS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.compression_options.size()));
- for (Map.Entry<String, String> _iter47 : this.compression_options.entrySet())
+ for (Map.Entry<String, String> _iter51 : this.compression_options.entrySet())
{
- oprot.writeString(_iter47.getKey());
- oprot.writeString(_iter47.getValue());
+ oprot.writeString(_iter51.getKey());
+ oprot.writeString(_iter51.getValue());
}
oprot.writeMapEnd();
}
View
22 interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java
@@ -650,15 +650,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 5: // INDEX_OPTIONS
if (field.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map29 = iprot.readMapBegin();
- this.index_options = new HashMap<String,String>(2*_map29.size);
- for (int _i30 = 0; _i30 < _map29.size; ++_i30)
+ org.apache.thrift.protocol.TMap _map33 = iprot.readMapBegin();
+ this.index_options = new HashMap<String,String>(2*_map33.size);
+ for (int _i34 = 0; _i34 < _map33.size; ++_i34)
{
- String _key31;
- String _val32;
- _key31 = iprot.readString();
- _val32 = iprot.readString();
- this.index_options.put(_key31, _val32);
+ String _key35;
+ String _val36;
+ _key35 = iprot.readString();
+ _val36 = iprot.readString();
+ this.index_options.put(_key35, _val36);
}
iprot.readMapEnd();
}
@@ -710,10 +710,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(INDEX_OPTIONS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.index_options.size()));
- for (Map.Entry<String, String> _iter33 : this.index_options.entrySet())
+ for (Map.Entry<String, String> _iter37 : this.index_options.entrySet())
{
- oprot.writeString(_iter33.getKey());
- oprot.writeString(_iter33.getValue());
+ oprot.writeString(_iter37.getKey());
+ oprot.writeString(_iter37.getValue());
}
oprot.writeMapEnd();
}
View
2  interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
@@ -44,6 +44,6 @@
public class Constants {
- public static final String VERSION = "19.13.0";
+ public static final String VERSION = "19.14.0";
}
View
44 interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java
@@ -554,15 +554,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 1: // NAME_TYPES
if (field.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map61 = iprot.readMapBegin();
- this.name_types = new HashMap<ByteBuffer,String>(2*_map61.size);
- for (int _i62 = 0; _i62 < _map61.size; ++_i62)
+ org.apache.thrift.protocol.TMap _map65 = iprot.readMapBegin();
+ this.name_types = new HashMap<ByteBuffer,String>(2*_map65.size);
+ for (int _i66 = 0; _i66 < _map65.size; ++_i66)
{
- ByteBuffer _key63;
- String _val64;
- _key63 = iprot.readBinary();
- _val64 = iprot.readString();
- this.name_types.put(_key63, _val64);
+ ByteBuffer _key67;
+ String _val68;
+ _key67 = iprot.readBinary();
+ _val68 = iprot.readString();
+ this.name_types.put(_key67, _val68);
}
iprot.readMapEnd();
}
@@ -573,15 +573,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 2: // VALUE_TYPES
if (field.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map65 = iprot.readMapBegin();
- this.value_types = new HashMap<ByteBuffer,String>(2*_map65.size);
- for (int _i66 = 0; _i66 < _map65.size; ++_i66)
+ org.apache.thrift.protocol.TMap _map69 = iprot.readMapBegin();
+ this.value_types = new HashMap<ByteBuffer,String>(2*_map69.size);
+ for (int _i70 = 0; _i70 < _map69.size; ++_i70)
{
- ByteBuffer _key67;
- String _val68;
- _key67 = iprot.readBinary();
- _val68 = iprot.readString();
- this.value_types.put(_key67, _val68);
+ ByteBuffer _key71;
+ String _val72;
+ _key71 = iprot.readBinary();
+ _val72 = iprot.readString();
+ this.value_types.put(_key71, _val72);
}
iprot.readMapEnd();
}
@@ -622,10 +622,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(NAME_TYPES_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.name_types.size()));
- for (Map.Entry<ByteBuffer, String> _iter69 : this.name_types.entrySet())
+ for (Map.Entry<ByteBuffer, String> _iter73 : this.name_types.entrySet())
{
- oprot.writeBinary(_iter69.getKey());
- oprot.writeString(_iter69.getValue());
+ oprot.writeBinary(_iter73.getKey());
+ oprot.writeString(_iter73.getValue());
}
oprot.writeMapEnd();
}
@@ -635,10 +635,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(VALUE_TYPES_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.value_types.size()));
- for (Map.Entry<ByteBuffer, String> _iter70 : this.value_types.entrySet())
+ for (Map.Entry<ByteBuffer, String> _iter74 : this.value_types.entrySet())
{
- oprot.writeBinary(_iter70.getKey());
- oprot.writeString(_iter70.getValue());
+ oprot.writeBinary(_iter74.getKey());
+ oprot.writeString(_iter74.getValue());
}
oprot.writeMapEnd();
}
View
18 interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
@@ -541,14 +541,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 2: // ROWS
if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list71 = iprot.readListBegin();
- this.rows = new ArrayList<CqlRow>(_list71.size);
- for (int _i72 = 0; _i72 < _list71.size; ++_i72)
+ org.apache.thrift.protocol.TList _list75 = iprot.readListBegin();
+ this.rows = new ArrayList<CqlRow>(_list75.size);
+ for (int _i76 = 0; _i76 < _list75.size; ++_i76)
{
- CqlRow _elem73;
- _elem73 = new CqlRow();
- _elem73.read(iprot);
- this.rows.add(_elem73);
+ CqlRow _elem77;
+ _elem77 = new CqlRow();
+ _elem77.read(iprot);
+ this.rows.add(_elem77);
}
iprot.readListEnd();
}
@@ -597,9 +597,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(ROWS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.rows.size()));
- for (CqlRow _iter74 : this.rows)
+ for (CqlRow _iter78 : this.rows)
{
- _iter74.write(oprot);
+ _iter78.write(oprot);
}
oprot.writeListEnd();
}
View
18 interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
@@ -395,14 +395,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 2: // COLUMNS
if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list57 = iprot.readListBegin();
- this.columns = new ArrayList<Column>(_list57.size);
- for (int _i58 = 0; _i58 < _list57.size; ++_i58)
+ org.apache.thrift.protocol.TList _list61 = iprot.readListBegin();
+ this.columns = new ArrayList<Column>(_list61.size);
+ for (int _i62 = 0; _i62 < _list61.size; ++_i62)
{
- Column _elem59;
- _elem59 = new Column();
- _elem59.read(iprot);
- this.columns.add(_elem59);
+ Column _elem63;
+ _elem63 = new Column();
+ _elem63.read(iprot);
+ this.columns.add(_elem63);
}
iprot.readListEnd();
}
@@ -434,9 +434,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.columns.size()));
- for (Column _iter60 : this.columns)
+ for (Column _iter64 : this.columns)
{
- _iter60.write(oprot);
+ _iter64.write(oprot);
}
oprot.writeListEnd();
}
View
442 interface/thrift/gen-java/org/apache/cassandra/thrift/EndpointDetails.java
@@ -0,0 +1,442 @@
+/**
+ * Autogenerated by Thrift
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.cassandra.thrift;
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EndpointDetails implements org.apache.thrift.TBase<EndpointDetails, EndpointDetails._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EndpointDetails");
+
+ private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I32, (short)1);
+ private static final org.apache.thrift.protocol.TField DATACENTER_FIELD_DESC = new org.apache.thrift.protocol.TField("datacenter", org.apache.thrift.protocol.TType.STRING, (short)2);
+
+ public int port;
+ public String datacenter;
+
+ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ PORT((short)1, "port"),
+ DATACENTER((short)2, "datacenter");
+
+ private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+ static {
+ for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ byName.put(field.getFieldName(), field);
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, or null if its not found.
+ */
+ public static _Fields findByThriftId(int fieldId) {
+ switch(fieldId) {
+ case 1: // PORT
+ return PORT;
+ case 2: // DATACENTER
+ return DATACENTER;
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, throwing an exception
+ * if it is not found.
+ */
+ public static _Fields findByThriftIdOrThrow(int fieldId) {
+ _Fields fields = findByThriftId(fieldId);
+ if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ return fields;
+ }
+
+ /**
+ * Find the _Fields constant that matches name, or null if its not found.
+ */
+ public static _Fields findByName(String name) {
+ return byName.get(name);
+ }
+
+ private final short _thriftId;
+ private final String _fieldName;
+
+ _Fields(short thriftId, String fieldName) {
+ _thriftId = thriftId;
+ _fieldName = fieldName;
+ }
+
+ public short getThriftFieldId() {
+ return _thriftId;
+ }
+
+ public String getFieldName() {
+ return _fieldName;
+ }
+ }
+
+ // isset id assignments
+ private static final int __PORT_ISSET_ID = 0;
+ private BitSet __isset_bit_vector = new BitSet(1);
+
+ public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ static {
+ Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+ tmpMap.put(_Fields.DATACENTER, new org.apache.thrift.meta_data.FieldMetaData("datacenter", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(EndpointDetails.class, metaDataMap);
+ }
+
+ public EndpointDetails() {
+ }
+
+ public EndpointDetails(
+ int port,
+ String datacenter)
+ {
+ this();
+ this.port = port;
+ setPortIsSet(true);
+ this.datacenter = datacenter;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public EndpointDetails(EndpointDetails other) {
+ __isset_bit_vector.clear();
+ __isset_bit_vector.or(other.__isset_bit_vector);
+ this.port = other.port;
+ if (other.isSetDatacenter()) {
+ this.datacenter = other.datacenter;
+ }
+ }
+
+ public EndpointDetails deepCopy() {
+ return new EndpointDetails(this);
+ }
+
+ @Override
+ public void clear() {
+ setPortIsSet(false);
+ this.port = 0;
+ this.datacenter = null;
+ }
+
+ public int getPort() {
+ return this.port;
+ }
+
+ public EndpointDetails setPort(int port) {
+ this.port = port;
+ setPortIsSet(true);
+ return this;
+ }
+
+ public void unsetPort() {
+ __isset_bit_vector.clear(__PORT_ISSET_ID);
+ }
+
+ /** Returns true if field port is set (has been assigned a value) and false otherwise */
+ public boolean isSetPort() {
+ return __isset_bit_vector.get(__PORT_ISSET_ID);
+ }
+
+ public void setPortIsSet(boolean value) {
+ __isset_bit_vector.set(__PORT_ISSET_ID, value);
+ }
+
+ public String getDatacenter() {
+ return this.datacenter;
+ }
+
+ public EndpointDetails setDatacenter(String datacenter) {
+ this.datacenter = datacenter;
+ return this;
+ }
+
+ public void unsetDatacenter() {
+ this.datacenter = null;
+ }
+
+ /** Returns true if field datacenter is set (has been assigned a value) and false otherwise */
+ public boolean isSetDatacenter() {
+ return this.datacenter != null;
+ }
+
+ public void setDatacenterIsSet(boolean value) {
+ if (!value) {
+ this.datacenter = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case PORT:
+ if (value == null) {
+ unsetPort();
+ } else {
+ setPort((Integer)value);
+ }
+ break;
+
+ case DATACENTER:
+ if (value == null) {
+ unsetDatacenter();
+ } else {
+ setDatacenter((String)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case PORT:
+ return new Integer(getPort());
+
+ case DATACENTER:
+ return getDatacenter();
+
+ }
+ throw new IllegalStateException();
+ }
+
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+ public boolean isSet(_Fields field) {
+ if (field == null) {
+ throw new IllegalArgumentException();
+ }
+
+ switch (field) {
+ case PORT:
+ return isSetPort();
+ case DATACENTER:
+ return isSetDatacenter();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof EndpointDetails)
+ return this.equals((EndpointDetails)that);
+ return false;
+ }
+
+ public boolean equals(EndpointDetails that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_port = true;
+ boolean that_present_port = true;
+ if (this_present_port || that_present_port) {
+ if (!(this_present_port && that_present_port))
+ return false;
+ if (this.port != that.port)
+ return false;
+ }
+
+ boolean this_present_datacenter = true && this.isSetDatacenter();
+ boolean that_present_datacenter = true && that.isSetDatacenter();
+ if (this_present_datacenter || that_present_datacenter) {
+ if (!(this_present_datacenter && that_present_datacenter))
+ return false;
+ if (!this.datacenter.equals(that.datacenter))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ HashCodeBuilder builder = new HashCodeBuilder();
+
+ boolean present_port = true;
+ builder.append(present_port);
+ if (present_port)
+ builder.append(port);
+
+ boolean present_datacenter = true && (isSetDatacenter());
+ builder.append(present_datacenter);
+ if (present_datacenter)
+ builder.append(datacenter);
+
+ return builder.toHashCode();
+ }
+
+ public int compareTo(EndpointDetails other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+ EndpointDetails typedOther = (EndpointDetails)other;
+
+ lastComparison = Boolean.valueOf(isSetPort()).compareTo(typedOther.isSetPort());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetPort()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, typedOther.port);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetDatacenter()).compareTo(typedOther.isSetDatacenter());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetDatacenter()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.datacenter, typedOther.datacenter);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ return 0;
+ }
+
+ public _Fields fieldForId(int fieldId) {
+ return _Fields.findByThriftId(fieldId);
+ }
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField field;
+ iprot.readStructBegin();
+ while (true)
+ {
+ field = iprot.readFieldBegin();
+ if (field.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (field.id) {
+ case 1: // PORT
+ if (field.type == org.apache.thrift.protocol.TType.I32) {
+ this.port = iprot.readI32();
+ setPortIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 2: // DATACENTER
+ if (field.type == org.apache.thrift.protocol.TType.STRING) {
+ this.datacenter = iprot.readString();
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+
+ // check for required fields of primitive type, which can't be checked in the validate method
+ validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ oprot.writeFieldBegin(PORT_FIELD_DESC);
+ oprot.writeI32(this.port);
+ oprot.writeFieldEnd();
+ if (this.datacenter != null) {
+ oprot.writeFieldBegin(DATACENTER_FIELD_DESC);
+ oprot.writeString(this.datacenter);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("EndpointDetails(");
+ boolean first = true;
+
+ sb.append("port:");
+ sb.append(this.port);
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("datacenter:");
+ if (this.datacenter == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.datacenter);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ }
+
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+ __isset_bit_vector = new BitSet(1);
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+}
+
View
40 interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
@@ -718,15 +718,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 3: // STRATEGY_OPTIONS
if (field.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map48 = iprot.readMapBegin();
- this.strategy_options = new HashMap<String,String>(2*_map48.size);
- for (int _i49 = 0; _i49 < _map48.size; ++_i49)
+ org.apache.thrift.protocol.TMap _map52 = iprot.readMapBegin();
+ this.strategy_options = new HashMap<String,String>(2*_map52.size);
+ for (int _i53 = 0; _i53 < _map52.size; ++_i53)
{
- String _key50;
- String _val51;
- _key50 = iprot.readString();
- _val51 = iprot.readString();
- this.strategy_options.put(_key50, _val51);
+ String _key54;
+ String _val55;
+ _key54 = iprot.readString();
+ _val55 = iprot.readString();
+ this.strategy_options.put(_key54, _val55);
}
iprot.readMapEnd();
}
@@ -745,14 +745,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
case 5: // CF_DEFS
if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list52 = iprot.readListBegin();
- this.cf_defs = new ArrayList<CfDef>(_list52.size);
- for (int _i53 = 0; _i53 < _list52.size; ++_i53)
+ org.apache.thrift.protocol.TList _list56 = iprot.readListBegin();
+ this.cf_defs = new ArrayList<CfDef>(_list56.size);
+ for (int _i57 = 0; _i57 < _list56.size; ++_i57)
{
- CfDef _elem54;
- _elem54 = new CfDef();
- _elem54.read(iprot);
- this.cf_defs.add(_elem54);
+ CfDef _elem58;
+ _elem58 = new CfDef();
+ _elem58.read(iprot);
+ this.cf_defs.add(_elem58);
}
iprot.readListEnd();
}
@@ -798,10 +798,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(STRATEGY_OPTIONS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.strategy_options.size()));
- for (Map.Entry<String, String> _iter55 : this.strategy_options.entrySet())
+ for (Map.Entry<String, String> _iter59 : this.strategy_options.entrySet())
{
- oprot.writeString(_iter55.getKey());
- oprot.writeString(_iter55.getValue());
+ oprot.writeString(_iter59.getKey());
+ oprot.writeString(_iter59.getValue());
}
oprot.writeMapEnd();
}
@@ -817,9 +817,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(CF_DEFS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.cf_defs.size()));
- for (CfDef _iter56 : this.cf_defs)
+ for (CfDef _iter60 : this.cf_defs)
{
- _iter56.write(oprot);
+ _iter60.write(oprot);
}
oprot.writeListEnd();
}
View
140 interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
@@ -48,16 +48,19 @@
private static final org.apache.thrift.protocol.TField START_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("start_token", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField END_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("end_token", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField ENDPOINTS_FIELD_DESC = new org.apache.thrift.protocol.TField("endpoints", org.apache.thrift.protocol.TType.LIST, (short)3);
+ private static final org.apache.thrift.protocol.TField ENDPOINT_DETAILS_FIELD_DESC = new org.apache.thrift.protocol.TField("endpoint_details", org.apache.thrift.protocol.TType.LIST, (short)4);
public String start_token;
public String end_token;
public List<String> endpoints;
+ public List<EndpointDetails> endpoint_details;
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
START_TOKEN((short)1, "start_token"),
END_TOKEN((short)2, "end_token"),
- ENDPOINTS((short)3, "endpoints");
+ ENDPOINTS((short)3, "endpoints"),
+ ENDPOINT_DETAILS((short)4, "endpoint_details");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -78,6 +81,8 @@ public static _Fields findByThriftId(int fieldId) {
return END_TOKEN;
case 3: // ENDPOINTS
return ENDPOINTS;
+ case 4: // ENDPOINT_DETAILS
+ return ENDPOINT_DETAILS;
default:
return null;
}
@@ -129,6 +134,9 @@ public String getFieldName() {
tmpMap.put(_Fields.ENDPOINTS, new org.apache.thrift.meta_data.FieldMetaData("endpoints", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+ tmpMap.put(_Fields.ENDPOINT_DETAILS, new org.apache.thrift.meta_data.FieldMetaData("endpoint_details", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, EndpointDetails.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TokenRange.class, metaDataMap);
}
@@ -164,6 +172,13 @@ public TokenRange(TokenRange other) {
}
this.endpoints = __this__endpoints;
}
+ if (other.isSetEndpoint_details()) {
+ List<EndpointDetails> __this__endpoint_details = new ArrayList<EndpointDetails>();
+ for (EndpointDetails other_element : other.endpoint_details) {
+ __this__endpoint_details.add(new EndpointDetails(other_element));
+ }
+ this.endpoint_details = __this__endpoint_details;
+ }
}
public TokenRange deepCopy() {
@@ -175,6 +190,7 @@ public void clear() {
this.start_token = null;
this.end_token = null;
this.endpoints = null;
+ this.endpoint_details = null;
}
public String getStart_token() {
@@ -264,6 +280,45 @@ public void setEndpointsIsSet(boolean value) {
}
}
+ public int getEndpoint_detailsSize() {
+ return (this.endpoint_details == null) ? 0 : this.endpoint_details.size();
+ }
+
+ public java.util.Iterator<EndpointDetails> getEndpoint_detailsIterator() {
+ return (this.endpoint_details == null) ? null : this.endpoint_details.iterator();
+ }
+
+ public void addToEndpoint_details(EndpointDetails elem) {
+ if (this.endpoint_details == null) {
+ this.endpoint_details = new ArrayList<EndpointDetails>();
+ }
+ this.endpoint_details.add(elem);
+ }
+
+ public List<EndpointDetails> getEndpoint_details() {
+ return this.endpoint_details;
+ }
+
+ public TokenRange setEndpoint_details(List<EndpointDetails> endpoint_details) {
+ this.endpoint_details = endpoint_details;
+ return this;
+ }
+
+ public void unsetEndpoint_details() {
+ this.endpoint_details = null;
+ }
+
+ /** Returns true if field endpoint_details is set (has been assigned a value) and false otherwise */
+ public boolean isSetEndpoint_details() {
+ return this.endpoint_details != null;
+ }
+
+ public void setEndpoint_detailsIsSet(boolean value) {
+ if (!value) {
+ this.endpoint_details = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case START_TOKEN:
@@ -290,6 +345,14 @@ public void setFieldValue(_Fields field, Object value) {
}
break;
+ case ENDPOINT_DETAILS:
+ if (value == null) {
+ unsetEndpoint_details();
+ } else {
+ setEndpoint_details((List<EndpointDetails>)value);
+ }
+ break;
+
}
}
@@ -304,6 +367,9 @@ public Object getFieldValue(_Fields field) {
case ENDPOINTS:
return getEndpoints();
+ case ENDPOINT_DETAILS:
+ return getEndpoint_details();
+
}
throw new IllegalStateException();
}
@@ -321,6 +387,8 @@ public boolean isSet(_Fields field) {
return isSetEnd_token();
case ENDPOINTS:
return isSetEndpoints();
+ case ENDPOINT_DETAILS:
+ return isSetEndpoint_details();
}
throw new IllegalStateException();
}
@@ -365,6 +433,15 @@ public boolean equals(TokenRange that) {
return false;
}
+ boolean this_present_endpoint_details = true && this.isSetEndpoint_details();
+ boolean that_present_endpoint_details = true && that.isSetEndpoint_details();
+ if (this_present_endpoint_details || that_present_endpoint_details) {
+ if (!(this_present_endpoint_details && that_present_endpoint_details))
+ return false;
+ if (!this.endpoint_details.equals(that.endpoint_details))
+ return false;
+ }
+
return true;
}
@@ -387,6 +464,11 @@ public int hashCode() {
if (present_endpoints)
builder.append(endpoints);
+ boolean present_endpoint_details = true && (isSetEndpoint_details());
+ builder.append(present_endpoint_details);
+ if (present_endpoint_details)
+ builder.append(endpoint_details);
+
return builder.toHashCode();
}
@@ -428,6 +510,16 @@ public int compareTo(TokenRange other) {
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetEndpoint_details()).compareTo(typedOther.isSetEndpoint_details());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetEndpoint_details()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endpoint_details, typedOther.endpoint_details);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -476,6 +568,24 @@ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.t
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
+ case 4: // ENDPOINT_DETAILS
+ if (field.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list23 = iprot.readListBegin();
+ this.endpoint_details = new ArrayList<EndpointDetails>(_list23.size);
+ for (int _i24 = 0; _i24 < _list23.size; ++_i24)
+ {
+ EndpointDetails _elem25;
+ _elem25 = new EndpointDetails();
+ _elem25.read(iprot);
+ this.endpoint_details.add(_elem25);
+ }
+ iprot.readListEnd();
+ }
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
@@ -505,14 +615,28 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.
oprot.writeFieldBegin(ENDPOINTS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.endpoints.size()));
- for (String _iter23 : this.endpoints)
+ for (String _iter26 : this.endpoints)
{
- oprot.writeString(_iter23);
+ oprot.writeString(_iter26);
}
oprot.writeListEnd();
}
oprot.writeFieldEnd();
}
+ if (this.endpoint_details != null) {
+ if (isSetEndpoint_details()) {
+ oprot.writeFieldBegin(ENDPOINT_DETAILS_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.endpoint_details.size()));
+ for (EndpointDetails _iter27 : this.endpoint_details)
+ {
+ _iter27.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -545,6 +669,16 @@ public String toString() {
sb.append(this.endpoints);
}
first = false;
+ if (isSetEndpoint_details()) {
+ if (!first) sb.append(", ");
+ sb.append("endpoint_details:");
+ if (this.endpoint_details == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.endpoint_details);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
View
2,502 src/java/org/apache/cassandra/thrift/CassandraServer.java
1,269 additions, 1,233 deletions not shown

No commit comments for this range

Something went wrong with that request. Please try again.