cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [1/3] cassandra git commit: (Hadoop) fix splits calculation
Date Tue, 10 Nov 2015 16:33:19 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.1 ffe48ec6e -> 11b073e63


(Hadoop) fix splits calculation

patch by Aleksey Yeschenko; reviewed by Alex Liu for CASSANDRA-10640


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

Branch: refs/heads/cassandra-3.1
Commit: 9fc957cf3097e54ccd72e51b2d0650dc3e83eae0
Parents: 177f607
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Nov 10 16:25:39 2015 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Nov 10 16:25:39 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                                        | 1 +
 .../apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fc957cf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 81ceb25..0557786 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.4
+ * (Hadoop) fix splits calculation (CASSANDRA-10640)
  * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
  * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
  * Use most up-to-date version of schema for system tables (CASSANDRA-10652)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fc957cf/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 d687183..148c08a 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@ -215,7 +215,7 @@ public abstract class AbstractColumnFamilyInputFormat<K, Y> extends
InputFormat<
                                     partitioner.preservesOrder() ?
                                             subrange.getStart().toString().substring(2) :
subrange.getStart().toString(),
                                     partitioner.preservesOrder() ?
-                                            subrange.getEnd().toString().substring(2) : subrange.getStart().toString(),
+                                            subrange.getEnd().toString().substring(2) : subrange.getEnd().toString(),
                                     subSplits.get(subSplit),
                                     endpoints);
 


Mime
View raw message