Updated Branches: refs/heads/trunk 0c0417d02 -> 59e3f3b9e
only fetch comparator if needed Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/59e3f3b9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59e3f3b9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59e3f3b9 Branch: refs/heads/trunk Commit: 59e3f3b9e4acb3f9f82f021ac7568b9db5654802 Parents: 0c0417d Author: Dave Brosius <[email protected]> Authored: Tue Jan 22 17:31:55 2013 -0500 Committer: Dave Brosius <[email protected]> Committed: Tue Jan 22 17:31:55 2013 -0500 ---------------------------------------------------------------------- .../apache/cassandra/thrift/ThriftValidation.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/59e3f3b9/src/java/org/apache/cassandra/thrift/ThriftValidation.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/ThriftValidation.java b/src/java/org/apache/cassandra/thrift/ThriftValidation.java index c9f63b4..f96b09b 100644 --- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java +++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java @@ -599,13 +599,14 @@ public class ThriftValidation public static IDiskAtomFilter asIFilter(SlicePredicate sp, CFMetaData metadata, ByteBuffer superColumn) { - AbstractType<?> comparator = metadata.isSuper() - ? ((CompositeType)metadata.comparator).types.get(superColumn == null ? 0 : 1) - : metadata.comparator; SliceRange sr = sp.slice_range; IDiskAtomFilter filter; if (sr == null) { + AbstractType<?> comparator = metadata.isSuper() + ? ((CompositeType)metadata.comparator).types.get(superColumn == null ? 0 : 1) + : metadata.comparator; + SortedSet<ByteBuffer> ss = new TreeSet<ByteBuffer>(comparator); ss.addAll(sp.column_names); filter = new NamesQueryFilter(ss);
