You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2016/12/14 20:13:46 UTC
[1/3] cassandra git commit: Fix missing cdc flag on Mutation creation
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X c9ead4826 -> 83ba3b7f3
refs/heads/trunk 0c56d6c22 -> dad5b96ec
Fix missing cdc flag on Mutation creation
Patch by jmckenzie; reviewed by blambov for CASSANDRA-13035
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83ba3b7f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83ba3b7f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83ba3b7f
Branch: refs/heads/cassandra-3.X
Commit: 83ba3b7f37b1f1931879d3724b8aef4eb4a1da76
Parents: c9ead48
Author: Joshua McKenzie <jm...@apache.org>
Authored: Mon Dec 12 15:30:37 2016 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Dec 14 15:11:50 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/Mutation.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83ba3b7f/src/java/org/apache/cassandra/db/Mutation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Mutation.java b/src/java/org/apache/cassandra/db/Mutation.java
index b08d6e5..00a637e 100644
--- a/src/java/org/apache/cassandra/db/Mutation.java
+++ b/src/java/org/apache/cassandra/db/Mutation.java
@@ -78,6 +78,8 @@ public class Mutation implements IMutation
this.keyspaceName = keyspaceName;
this.key = key;
this.modifications = modifications;
+ for (PartitionUpdate pu : modifications.values())
+ cdcEnabled |= pu.metadata().params.cdc;
}
public Mutation copy()
@@ -92,6 +94,11 @@ public class Mutation implements IMutation
Mutation copy = copy();
copy.modifications.keySet().removeAll(cfIds);
+
+ copy.cdcEnabled = false;
+ for (PartitionUpdate pu : modifications.values())
+ copy.cdcEnabled |= pu.metadata().params.cdc;
+
return copy;
}
[2/3] cassandra git commit: Fix missing cdc flag on Mutation creation
Posted by jm...@apache.org.
Fix missing cdc flag on Mutation creation
Patch by jmckenzie; reviewed by blambov for CASSANDRA-13035
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83ba3b7f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83ba3b7f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83ba3b7f
Branch: refs/heads/trunk
Commit: 83ba3b7f37b1f1931879d3724b8aef4eb4a1da76
Parents: c9ead48
Author: Joshua McKenzie <jm...@apache.org>
Authored: Mon Dec 12 15:30:37 2016 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Dec 14 15:11:50 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/Mutation.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83ba3b7f/src/java/org/apache/cassandra/db/Mutation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Mutation.java b/src/java/org/apache/cassandra/db/Mutation.java
index b08d6e5..00a637e 100644
--- a/src/java/org/apache/cassandra/db/Mutation.java
+++ b/src/java/org/apache/cassandra/db/Mutation.java
@@ -78,6 +78,8 @@ public class Mutation implements IMutation
this.keyspaceName = keyspaceName;
this.key = key;
this.modifications = modifications;
+ for (PartitionUpdate pu : modifications.values())
+ cdcEnabled |= pu.metadata().params.cdc;
}
public Mutation copy()
@@ -92,6 +94,11 @@ public class Mutation implements IMutation
Mutation copy = copy();
copy.modifications.keySet().removeAll(cfIds);
+
+ copy.cdcEnabled = false;
+ for (PartitionUpdate pu : modifications.values())
+ copy.cdcEnabled |= pu.metadata().params.cdc;
+
return copy;
}
[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Posted by jm...@apache.org.
Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dad5b96e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dad5b96e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dad5b96e
Branch: refs/heads/trunk
Commit: dad5b96ecfaa739f1a26e1df117c33046fa27dbf
Parents: 0c56d6c 83ba3b7
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Dec 14 15:12:57 2016 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Dec 14 15:12:57 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/Mutation.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dad5b96e/src/java/org/apache/cassandra/db/Mutation.java
----------------------------------------------------------------------