add strategy_options to the KSMetaData.toString() output

patch by Vladimir Sverzhinsky; reviewed by Pavel Yaskevich for CASSANDRA-4248
This commit is contained in:
Pavel Yaskevich 2012-06-26 00:23:53 +03:00
parent ae76bda569
commit de55757909
3 changed files with 55 additions and 1 deletions

View File

@ -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)

View File

@ -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();
}

View File

@ -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()));
}
}