You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2015/07/17 08:39:38 UTC
[1/6] cassandra git commit: Fix broken logging for "empty" flushes in
Memtable
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 4fcd7d4d3 -> 1eda7cb55
refs/heads/cassandra-2.2 2b99b5d35 -> f74419cd2
refs/heads/trunk 689582c04 -> f5f3ae1da
Fix broken logging for "empty" flushes in Memtable
patch by Michael McKibben; reviewed by Robert Stupp for CASSANDRA-9837
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1eda7cb5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1eda7cb5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1eda7cb5
Branch: refs/heads/cassandra-2.1
Commit: 1eda7cb55c5876046cbc3f4ace3c7812ca032f69
Parents: 4fcd7d4
Author: Michael McKibben <mi...@gmail.com>
Authored: Fri Jul 17 08:36:00 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri Jul 17 08:36:12 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Memtable.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1eda7cb5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e950f3b..49cc850 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.9
+ * Fix broken logging for "empty" flushes in Memtable (CASSANDRA-9837)
* Complete CASSANDRA-8448 fix (CASSANDRA-9519)
* Handle corrupt files on startup (CASSANDRA-9686)
* Fix clientutil jar and tests (CASSANDRA-9760)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1eda7cb5/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java
index 9f6cf9b..375195f 100644
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@ -390,7 +390,7 @@ public class Memtable
}
else
{
- logger.info("Completed flushing %s; nothing needed to be retained. Commitlog position was {}",
+ logger.info("Completed flushing {}; nothing needed to be retained. Commitlog position was {}",
writer.getFilename(), context);
writer.abort();
ssTable = null;
[4/6] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sn...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f74419cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f74419cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f74419cd
Branch: refs/heads/trunk
Commit: f74419cd2b13c3c8fe01d09df16f7edae583fe35
Parents: 2b99b5d 1eda7cb
Author: Robert Stupp <sn...@snazy.de>
Authored: Fri Jul 17 08:37:37 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri Jul 17 08:37:37 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Memtable.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f74419cd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b4ea4b4,49cc850..e6c093d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
-2.1.9
+2.2.0-rc3
+ * sum() and avg() functions missing for smallint and tinyint types (CASSANDRA-9671)
+ * Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771)
+Merged from 2.1:
+ * Fix broken logging for "empty" flushes in Memtable (CASSANDRA-9837)
* Complete CASSANDRA-8448 fix (CASSANDRA-9519)
* Handle corrupt files on startup (CASSANDRA-9686)
* Fix clientutil jar and tests (CASSANDRA-9760)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f74419cd/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
[3/6] cassandra git commit: Fix broken logging for "empty" flushes in
Memtable
Posted by sn...@apache.org.
Fix broken logging for "empty" flushes in Memtable
patch by Michael McKibben; reviewed by Robert Stupp for CASSANDRA-9837
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1eda7cb5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1eda7cb5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1eda7cb5
Branch: refs/heads/trunk
Commit: 1eda7cb55c5876046cbc3f4ace3c7812ca032f69
Parents: 4fcd7d4
Author: Michael McKibben <mi...@gmail.com>
Authored: Fri Jul 17 08:36:00 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri Jul 17 08:36:12 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Memtable.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1eda7cb5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e950f3b..49cc850 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.9
+ * Fix broken logging for "empty" flushes in Memtable (CASSANDRA-9837)
* Complete CASSANDRA-8448 fix (CASSANDRA-9519)
* Handle corrupt files on startup (CASSANDRA-9686)
* Fix clientutil jar and tests (CASSANDRA-9760)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1eda7cb5/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java
index 9f6cf9b..375195f 100644
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@ -390,7 +390,7 @@ public class Memtable
}
else
{
- logger.info("Completed flushing %s; nothing needed to be retained. Commitlog position was {}",
+ logger.info("Completed flushing {}; nothing needed to be retained. Commitlog position was {}",
writer.getFilename(), context);
writer.abort();
ssTable = null;
[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by sn...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5f3ae1d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5f3ae1d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5f3ae1d
Branch: refs/heads/trunk
Commit: f5f3ae1da45d633c5eb03b3fe760b4e866dca9d7
Parents: 689582c f74419c
Author: Robert Stupp <sn...@snazy.de>
Authored: Fri Jul 17 08:37:49 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri Jul 17 08:37:49 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Memtable.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5f3ae1d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4e2c22e,e6c093d..76d6e92
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,8 +1,28 @@@
+3.0
+ * Metrics should use up to date nomenclature (CASSANDRA-9448)
+ * Change CREATE/ALTER TABLE syntax for compression (CASSANDRA-8384)
+ * Cleanup crc and adler code for java 8 (CASSANDRA-9650)
+ * Storage engine refactor (CASSANDRA-8099, 9743, 9746, 9759, 9781, 9808)
+ * Update Guava to 18.0 (CASSANDRA-9653)
+ * Bloom filter false positive ratio is not honoured (CASSANDRA-8413)
+ * New option for cassandra-stress to leave a ratio of columns null (CASSANDRA-9522)
+ * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035)
+ * Add algorithmic token allocation (CASSANDRA-7032)
+ * Add nodetool command to replay batchlog (CASSANDRA-9547)
+ * Make file buffer cache independent of paths being read (CASSANDRA-8897)
+ * Remove deprecated legacy Hadoop code (CASSANDRA-9353)
+ * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
+ * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
+ * Change default garbage collector to G1 (CASSANDRA-7486)
+ * Populate TokenMetadata early during startup (CASSANDRA-9317)
+ * undeprecate cache recentHitRate (CASSANDRA-6591)
+ * Add support for selectively varint encoding fields (CASSANDRA-9499)
+
+
2.2.0-rc3
- * sum() and avg() functions missing for smallint and tinyint types (CASSANDRA-9671)
* Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771)
Merged from 2.1:
+ * Fix broken logging for "empty" flushes in Memtable (CASSANDRA-9837)
* Complete CASSANDRA-8448 fix (CASSANDRA-9519)
* Handle corrupt files on startup (CASSANDRA-9686)
* Fix clientutil jar and tests (CASSANDRA-9760)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5f3ae1d/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
[5/6] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sn...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f74419cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f74419cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f74419cd
Branch: refs/heads/cassandra-2.2
Commit: f74419cd2b13c3c8fe01d09df16f7edae583fe35
Parents: 2b99b5d 1eda7cb
Author: Robert Stupp <sn...@snazy.de>
Authored: Fri Jul 17 08:37:37 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri Jul 17 08:37:37 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Memtable.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f74419cd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b4ea4b4,49cc850..e6c093d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
-2.1.9
+2.2.0-rc3
+ * sum() and avg() functions missing for smallint and tinyint types (CASSANDRA-9671)
+ * Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771)
+Merged from 2.1:
+ * Fix broken logging for "empty" flushes in Memtable (CASSANDRA-9837)
* Complete CASSANDRA-8448 fix (CASSANDRA-9519)
* Handle corrupt files on startup (CASSANDRA-9686)
* Fix clientutil jar and tests (CASSANDRA-9760)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f74419cd/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
[2/6] cassandra git commit: Fix broken logging for "empty" flushes in
Memtable
Posted by sn...@apache.org.
Fix broken logging for "empty" flushes in Memtable
patch by Michael McKibben; reviewed by Robert Stupp for CASSANDRA-9837
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1eda7cb5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1eda7cb5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1eda7cb5
Branch: refs/heads/cassandra-2.2
Commit: 1eda7cb55c5876046cbc3f4ace3c7812ca032f69
Parents: 4fcd7d4
Author: Michael McKibben <mi...@gmail.com>
Authored: Fri Jul 17 08:36:00 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri Jul 17 08:36:12 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Memtable.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1eda7cb5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e950f3b..49cc850 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.9
+ * Fix broken logging for "empty" flushes in Memtable (CASSANDRA-9837)
* Complete CASSANDRA-8448 fix (CASSANDRA-9519)
* Handle corrupt files on startup (CASSANDRA-9686)
* Fix clientutil jar and tests (CASSANDRA-9760)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1eda7cb5/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java
index 9f6cf9b..375195f 100644
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@ -390,7 +390,7 @@ public class Memtable
}
else
{
- logger.info("Completed flushing %s; nothing needed to be retained. Commitlog position was {}",
+ logger.info("Completed flushing {}; nothing needed to be retained. Commitlog position was {}",
writer.getFilename(), context);
writer.abort();
ssTable = null;