Author: jbellis
Date: Wed Sep 8 15:49:28 2010
New Revision: 995108
URL: http://svn.apache.org/viewvc?rev=995108&view=rev
Log:
rename check_schema_agreement to describe_schema_versions. patch by jbellis
Modified:
cassandra/trunk/CHANGES.txt
cassandra/trunk/interface/cassandra.thrift
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
Modified: cassandra/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=995108&r1=995107&r2=995108&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Wed Sep 8 15:49:28 2010
@@ -62,6 +62,8 @@ dev
* correct ordering of drain operations so CL.recover is no longer
necessary (CASSANDRA-1408)
* removed keyspace from describe_splits method (CASSANDRA-1425)
+ * rename check_schema_agreement to describe_schema_versions
+ (CASSANDRA-1478)
0.7-beta1
Modified: cassandra/trunk/interface/cassandra.thrift
URL:
http://svn.apache.org/viewvc/cassandra/trunk/interface/cassandra.thrift?rev=995108&r1=995107&r2=995108&view=diff
==============================================================================
--- cassandra/trunk/interface/cassandra.thrift (original)
+++ cassandra/trunk/interface/cassandra.thrift Wed Sep 8 15:49:28 2010
@@ -484,11 +484,11 @@ service Cassandra {
// rather than user data. The nodeprobe program provides usage examples.
/**
- * ask the cluster if they all are using the same migration id. returns a
map of version->hosts-on-that-version.
- * hosts that did not respond will be under the key
DatabaseDescriptor.INITIAL_VERSION. agreement can be determined
- * by checking if the size of the map is 1.
+ * 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.
*/
- map<string, list<string>> check_schema_agreement()
+ map<string, list<string>> describe_schema_versions()
throws (1: InvalidRequestException ire),
/** list the defined keyspaces in this cluster */
Modified:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java?rev=995108&r1=995107&r2=995108&view=diff
==============================================================================
---
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
(original)
+++
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
Wed Sep 8 15:49:28 2010
@@ -36,7 +36,7 @@ import java.util.HashSet;
import java.util.EnumSet;
import java.util.Collections;
import java.util.BitSet;
-import java.util.Arrays;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -176,7 +176,7 @@ public class Cassandra {
* hosts that did not respond will be under the key
DatabaseDescriptor.INITIAL_VERSION. agreement can be determined
* by checking if the size of the map is 1.
*/
- public Map<String,List<String>> check_schema_agreement() throws
InvalidRequestException, TException;
+ public Map<String,List<String>> describe_schema_versions() throws
InvalidRequestException, TException;
/**
* list the defined keyspaces in this cluster
@@ -977,7 +977,7 @@ public class Cassandra {
return;
}
- public Map<String,List<String>> check_schema_agreement() throws
InvalidRequestException, TException
+ public Map<String,List<String>> describe_schema_versions() throws
InvalidRequestException, TException
{
send_check_schema_agreement();
return recv_check_schema_agreement();
@@ -3206,7 +3206,7 @@ public class Cassandra {
iprot.readMessageEnd();
check_schema_agreement_result result = new
check_schema_agreement_result();
try {
- result.success = iface_.check_schema_agreement();
+ result.success = iface_.describe_schema_versions();
} catch (InvalidRequestException ire) {
result.ire = ire;
} catch (Throwable th) {
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=995108&r1=995107&r2=995108&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java Wed
Sep 8 15:49:28 2010
@@ -40,14 +40,12 @@ import org.apache.avro.generic.GenericAr
import org.apache.avro.generic.GenericData;
import org.apache.avro.ipc.AvroRemoteException;
import org.apache.avro.util.Utf8;
-import org.apache.cassandra.avro.InvalidRequestException;
import org.apache.cassandra.concurrent.Stage;
import org.apache.cassandra.db.migration.DropKeyspace;
import org.apache.cassandra.db.migration.RenameKeyspace;
import org.apache.cassandra.db.migration.UpdateColumnFamily;
import org.apache.cassandra.db.migration.UpdateKeyspace;
import org.apache.cassandra.dht.*;
-import org.apache.cassandra.thrift.*;
import org.apache.cassandra.utils.FBUtilities;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,7 +55,6 @@ import org.apache.cassandra.auth.Permiss
import org.apache.cassandra.concurrent.StageManager;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.ColumnDefinition;
-import org.apache.cassandra.config.Config;
import org.apache.cassandra.config.ConfigurationException;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.KSMetaData;
@@ -806,7 +803,7 @@ public class CassandraServer implements
public Map<CharSequence, List<CharSequence>> check_schema_agreement()
{
logger.debug("checking schema agreement");
- return (Map) StorageProxy.checkSchemaAgreement();
+ return (Map) StorageProxy.describeSchemaVersions();
}
protected void checkKeyspaceAndLoginAuthorized(Permission perm) throws
InvalidRequestException
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java?rev=995108&r1=995107&r2=995108&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java Wed
Sep 8 15:49:28 2010
@@ -487,7 +487,7 @@ public class StorageProxy implements Sto
* migration id. This is useful for determining if a schema change has
propagated through the cluster. Disagreement
* is assumed if any node fails to respond.
*/
- public static Map<String, List<String>> checkSchemaAgreement()
+ public static Map<String, List<String>> describeSchemaVersions()
{
final Map<String, List<String>> results = new HashMap<String,
List<String>>();
Modified:
cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java?rev=995108&r1=995107&r2=995108&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
Wed Sep 8 15:49:28 2010
@@ -989,10 +989,10 @@ public class CassandraServer implements
clientState.setKeyspace(keyspace);
}
- public Map<String, List<String>> check_schema_agreement() throws
TException, InvalidRequestException
+ public Map<String, List<String>> describe_schema_versions() throws
TException, InvalidRequestException
{
logger.debug("checking schema agreement");
- return StorageProxy.checkSchemaAgreement();
+ return StorageProxy.describeSchemaVersions();
}
// main method moved to CassandraDaemon
