You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/07/14 01:52:21 UTC
git commit: remove unimplemented cli option schema-mwt patch by
dbrosius reviewed by jbellis for CASSANDRA-5754
Updated Branches:
refs/heads/trunk b2eec795c -> 295984dbd
remove unimplemented cli option schema-mwt
patch by dbrosius reviewed by jbellis for CASSANDRA-5754
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/295984db
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/295984db
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/295984db
Branch: refs/heads/trunk
Commit: 295984dbd08598793cf2d072705010302fed205c
Parents: b2eec79
Author: Dave Brosius <db...@apache.org>
Authored: Sat Jul 13 19:50:23 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Sat Jul 13 19:50:23 2013 -0400
----------------------------------------------------------------------
CHANGES.txt | 2 +-
src/java/org/apache/cassandra/cli/CliOptions.java | 9 +--------
src/java/org/apache/cassandra/cli/CliSessionState.java | 1 -
3 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/295984db/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fd3496d..4656160 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
2.0.0-beta2
* Allow nodetool with no args, and with help to run without a server (CASSANDRA-5734)
* Cleanup AbstractType/TypeSerializer classes (CASSANDRA-5744)
-
+ * Remove unimplemented cli option schema-mwt (CASSANDRA-5754)
2.0.0-beta1
* Removed on-heap row cache (CASSANDRA-5348)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/295984db/src/java/org/apache/cassandra/cli/CliOptions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliOptions.java b/src/java/org/apache/cassandra/cli/CliOptions.java
index f64cceb..464d092 100644
--- a/src/java/org/apache/cassandra/cli/CliOptions.java
+++ b/src/java/org/apache/cassandra/cli/CliOptions.java
@@ -47,7 +47,6 @@ public class CliOptions
private static final String JMX_USERNAME_OPTION = "jmxusername";
private static final String JMX_PASSWORD_OPTION = "jmxpassword";
private static final String VERBOSE_OPTION = "verbose";
- private static final String SCHEMA_MIGRATION_WAIT_TIME = "schema-mwt";
private static final String SSL_TRUSTSTORE = "truststore";
private static final String SSL_TRUSTSTORE_PW = "truststore-password";
@@ -75,7 +74,6 @@ public class CliOptions
options.addOption(null, JMX_PORT_OPTION, "JMX-PORT", "JMX service port");
options.addOption(null, JMX_USERNAME_OPTION, "JMX-USERNAME", "JMX service username");
options.addOption(null, JMX_PASSWORD_OPTION, "JMX-PASSWORD", "JMX service password");
- options.addOption(null, SCHEMA_MIGRATION_WAIT_TIME, "TIME", "Schema migration wait time (secs.), default is 10 secs");
options.addOption("tf", TRANSPORT_FACTORY, "TRANSPORT-FACTORY", "Fully-qualified TTransportFactory class name for creating a connection to cassandra");
// ssl connection-related options
@@ -188,11 +186,6 @@ public class CliOptions
css.verbose = true;
}
- if (cmd.hasOption(SCHEMA_MIGRATION_WAIT_TIME))
- {
- css.schema_mwt = Integer.parseInt(cmd.getOptionValue(SCHEMA_MIGRATION_WAIT_TIME)) * 1000;
- }
-
if(cmd.hasOption(SSL_TRUSTSTORE))
{
css.encOptions.truststore = cmd.getOptionValue(SSL_TRUSTSTORE);
@@ -276,7 +269,7 @@ public class CliOptions
{
try
{
- Class factory = Class.forName(transportFactory);
+ Class<?> factory = Class.forName(transportFactory);
if(!TTransportFactory.class.isAssignableFrom(factory))
throw new IllegalArgumentException(String.format("transport factory '%s' " +
http://git-wip-us.apache.org/repos/asf/cassandra/blob/295984db/src/java/org/apache/cassandra/cli/CliSessionState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliSessionState.java b/src/java/org/apache/cassandra/cli/CliSessionState.java
index 2178f8a..9e833c6 100644
--- a/src/java/org/apache/cassandra/cli/CliSessionState.java
+++ b/src/java/org/apache/cassandra/cli/CliSessionState.java
@@ -44,7 +44,6 @@ public class CliSessionState
public String jmxUsername; // JMX service username
public String jmxPassword; // JMX service password
public boolean verbose = false; // verbose output
- public int schema_mwt = 10 * 1000; // Schema migration wait time (secs.)
public TTransportFactory transportFactory = new FramedTransportFactory();
public EncryptionOptions encOptions = new ClientEncryptionOptions();