[1/2] cassandra git commit: (Hadoop) fix CIF describeSplits() not handling 0 size estimates

2015-11-05 Thread aleksey 
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 
Authored: Tue Oct 27 11:51:57 2015 +
Committer: Aleksey Yeschenko 
Committed: Thu Nov 5 22:31:29 2015 +

--
 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 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 splitRanges = tokenRange.splitEvenly(splitCount);
 Map rangesWithLength = new HashMap<>();
 for (TokenRange range : splitRanges)

cassandra git commit: (Hadoop) fix CIF describeSplits() not handling 0 size estimates

2015-11-05 Thread aleksey 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 5289a564c -> 9c9f26382


(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/cassandra-3.0
Commit: 9c9f263822ab0c7669f162380af6645ef8309083
Parents: 5289a56
Author: Mike Adamson 
Authored: Tue Oct 27 11:51:57 2015 +
Committer: Aleksey Yeschenko 
Committed: Thu Nov 5 22:31:29 2015 +

--
 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 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 splitRanges = tokenRange.splitEvenly(splitCount);
 Map rangesWithLength = new HashMap<>();
 for (TokenRange range : splitRanges)