You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/10/20 03:09:27 UTC
[05/12] git commit: Require CFRR batchSize to be at least 2 patch by
Alex Liu and jbellis for CASSANDRA-6114
Require CFRR batchSize to be at least 2
patch by Alex Liu and jbellis for CASSANDRA-6114
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa155248
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa155248
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa155248
Branch: refs/heads/trunk
Commit: fa155248eeb88fabe2a67fd9b591bc3401c1bae6
Parents: 558483d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sun Oct 20 00:18:58 2013 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sun Oct 20 00:18:58 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
.../org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java | 3 +++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa155248/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 87be6fa..70bb919 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+1.2.12
+ * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
+
+
1.2.11
* Add a warning for small LCS sstable size (CASSANDRA-6191)
* Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa155248/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
index 701260a..6846356 100644
--- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
@@ -144,6 +144,9 @@ public class ColumnFamilyRecordReader extends RecordReader<ByteBuffer, SortedMap
cfName = ConfigHelper.getInputColumnFamily(conf);
consistencyLevel = ConsistencyLevel.valueOf(ConfigHelper.getReadConsistencyLevel(conf));
keyspace = ConfigHelper.getInputKeyspace(conf);
+
+ if (batchSize < 2)
+ throw new IllegalArgumentException("Minimum batchSize is 2. Suggested batchSize is 100 or more");
try
{