Updated Branches: refs/heads/trunk 576efcd81 -> 4ab0dacad
replace LBQ with CLQ in RangeSliceResponseResolver Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4ab0daca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ab0daca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ab0daca Branch: refs/heads/trunk Commit: 4ab0dacade95fcca81d032d5b23fb40d45606325 Parents: 576efcd Author: Jonathan Ellis <[email protected]> Authored: Wed Apr 10 16:32:05 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Apr 10 16:32:42 2013 -0500 ---------------------------------------------------------------------- .../service/RangeSliceResponseResolver.java | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ab0daca/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java b/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java index 1613b21..5ffcdbe 100644 --- a/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java +++ b/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java @@ -19,15 +19,19 @@ package org.apache.cassandra.service; import java.net.InetAddress; import java.util.*; -import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ConcurrentLinkedQueue; + import com.google.common.collect.AbstractIterator; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.ColumnFamily; +import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.db.RangeSliceReply; +import org.apache.cassandra.db.Row; import org.apache.cassandra.net.AsyncOneResponse; import org.apache.cassandra.net.MessageIn; -import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.CloseableIterator; import org.apache.cassandra.utils.MergeIterator; +import org.apache.cassandra.utils.Pair; /** * Turns RangeSliceReply objects into row (string -> CF) maps, resolving @@ -45,7 +49,7 @@ public class RangeSliceResponseResolver implements IResponseResolver<RangeSliceR private final String table; private List<InetAddress> sources; - protected final Collection<MessageIn<RangeSliceReply>> responses = new LinkedBlockingQueue<MessageIn<RangeSliceReply>>();; + protected final Collection<MessageIn<RangeSliceReply>> responses = new ConcurrentLinkedQueue<MessageIn<RangeSliceReply>>(); public final List<AsyncOneResponse> repairResults = new ArrayList<AsyncOneResponse>(); public RangeSliceResponseResolver(String table)
