natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.0' into cassandra-2.1

This commit is contained in:
Brandon Williams 2014-06-13 11:18:52 -05:00
parent 30d3623bcb cc276fb198
commit 12025b7ae7
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/apache/cassandra/db/Keyspace.java
View File

@ -32,7 +32,6 @@ import java.util.concurrent.Future;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import org.apache.cassandra.metrics.KeyspaceMetrics;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -81,7 +80,7 @@ public class Keyspace
/* ColumnFamilyStore per column family */
private final ConcurrentMap<UUID, ColumnFamilyStore> columnFamilyStores = new ConcurrentHashMap<UUID, ColumnFamilyStore>();
private volatile AbstractReplicationStrategy replicationStrategy;
public final KeyspaceMetrics metric;
public static final Function<String,Keyspace> keyspaceTransformer = new Function<String, Keyspace>()
{
public Keyspace apply(String keyspaceName)
@ -275,7 +274,6 @@ public class Keyspace
metadata = Schema.instance.getKSMetaData(keyspaceName);
assert metadata != null : "Unknown keyspace " + keyspaceName;
createReplicationStrategy(metadata);
metric = new KeyspaceMetrics(this);
for (CFMetaData cfm : new ArrayList<CFMetaData>(metadata.cfMetaData().values()))
{