You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/10/02 22:22:20 UTC
[1/3] cassandra git commit: Make Hadoop CF splits more polite to
custom orderered partitioners
Repository: cassandra
Updated Branches:
refs/heads/trunk 5860efa9a -> 602be359d
Make Hadoop CF splits more polite to custom orderered partitioners
patch by Chris Lockfort; reviewed by Philip Thompson for CASSANDRA-10400
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c073e70
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c073e70
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c073e70
Branch: refs/heads/trunk
Commit: 1c073e70edda23c97267228f00dc611d0fe61332
Parents: f3cd3ed
Author: Chris Lockfort <cl...@palantir.com>
Authored: Fri Sep 25 14:03:39 2015 -0700
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Oct 2 13:12:01 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
.../cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 6 ++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c073e70/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9c70c74..47fa4c2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.2.3
+ * Make Hadoop CF splits more polite to custom orderered partitioners (CASSANDRA-10400)
+
+
2.2.2
* cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
* Configurable page size in cqlsh (CASSANDRA-9855)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c073e70/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 103d478..e531ad1 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@ -203,8 +203,6 @@ public abstract class AbstractColumnFamilyInputFormat<K, Y> 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<TokenRange> ranges = subSplit.unwrap();
@@ -212,9 +210,9 @@ public abstract class AbstractColumnFamilyInputFormat<K, Y> extends InputFormat<
{
ColumnFamilySplit split =
new ColumnFamilySplit(
- partitionerIsOpp ?
+ partitioner.preservesOrder() ?
subrange.getStart().toString().substring(2) : subrange.getStart().toString(),
- partitionerIsOpp ?
+ partitioner.preservesOrder() ?
subrange.getEnd().toString().substring(2) : subrange.getStart().toString(),
subSplits.get(subSplit),
endpoints);
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/602be359
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/602be359
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/602be359
Branch: refs/heads/trunk
Commit: 602be359db9163f9bd6815ddcdadbda6464b6678
Parents: 5860efa a3f1eed
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Oct 2 13:22:08 2015 -0700
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Oct 2 13:22:08 2015 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a3f1eeda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3f1eeda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3f1eeda
Branch: refs/heads/trunk
Commit: a3f1eedae52f9454ee464c82b434e12bed0e860c
Parents: 5ffae4f 1c073e7
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Oct 2 13:21:42 2015 -0700
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Oct 2 13:21:42 2015 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------