fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc276fb1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc276fb1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc276fb1 Branch: refs/heads/cassandra-2.1 Commit: cc276fb198cbc1cddd880736a5d99f49cfcc9592 Parents: be79ba5 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jun 13 11:17:51 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jun 13 11:17:51 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Keyspace.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc276fb1/src/java/org/apache/cassandra/db/Keyspace.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Keyspace.java b/src/java/org/apache/cassandra/db/Keyspace.java index 308d8ef..a6da637 100644 --- a/src/java/org/apache/cassandra/db/Keyspace.java +++ b/src/java/org/apache/cassandra/db/Keyspace.java @@ -27,7 +27,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; 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; @@ -79,7 +78,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) @@ -265,7 +264,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())) {
