cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject git commit: simplify use of columnType, used only for super column types
Date Fri, 20 Dec 2013 04:08:18 GMT
Updated Branches:
  refs/heads/trunk 2aeb30cf7 -> 5d1d70a07


simplify use of columnType, used only for super column types


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d1d70a0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d1d70a0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d1d70a0

Branch: refs/heads/trunk
Commit: 5d1d70a07b16bd8226ca79eab6efbcb102135f98
Parents: 2aeb30c
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Thu Dec 19 23:07:36 2013 -0500
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Thu Dec 19 23:07:36 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/thrift/CassandraServer.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d1d70a0/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 8c0e594..a8837ce 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -388,13 +388,12 @@ public class CassandraServer implements Cassandra.Iface
     private IDiskAtomFilter toInternalFilter(CFMetaData metadata, ColumnParent parent, SlicePredicate
predicate)
     {
         IDiskAtomFilter filter;
-        CellNameType columnType = metadata.isSuper()
-                                ? new SimpleDenseCellNameType(metadata.comparator.subtype(parent.isSetSuper_column()
? 1 : 0))
-                                : metadata.comparator;
+
         if (predicate.column_names != null)
         {
             if (metadata.isSuper())
             {
+                CellNameType columnType = new SimpleDenseCellNameType(metadata.comparator.subtype(parent.isSetSuper_column()
? 1 : 0));
                 SortedSet<CellName> s = new TreeSet<CellName>(columnType);
                 for (ByteBuffer bb : predicate.column_names)
                     s.add(columnType.cellFromByteBuffer(bb));


Mime
View raw message