From de5575790920364561ac476b3dabf534cdb36227 Mon Sep 17 00:00:00 2001
From: Pavel Yaskevich <xedin@apache.org>
Date: Tue, 26 Jun 2012 00:23:53 +0300
Subject: [PATCH] add strategy_options to the KSMetaData.toString() output
 patch by Vladimir Sverzhinsky; reviewed by Pavel Yaskevich for CASSANDRA-4248

---
 CHANGES.txt                                   |  1 +
 .../apache/cassandra/config/KSMetaData.java   |  5 +-
 .../cassandra/config/KSMetaDataTest.java      | 50 +++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 test/unit/org/apache/cassandra/config/KSMetaDataTest.java

diff --git a/CHANGES.txt b/CHANGES.txt
index 4842abf6fd..1e9f830408 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)
 
diff --git a/src/java/org/apache/cassandra/config/KSMetaData.java b/src/java/org/apache/cassandra/config/KSMetaData.java
index 14e9cc30ad..bd6c121b64 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();
     }
 
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 0000000000..90930866e7
--- /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()));
+    }
+}