cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xe...@apache.org
Subject [3/3] git commit: add strategy_options to the KSMetaData.toString() output patch by Vladimir Sverzhinsky; reviewed by Pavel Yaskevich for CASSANDRA-4248
Date Mon, 25 Jun 2012 21:37:54 GMT
add strategy_options to the KSMetaData.toString() output
patch by Vladimir Sverzhinsky; reviewed by Pavel Yaskevich for CASSANDRA-4248


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de557579
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de557579
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de557579

Branch: refs/heads/trunk
Commit: de5575790920364561ac476b3dabf534cdb36227
Parents: ae76bda
Author: Pavel Yaskevich <xedin@apache.org>
Authored: Tue Jun 26 00:23:53 2012 +0300
Committer: Pavel Yaskevich <xedin@apache.org>
Committed: Tue Jun 26 00:23:53 2012 +0300

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../org/apache/cassandra/config/KSMetaData.java    |    5 +-
 .../apache/cassandra/config/KSMetaDataTest.java    |   50 +++++++++++++++
 3 files changed, 55 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/de557579/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4842abf..1e9f830 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,7 @@
  * CFMetaData.fromThrift to throw ConfigurationException upon error (CASSANDRA-4353)
  * Use CF comparator to sort indexed columns in SecondaryIndexManager
    (CASSANDRA-4365)
+ * add strategy_options to the KSMetaData.toString() output (CASSANDRA-4248)
 Merged from 1.0:
  * Set gc_grace on index CF to 0 (CASSANDRA-4314)
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/de557579/src/java/org/apache/cassandra/config/KSMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/KSMetaData.java b/src/java/org/apache/cassandra/config/KSMetaData.java
index 14e9cc3..bd6c121 100644
--- a/src/java/org/apache/cassandra/config/KSMetaData.java
+++ b/src/java/org/apache/cassandra/config/KSMetaData.java
@@ -131,7 +131,10 @@ public final class KSMetaData
           .append("{")
           .append(StringUtils.join(cfMetaData.values(), ", "))
           .append("}")
-          .append(", durable_writes: ").append(durableWrites);
+          .append(", strategy_options: ")
+          .append(strategyOptions.toString())
+          .append(", durable_writes: ")
+          .append(durableWrites);
         return sb.toString();
     }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/de557579/test/unit/org/apache/cassandra/config/KSMetaDataTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/config/KSMetaDataTest.java b/test/unit/org/apache/cassandra/config/KSMetaDataTest.java
new file mode 100644
index 0000000..9093086
--- /dev/null
+++ b/test/unit/org/apache/cassandra/config/KSMetaDataTest.java
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cassandra.config;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.cassandra.locator.SimpleStrategy;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+public class KSMetaDataTest
+{
+    @Test
+    public void testToStringHasStrategyOptions() throws Exception
+    {
+        Map<String, String> options = new HashMap<String, String>();
+        options.put("key1", "value1");
+        options.put("key2", "value2");
+        options.put("key3", "value3");
+
+        KSMetaData ksMeta = new KSMetaData("test",
+                                            SimpleStrategy.class,
+                                            options,
+                                            true,
+                                            Collections.<CFMetaData>emptyList());
+
+        assertTrue(ksMeta.toString().contains(options.toString()));
+    }
+}


Mime
View raw message