You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2018/09/14 10:26:07 UTC
[8/9] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
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/5d558820
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d558820
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d558820
Branch: refs/heads/trunk
Commit: 5d558820486bbca6783da7797bcc472aad3b7dd3
Parents: 2725d50 06c55f7
Author: Benedict Elliott Smith <be...@apple.com>
Authored: Fri Sep 14 11:24:41 2018 +0100
Committer: Benedict Elliott Smith <be...@apple.com>
Committed: Fri Sep 14 11:24:41 2018 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../org/apache/cassandra/db/LegacyLayout.java | 38 +++++++++++++++----
.../apache/cassandra/db/LegacyLayoutTest.java | 40 +++++++++++++++++++-
3 files changed, 71 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d558820/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4f2a649,195c97c..f04cae1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,6 +1,7 @@@
-3.0.18
+3.11.4
+Merged from 3.0:
+ * Fix corrupted collection deletions for dropped columns in 3.0 <-> 2.{1,2} messages (CASSANDRA-14568)
+ * Fix corrupted static collection deletions in 3.0 <-> 2.{1,2} messages (CASSANDRA-14568)
* Handle failures in parallelAllSSTableOperation (cleanup/upgradesstables/etc) (CASSANDRA-14657)
* Improve TokenMetaData cache populating performance avoid long locking (CASSANDRA-14660)
* Fix static column order for SELECT * wildcard queries (CASSANDRA-14638)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d558820/src/java/org/apache/cassandra/db/LegacyLayout.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/LegacyLayout.java
index eed4113,ecc507e..c697a8d
--- a/src/java/org/apache/cassandra/db/LegacyLayout.java
+++ b/src/java/org/apache/cassandra/db/LegacyLayout.java
@@@ -799,12 -807,18 +808,18 @@@ public abstract class LegacyLayou
if (!delTime.isLive())
{
Clustering clustering = row.clustering();
+ boolean isStatic = clustering == Clustering.STATIC_CLUSTERING;
+ assert isStatic == col.isStatic();
- ClusteringBound startBound = ClusteringBound.inclusiveStartOf(clustering);
- ClusteringBound endBound = ClusteringBound.inclusiveEndOf(clustering);
- Slice.Bound startBound = isStatic
++ ClusteringBound startBound = isStatic
+ ? LegacyDeletionInfo.staticBound(metadata, true)
- : Slice.Bound.inclusiveStartOf(clustering);
- Slice.Bound endBound = isStatic
++ : ClusteringBound.inclusiveStartOf(clustering);
++ ClusteringBound endBound = isStatic
+ ? LegacyDeletionInfo.staticBound(metadata, false)
- : Slice.Bound.inclusiveEndOf(clustering);
++ : ClusteringBound.inclusiveEndOf(clustering);
- LegacyLayout.LegacyBound start = new LegacyLayout.LegacyBound(startBound, col.isStatic(), col);
- LegacyLayout.LegacyBound end = new LegacyLayout.LegacyBound(endBound, col.isStatic(), col);
+ LegacyLayout.LegacyBound start = new LegacyLayout.LegacyBound(startBound, isStatic, col);
+ LegacyLayout.LegacyBound end = new LegacyLayout.LegacyBound(endBound, isStatic, col);
deletions.add(start, end, delTime.markedForDeleteAt(), delTime.localDeletionTime());
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d558820/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org