You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/10/28 17:54:02 UTC
[1/6] git commit: Allow overriding max hin ttl. Patch by Vishy Kasar,
reviewed by brandonwilliams for CASSANDRA-5988
Updated Branches:
refs/heads/cassandra-1.2 47896c888 -> a0831bb6b
refs/heads/cassandra-2.0 fcd657cde -> 9e47591d3
refs/heads/trunk e5f4fd612 -> 4f5edb647
Allow overriding max hin ttl.
Patch by Vishy Kasar, reviewed by brandonwilliams for CASSANDRA-5988
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0831bb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0831bb6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0831bb6
Branch: refs/heads/cassandra-1.2
Commit: a0831bb6b9ad98c280bc97ad0780340985edef7a
Parents: 47896c8
Author: Brandon Williams <br...@apache.org>
Authored: Mon Oct 28 11:45:24 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Oct 28 11:46:18 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/RowMutation.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0831bb6/src/java/org/apache/cassandra/db/RowMutation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/RowMutation.java b/src/java/org/apache/cassandra/db/RowMutation.java
index 5000d79..1a095c5 100644
--- a/src/java/org/apache/cassandra/db/RowMutation.java
+++ b/src/java/org/apache/cassandra/db/RowMutation.java
@@ -45,6 +45,7 @@ public class RowMutation implements IMutation
public static final RowMutationSerializer serializer = new RowMutationSerializer();
public static final String FORWARD_TO = "FWD_TO";
public static final String FORWARD_FROM = "FWD_FRM";
+ static final int maxHintTTL = Integer.parseInt(System.getProperty("cassandra.maxHintTTL", String.valueOf(Integer.MAX_VALUE)));
private final String table;
private final ByteBuffer key;
@@ -128,7 +129,7 @@ public class RowMutation implements IMutation
*/
public int calculateHintTTL()
{
- int ttl = Integer.MAX_VALUE;
+ int ttl = maxHintTTL;
for (ColumnFamily cf : getColumnFamilies())
ttl = Math.min(ttl, cf.metadata().getGcGraceSeconds());
return ttl;
[3/6] git commit: Allow overriding max hin ttl. Patch by Vishy Kasar,
reviewed by brandonwilliams for CASSANDRA-5988
Posted by br...@apache.org.
Allow overriding max hin ttl.
Patch by Vishy Kasar, reviewed by brandonwilliams for CASSANDRA-5988
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0831bb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0831bb6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0831bb6
Branch: refs/heads/trunk
Commit: a0831bb6b9ad98c280bc97ad0780340985edef7a
Parents: 47896c8
Author: Brandon Williams <br...@apache.org>
Authored: Mon Oct 28 11:45:24 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Oct 28 11:46:18 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/RowMutation.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0831bb6/src/java/org/apache/cassandra/db/RowMutation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/RowMutation.java b/src/java/org/apache/cassandra/db/RowMutation.java
index 5000d79..1a095c5 100644
--- a/src/java/org/apache/cassandra/db/RowMutation.java
+++ b/src/java/org/apache/cassandra/db/RowMutation.java
@@ -45,6 +45,7 @@ public class RowMutation implements IMutation
public static final RowMutationSerializer serializer = new RowMutationSerializer();
public static final String FORWARD_TO = "FWD_TO";
public static final String FORWARD_FROM = "FWD_FRM";
+ static final int maxHintTTL = Integer.parseInt(System.getProperty("cassandra.maxHintTTL", String.valueOf(Integer.MAX_VALUE)));
private final String table;
private final ByteBuffer key;
@@ -128,7 +129,7 @@ public class RowMutation implements IMutation
*/
public int calculateHintTTL()
{
- int ttl = Integer.MAX_VALUE;
+ int ttl = maxHintTTL;
for (ColumnFamily cf : getColumnFamilies())
ttl = Math.min(ttl, cf.metadata().getGcGraceSeconds());
return ttl;
[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9e47591d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e47591d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e47591d
Branch: refs/heads/cassandra-2.0
Commit: 9e47591d3a7ab2092e3b72300b1aa86fc9ce04de
Parents: fcd657c a0831bb
Author: Brandon Williams <br...@apache.org>
Authored: Mon Oct 28 11:52:14 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Oct 28 11:52:14 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/6] git commit: Allow overriding max hin ttl. Patch by Vishy Kasar,
reviewed by brandonwilliams for CASSANDRA-5988
Posted by br...@apache.org.
Allow overriding max hin ttl.
Patch by Vishy Kasar, reviewed by brandonwilliams for CASSANDRA-5988
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0831bb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0831bb6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0831bb6
Branch: refs/heads/cassandra-2.0
Commit: a0831bb6b9ad98c280bc97ad0780340985edef7a
Parents: 47896c8
Author: Brandon Williams <br...@apache.org>
Authored: Mon Oct 28 11:45:24 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Oct 28 11:46:18 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/RowMutation.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0831bb6/src/java/org/apache/cassandra/db/RowMutation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/RowMutation.java b/src/java/org/apache/cassandra/db/RowMutation.java
index 5000d79..1a095c5 100644
--- a/src/java/org/apache/cassandra/db/RowMutation.java
+++ b/src/java/org/apache/cassandra/db/RowMutation.java
@@ -45,6 +45,7 @@ public class RowMutation implements IMutation
public static final RowMutationSerializer serializer = new RowMutationSerializer();
public static final String FORWARD_TO = "FWD_TO";
public static final String FORWARD_FROM = "FWD_FRM";
+ static final int maxHintTTL = Integer.parseInt(System.getProperty("cassandra.maxHintTTL", String.valueOf(Integer.MAX_VALUE)));
private final String table;
private final ByteBuffer key;
@@ -128,7 +129,7 @@ public class RowMutation implements IMutation
*/
public int calculateHintTTL()
{
- int ttl = Integer.MAX_VALUE;
+ int ttl = maxHintTTL;
for (ColumnFamily cf : getColumnFamilies())
ttl = Math.min(ttl, cf.metadata().getGcGraceSeconds());
return ttl;
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9e47591d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e47591d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e47591d
Branch: refs/heads/trunk
Commit: 9e47591d3a7ab2092e3b72300b1aa86fc9ce04de
Parents: fcd657c a0831bb
Author: Brandon Williams <br...@apache.org>
Authored: Mon Oct 28 11:52:14 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Oct 28 11:52:14 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f5edb64
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f5edb64
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f5edb64
Branch: refs/heads/trunk
Commit: 4f5edb6479ebb1c8f667bbed984803460ec766a8
Parents: e5f4fd6 9e47591
Author: Brandon Williams <br...@apache.org>
Authored: Mon Oct 28 11:52:25 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Oct 28 11:52:25 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------