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:22:55 UTC
[1/6] cassandra git commit: Fix missing cdc flag on Mutation creation
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 66e214592 -> 249e4b195
refs/heads/cassandra-3.X 83ba3b7f3 -> de84f264f
refs/heads/trunk dad5b96ec -> b88ddb8ab
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/249e4b19
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/249e4b19
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/249e4b19
Branch: refs/heads/cassandra-3.11
Commit: 249e4b195de0d5351c4bfdd600bcd74b4fa085a5
Parents: 66e2145
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:21:27 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/249e4b19/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;
}
[6/6] 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/b88ddb8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b88ddb8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b88ddb8a
Branch: refs/heads/trunk
Commit: b88ddb8ab0d130db67ffcecca6d0b4eac3d06e6f
Parents: dad5b96 de84f26
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Dec 14 15:22:04 2016 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Dec 14 15:22:04 2016 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/6] 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/249e4b19
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/249e4b19
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/249e4b19
Branch: refs/heads/cassandra-3.X
Commit: 249e4b195de0d5351c4bfdd600bcd74b4fa085a5
Parents: 66e2145
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:21:27 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/249e4b19/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/6] 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/249e4b19
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/249e4b19
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/249e4b19
Branch: refs/heads/trunk
Commit: 249e4b195de0d5351c4bfdd600bcd74b4fa085a5
Parents: 66e2145
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:21:27 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/249e4b19/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;
}
[5/6] cassandra git commit: Merge branch 'cassandra-3.11' into
cassandra-3.X
Posted by jm...@apache.org.
Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de84f264
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de84f264
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de84f264
Branch: refs/heads/cassandra-3.X
Commit: de84f264fec3dae23f60ac829b55db792f39aa37
Parents: 83ba3b7 249e4b1
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Dec 14 15:21:50 2016 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Dec 14 15:21:50 2016 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/6] cassandra git commit: Merge branch 'cassandra-3.11' into
cassandra-3.X
Posted by jm...@apache.org.
Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de84f264
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de84f264
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de84f264
Branch: refs/heads/trunk
Commit: de84f264fec3dae23f60ac829b55db792f39aa37
Parents: 83ba3b7 249e4b1
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Dec 14 15:21:50 2016 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Dec 14 15:21:50 2016 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------