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:23 UTC
[01/12] git commit: free metadata on close for CSF
Updated Branches:
refs/heads/cassandra-1.2 e983ef13b -> abe1395cb
refs/heads/cassandra-2.0 232906d7e -> 58014d303
refs/heads/trunk 656d3240f -> d32f1eb21
free metadata on close for CSF
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f0b8800
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f0b8800
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f0b8800
Branch: refs/heads/cassandra-2.0
Commit: 6f0b88002ecef88e31074356125f28f81a22a98a
Parents: 16bb898
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Oct 19 23:39:42 2013 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Oct 19 23:39:42 2013 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/CompressedSegmentedFile.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f0b8800/src/java/org/apache/cassandra/io/util/CompressedSegmentedFile.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/CompressedSegmentedFile.java b/src/java/org/apache/cassandra/io/util/CompressedSegmentedFile.java
index f41b1aa..d0ea3fd 100644
--- a/src/java/org/apache/cassandra/io/util/CompressedSegmentedFile.java
+++ b/src/java/org/apache/cassandra/io/util/CompressedSegmentedFile.java
@@ -57,5 +57,6 @@ public class CompressedSegmentedFile extends SegmentedFile implements ICompresse
public void cleanup()
{
+ metadata.close();
}
}
[10/12] git commit: Require CFRR batchSize to be at least 2 patch by
Alex Liu and jbellis for CASSANDRA-6114
Posted by jb...@apache.org.
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/cassandra-1.2
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
{
[02/12] git commit: free metadata on close for CSF
Posted by jb...@apache.org.
free metadata on close for CSF
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f0b8800
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f0b8800
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f0b8800
Branch: refs/heads/trunk
Commit: 6f0b88002ecef88e31074356125f28f81a22a98a
Parents: 16bb898
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Oct 19 23:39:42 2013 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Oct 19 23:39:42 2013 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/CompressedSegmentedFile.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f0b8800/src/java/org/apache/cassandra/io/util/CompressedSegmentedFile.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/CompressedSegmentedFile.java b/src/java/org/apache/cassandra/io/util/CompressedSegmentedFile.java
index f41b1aa..d0ea3fd 100644
--- a/src/java/org/apache/cassandra/io/util/CompressedSegmentedFile.java
+++ b/src/java/org/apache/cassandra/io/util/CompressedSegmentedFile.java
@@ -57,5 +57,6 @@ public class CompressedSegmentedFile extends SegmentedFile implements ICompresse
public void cleanup()
{
+ metadata.close();
}
}
[09/12] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@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/0a8f4bab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a8f4bab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a8f4bab
Branch: refs/heads/trunk
Commit: 0a8f4bab76ac9ab57e79e20b0fdc4f2d0b3b8bfc
Parents: 6c37934 74d63ba
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sun Oct 20 00:22:51 2013 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sun Oct 20 00:22:51 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 1 +
.../org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java | 3 +++
.../org/apache/cassandra/io/util/CompressedSegmentedFile.java | 1 +
src/java/org/apache/cassandra/io/util/Memory.java | 1 +
5 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a8f4bab/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a8f4bab/NEWS.txt
----------------------------------------------------------------------
[12/12] git commit: merge
Posted by jb...@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/d32f1eb2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d32f1eb2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d32f1eb2
Branch: refs/heads/trunk
Commit: d32f1eb2128296b2077db6bffa226535852c47b9
Parents: 0a8f4ba 656d324
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sun Oct 20 02:09:18 2013 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sun Oct 20 02:09:18 2013 +0100
----------------------------------------------------------------------
NEWS.txt | 12 +++-
.../io/compress/CompressedSequentialWriter.java | 12 ++++
.../cassandra/service/StorageService.java | 12 ++--
.../service/LeaveAndBootstrapTest.java | 72 ++++++++++----------
.../org/apache/cassandra/service/MoveTest.java | 64 ++++++++---------
.../cassandra/tools/SSTableExportTest.java | 4 +-
6 files changed, 99 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d32f1eb2/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index f8ef5ff,519ed55..1dd2a0e
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -38,12 -38,6 +38,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
=====
[06/12] git commit: Require CFRR batchSize to be at least 2 patch by
Alex Liu and jbellis for CASSANDRA-6114
Posted by jb...@apache.org.
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/cassandra-2.0
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
{
[05/12] git commit: Require CFRR batchSize to be at least 2 patch by
Alex Liu and jbellis for CASSANDRA-6114
Posted by jb...@apache.org.
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
{
[03/12] git commit: assert that we're not using the size of a freed
memory region (a sign of reference-counting bugs)
Posted by jb...@apache.org.
assert that we're not using the size of a freed memory region (a sign of reference-counting bugs)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c65759e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c65759e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c65759e
Branch: refs/heads/cassandra-2.0
Commit: 0c65759ef4cb91bbca60881c9e3aae39ce9ddc2f
Parents: 6f0b880
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Oct 19 23:43:10 2013 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Oct 19 23:43:10 2013 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/Memory.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c65759e/src/java/org/apache/cassandra/io/util/Memory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/Memory.java b/src/java/org/apache/cassandra/io/util/Memory.java
index 91c601d..f276190 100644
--- a/src/java/org/apache/cassandra/io/util/Memory.java
+++ b/src/java/org/apache/cassandra/io/util/Memory.java
@@ -156,6 +156,7 @@ public class Memory
public long size()
{
+ assert peer != 0;
return size;
}
[04/12] git commit: assert that we're not using the size of a freed
memory region (a sign of reference-counting bugs)
Posted by jb...@apache.org.
assert that we're not using the size of a freed memory region (a sign of reference-counting bugs)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c65759e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c65759e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c65759e
Branch: refs/heads/trunk
Commit: 0c65759ef4cb91bbca60881c9e3aae39ce9ddc2f
Parents: 6f0b880
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Oct 19 23:43:10 2013 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Oct 19 23:43:10 2013 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/Memory.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c65759e/src/java/org/apache/cassandra/io/util/Memory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/Memory.java b/src/java/org/apache/cassandra/io/util/Memory.java
index 91c601d..f276190 100644
--- a/src/java/org/apache/cassandra/io/util/Memory.java
+++ b/src/java/org/apache/cassandra/io/util/Memory.java
@@ -156,6 +156,7 @@ public class Memory
public long size()
{
+ assert peer != 0;
return size;
}
[07/12] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74d63ba5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74d63ba5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74d63ba5
Branch: refs/heads/cassandra-2.0
Commit: 74d63ba566ef783243802f2ab0c453e8c2440574
Parents: 0c65759 fa15524
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sun Oct 20 00:21:48 2013 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sun Oct 20 00:21:48 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 1 +
.../org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java | 3 +++
3 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/74d63ba5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f4d6980,70bb919..41e885e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,8 +1,30 @@@
-1.2.12
+2.0.2
+ * Update FailureDetector to use nanontime (CASSANDRA-4925)
+ * Fix FileCacheService regressions (CASSANDRA-6149)
+ * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
+ * Fix race conditions in bulk loader (CASSANDRA-6129)
+ * Add configurable metrics reporting (CASSANDRA-4430)
+ * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
+ * Track and persist sstable read activity (CASSANDRA-5515)
+ * Fixes for speculative retry (CASSANDRA-5932)
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+ * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
+ * Fix insertion of collections with CAS (CASSANDRA-6069)
+ * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
+ * Track clients' remote addresses in ClientState (CASSANDRA-6070)
+ * Create snapshot dir if it does not exist when migrating
+ leveled manifest (CASSANDRA-6093)
+ * make sequential nodetool repair the default (CASSANDRA-5950)
+ * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
+ * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
+ * Delete can potentially be skipped in batch (CASSANDRA-6115)
+ * Allow alter keyspace on system_traces (CASSANDRA-6016)
+ * Disallow empty column names in cql (CASSANDRA-6136)
+ * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383)
+ * Save compaction history to system keyspace (CASSANDRA-5078)
+ * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166)
+Merged from 1.2:
+ * (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)
* Mark CF clean if a mutation raced the drop and got it marked dirty
http://git-wip-us.apache.org/repos/asf/cassandra/blob/74d63ba5/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 4bffa77,d803f02..7bd0d63
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -32,17 -25,14 +32,18 @@@ New feature
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
+=====
Upgrading
---------
- - ColumnFamilyMetrics#sstablesPerReadHistogram switched from uniform sampling
- to biased-to-last-five-minutes sampling.
+ - The default memtable allocation has changed from 1/3 of heap to 1/4
+ of heap. Also, default (single-partition) read and write timeouts
+ have been reduced from 10s to 5s and 2s, respectively.
-1.2.10
-======
+2.0.0
+=====
Upgrading
---------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/74d63ba5/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
----------------------------------------------------------------------
[11/12] git commit: merge
Posted by jb...@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/cassandra-2.0
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
=====
[08/12] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74d63ba5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74d63ba5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74d63ba5
Branch: refs/heads/trunk
Commit: 74d63ba566ef783243802f2ab0c453e8c2440574
Parents: 0c65759 fa15524
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sun Oct 20 00:21:48 2013 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sun Oct 20 00:21:48 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 1 +
.../org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java | 3 +++
3 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/74d63ba5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f4d6980,70bb919..41e885e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,8 +1,30 @@@
-1.2.12
+2.0.2
+ * Update FailureDetector to use nanontime (CASSANDRA-4925)
+ * Fix FileCacheService regressions (CASSANDRA-6149)
+ * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
+ * Fix race conditions in bulk loader (CASSANDRA-6129)
+ * Add configurable metrics reporting (CASSANDRA-4430)
+ * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
+ * Track and persist sstable read activity (CASSANDRA-5515)
+ * Fixes for speculative retry (CASSANDRA-5932)
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+ * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
+ * Fix insertion of collections with CAS (CASSANDRA-6069)
+ * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
+ * Track clients' remote addresses in ClientState (CASSANDRA-6070)
+ * Create snapshot dir if it does not exist when migrating
+ leveled manifest (CASSANDRA-6093)
+ * make sequential nodetool repair the default (CASSANDRA-5950)
+ * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
+ * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
+ * Delete can potentially be skipped in batch (CASSANDRA-6115)
+ * Allow alter keyspace on system_traces (CASSANDRA-6016)
+ * Disallow empty column names in cql (CASSANDRA-6136)
+ * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383)
+ * Save compaction history to system keyspace (CASSANDRA-5078)
+ * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166)
+Merged from 1.2:
+ * (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)
* Mark CF clean if a mutation raced the drop and got it marked dirty
http://git-wip-us.apache.org/repos/asf/cassandra/blob/74d63ba5/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 4bffa77,d803f02..7bd0d63
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -32,17 -25,14 +32,18 @@@ New feature
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
+=====
Upgrading
---------
- - ColumnFamilyMetrics#sstablesPerReadHistogram switched from uniform sampling
- to biased-to-last-five-minutes sampling.
+ - The default memtable allocation has changed from 1/3 of heap to 1/4
+ of heap. Also, default (single-partition) read and write timeouts
+ have been reduced from 10s to 5s and 2s, respectively.
-1.2.10
-======
+2.0.0
+=====
Upgrading
---------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/74d63ba5/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
----------------------------------------------------------------------