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/22 22:31:46 UTC
[2/9] git commit: Fix SSTableLoader
Fix SSTableLoader
patch by thobbs; reviewed by slebresne for CASSANDRA-6205
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7159ec10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7159ec10
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7159ec10
Branch: refs/heads/trunk
Commit: 7159ec10046fd4dce58ca9406ef096fdb965700d
Parents: 66fe5bd
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Oct 22 17:42:50 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Oct 22 17:42:50 2013 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/io/sstable/SSTableReader.java | 10 ++++------
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7159ec10/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e89ca41..ac4c010 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,6 +26,7 @@
* CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212)
* Add reloadtriggers command to nodetool (CASSANDRA-4949)
* cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139)
+ * Fix sstable loader (CASSANDRA-6205)
Merged from 1.2:
* (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
* Add a warning for small LCS sstable size (CASSANDRA-6191)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7159ec10/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index cb0873d..9837f4c 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@ -36,10 +36,7 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.cache.InstrumentingCache;
import org.apache.cassandra.cache.KeyCacheKey;
import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor;
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.config.ColumnDefinition;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.config.Schema;
+import org.apache.cassandra.config.*;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
import org.apache.cassandra.db.commitlog.ReplayPosition;
@@ -327,8 +324,9 @@ public class SSTableReader extends SSTable implements Closeable
deletingTask = new SSTableDeletingTask(this);
- // Don't track read rates for tables in the system keyspace
- if (Keyspace.SYSTEM_KS.equals(desc.ksname))
+ // Don't track read rates for tables in the system keyspace and don't bother trying to load or persist
+ // the read meter when in client mode
+ if (Keyspace.SYSTEM_KS.equals(desc.ksname) || Config.isClientMode())
{
readMeter = null;
return;