Repository: cassandra Updated Branches: refs/heads/trunk 93b64f7b3 -> fc40cb181
push down counter check to where it's needed Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc40cb18 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc40cb18 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc40cb18 Branch: refs/heads/trunk Commit: fc40cb181764599d39f78587a5e21eb0f193b8e0 Parents: 93b64f7 Author: Dave Brosius <[email protected]> Authored: Sun May 1 21:55:04 2016 -0400 Committer: Dave Brosius <[email protected]> Committed: Sun May 1 21:55:04 2016 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/rows/Cell.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc40cb18/src/java/org/apache/cassandra/db/rows/Cell.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/rows/Cell.java b/src/java/org/apache/cassandra/db/rows/Cell.java index ad1c39a..6644726 100644 --- a/src/java/org/apache/cassandra/db/rows/Cell.java +++ b/src/java/org/apache/cassandra/db/rows/Cell.java @@ -229,8 +229,6 @@ public abstract class Cell extends ColumnData ? column.cellPathSerializer().deserialize(in) : null; - boolean isCounter = localDeletionTime == NO_DELETION_TIME && column.type.isCounter(); - ByteBuffer value = ByteBufferUtil.EMPTY_BYTE_BUFFER; if (hasValue) { @@ -240,6 +238,8 @@ public abstract class Cell extends ColumnData } else { + boolean isCounter = localDeletionTime == NO_DELETION_TIME && column.type.isCounter(); + value = header.getType(column).readValue(in); if (isCounter) value = helper.maybeClearCounterValue(value);
