cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject cassandra git commit: remove confusingly-unused deserializer parameter
Date Fri, 23 Dec 2016 00:52:12 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk a605f4258 -> 187636c47


remove confusingly-unused deserializer parameter


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

Branch: refs/heads/trunk
Commit: 187636c471d375cf8c4f11d4ae6857c6943770fa
Parents: a605f42
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Thu Dec 22 19:51:38 2016 -0500
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Thu Dec 22 19:51:38 2016 -0500

----------------------------------------------------------------------
 .../cassandra/db/columniterator/AbstractSSTableIterator.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/187636c4/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java
b/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java
index 6196b1e..71f8c43 100644
--- a/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java
+++ b/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java
@@ -99,7 +99,7 @@ public abstract class AbstractSSTableIterator implements UnfilteredRowIterator
                     // Note that this needs to be called after file != null and after the
partitionDeletion has been set, but before readStaticRow
                     // (since it uses it) so we can't move that up (but we'll be able to
simplify as soon as we drop support for the old file format).
                     this.reader = createReader(indexEntry, file, shouldCloseFile);
-                    this.staticRow = readStaticRow(sstable, file, helper, columns.fetchedColumns().statics,
reader.deserializer);
+                    this.staticRow = readStaticRow(sstable, file, helper, columns.fetchedColumns().statics);
                 }
                 else
                 {
@@ -154,8 +154,7 @@ public abstract class AbstractSSTableIterator implements UnfilteredRowIterator
     private static Row readStaticRow(SSTableReader sstable,
                                      FileDataInput file,
                                      SerializationHelper helper,
-                                     Columns statics,
-                                     UnfilteredDeserializer deserializer) throws IOException
+                                     Columns statics) throws IOException
     {
         if (!sstable.header.hasStatic())
             return Rows.EMPTY_STATIC_ROW;


Mime
View raw message