Author: brandonwilliams Date: Tue Sep 13 18:22:45 2011 New Revision: 1170284
URL: http://svn.apache.org/viewvc?rev=1170284&view=rev Log: Return both listen_address and rpc_address through describe_ring. Patch by Nick Bailey, reviewed by brandonwilliams for CASSANDRA-3187 Modified: cassandra/branches/cassandra-0.8/NEWS.txt cassandra/branches/cassandra-0.8/interface/cassandra.thrift cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterSuperColumn.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/CassandraServer.java Modified: cassandra/branches/cassandra-0.8/NEWS.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/NEWS.txt?rev=1170284&r1=1170283&r2=1170284&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/NEWS.txt (original) +++ cassandra/branches/cassandra-0.8/NEWS.txt Tue Sep 13 18:22:45 2011 @@ -1,3 +1,10 @@ +0.8.6 +===== + +Features +-------- + - describe_ring now returns both the listen_address and rpc_address + 0.8.5 ===== Modified: cassandra/branches/cassandra-0.8/interface/cassandra.thrift URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/interface/cassandra.thrift?rev=1170284&r1=1170283&r2=1170284&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/interface/cassandra.thrift (original) +++ cassandra/branches/cassandra-0.8/interface/cassandra.thrift Tue Sep 13 18:22:45 2011 @@ -342,10 +342,19 @@ struct Mutation { 2: optional Deletion deletion, } +/** + A TokenRange describes part of the Cassandra ring, it is a mapping from a range to + endpoints responsible for that range. + @param start_token The first token in the range + @param end_token The last token in the range + @param endpoints The endpoints responsible for the range (listed by their configured listen_address) + @param rpc_endpoints The endpoints responsible for the range (listed by their configured rpc_address) +*/ struct TokenRange { 1: required string start_token, 2: required string end_token, 3: required list<string> endpoints, + 4: optional list<string> rpc_endpoints } /** Modified: cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java?rev=1170284&r1=1170283&r2=1170284&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java (original) +++ cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java Tue Sep 13 18:22:45 2011 @@ -334,5 +334,21 @@ public class AuthenticationException ext } } + 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 { + 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); + } + } + } Modified: cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java?rev=1170284&r1=1170283&r2=1170284&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java (original) +++ cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java Tue Sep 13 18:22:45 2011 @@ -308,15 +308,15 @@ public class AuthenticationRequest imple 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 class AuthenticationRequest imple 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(); } @@ -379,5 +379,21 @@ public class AuthenticationRequest imple } } + 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 { + 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); + } + } + } Modified: cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java?rev=1170284&r1=1170283&r2=1170284&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java (original) +++ cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java Tue Sep 13 18:22:45 2011 @@ -334,5 +334,21 @@ public class AuthorizationException exte } } + 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 { + 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); + } + } + }
