You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/05/10 01:52:28 UTC
[1/3] git commit: Fix IllegalStateException in CqlPagingRecordReader
for inputPageRowSize
Repository: cassandra
Updated Branches:
refs/heads/trunk 11c8a2270 -> c807b42d7
Fix IllegalStateException in CqlPagingRecordReader for inputPageRowSize
patch by btheisen reviewed by dbrosius for cassandra-7198
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/453a0743
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/453a0743
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/453a0743
Branch: refs/heads/trunk
Commit: 453a07430c3ebce938047f9d5d0339ff90c6bfcc
Parents: 7484bd4
Author: Brent Theisen <br...@bantamlabs.com>
Authored: Fri May 9 19:45:53 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri May 9 19:45:53 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlPagingRecordReader.java | 12 +++++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/453a0743/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9e6f173..32bd539 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@
* Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088)
* cqlsh can't tab-complete disabling compaction (CASSANDRA-7185)
* cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172)
+ * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
2.0.8
http://git-wip-us.apache.org/repos/asf/cassandra/blob/453a0743/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
index b692280..1492ce0 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
@@ -24,6 +24,7 @@ import java.nio.ByteBuffer;
import java.nio.charset.CharacterCodingException;
import java.util.*;
+import com.google.common.base.Optional;
import com.google.common.collect.AbstractIterator;
import com.google.common.collect.Iterables;
import org.apache.cassandra.hadoop.HadoopCompat;
@@ -115,13 +116,14 @@ public class CqlPagingRecordReader extends RecordReader<Map<String, ByteBuffer>,
columns = CqlConfigHelper.getInputcolumns(conf);
userDefinedWhereClauses = CqlConfigHelper.getInputWhereClauses(conf);
- try
+ Optional<Integer> pageRowSizeOptional = CqlConfigHelper.getInputPageRowSize(conf);
+ try
{
- pageRowSize = CqlConfigHelper.getInputPageRowSize(conf).get();
- }
- catch (NumberFormatException e)
+ pageRowSize = pageRowSizeOptional.isPresent() ? pageRowSizeOptional.get() : DEFAULT_CQL_PAGE_LIMIT;
+ }
+ catch(NumberFormatException e)
{
- pageRowSize = DEFAULT_CQL_PAGE_LIMIT;
+ pageRowSize = DEFAULT_CQL_PAGE_LIMIT;
}
partitioner = ConfigHelper.getInputPartitioner(HadoopCompat.getConfiguration(context));
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by db...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7b398c52
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b398c52
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b398c52
Branch: refs/heads/trunk
Commit: 7b398c52d52577c7d5c9537e862655b369098a84
Parents: e3dd88a 453a074
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri May 9 19:51:25 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri May 9 19:51:25 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlPagingRecordReader.java | 12 +++++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b398c52/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 622d381,32bd539..e307843
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -19,6 -8,25 +19,7 @@@ Merged from 2.0
* Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088)
* cqlsh can't tab-complete disabling compaction (CASSANDRA-7185)
* cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172)
+ * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
-
-
-2.0.8
- * Correctly delete scheduled range xfers (CASSANDRA-7143)
- * Make batchlog replica selection rack-aware (CASSANDRA-6551)
- * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
- * Set JMX RMI port to 7199 (CASSANDRA-7087)
- * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
- * Log a warning for large batches (CASSANDRA-6487)
- * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
- * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
- * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
- * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
- * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
- * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
- * Re-add parameter columns to tracing session (CASSANDRA-6942)
- * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
- * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b398c52/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c807b42d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c807b42d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c807b42d
Branch: refs/heads/trunk
Commit: c807b42d70535e5e25b91d8454f363fd5a6a0245
Parents: 11c8a22 7b398c5
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri May 9 19:51:55 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri May 9 19:51:55 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlPagingRecordReader.java | 12 +++++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c807b42d/CHANGES.txt
----------------------------------------------------------------------