You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/08/05 13:03:45 UTC
[1/6] cassandra git commit: NullPointerException during compaction on
table with static columns
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 cc8f6cc51 -> b66e5a189
refs/heads/cassandra-3.9 5e319bb69 -> 21c92cab8
refs/heads/trunk 78e918024 -> 7fe430943
NullPointerException during compaction on table with static columns
patch by Sylvain Lebresne; reviewed by Carl Yeksigian for CASSANDRA-12336
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b66e5a18
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b66e5a18
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b66e5a18
Branch: refs/heads/cassandra-3.0
Commit: b66e5a189674536903638b2028eaac23af85266b
Parents: cc8f6cc
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jul 29 12:36:40 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Aug 5 15:02:20 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/transform/BaseRows.java | 3 ++-
.../cassandra/cql3/validation/entities/StaticColumnsTest.java | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b66e5a18/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 49733d3..046c8b3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.9
+ * NullPointerException during compaction on table with static columns (CASSANDRA-12336)
* Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823)
* Fix upgrade of super columns on thrift (CASSANDRA-12335)
* Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b66e5a18/src/java/org/apache/cassandra/db/transform/BaseRows.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/transform/BaseRows.java b/src/java/org/apache/cassandra/db/transform/BaseRows.java
index 7b0bb99..0586840 100644
--- a/src/java/org/apache/cassandra/db/transform/BaseRows.java
+++ b/src/java/org/apache/cassandra/db/transform/BaseRows.java
@@ -102,7 +102,8 @@ implements BaseRowIterator<R>
super.add(transformation);
// transform any existing data
- staticRow = transformation.applyToStatic(staticRow);
+ if (staticRow != null)
+ staticRow = transformation.applyToStatic(staticRow);
next = applyOne(next, transformation);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b66e5a18/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java
index 75cbcc7..efa48ae 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java
@@ -286,6 +286,8 @@ public class StaticColumnsTest extends CQLTester
flush();
+ Thread.sleep(1000);
+
compact();
assertRows(execute("SELECT * FROM %s"), row("k1", "c1", null, "v1"));
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9
* cassandra-3.0:
NullPointerException during compaction on table with static columns
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21c92cab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21c92cab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21c92cab
Branch: refs/heads/trunk
Commit: 21c92cab872d9dcbc2722c73555c9dddc4c30ece
Parents: 5e319bb b66e5a1
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Aug 5 15:03:07 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Aug 5 15:03:07 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/cql3/validation/entities/StaticColumnsTest.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/21c92cab/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bcfbdc9,046c8b3..289f370
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
-3.0.9
+3.9
+ * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
+ * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
+ * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348)
+ * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
+ * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
+Merged from 3.0:
+ * NullPointerException during compaction on table with static columns (CASSANDRA-12336)
* Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823)
* Fix upgrade of super columns on thrift (CASSANDRA-12335)
* Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/21c92cab/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java
----------------------------------------------------------------------
[3/6] cassandra git commit: NullPointerException during compaction on
table with static columns
Posted by sl...@apache.org.
NullPointerException during compaction on table with static columns
patch by Sylvain Lebresne; reviewed by Carl Yeksigian for CASSANDRA-12336
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b66e5a18
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b66e5a18
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b66e5a18
Branch: refs/heads/trunk
Commit: b66e5a189674536903638b2028eaac23af85266b
Parents: cc8f6cc
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jul 29 12:36:40 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Aug 5 15:02:20 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/transform/BaseRows.java | 3 ++-
.../cassandra/cql3/validation/entities/StaticColumnsTest.java | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b66e5a18/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 49733d3..046c8b3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.9
+ * NullPointerException during compaction on table with static columns (CASSANDRA-12336)
* Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823)
* Fix upgrade of super columns on thrift (CASSANDRA-12335)
* Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b66e5a18/src/java/org/apache/cassandra/db/transform/BaseRows.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/transform/BaseRows.java b/src/java/org/apache/cassandra/db/transform/BaseRows.java
index 7b0bb99..0586840 100644
--- a/src/java/org/apache/cassandra/db/transform/BaseRows.java
+++ b/src/java/org/apache/cassandra/db/transform/BaseRows.java
@@ -102,7 +102,8 @@ implements BaseRowIterator<R>
super.add(transformation);
// transform any existing data
- staticRow = transformation.applyToStatic(staticRow);
+ if (staticRow != null)
+ staticRow = transformation.applyToStatic(staticRow);
next = applyOne(next, transformation);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b66e5a18/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java
index 75cbcc7..efa48ae 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java
@@ -286,6 +286,8 @@ public class StaticColumnsTest extends CQLTester
flush();
+ Thread.sleep(1000);
+
compact();
assertRows(execute("SELECT * FROM %s"), row("k1", "c1", null, "v1"));
[2/6] cassandra git commit: NullPointerException during compaction on
table with static columns
Posted by sl...@apache.org.
NullPointerException during compaction on table with static columns
patch by Sylvain Lebresne; reviewed by Carl Yeksigian for CASSANDRA-12336
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b66e5a18
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b66e5a18
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b66e5a18
Branch: refs/heads/cassandra-3.9
Commit: b66e5a189674536903638b2028eaac23af85266b
Parents: cc8f6cc
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jul 29 12:36:40 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Aug 5 15:02:20 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/transform/BaseRows.java | 3 ++-
.../cassandra/cql3/validation/entities/StaticColumnsTest.java | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b66e5a18/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 49733d3..046c8b3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.9
+ * NullPointerException during compaction on table with static columns (CASSANDRA-12336)
* Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823)
* Fix upgrade of super columns on thrift (CASSANDRA-12335)
* Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b66e5a18/src/java/org/apache/cassandra/db/transform/BaseRows.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/transform/BaseRows.java b/src/java/org/apache/cassandra/db/transform/BaseRows.java
index 7b0bb99..0586840 100644
--- a/src/java/org/apache/cassandra/db/transform/BaseRows.java
+++ b/src/java/org/apache/cassandra/db/transform/BaseRows.java
@@ -102,7 +102,8 @@ implements BaseRowIterator<R>
super.add(transformation);
// transform any existing data
- staticRow = transformation.applyToStatic(staticRow);
+ if (staticRow != null)
+ staticRow = transformation.applyToStatic(staticRow);
next = applyOne(next, transformation);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b66e5a18/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java
index 75cbcc7..efa48ae 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java
@@ -286,6 +286,8 @@ public class StaticColumnsTest extends CQLTester
flush();
+ Thread.sleep(1000);
+
compact();
assertRows(execute("SELECT * FROM %s"), row("k1", "c1", null, "v1"));
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-3.9' into trunk
* cassandra-3.9:
NullPointerException during compaction on table with static columns
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7fe43094
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fe43094
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fe43094
Branch: refs/heads/trunk
Commit: 7fe4309430e22bd4d17c7fd91f281bb4d0878ffa
Parents: 78e9180 21c92ca
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Aug 5 15:03:19 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Aug 5 15:03:19 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/cql3/validation/entities/StaticColumnsTest.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fe43094/CHANGES.txt
----------------------------------------------------------------------
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9
* cassandra-3.0:
NullPointerException during compaction on table with static columns
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21c92cab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21c92cab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21c92cab
Branch: refs/heads/cassandra-3.9
Commit: 21c92cab872d9dcbc2722c73555c9dddc4c30ece
Parents: 5e319bb b66e5a1
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Aug 5 15:03:07 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Aug 5 15:03:07 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/cql3/validation/entities/StaticColumnsTest.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/21c92cab/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bcfbdc9,046c8b3..289f370
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
-3.0.9
+3.9
+ * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
+ * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
+ * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348)
+ * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
+ * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
+Merged from 3.0:
+ * NullPointerException during compaction on table with static columns (CASSANDRA-12336)
* Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823)
* Fix upgrade of super columns on thrift (CASSANDRA-12335)
* Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/21c92cab/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java
----------------------------------------------------------------------