You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/02/02 17:24:12 UTC

svn commit: r1066516 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliUserHelp.java

Author: jbellis
Date: Wed Feb  2 16:24:12 2011
New Revision: 1066516

URL: http://svn.apache.org/viewvc?rev=1066516&view=rev
Log:
clarify that r_f does not apply to NTS

Modified:
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliUserHelp.java

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliUserHelp.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliUserHelp.java?rev=1066516&r1=1066515&r2=1066516&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliUserHelp.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliUserHelp.java Wed Feb  2 16:24:12 2011
@@ -133,15 +133,20 @@ public class CliUserHelp {
                 state.out.println("valid attributes are:");
                 state.out.println("    replication_factor: to how many nodes should entries to this keyspace be");
                 state.out.println("                        replicated. Valid entries are integers greater than 0.");
+                state.out.println("                        Applies to Simple and OldNT strategies but NOT NTS.");
                 state.out.println("    placement_strategy: the fully qualified class used to place replicas in");
                 state.out.println("                        this keyspace. Valid values are");
                 state.out.println("                        org.apache.cassandra.locator.SimpleStrategy,");
                 state.out.println("                        org.apache.cassandra.locator.NetworkTopologyStrategy,");
                 state.out.println("                        and org.apache.cassandra.locator.OldNetworkTopologyStrategy");
-                state.out.println("      strategy_options: additional options for placement_strategy.\n");
-                state.out.println("example:");
-                state.out.println("create keyspace foo with replication_factor = 3 and ");
-                state.out.println("        placement_strategy = 'org.apache.cassandra.locator.SimpleStrategy'");
+                state.out.println("      strategy_options: additional options for placement_strategy.");
+                state.out.println("                        Applies only to NetworkTopologyStrategy.");
+                state.out.println("\nexamples:");
+                state.out.println("create keyspace foo with");
+                state.out.println("        placement_strategy = 'org.apache.cassandra.locator.SimpleStrategy';");
+                state.out.println("        and replication_factor = 3;");
+                state.out.println("create keyspace foo with");
+                state.out.println("        placement_strategy = 'org.apache.cassandra.locator.NetworkTopologyStrategy';");
                 state.out.println("        and strategy_options=[{DC1:2, DC2:2}];");
                 break;
 
@@ -153,16 +158,21 @@ public class CliUserHelp {
                 state.out.println("valid attributes are:");
                 state.out.println("    replication_factor: to how many nodes should entries to this keyspace be");
                 state.out.println("                        replicated. Valid entries are integers greater than 0.");
+                state.out.println("                        Applies to Simple and OldNT strategies but NOT NTS.");
                 state.out.println("    placement_strategy: the fully qualified class used to place replicas in");
                 state.out.println("                        this keyspace. Valid values are");
                 state.out.println("                        org.apache.cassandra.locator.SimpleStrategy,");
                 state.out.println("                        org.apache.cassandra.locator.NetworkTopologyStrategy,");
                 state.out.println("                        and org.apache.cassandra.locator.OldNetworkTopologyStrategy");
-                state.out.println("      strategy_options: additional options for placement_strategy.\n");
-                state.out.println("example:");
-                state.out.println("update keyspace foo with replication_factor = 2 and ");
-                state.out.println("        placement_strategy = 'org.apache.cassandra.locator.LocalStrategy'");
-                state.out.println("        and strategy_options=[{DC1:1, DC2:4, DC3:2}];");
+                state.out.println("      strategy_options: additional options for placement_strategy.");
+                state.out.println("                        Applies only to NetworkTopologyStrategy.");
+                state.out.println("\nexamples:");
+                state.out.println("update keyspace foo with");
+                state.out.println("        placement_strategy = 'org.apache.cassandra.locator.SimpleStrategy';");
+                state.out.println("        and replication_factor = 3;");
+                state.out.println("update keyspace foo with");
+                state.out.println("        placement_strategy = 'org.apache.cassandra.locator.NetworkTopologyStrategy';");
+                state.out.println("        and strategy_options=[{DC1:2, DC2:2}];");
                 break;
 
             case CliParser.NODE_ADD_COLUMN_FAMILY: