From 4f0237acd5ee8097f90732ac416622588e4d7552 Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Fri, 27 Jul 2012 17:14:32 +0200 Subject: [PATCH 1/7] Update versions, news and changes for 1.0.11 release --- CHANGES.txt | 4 ++++ NEWS.txt | 8 ++++++++ build.xml | 2 +- debian/changelog | 6 ++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index b3fa1a8653..c708aeadcc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -13,6 +13,10 @@ * Fix LCS splitting sstable base on uncompressed size (CASSANDRA-4419) * Push the validation of secondary index values to the SecondaryIndexManager (CASSANDRA-4240) * Don't purge columns during upgradesstables (CASSANDRA-4462) + * Make cqlsh work with piping (CASSANDRA-4113) + * Validate arguments for nodetool decommission (CASSANDRA-4061) + * Report thrift status in nodetool info (CASSANDRA-4010) + 1.0.10 * fix maxTimestamp to include row tombstones (CASSANDRA-4116) diff --git a/NEWS.txt b/NEWS.txt index 42bea7c63d..1654b44903 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -8,6 +8,14 @@ upgrade, just in case you need to roll back to the previous version. (Cassandra version X + 1 will always be able to read data files created by version X, but the inverse is not necessarily the case.) +1.0.11 +====== + +Upgrading +--------- + - Nothing specific to 1.0.10 + + 1.0.10 ====== diff --git a/build.xml b/build.xml index 261691d0b1..705db5e6c2 100644 --- a/build.xml +++ b/build.xml @@ -25,7 +25,7 @@ - + diff --git a/debian/changelog b/debian/changelog index c34d7a010e..76312848b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (1.0.11) unstable; urgency=low + + * New release + + -- Sylvain Lebresne Fri, 27 Jul 2012 17:04:14 +0200 + cassandra (1.0.10) unstable; urgency=low * New release From 813553bea9d1145cca671d61737bc9673315b8f0 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Tue, 31 Jul 2012 10:44:13 -0500 Subject: [PATCH 2/7] formatting --- .../cassandra/hadoop/ColumnFamilyRecordReader.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java index b84eb85096..5d0ac727b2 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java @@ -302,22 +302,20 @@ public class ColumnFamilyRecordReader extends RecordReader it = rows.iterator(); - - while(it.hasNext()) + while (it.hasNext()) { KeySlice ks = it.next(); - if (ks.getColumnsSize() == 0) { - it.remove(); + it.remove(); } } - + // all ghosts, spooky if (rows.isEmpty()) { @@ -325,7 +323,7 @@ public class ColumnFamilyRecordReader extends RecordReader Date: Tue, 31 Jul 2012 10:41:26 -0500 Subject: [PATCH 3/7] fix CFRR iterating through resultset consisting entirely of tombstones patch by jbellis; tested by Niel Drummand and reviewed by Brandon Williams for CASSANDRA-4466 --- CHANGES.txt | 5 +++++ .../cassandra/hadoop/ColumnFamilyRecordReader.java | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index c708aeadcc..222081b0a9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,8 @@ +1.0.12 + * (Hadoop) fix iterating through a resultset consisting entirely + of tombstoned rows (CASSANDRA-4466) + + 1.0.11 * allow dropping columns shadowed by not-yet-expired supercolumn or row tombstones in PrecompactedRow (CASSANDRA-4396) diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java index 5d0ac727b2..20d6068532 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java @@ -307,18 +307,21 @@ public class ColumnFamilyRecordReader extends RecordReader it = rows.iterator(); - while (it.hasNext()) + KeySlice ks; + do { - KeySlice ks = it.next(); + ks = it.next(); if (ks.getColumnsSize() == 0) { it.remove(); } - } + } while (it.hasNext()); // all ghosts, spooky if (rows.isEmpty()) { + // maybeInit assumes it can get the start-with key from the rows collection, so add back the last + rows.add(ks); maybeInit(); return; } From 510689e3a44addcabc4e505e0ebed88edcee244b Mon Sep 17 00:00:00 2001 From: Eric Evans Date: Fri, 10 Aug 2012 10:33:12 -0500 Subject: [PATCH 4/7] a startswith func that works for dash and bash Patch by eevans for CASSANDRA-4494 --- conf/cassandra-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh index 292801885f..6ae28a086d 100644 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@ -177,7 +177,7 @@ if [ "x$CASSANDRA_HEAPDUMP_DIR" != "x" ]; then fi -startswith () [ "${1#$2}" != "$1" ] +startswith() { [ "${1#$2}" != "$1" ]; } if [ "`uname`" = "Linux" ] ; then # reduce the per-thread stack size to minimize the impact of Thrift From 197511f0b1b10b67fdd4942fe6f9c88adcad6f57 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Mon, 13 Aug 2012 14:22:36 -0500 Subject: [PATCH 5/7] fix setting key length for old-style mapred api patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4534 --- CHANGES.txt | 1 + .../org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 222081b0a9..d025bef1fe 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.0.12 + * (Hadoop) fix setting key length for old-style mapred api (CASSANDRA-4534) * (Hadoop) fix iterating through a resultset consisting entirely of tombstoned rows (CASSANDRA-4466) diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java index 20d6068532..aac61ad7ad 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java @@ -416,7 +416,7 @@ public class ColumnFamilyRecordReader extends RecordReader Date: Mon, 13 Aug 2012 15:16:02 -0500 Subject: [PATCH 6/7] updated for 1.1.4 release --- build.xml | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index e23483ccef..10dbeccb71 100644 --- a/build.xml +++ b/build.xml @@ -25,7 +25,7 @@ - + diff --git a/debian/changelog b/debian/changelog index 946498c1ef..9c6bfdc948 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (1.1.4) unstable; urgency=low + + * New release + + -- Eric Evans Mon, 13 Aug 2012 15:13:20 -0500 + cassandra (1.1.3) unstable; urgency=low * New release From a201422b24e1fc4457d09b082f4a04f6b89cf49b Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Mon, 13 Aug 2012 18:06:32 -0500 Subject: [PATCH 7/7] add #4494 to CHANGES --- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index aa406269d7..dcc8a4eed9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,7 @@ 1.1.4 * fix offline scrub to catch >= out of order rows (CASSANDRA-4411) + * fix cassandra-env.sh on RHEL and other non-dash-based systems + (CASSANDRA-4494) 1.1.3