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/02/02 14:23:24 UTC
[1/6] cassandra git commit: Inconditionally update the sstable
deletion info for live LivenessInfo
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 c83d108a3 -> df3d0b00b
refs/heads/cassandra-3.3 a7125d2a2 -> 8996b64e4
refs/heads/trunk 92242d782 -> be1efd283
Inconditionally update the sstable deletion info for live LivenessInfo
patch by slebresne; reviewed by krummas for CASSANDRA-11102
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df3d0b00
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df3d0b00
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df3d0b00
Branch: refs/heads/cassandra-3.0
Commit: df3d0b00b0d9a0725b3f1681e6ce9ffe6d330de4
Parents: c83d108
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Feb 2 10:27:49 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Feb 2 14:22:20 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/io/sstable/metadata/MetadataCollector.java | 7 ++-----
.../org/apache/cassandra/db/compaction/TTLExpiryTest.java | 2 ++
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df3d0b00/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index da6f5cc..3423927 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.3
+ * Fix incorrect computation of deletion time in sstable metadata (CASSANDRA-11102)
* Avoid memory leak when collecting sstable metadata (CASSANDRA-11026)
* Mutations do not block for completion under view lock contention (CASSANDRA-10779)
* Invalidate legacy schema tables when unloading them (CASSANDRA-11071)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df3d0b00/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
index 3947dc8..c2b0caf 100644
--- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
@@ -169,11 +169,8 @@ public class MetadataCollector implements PartitionStatisticsCollector
return;
updateTimestamp(newInfo.timestamp());
- if (newInfo.isExpiring())
- {
- updateTTL(newInfo.ttl());
- updateLocalDeletionTime(newInfo.localExpirationTime());
- }
+ updateTTL(newInfo.ttl());
+ updateLocalDeletionTime(newInfo.localExpirationTime());
}
public void update(Cell cell)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df3d0b00/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
index 7dd3da0..b264553 100644
--- a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
@@ -258,6 +258,7 @@ public class TTLExpiryTest
cfs.metadata.gcGraceSeconds(0);
new RowUpdateBuilder(cfs.metadata, System.currentTimeMillis(), "test")
+ .noRowMarker()
.add("col1", ByteBufferUtil.EMPTY_BYTE_BUFFER)
.build()
.applyUnsafe();
@@ -267,6 +268,7 @@ public class TTLExpiryTest
for (int i = 0; i < 10; i++)
{
new RowUpdateBuilder(cfs.metadata, System.currentTimeMillis(), "test")
+ .noRowMarker()
.delete("col1")
.build()
.applyUnsafe();
[6/6] cassandra git commit: Merge branch 'cassandra-3.3' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be1efd28
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be1efd28
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be1efd28
Branch: refs/heads/trunk
Commit: be1efd28392fe9a4cc28be8d91eb6a685651a8f8
Parents: 92242d7 8996b64
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Feb 2 14:23:07 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Feb 2 14:23:07 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/io/sstable/metadata/MetadataCollector.java | 7 ++-----
.../org/apache/cassandra/db/compaction/TTLExpiryTest.java | 2 ++
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/be1efd28/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/be1efd28/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
----------------------------------------------------------------------
[2/6] cassandra git commit: Inconditionally update the sstable
deletion info for live LivenessInfo
Posted by sl...@apache.org.
Inconditionally update the sstable deletion info for live LivenessInfo
patch by slebresne; reviewed by krummas for CASSANDRA-11102
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df3d0b00
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df3d0b00
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df3d0b00
Branch: refs/heads/cassandra-3.3
Commit: df3d0b00b0d9a0725b3f1681e6ce9ffe6d330de4
Parents: c83d108
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Feb 2 10:27:49 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Feb 2 14:22:20 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/io/sstable/metadata/MetadataCollector.java | 7 ++-----
.../org/apache/cassandra/db/compaction/TTLExpiryTest.java | 2 ++
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df3d0b00/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index da6f5cc..3423927 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.3
+ * Fix incorrect computation of deletion time in sstable metadata (CASSANDRA-11102)
* Avoid memory leak when collecting sstable metadata (CASSANDRA-11026)
* Mutations do not block for completion under view lock contention (CASSANDRA-10779)
* Invalidate legacy schema tables when unloading them (CASSANDRA-11071)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df3d0b00/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
index 3947dc8..c2b0caf 100644
--- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
@@ -169,11 +169,8 @@ public class MetadataCollector implements PartitionStatisticsCollector
return;
updateTimestamp(newInfo.timestamp());
- if (newInfo.isExpiring())
- {
- updateTTL(newInfo.ttl());
- updateLocalDeletionTime(newInfo.localExpirationTime());
- }
+ updateTTL(newInfo.ttl());
+ updateLocalDeletionTime(newInfo.localExpirationTime());
}
public void update(Cell cell)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df3d0b00/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
index 7dd3da0..b264553 100644
--- a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
@@ -258,6 +258,7 @@ public class TTLExpiryTest
cfs.metadata.gcGraceSeconds(0);
new RowUpdateBuilder(cfs.metadata, System.currentTimeMillis(), "test")
+ .noRowMarker()
.add("col1", ByteBufferUtil.EMPTY_BYTE_BUFFER)
.build()
.applyUnsafe();
@@ -267,6 +268,7 @@ public class TTLExpiryTest
for (int i = 0; i < 10; i++)
{
new RowUpdateBuilder(cfs.metadata, System.currentTimeMillis(), "test")
+ .noRowMarker()
.delete("col1")
.build()
.applyUnsafe();
[3/6] cassandra git commit: Inconditionally update the sstable
deletion info for live LivenessInfo
Posted by sl...@apache.org.
Inconditionally update the sstable deletion info for live LivenessInfo
patch by slebresne; reviewed by krummas for CASSANDRA-11102
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df3d0b00
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df3d0b00
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df3d0b00
Branch: refs/heads/trunk
Commit: df3d0b00b0d9a0725b3f1681e6ce9ffe6d330de4
Parents: c83d108
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Feb 2 10:27:49 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Feb 2 14:22:20 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/io/sstable/metadata/MetadataCollector.java | 7 ++-----
.../org/apache/cassandra/db/compaction/TTLExpiryTest.java | 2 ++
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df3d0b00/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index da6f5cc..3423927 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.3
+ * Fix incorrect computation of deletion time in sstable metadata (CASSANDRA-11102)
* Avoid memory leak when collecting sstable metadata (CASSANDRA-11026)
* Mutations do not block for completion under view lock contention (CASSANDRA-10779)
* Invalidate legacy schema tables when unloading them (CASSANDRA-11071)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df3d0b00/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
index 3947dc8..c2b0caf 100644
--- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
@@ -169,11 +169,8 @@ public class MetadataCollector implements PartitionStatisticsCollector
return;
updateTimestamp(newInfo.timestamp());
- if (newInfo.isExpiring())
- {
- updateTTL(newInfo.ttl());
- updateLocalDeletionTime(newInfo.localExpirationTime());
- }
+ updateTTL(newInfo.ttl());
+ updateLocalDeletionTime(newInfo.localExpirationTime());
}
public void update(Cell cell)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df3d0b00/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
index 7dd3da0..b264553 100644
--- a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
@@ -258,6 +258,7 @@ public class TTLExpiryTest
cfs.metadata.gcGraceSeconds(0);
new RowUpdateBuilder(cfs.metadata, System.currentTimeMillis(), "test")
+ .noRowMarker()
.add("col1", ByteBufferUtil.EMPTY_BYTE_BUFFER)
.build()
.applyUnsafe();
@@ -267,6 +268,7 @@ public class TTLExpiryTest
for (int i = 0; i < 10; i++)
{
new RowUpdateBuilder(cfs.metadata, System.currentTimeMillis(), "test")
+ .noRowMarker()
.delete("col1")
.build()
.applyUnsafe();
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8996b64e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8996b64e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8996b64e
Branch: refs/heads/cassandra-3.3
Commit: 8996b64e43a3a89dd0648f584298e2e65383b0c3
Parents: a7125d2 df3d0b0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Feb 2 14:22:59 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Feb 2 14:22:59 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/io/sstable/metadata/MetadataCollector.java | 7 ++-----
.../org/apache/cassandra/db/compaction/TTLExpiryTest.java | 2 ++
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8996b64e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2600d56,3423927..c0acd3d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
-3.0.3
+3.3
+ * Avoid infinite loop if owned range is smaller than number of
+ data dirs (CASSANDRA-11034)
+ * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010)
+Merged from 3.0:
+ * Fix incorrect computation of deletion time in sstable metadata (CASSANDRA-11102)
* Avoid memory leak when collecting sstable metadata (CASSANDRA-11026)
* Mutations do not block for completion under view lock contention (CASSANDRA-10779)
* Invalidate legacy schema tables when unloading them (CASSANDRA-11071)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8996b64e/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
----------------------------------------------------------------------
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8996b64e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8996b64e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8996b64e
Branch: refs/heads/trunk
Commit: 8996b64e43a3a89dd0648f584298e2e65383b0c3
Parents: a7125d2 df3d0b0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Feb 2 14:22:59 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Feb 2 14:22:59 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/io/sstable/metadata/MetadataCollector.java | 7 ++-----
.../org/apache/cassandra/db/compaction/TTLExpiryTest.java | 2 ++
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8996b64e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2600d56,3423927..c0acd3d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
-3.0.3
+3.3
+ * Avoid infinite loop if owned range is smaller than number of
+ data dirs (CASSANDRA-11034)
+ * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010)
+Merged from 3.0:
+ * Fix incorrect computation of deletion time in sstable metadata (CASSANDRA-11102)
* Avoid memory leak when collecting sstable metadata (CASSANDRA-11026)
* Mutations do not block for completion under view lock contention (CASSANDRA-10779)
* Invalidate legacy schema tables when unloading them (CASSANDRA-11071)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8996b64e/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
----------------------------------------------------------------------