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 2013/10/21 03:59:38 UTC
[1/5] git commit: Require CFRR batchSize to be at least 2 patch by
Alex Liu and jbellis for CASSANDRA-6114
Updated Branches:
refs/heads/trunk d32f1eb21 -> 0b0c9e419
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/abe1395c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/abe1395c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/abe1395c
Branch: refs/heads/trunk
Commit: abe1395cbc29b21856d06b4bb3857fa7ae95eb18
Parents: e983ef1
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 02:08:08 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/abe1395c/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/abe1395c/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
{
[4/5] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by db...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/72f47a4e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72f47a4e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/72f47a4e
Branch: refs/heads/trunk
Commit: 72f47a4e59beb4f8fa8cc4533425871434f0690a
Parents: 58014d3 9afac24
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sun Oct 20 21:56:52 2013 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun Oct 20 21:56:52 2013 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cli/CliMain.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/72f47a4e/src/java/org/apache/cassandra/cli/CliMain.java
----------------------------------------------------------------------
[2/5] git commit: merge
Posted by db...@apache.org.
merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58014d30
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58014d30
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58014d30
Branch: refs/heads/trunk
Commit: 58014d3038621a9bd732724d226b377917fd62e7
Parents: 74d63ba 232906d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sun Oct 20 02:08:52 2013 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sun Oct 20 02:08:52 2013 +0100
----------------------------------------------------------------------
NEWS.txt | 12 +++++++++++-
.../io/compress/CompressedSequentialWriter.java | 12 ++++++++++++
.../org/apache/cassandra/service/StorageService.java | 12 ++++++------
3 files changed, 29 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58014d30/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 7bd0d63,9d90ea7..69ab4fd
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -26,12 -26,6 +26,12 @@@ New feature
- Compaction history and stats are now saved to system keyspace
(system.compaction_history table). You can access historiy via
new 'nodetool compactionhistory' command or CQL.
- - Added a new consistenct level, LOCAL_ONE, that forces all CL.ONE operations to
++ - Added a new consistency level, LOCAL_ONE, that forces all CL.ONE operations to
+ execute only in the local datacenter.
+ - New replace_address to supplant the (now removed) replace_token and
+ replace_node workflows to replace a dead node in place. Works like the
+ old options, but takes the IP address of the node to be replaced.
+
2.0.1
=====
[5/5] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.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/0b0c9e41
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b0c9e41
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b0c9e41
Branch: refs/heads/trunk
Commit: 0b0c9e419e46beb8f620fd4970cb7c482fd63d23
Parents: d32f1eb 72f47a4
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sun Oct 20 21:59:05 2013 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun Oct 20 21:59:05 2013 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cli/CliMain.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/5] git commit: make sure files get closed
Posted by db...@apache.org.
make sure files get closed
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9afac241
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9afac241
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9afac241
Branch: refs/heads/trunk
Commit: 9afac241090ee961bd1bcd3c9e78798ac1868d37
Parents: abe1395
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sun Oct 20 21:52:08 2013 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun Oct 20 21:52:08 2013 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cli/CliMain.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9afac241/src/java/org/apache/cassandra/cli/CliMain.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliMain.java b/src/java/org/apache/cassandra/cli/CliMain.java
index 8c110c2..39a10db 100644
--- a/src/java/org/apache/cassandra/cli/CliMain.java
+++ b/src/java/org/apache/cassandra/cli/CliMain.java
@@ -264,18 +264,22 @@ public class CliMain
// load statements from file and process them
if (sessionState.inFileMode())
{
- FileReader fileReader;
+ BufferedReader reader = null;
try
{
- fileReader = new FileReader(sessionState.filename);
- evaluateFileStatements(new BufferedReader(fileReader));
+ reader = new BufferedReader(new FileReader(sessionState.filename));
+ evaluateFileStatements(reader);
}
catch (IOException e)
{
sessionState.err.println(e.getMessage());
System.exit(1);
}
+ finally
+ {
+ FileUtils.closeQuietly(reader);
+ }
return;
}