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 D78CF17E43 for ; Fri, 15 May 2015 11:25:26 +0000 (UTC) Received: (qmail 91039 invoked by uid 500); 15 May 2015 11:25:21 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 90999 invoked by uid 500); 15 May 2015 11:25:21 -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 90988 invoked by uid 99); 15 May 2015 11:25:21 -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; Fri, 15 May 2015 11:25:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8F9C4E051A; Fri, 15 May 2015 11:25:21 +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 Message-Id: <2a4de0eb24284139a79e51461fecc6ae@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cassandra git commit: Fix ACFIF building of ColumnFamilySplit for non-BO partitioners Date: Fri, 15 May 2015 11:25:21 +0000 (UTC) Repository: cassandra Updated Branches: refs/heads/trunk 5c54f42ff -> 1644e82f7 Fix ACFIF building of ColumnFamilySplit for non-BO partitioners patch by Philip Thompson; reviewed by Mike Adamson for CASSANDRA-9381 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1644e82f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1644e82f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1644e82f Branch: refs/heads/trunk Commit: 1644e82f757024df8833668e54cb75e309d9f427 Parents: 5c54f42 Author: Philip Thompson Authored: Fri May 15 14:22:37 2015 +0300 Committer: Aleksey Yeschenko Committed: Fri May 15 14:22:37 2015 +0300 ---------------------------------------------------------------------- .../cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1644e82f/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java index f37504b..2c04475 100644 --- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java +++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java @@ -31,7 +31,9 @@ import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; import com.datastax.driver.core.TokenRange; import org.apache.cassandra.db.SystemKeyspace; +import org.apache.cassandra.dht.ByteOrderedPartitioner; import org.apache.cassandra.dht.IPartitioner; +import org.apache.cassandra.dht.OrderPreservingPartitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.hadoop.cql3.*; @@ -200,6 +202,8 @@ public abstract class AbstractColumnFamilyInputFormat extends InputFormat< for (Host endpoint : hosts) endpoints[endpointIndex++] = endpoint.getAddress().getHostName(); + boolean partitionerIsOpp = partitioner instanceof OrderPreservingPartitioner || partitioner instanceof ByteOrderedPartitioner; + for (TokenRange subSplit : subSplits.keySet()) { List ranges = subSplit.unwrap(); @@ -207,8 +211,10 @@ public abstract class AbstractColumnFamilyInputFormat extends InputFormat< { ColumnFamilySplit split = new ColumnFamilySplit( - subrange.getStart().toString().substring(2), - subrange.getEnd().toString().substring(2), + partitionerIsOpp ? + subrange.getStart().toString().substring(2) : subrange.getStart().toString(), + partitionerIsOpp ? + subrange.getEnd().toString().substring(2) : subrange.getStart().toString(), subSplits.get(subSplit), endpoints);