Repository: cassandra Updated Branches: refs/heads/trunk b6cb2ab6b -> 1eea75bcc
Fix Util.spinAssertEquals patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-12283 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3de6e9d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3de6e9d3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3de6e9d3 Branch: refs/heads/trunk Commit: 3de6e9d327fc13cdb1b81cec918ab90a1a524fbe Parents: cbebb29 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Tue Nov 8 17:53:27 2016 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Tue Nov 8 17:53:27 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + test/unit/org/apache/cassandra/Util.java | 23 +++-------------------- 2 files changed, 4 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3de6e9d3/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9d328ae..b550885 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.9 + * Fix Util.spinAssertEquals (CASSANDRA-12283) * Fix potential NPE for compactionstats (CASSANDRA-12462) * Prepare legacy authenticate statement if credentials table initialised after node startup (CASSANDRA-12813) * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 (CASSANDRA-12754) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3de6e9d3/test/unit/org/apache/cassandra/Util.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/Util.java b/test/unit/org/apache/cassandra/Util.java index 91aa5fd..f6b4771 100644 --- a/test/unit/org/apache/cassandra/Util.java +++ b/test/unit/org/apache/cassandra/Util.java @@ -24,18 +24,12 @@ import java.io.*; import java.net.InetAddress; import java.net.UnknownHostException; import java.nio.ByteBuffer; -import java.nio.channels.FileChannel; import java.util.*; import java.util.concurrent.Callable; import java.util.concurrent.Future; import com.google.common.base.Supplier; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import org.apache.cassandra.cache.CachingOptions; -import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.*; import org.apache.cassandra.db.composites.*; import org.apache.cassandra.db.compaction.AbstractCompactionTask; @@ -46,27 +40,16 @@ import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.db.filter.SliceQueryFilter; import org.apache.cassandra.db.filter.NamesQueryFilter; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.dht.*; import org.apache.cassandra.dht.RandomPartitioner.BigIntegerToken; import org.apache.cassandra.gms.ApplicationState; import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.gms.VersionedValue; -import org.apache.cassandra.io.sstable.Component; import org.apache.cassandra.io.sstable.Descriptor; -import org.apache.cassandra.io.sstable.IndexSummary; import org.apache.cassandra.io.sstable.format.SSTableReader; -import org.apache.cassandra.io.sstable.format.big.BigTableReader; -import org.apache.cassandra.io.sstable.metadata.MetadataCollector; -import org.apache.cassandra.io.sstable.metadata.MetadataType; -import org.apache.cassandra.io.sstable.metadata.StatsMetadata; -import org.apache.cassandra.io.util.*; -import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.utils.AlwaysPresentFilter; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.CounterId; -import org.apache.hadoop.fs.FileUtil; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -80,7 +63,7 @@ public class Util return StorageService.getPartitioner().decorateKey(ByteBufferUtil.bytes(key)); } - public static DecoratedKey dk(String key, AbstractType type) + public static DecoratedKey dk(String key, AbstractType<?> type) { return StorageService.getPartitioner().decorateKey(type.fromString(key)); } @@ -386,8 +369,8 @@ public class Util public static void spinAssertEquals(Object expected, Supplier<Object> s, int timeoutInSeconds) { - long now = System.currentTimeMillis(); - while (System.currentTimeMillis() - now < now + (1000 * timeoutInSeconds)) + long start = System.currentTimeMillis(); + while (System.currentTimeMillis() < start + (1000 * timeoutInSeconds)) { if (s.get().equals(expected)) break;
