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/11/05 23:32:44 UTC
[1/2] cassandra git commit: (Hadoop) fix CIF describeSplits() not
handling 0 size estimates
Repository: cassandra
Updated Branches:
refs/heads/trunk a38f362a0 -> 718c4789c
(Hadoop) fix CIF describeSplits() not handling 0 size estimates
patch by Mike Adamson; reviewed by Paulo Motta for CASSANDRA-10600
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c9f2638
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c9f2638
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c9f2638
Branch: refs/heads/trunk
Commit: 9c9f263822ab0c7669f162380af6645ef8309083
Parents: 5289a56
Author: Mike Adamson <ma...@datastax.com>
Authored: Tue Oct 27 11:51:57 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Nov 5 22:31:29 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlInputFormat.java | 22 ++++++++++++++------
2 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c9f2638/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1ff2fdb..b469594 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0
+ * (Hadoop) fix CIF describeSplits() not handling 0 size estimates (CASSANDRA-10600)
* Fix reading of legacy sstables (CASSANDRA-10590)
* Use CQL type names in schema metadata tables (CASSANDRA-10365)
* Guard batchlog replay against integer division by zero (CASSANDRA-9223)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c9f2638/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
index ec5167b..1b11391 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
@@ -246,19 +246,29 @@ public class CqlInputFormat extends org.apache.hadoop.mapreduce.InputFormat<Long
ResultSet resultSet = session.execute(query, keyspace, table, tokenRange.getStart().toString(), tokenRange.getEnd().toString());
Row row = resultSet.one();
- // If we have no data on this split, return the full split i.e., do not sub-split
+
+ long meanPartitionSize = 0;
+ long partitionCount = 0;
+ int splitCount = 0;
+
+ if (row != null)
+ {
+ meanPartitionSize = row.getLong("mean_partition_size");
+ partitionCount = row.getLong("partitions_count");
+
+ splitCount = (int)((meanPartitionSize * partitionCount) / splitSize);
+ }
+
+ // If we have no data on this split or the size estimate is 0,
+ // return the full split i.e., do not sub-split
// Assume smallest granularity of partition count available from CASSANDRA-7688
- if (row == null)
+ if (splitCount == 0)
{
Map<TokenRange, Long> wrappedTokenRange = new HashMap<>();
wrappedTokenRange.put(tokenRange, (long) 128);
return wrappedTokenRange;
}
- long meanPartitionSize = row.getLong("mean_partition_size");
- long partitionCount = row.getLong("partitions_count");
-
- int splitCount = (int)((meanPartitionSize * partitionCount) / splitSize);
List<TokenRange> splitRanges = tokenRange.splitEvenly(splitCount);
Map<TokenRange, Long> rangesWithLength = new HashMap<>();
for (TokenRange range : splitRanges)
[2/2] 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/718c4789
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/718c4789
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/718c4789
Branch: refs/heads/trunk
Commit: 718c4789c90c25b676f04437b3a31c30b4b460cf
Parents: a38f362 9c9f263
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Nov 5 22:32:34 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Nov 5 22:32:34 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlInputFormat.java | 22 ++++++++++++++------
2 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/718c4789/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 14b6007,b469594..72dc800
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
+3.2
+ * Added graphing option to cassandra-stress (CASSANDRA-7918)
+ * Abort in-progress queries that time out (CASSANDRA-7392)
+ * Add transparent data encryption core classes (CASSANDRA-9945)
+
+
3.0
+ * (Hadoop) fix CIF describeSplits() not handling 0 size estimates (CASSANDRA-10600)
* Fix reading of legacy sstables (CASSANDRA-10590)
* Use CQL type names in schema metadata tables (CASSANDRA-10365)
* Guard batchlog replay against integer division by zero (CASSANDRA-9223)