You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2016/08/26 22:37:54 UTC
cassandra git commit: push down code to where it's actually needed
Repository: cassandra
Updated Branches:
refs/heads/trunk dc1712a81 -> a8743c6e3
push down code to where it's actually needed
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8743c6e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8743c6e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8743c6e
Branch: refs/heads/trunk
Commit: a8743c6e3b2876af3f028097ae3115db160e72e3
Parents: dc1712a
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri Aug 26 18:37:33 2016 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri Aug 26 18:37:33 2016 -0400
----------------------------------------------------------------------
.../org/apache/cassandra/cql3/statements/BatchStatement.java | 3 ++-
.../cassandra/index/internal/composites/CompositesSearcher.java | 3 ++-
src/java/org/apache/cassandra/tools/StandaloneScrubber.java | 3 ++-
.../org/apache/cassandra/tools/nodetool/CompactionStats.java | 5 +++--
src/java/org/apache/cassandra/transport/Server.java | 3 ++-
5 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8743c6e/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
index ae64e7a..83a8324 100644
--- a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
@@ -269,7 +269,6 @@ public class BatchStatement implements CQLStatement
long size = 0;
long warnThreshold = DatabaseDescriptor.getBatchSizeWarnThreshold();
- long failThreshold = DatabaseDescriptor.getBatchSizeFailThreshold();
for (IMutation mutation : mutations)
{
@@ -286,6 +285,8 @@ public class BatchStatement implements CQLStatement
tableNames.add(String.format("%s.%s", update.metadata().ksName, update.metadata().cfName));
}
+ long failThreshold = DatabaseDescriptor.getBatchSizeFailThreshold();
+
String format = "Batch for {} is of size {}, exceeding specified threshold of {} by {}.{}";
if (size > failThreshold)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8743c6e/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java b/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
index e2b0b2a..324d939 100644
--- a/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
+++ b/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
@@ -227,7 +227,6 @@ public class CompositesSearcher extends CassandraIndexSearcher
}
UnfilteredRowIterator iteratorToReturn = null;
- ClusteringComparator comparator = dataIter.metadata().comparator;
if (isStaticColumn())
{
if (entries.size() != 1)
@@ -248,6 +247,8 @@ public class CompositesSearcher extends CassandraIndexSearcher
}
else
{
+ ClusteringComparator comparator = dataIter.metadata().comparator;
+
class Transform extends Transformation
{
private int entriesIdx;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8743c6e/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
index f544089..8574179 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
@@ -160,9 +160,10 @@ public class StandaloneScrubber
private static void checkManifest(CompactionStrategyManager strategyManager, ColumnFamilyStore cfs, Collection<SSTableReader> sstables)
{
- int maxSizeInMB = (int)((cfs.getCompactionStrategyManager().getMaxSSTableBytes()) / (1024L * 1024L));
if (strategyManager.getCompactionParams().klass().equals(LeveledCompactionStrategy.class))
{
+ int maxSizeInMB = (int)((cfs.getCompactionStrategyManager().getMaxSSTableBytes()) / (1024L * 1024L));
+
System.out.println("Checking leveled manifest");
Predicate<SSTableReader> repairedPredicate = new Predicate<SSTableReader>()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8743c6e/src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java b/src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java
index 411dc23..4fd0423 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java
@@ -72,10 +72,11 @@ public class CompactionStats extends NodeToolCmd
public static void reportCompactionTable(List<Map<String,String>> compactions, int compactionThroughput, boolean humanReadable)
{
- long remainingBytes = 0;
- TableBuilder table = new TableBuilder();
if (!compactions.isEmpty())
{
+ long remainingBytes = 0;
+ TableBuilder table = new TableBuilder();
+
table.add("id", "compaction type", "keyspace", "table", "completed", "total", "unit", "progress");
for (Map<String, String> c : compactions)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8743c6e/src/java/org/apache/cassandra/transport/Server.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/Server.java b/src/java/org/apache/cassandra/transport/Server.java
index bf66877..3defb4f 100644
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@ -138,9 +138,10 @@ public class Server implements CassandraDaemon.Server
if (workerGroup != null)
bootstrap = bootstrap.group(workerGroup);
- final EncryptionOptions.ClientEncryptionOptions clientEnc = DatabaseDescriptor.getClientEncryptionOptions();
if (this.useSSL)
{
+ final EncryptionOptions.ClientEncryptionOptions clientEnc = DatabaseDescriptor.getClientEncryptionOptions();
+
if (clientEnc.optional)
{
logger.info("Enabling optionally encrypted CQL connections between client and server");