You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/11/12 23:15:01 UTC
[2/4] git commit: fix merge from 1.1
fix merge from 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66001665
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66001665
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66001665
Branch: refs/heads/trunk
Commit: 660016658f033875f4a442b5f9fdd5875f610cb9
Parents: 3e77082
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Nov 12 16:14:44 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Nov 12 16:14:44 2012 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/service/StorageProxy.java | 18 ++++++++++-----
1 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66001665/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 33266c7..b747075 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -41,7 +41,9 @@ import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.Schema;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.filter.IDiskAtomFilter;
import org.apache.cassandra.db.filter.QueryPath;
+import org.apache.cassandra.db.filter.SliceQueryFilter;
import org.apache.cassandra.db.marshal.UUIDType;
import org.apache.cassandra.dht.AbstractBounds;
import org.apache.cassandra.dht.Bounds;
@@ -1091,8 +1093,11 @@ public class StorageProxy implements StorageProxyMBean
// now scan until we have enough results
try
{
- final SlicePredicate emptyPredicate = getEmptySlicePredicate();
- SlicePredicate commandPredicate = command.predicate;
+ final IDiskAtomFilter emptyPredicate = new SliceQueryFilter(ByteBufferUtil.EMPTY_BYTE_BUFFER,
+ ByteBufferUtil.EMPTY_BYTE_BUFFER,
+ false,
+ -1);
+ IDiskAtomFilter commandPredicate = command.predicate;
int columnsCount = 0;
rows = new ArrayList<Row>();
@@ -1174,11 +1179,12 @@ public class StorageProxy implements StorageProxyMBean
return trim(command, rows);
}
- private static SlicePredicate getEmptySlicePredicate()
+ private static IDiskAtomFilter getEmptySlicePredicate()
{
- final SliceRange emptySliceRange =
- new SliceRange(ByteBufferUtil.EMPTY_BYTE_BUFFER, ByteBufferUtil.EMPTY_BYTE_BUFFER, false, -1);
- return new SlicePredicate().setSlice_range(emptySliceRange);
+ return new SliceQueryFilter(ByteBufferUtil.EMPTY_BYTE_BUFFER,
+ ByteBufferUtil.EMPTY_BYTE_BUFFER,
+ false,
+ -1);
}
private static List<Row> trim(RangeSliceCommand command, List<Row> rows)