You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2016/02/09 14:43:19 UTC
[1/3] cassandra git commit: Avoid creating empty hint files
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 <al...@apache.org>
Authored: Mon Feb 8 17:19:29 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
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;
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.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/2fe34bad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fe34bad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fe34bad
Branch: refs/heads/trunk
Commit: 2fe34badb1e05a1ae956dfd7ce809dc253e2720e
Parents: 9adc6d8 1f62608
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Feb 9 13:43:04 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Feb 9 13:43:04 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/2fe34bad/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f2e37a5,6cc6368..6cd4cf5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
-3.0.4
+3.4
+ * Add LIKE support to CQL3 (CASSANDRA-11067)
+ * Generic Java UDF types (CASSANDRA-10819)
+ * cqlsh: Include sub-second precision in timestamps by default (CASSANDRA-10428)
+ * Set javac encoding to utf-8 (CASSANDRA-11077)
+ * Integrate SASI index into Cassandra (CASSANDRA-10661)
+ * Add --skip-flush option to nodetool snapshot
+ * Skip values for non-queried columns (CASSANDRA-10657)
+ * Add support for secondary indexes on static columns (CASSANDRA-8103)
+ * CommitLogUpgradeTestMaker creates broken commit logs (CASSANDRA-11051)
+ * Add metric for number of dropped mutations (CASSANDRA-10866)
+ * Simplify row cache invalidation code (CASSANDRA-10396)
+ * Support user-defined compaction through nodetool (CASSANDRA-10660)
+ * Stripe view locks by key and table ID to reduce contention (CASSANDRA-10981)
+ * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953)
+ * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838)
+Merged from 3.0:
+ * 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)
[2/3] cassandra git commit: Avoid creating empty hint files
Posted by al...@apache.org.
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/trunk
Commit: 1f626087c8819b75f17fcbe757603fc0026d3cc1
Parents: a598ebe
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Feb 8 17:19:29 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
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;