cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jji...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Date Mon, 19 Jun 2017 00:48:23 GMT
Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15900785
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15900785
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15900785

Branch: refs/heads/trunk
Commit: 1590078591138d7fcd184fb1337722d5146d654d
Parents: 6608bea d370d05
Author: Jeff Jirsa <jjirsa@apple.com>
Authored: Sun Jun 18 17:45:59 2017 -0700
Committer: Jeff Jirsa <jjirsa@apple.com>
Committed: Sun Jun 18 17:47:20 2017 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/15900785/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/15900785/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 2d4f191,87b388e..a750901
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -1401,19 -1513,8 +1401,19 @@@ public class DatabaseDescripto
          conf.compaction_throughput_mb_per_sec = value;
      }
  
-     public static int getCompactionLargePartitionWarningThreshold() { return conf.compaction_large_partition_warning_threshold_mb
* 1024 * 1024; }
+     public static long getCompactionLargePartitionWarningThreshold() { return conf.compaction_large_partition_warning_threshold_mb
* 1024L * 1024L; }
  
 +    public static int getConcurrentValidations()
 +    {
 +        return conf.concurrent_validations;
 +    }
 +
 +    public static void setConcurrentValidations(int value)
 +    {
 +        value = value > 0 ? value : Integer.MAX_VALUE;
 +        conf.concurrent_validations = value;
 +    }
 +
      public static long getMinFreeSpacePerDriveInBytes()
      {
          return conf.min_free_space_per_drive_in_mb * 1024L * 1024L;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message