Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 a598ebeef -> 1f626087c refs/heads/trunk 9adc6d820 -> 2fe34badb
Avoid creating empty hint files patch by Aleksey Yeschenko; reviewed by Blake Eggleston for CASSANDRA-11090 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1f626087 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1f626087 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1f626087 Branch: refs/heads/cassandra-3.0 Commit: 1f626087c8819b75f17fcbe757603fc0026d3cc1 Parents: a598ebe Author: Aleksey Yeschenko <[email protected]> Authored: Mon Feb 8 17:19:29 2016 +0000 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Feb 9 13:41:28 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/hints/HintsWriteExecutor.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f626087/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 4074c66..6cc6368 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.4 + * Avoid creating empty hint files (CASSANDRA-11090) * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120) * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062) * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f626087/src/java/org/apache/cassandra/hints/HintsWriteExecutor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hints/HintsWriteExecutor.java b/src/java/org/apache/cassandra/hints/HintsWriteExecutor.java index 098573a..1a69a4f 100644 --- a/src/java/org/apache/cassandra/hints/HintsWriteExecutor.java +++ b/src/java/org/apache/cassandra/hints/HintsWriteExecutor.java @@ -200,7 +200,8 @@ final class HintsWriteExecutor { while (true) { - flushInternal(iterator, store); + if (iterator.hasNext()) + flushInternal(iterator, store); if (!iterator.hasNext()) break;
