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 66C3710DC0 for ; Thu, 12 Feb 2015 21:07:26 +0000 (UTC) Received: (qmail 86170 invoked by uid 500); 12 Feb 2015 21:07:23 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 86060 invoked by uid 500); 12 Feb 2015 21:07:23 -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 86045 invoked by uid 99); 12 Feb 2015 21:07:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Feb 2015 21:07:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DB64FE03A6; Thu, 12 Feb 2015 21:07:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Thu, 12 Feb 2015 21:07:22 -0000 Message-Id: <722bd8a253ee4de2acc6ed9e10449928@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] cassandra git commit: Fix HSHA/offheap_objects corruption Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 5c9d73209 -> a2497e1a2 Fix HSHA/offheap_objects corruption patch by benedict; reviewed by marcus for CASSANDRA-8719 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7cc1cf00 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7cc1cf00 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7cc1cf00 Branch: refs/heads/cassandra-2.1 Commit: 7cc1cf000c6b48bc13aa551467f27e4ab28b2031 Parents: fd6f9c6 Author: Benedict Elliott Smith Authored: Wed Feb 11 11:21:12 2015 +0000 Committer: Aleksey Yeschenko Committed: Wed Feb 11 15:19:22 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/utils/memory/MemoryUtil.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7cc1cf00/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d44d70d..954fa3f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.3 + * Fix HSHA/offheap_objects corruption (CASSANDRA-8719) * Upgrade libthrift to 0.9.2 (CASSANDRA-8685) * Don't use the shared ref in sstableloader (CASSANDRA-8704) * Purge internal prepared statements if related tables or http://git-wip-us.apache.org/repos/asf/cassandra/blob/7cc1cf00/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java b/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java index 129a60b..57edc52 100644 --- a/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java +++ b/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java @@ -243,7 +243,7 @@ public abstract class MemoryUtil if (buffer.isDirect()) setBytes(unsafe.getLong(buffer, DIRECT_BYTE_BUFFER_ADDRESS_OFFSET) + start, address, count); else - setBytes(address, buffer.array(), start, count); + setBytes(address, buffer.array(), buffer.arrayOffset() + start, count); } /**