Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8C2FB1116D for ; Wed, 21 May 2014 18:25:33 +0000 (UTC) Received: (qmail 88642 invoked by uid 500); 21 May 2014 18:25:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 88598 invoked by uid 500); 21 May 2014 18:25:33 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 88586 invoked by uid 99); 21 May 2014 18:25:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 May 2014 18:25:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 27A619A0FBC; Wed, 21 May 2014 18:25:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Wed, 21 May 2014 18:25:34 -0000 Message-Id: <91fd7f7da2694bd6b5c6dd1555637a7f@git.apache.org> In-Reply-To: <330764ae55554b7eaaa72f921f959372@git.apache.org> References: <330764ae55554b7eaaa72f921f959372@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: fix native cell ByteOrder patch by bes; reviewed by jbellis and tested by mshuler for CASSANDRA-7201 fix native cell ByteOrder patch by bes; reviewed by jbellis and tested by mshuler for CASSANDRA-7201 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e06d74ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e06d74ef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e06d74ef Branch: refs/heads/trunk Commit: e06d74ef534770ff0f5d4c1b95234bb321fc1a68 Parents: dd6a229 Author: Jonathan Ellis Authored: Wed May 21 13:25:17 2014 -0500 Committer: Jonathan Ellis Committed: Wed May 21 13:25:17 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/AbstractNativeCell.java | 5 +++-- src/java/org/apache/cassandra/db/NativeCounterCell.java | 5 ----- 2 files changed, 3 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e06d74ef/src/java/org/apache/cassandra/db/AbstractNativeCell.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/AbstractNativeCell.java b/src/java/org/apache/cassandra/db/AbstractNativeCell.java index d21171f..f3128b8 100644 --- a/src/java/org/apache/cassandra/db/AbstractNativeCell.java +++ b/src/java/org/apache/cassandra/db/AbstractNativeCell.java @@ -18,6 +18,7 @@ package org.apache.cassandra.db; import java.nio.ByteBuffer; +import java.nio.ByteOrder; import java.security.MessageDigest; import org.apache.cassandra.config.CFMetaData; @@ -183,7 +184,7 @@ public abstract class AbstractNativeCell extends AbstractCell implements CellNam public ByteBuffer value() { long offset = valueStartOffset(); - return getByteBuffer(offset, (int) (internalSize() - (postfixSize() + offset))); + return getByteBuffer(offset, (int) (internalSize() - (postfixSize() + offset))).order(ByteOrder.BIG_ENDIAN); } private int clusteringSizeDelta() @@ -291,7 +292,7 @@ public abstract class AbstractNativeCell extends AbstractCell implements CellNam int cellNamesOffset = nameDeltaOffset(size); int startDelta = i == 0 ? 0 : getShort(nameDeltaOffset(i)); int endDelta = i < size - 1 ? getShort(nameDeltaOffset(i + 1)) : valueStartOffset() - cellNamesOffset; - return getByteBuffer(cellNamesOffset + startDelta, endDelta - startDelta); + return getByteBuffer(cellNamesOffset + startDelta, endDelta - startDelta).order(ByteOrder.BIG_ENDIAN); } private static final ThreadLocal BUFFER = new ThreadLocal() http://git-wip-us.apache.org/repos/asf/cassandra/blob/e06d74ef/src/java/org/apache/cassandra/db/NativeCounterCell.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/NativeCounterCell.java b/src/java/org/apache/cassandra/db/NativeCounterCell.java index 5eba27c..374eb23 100644 --- a/src/java/org/apache/cassandra/db/NativeCounterCell.java +++ b/src/java/org/apache/cassandra/db/NativeCounterCell.java @@ -68,11 +68,6 @@ public class NativeCounterCell extends NativeCell implements CounterCell return getLong(internalSize() - 8); } - public ByteBuffer value() - { - return super.value().order(ByteOrder.BIG_ENDIAN); - } - @Override public long total() {