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 2017/04/09 09:01:26 UTC
[01/10] cassandra git commit: Fix weightedSize() for row-cache
reported by JMX and NodeTool
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 194329d3c -> 470f15be6
refs/heads/cassandra-3.0 fee2a3a09 -> 58e8008a5
refs/heads/cassandra-3.11 99881b971 -> c38e618d6
refs/heads/trunk 7fa1577c2 -> 333ebd67a
Fix weightedSize() for row-cache reported by JMX and NodeTool
patch by Fuud; reviewed by Robert Stupp for CASSANDRA-13393
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/470f15be
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/470f15be
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/470f15be
Branch: refs/heads/cassandra-2.2
Commit: 470f15be652ffb3c471161d6fb10c8893ff59e46
Parents: 194329d
Author: Fuud <fu...@gmail.com>
Authored: Sun Apr 9 10:54:25 2017 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sun Apr 9 10:54:25 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cache/OHCProvider.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/470f15be/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6ea2d59..366db50 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
* Fix JVM metric paths (CASSANDRA-13103)
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/470f15be/src/java/org/apache/cassandra/cache/OHCProvider.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/OHCProvider.java b/src/java/org/apache/cassandra/cache/OHCProvider.java
index 9b1c8cf..ab2745a 100644
--- a/src/java/org/apache/cassandra/cache/OHCProvider.java
+++ b/src/java/org/apache/cassandra/cache/OHCProvider.java
@@ -100,7 +100,7 @@ public class OHCProvider implements CacheProvider<RowCacheKey, IRowCacheEntry>
public long weightedSize()
{
- return ohCache.size();
+ return ohCache.memUsed();
}
public void clear()
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sn...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58e8008a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58e8008a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58e8008a
Branch: refs/heads/cassandra-3.0
Commit: 58e8008a50ed9fddf87e92b2199894ce11156f2a
Parents: fee2a3a 470f15b
Author: Robert Stupp <sn...@snazy.de>
Authored: Sun Apr 9 10:55:13 2017 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sun Apr 9 10:58:15 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cache/OHCProvider.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58e8008a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7b577dd,366db50..c5e517f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,6 +1,25 @@@
-2.2.10
+3.0.13
+ * Fix startup problems due to schema tables not completely flushed (CASSANDRA-12213)
+ * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
+ * Fix 2i page size calculation when there are no regular columns (CASSANDRA-13400)
+ * Fix the conversion of 2.X expired rows without regular column data (CASSANDRA-13395)
+ * Fix hint delivery when using ext+internal IPs with prefer_local enabled (CASSANDRA-13020)
+ * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors (CASSANDRA-13389)
+ * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
+ * Use the Kernel32 library to retrieve the PID on Windows and fix startup checks (CASSANDRA-13333)
+ * Fix code to not exchange schema across major versions (CASSANDRA-13274)
+ * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
+ * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
+ * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
+ * Applying: Use a unique metric reservoir per test run when using Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
+ * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
+ * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
+ * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
+ * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
+ * Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410)
+ * Fix NPE issue in StorageService (CASSANDRA-13060)
+Merged from 2.2:
+ * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
- * Fix JVM metric paths (CASSANDRA-13103)
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
* Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58e8008a/src/java/org/apache/cassandra/cache/OHCProvider.java
----------------------------------------------------------------------
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sn...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58e8008a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58e8008a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58e8008a
Branch: refs/heads/cassandra-3.11
Commit: 58e8008a50ed9fddf87e92b2199894ce11156f2a
Parents: fee2a3a 470f15b
Author: Robert Stupp <sn...@snazy.de>
Authored: Sun Apr 9 10:55:13 2017 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sun Apr 9 10:58:15 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cache/OHCProvider.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58e8008a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7b577dd,366db50..c5e517f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,6 +1,25 @@@
-2.2.10
+3.0.13
+ * Fix startup problems due to schema tables not completely flushed (CASSANDRA-12213)
+ * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
+ * Fix 2i page size calculation when there are no regular columns (CASSANDRA-13400)
+ * Fix the conversion of 2.X expired rows without regular column data (CASSANDRA-13395)
+ * Fix hint delivery when using ext+internal IPs with prefer_local enabled (CASSANDRA-13020)
+ * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors (CASSANDRA-13389)
+ * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
+ * Use the Kernel32 library to retrieve the PID on Windows and fix startup checks (CASSANDRA-13333)
+ * Fix code to not exchange schema across major versions (CASSANDRA-13274)
+ * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
+ * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
+ * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
+ * Applying: Use a unique metric reservoir per test run when using Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
+ * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
+ * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
+ * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
+ * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
+ * Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410)
+ * Fix NPE issue in StorageService (CASSANDRA-13060)
+Merged from 2.2:
+ * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
- * Fix JVM metric paths (CASSANDRA-13103)
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
* Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58e8008a/src/java/org/apache/cassandra/cache/OHCProvider.java
----------------------------------------------------------------------
[02/10] cassandra git commit: Fix weightedSize() for row-cache
reported by JMX and NodeTool
Posted by sn...@apache.org.
Fix weightedSize() for row-cache reported by JMX and NodeTool
patch by Fuud; reviewed by Robert Stupp for CASSANDRA-13393
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/470f15be
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/470f15be
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/470f15be
Branch: refs/heads/cassandra-3.0
Commit: 470f15be652ffb3c471161d6fb10c8893ff59e46
Parents: 194329d
Author: Fuud <fu...@gmail.com>
Authored: Sun Apr 9 10:54:25 2017 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sun Apr 9 10:54:25 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cache/OHCProvider.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/470f15be/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6ea2d59..366db50 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
* Fix JVM metric paths (CASSANDRA-13103)
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/470f15be/src/java/org/apache/cassandra/cache/OHCProvider.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/OHCProvider.java b/src/java/org/apache/cassandra/cache/OHCProvider.java
index 9b1c8cf..ab2745a 100644
--- a/src/java/org/apache/cassandra/cache/OHCProvider.java
+++ b/src/java/org/apache/cassandra/cache/OHCProvider.java
@@ -100,7 +100,7 @@ public class OHCProvider implements CacheProvider<RowCacheKey, IRowCacheEntry>
public long weightedSize()
{
- return ohCache.size();
+ return ohCache.memUsed();
}
public void clear()
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sn...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58e8008a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58e8008a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58e8008a
Branch: refs/heads/trunk
Commit: 58e8008a50ed9fddf87e92b2199894ce11156f2a
Parents: fee2a3a 470f15b
Author: Robert Stupp <sn...@snazy.de>
Authored: Sun Apr 9 10:55:13 2017 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sun Apr 9 10:58:15 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cache/OHCProvider.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58e8008a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7b577dd,366db50..c5e517f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,6 +1,25 @@@
-2.2.10
+3.0.13
+ * Fix startup problems due to schema tables not completely flushed (CASSANDRA-12213)
+ * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
+ * Fix 2i page size calculation when there are no regular columns (CASSANDRA-13400)
+ * Fix the conversion of 2.X expired rows without regular column data (CASSANDRA-13395)
+ * Fix hint delivery when using ext+internal IPs with prefer_local enabled (CASSANDRA-13020)
+ * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors (CASSANDRA-13389)
+ * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
+ * Use the Kernel32 library to retrieve the PID on Windows and fix startup checks (CASSANDRA-13333)
+ * Fix code to not exchange schema across major versions (CASSANDRA-13274)
+ * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
+ * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
+ * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
+ * Applying: Use a unique metric reservoir per test run when using Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
+ * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
+ * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
+ * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
+ * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
+ * Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410)
+ * Fix NPE issue in StorageService (CASSANDRA-13060)
+Merged from 2.2:
+ * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
- * Fix JVM metric paths (CASSANDRA-13103)
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
* Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58e8008a/src/java/org/apache/cassandra/cache/OHCProvider.java
----------------------------------------------------------------------
[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by sn...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/333ebd67
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/333ebd67
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/333ebd67
Branch: refs/heads/trunk
Commit: 333ebd67a0ee7497f0c2f62372befbd01515a3c2
Parents: 7fa1577 c38e618
Author: Robert Stupp <sn...@snazy.de>
Authored: Sun Apr 9 10:59:18 2017 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sun Apr 9 10:59:18 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cache/OHCProvider.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/333ebd67/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/333ebd67/src/java/org/apache/cassandra/cache/OHCProvider.java
----------------------------------------------------------------------
[03/10] cassandra git commit: Fix weightedSize() for row-cache
reported by JMX and NodeTool
Posted by sn...@apache.org.
Fix weightedSize() for row-cache reported by JMX and NodeTool
patch by Fuud; reviewed by Robert Stupp for CASSANDRA-13393
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/470f15be
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/470f15be
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/470f15be
Branch: refs/heads/cassandra-3.11
Commit: 470f15be652ffb3c471161d6fb10c8893ff59e46
Parents: 194329d
Author: Fuud <fu...@gmail.com>
Authored: Sun Apr 9 10:54:25 2017 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sun Apr 9 10:54:25 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cache/OHCProvider.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/470f15be/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6ea2d59..366db50 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
* Fix JVM metric paths (CASSANDRA-13103)
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/470f15be/src/java/org/apache/cassandra/cache/OHCProvider.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/OHCProvider.java b/src/java/org/apache/cassandra/cache/OHCProvider.java
index 9b1c8cf..ab2745a 100644
--- a/src/java/org/apache/cassandra/cache/OHCProvider.java
+++ b/src/java/org/apache/cassandra/cache/OHCProvider.java
@@ -100,7 +100,7 @@ public class OHCProvider implements CacheProvider<RowCacheKey, IRowCacheEntry>
public long weightedSize()
{
- return ohCache.size();
+ return ohCache.memUsed();
}
public void clear()
[04/10] cassandra git commit: Fix weightedSize() for row-cache
reported by JMX and NodeTool
Posted by sn...@apache.org.
Fix weightedSize() for row-cache reported by JMX and NodeTool
patch by Fuud; reviewed by Robert Stupp for CASSANDRA-13393
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/470f15be
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/470f15be
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/470f15be
Branch: refs/heads/trunk
Commit: 470f15be652ffb3c471161d6fb10c8893ff59e46
Parents: 194329d
Author: Fuud <fu...@gmail.com>
Authored: Sun Apr 9 10:54:25 2017 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sun Apr 9 10:54:25 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cache/OHCProvider.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/470f15be/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6ea2d59..366db50 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
* Fix JVM metric paths (CASSANDRA-13103)
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/470f15be/src/java/org/apache/cassandra/cache/OHCProvider.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/OHCProvider.java b/src/java/org/apache/cassandra/cache/OHCProvider.java
index 9b1c8cf..ab2745a 100644
--- a/src/java/org/apache/cassandra/cache/OHCProvider.java
+++ b/src/java/org/apache/cassandra/cache/OHCProvider.java
@@ -100,7 +100,7 @@ public class OHCProvider implements CacheProvider<RowCacheKey, IRowCacheEntry>
public long weightedSize()
{
- return ohCache.size();
+ return ohCache.memUsed();
}
public void clear()
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by sn...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c38e618d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c38e618d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c38e618d
Branch: refs/heads/trunk
Commit: c38e618d69ac30868ae0f413320ffc8e0f27c9be
Parents: 99881b9 58e8008
Author: Robert Stupp <sn...@snazy.de>
Authored: Sun Apr 9 10:58:56 2017 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sun Apr 9 10:58:56 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cache/OHCProvider.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c38e618d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a34db06,c5e517f..a7b464a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -42,30 -15,11 +42,31 @@@ Merged from 3.0
* Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
* Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
* Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
- * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
+ * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to LogRecord absolute path (CASSANDRA-13294)
+ * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
+ * Cqlsh copy-from should error out when csv contains invalid data for collections (CASSANDRA-13071)
+ * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232)
+ * Coalescing strategy sleeps too much (CASSANDRA-13090)
+ * Faster StreamingHistogram (CASSANDRA-13038)
+ * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237)
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
+ * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
+ * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639)
+ * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
+ * Hint related logging should include the IP address of the destination in addition to
+ host ID (CASSANDRA-13205)
+ * Reloading logback.xml does not work (CASSANDRA-13173)
+ * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109)
+ * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
+ * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
+ * Fix handling of partition with partition-level deletion plus
+ live rows in sstabledump (CASSANDRA-13177)
+ * Provide user workaround when system_schema.columns does not contain entries
+ for a table that's in system_schema.tables (CASSANDRA-13180)
* Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410)
- * Fix NPE issue in StorageService (CASSANDRA-13060)
Merged from 2.2:
+ * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
+ * Fix JVM metric names (CASSANDRA-13103)
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
* Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by sn...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c38e618d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c38e618d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c38e618d
Branch: refs/heads/cassandra-3.11
Commit: c38e618d69ac30868ae0f413320ffc8e0f27c9be
Parents: 99881b9 58e8008
Author: Robert Stupp <sn...@snazy.de>
Authored: Sun Apr 9 10:58:56 2017 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sun Apr 9 10:58:56 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cache/OHCProvider.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c38e618d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a34db06,c5e517f..a7b464a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -42,30 -15,11 +42,31 @@@ Merged from 3.0
* Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
* Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
* Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
- * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
+ * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to LogRecord absolute path (CASSANDRA-13294)
+ * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
+ * Cqlsh copy-from should error out when csv contains invalid data for collections (CASSANDRA-13071)
+ * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232)
+ * Coalescing strategy sleeps too much (CASSANDRA-13090)
+ * Faster StreamingHistogram (CASSANDRA-13038)
+ * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237)
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
+ * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
+ * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639)
+ * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
+ * Hint related logging should include the IP address of the destination in addition to
+ host ID (CASSANDRA-13205)
+ * Reloading logback.xml does not work (CASSANDRA-13173)
+ * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109)
+ * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
+ * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
+ * Fix handling of partition with partition-level deletion plus
+ live rows in sstabledump (CASSANDRA-13177)
+ * Provide user workaround when system_schema.columns does not contain entries
+ for a table that's in system_schema.tables (CASSANDRA-13180)
* Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410)
- * Fix NPE issue in StorageService (CASSANDRA-13060)
Merged from 2.2:
+ * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
+ * Fix JVM metric names (CASSANDRA-13103)
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
* Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)