cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [1/3] cassandra git commit: ninja fix 9894 rebase error
Date Wed, 12 Aug 2015 09:26:41 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 145583784 -> 4623aa66f
  refs/heads/trunk 22bfdab50 -> ad6f85e7b


ninja fix 9894 rebase error


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

Branch: refs/heads/cassandra-3.0
Commit: 4623aa66fec4187fd870705b288e4cf695153fa3
Parents: 1455837
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Wed Aug 12 11:25:07 2015 +0200
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Wed Aug 12 11:25:07 2015 +0200

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/ReadResponse.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4623aa66/src/java/org/apache/cassandra/db/ReadResponse.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadResponse.java b/src/java/org/apache/cassandra/db/ReadResponse.java
index 6f418f9..a66cb6a 100644
--- a/src/java/org/apache/cassandra/db/ReadResponse.java
+++ b/src/java/org/apache/cassandra/db/ReadResponse.java
@@ -133,11 +133,11 @@ public abstract class ReadResponse
             }
         }
 
-        protected ColumnFilter selection(ColumnFilter sent)
+        protected ColumnFilter selection(ReadCommand sent)
         {
             // we didn't send anything, so we don't provide it in the serializer methods,
but use the
             // object's reference to the original column filter we received
-            assert sent == null | sent == received;
+            assert sent == null || sent.columnFilter() == received;
             return received;
         }
     }
@@ -150,11 +150,11 @@ public abstract class ReadResponse
             super(null, data, SerializationHelper.Flag.FROM_REMOTE);
         }
 
-        protected ColumnFilter selection(ColumnFilter sent)
+        protected ColumnFilter selection(ReadCommand sent)
         {
             // we should always know what we sent, and should provide it in digest() and
makeIterator()
             assert sent != null;
-            return sent;
+            return sent.columnFilter();
         }
     }
 
@@ -172,7 +172,7 @@ public abstract class ReadResponse
             this.flag = flag;
         }
 
-        protected abstract ColumnFilter selection(ColumnFilter filter);
+        protected abstract ColumnFilter selection(ReadCommand command);
 
         public UnfilteredPartitionIterator makeIterator(CFMetaData metadata, ReadCommand
command)
         {
@@ -182,7 +182,7 @@ public abstract class ReadResponse
                 return UnfilteredPartitionIterators.serializerForIntraNode().deserialize(in,
                                                                                         
MessagingService.current_version,
                                                                                         
metadata,
-                                                                                        
selection(command.columnFilter()),
+                                                                                        
selection(command),
                                                                                         
flag);
             }
             catch (IOException e)


Mime
View raw message