Author: eevans
Date: Tue May 18 19:44:44 2010
New Revision: 945846
URL: http://svn.apache.org/viewvc?rev=945846&view=rev
Log:
renamed get_api_version to describe_version (avro)
Patch by eevans
Modified:
cassandra/trunk/interface/cassandra.avpr
cassandra/trunk/interface/cassandra.genavro
cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
cassandra/trunk/test/system/test_avro_server.py
Modified: cassandra/trunk/interface/cassandra.avpr
URL:
http://svn.apache.org/viewvc/cassandra/trunk/interface/cassandra.avpr?rev=945846&r1=945845&r2=945846&view=diff
==============================================================================
--- cassandra/trunk/interface/cassandra.avpr (original)
+++ cassandra/trunk/interface/cassandra.avpr Tue May 18 19:44:44 2010
@@ -169,10 +169,6 @@
"errors": ["InvalidRequestException", "UnavailableException",
"TimedOutException"]
},
- "get_api_version": {
- "request": [],
- "response": "string"
- },
"system_add_keyspace": {
"request": [{"name": "ks_def", "type": "KsDef"}],
"response": "null",
@@ -192,6 +188,11 @@
"request": [],
"response": "string",
"errors": []
+ },
+ "describe_version": {
+ "request": [],
+ "response": "string",
+ "errors": []
}
}
}
Modified: cassandra/trunk/interface/cassandra.genavro
URL:
http://svn.apache.org/viewvc/cassandra/trunk/interface/cassandra.genavro?rev=945846&r1=945845&r2=945846&view=diff
==============================================================================
--- cassandra/trunk/interface/cassandra.genavro (original)
+++ cassandra/trunk/interface/cassandra.genavro Tue May 18 19:44:44 2010
@@ -122,8 +122,6 @@ protocol Cassandra {
ConsistencyLevel consistency_level)
throws InvalidRequestException, UnavailableException, TimedOutException;
- string get_api_version();
-
void system_add_keyspace(KsDef ks_def) throws InvalidRequestException;
void set_keyspace(string keyspace) throws InvalidRequestException;
@@ -131,4 +129,6 @@ protocol Cassandra {
array<string> describe_keyspaces();
string describe_cluster_name();
+
+ string describe_version();
}
Modified:
cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java?rev=945846&r1=945845&r2=945846&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java Tue
May 18 19:44:44 2010
@@ -469,11 +469,6 @@ public class CassandraServer implements
return null;
}
- public Utf8 get_api_version() throws AvroRemoteException
- {
- return API_VERSION;
- }
-
@Override
public Void set_keyspace(Utf8 keyspace) throws InvalidRequestException
{
@@ -571,4 +566,11 @@ public class CassandraServer implements
{
return new Utf8(DatabaseDescriptor.getClusterName());
}
+
+
+ @Override
+ public Utf8 describe_version() throws AvroRemoteException
+ {
+ return API_VERSION;
+ }
}
Modified: cassandra/trunk/test/system/test_avro_server.py
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/system/test_avro_server.py?rev=945846&r1=945845&r2=945846&view=diff
==============================================================================
--- cassandra/trunk/test/system/test_avro_server.py (original)
+++ cassandra/trunk/test/system/test_avro_server.py Tue May 18 19:44:44 2010
@@ -101,9 +101,9 @@ class TestRpcOperations(AvroTester):
name = self.client.request('describe_cluster_name', {})
assert 'Test' in name, "'Test' not in '" + name + "'"
- def test_get_api_version(self):
+ def test_describe_version(self):
"getting the remote api version string"
- vers = self.client.request('get_api_version', {})
+ vers = self.client.request('describe_version', {})
assert isinstance(vers, (str,unicode)), "api version is not a string"
segs = vers.split('.')
assert len(segs) == 3 and len([i for i in segs if i.isdigit()]) == 3, \
