Merge branch 'cassandra-2.1' into trunk
Conflicts:
test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5346ce70
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5346ce70
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5346ce70
Branch: refs/heads/trunk
Commit: 5346ce700cefd2d848e2507c87d03fd54e89424b
Parents: 034e017 ec7fba4
Author: Benedict Elliott Smith <bened...@apache.org>
Authored: Wed Mar 4 16:07:34 2015 +0000
Committer: Benedict Elliott Smith <bened...@apache.org>
Committed: Wed Mar 4 16:07:34 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../apache/cassandra/db/ColumnFamilyStore.java | 2 +-
.../org/apache/cassandra/db/DataTracker.java | 75 +++++++++--------
.../SizeTieredCompactionStrategy.java | 3 +-
.../cassandra/io/sstable/SSTableRewriter.java | 2 +-
.../unit/org/apache/cassandra/SchemaLoader.java | 4 +-
.../io/sstable/IndexSummaryManagerTest.java | 84 ++++++++++++++++++--
.../io/sstable/SSTableRewriterTest.java | 7 +-
8 files changed, 137 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5346ce70/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5346ce70/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5346ce70/src/java/org/apache/cassandra/db/DataTracker.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/DataTracker.java
index 5584ce2,2c2053c..cc29f9d
--- a/src/java/org/apache/cassandra/db/DataTracker.java
+++ b/src/java/org/apache/cassandra/db/DataTracker.java
@@@ -23,8 -23,8 +23,9 @@@ import java.util.concurrent.CopyOnWrite
import java.util.concurrent.atomic.AtomicReference;
import com.google.common.base.Predicate;
+ import com.google.common.base.Predicates;
import com.google.common.collect.*;
+import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.db.commitlog.ReplayPosition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5346ce70/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5346ce70/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5346ce70/test/unit/org/apache/cassandra/SchemaLoader.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5346ce70/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
index 0f2143a,dec7705..ecbbd76
--- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
@@@ -20,28 -20,27 +20,33 @@@ package org.apache.cassandra.io.sstable
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.*;
- import java.util.concurrent.ExecutionException;
- import java.util.concurrent.Future;
- import java.util.concurrent.TimeUnit;
+ import java.util.concurrent.*;
+ import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
+ import org.junit.runner.RunWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+ import junit.framework.Assert;
+ import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+import org.apache.cassandra.cache.CachingOptions;
+import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.*;
+ import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.db.filter.QueryFilter;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.metrics.RestorableMeter;
+ import org.apache.cassandra.utils.FBUtilities;
+ import org.apache.cassandra.utils.concurrent.OpOrder;
import static
org.apache.cassandra.io.sstable.Downsampling.BASE_SAMPLING_LEVEL;
import static
org.apache.cassandra.io.sstable.IndexSummaryManager.DOWNSAMPLE_THESHOLD;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5346ce70/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
----------------------------------------------------------------------
