cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [2/3] git commit: include sstable count in tracing events
Date Sat, 03 Nov 2012 20:41:03 GMT
include sstable count in tracing events


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

Branch: refs/heads/trunk
Commit: 018ea85df3d391c348f1073b04e78d77a65798d2
Parents: 015358c
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Sat Nov 3 13:22:19 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Sat Nov 3 13:24:50 2012 -0500

----------------------------------------------------------------------
 .../apache/cassandra/db/CollationController.java   |    2 +-
 .../org/apache/cassandra/db/ColumnFamilyStore.java |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/018ea85d/src/java/org/apache/cassandra/db/CollationController.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/CollationController.java b/src/java/org/apache/cassandra/db/CollationController.java
index 7bec7b2..21c3a2f 100644
--- a/src/java/org/apache/cassandra/db/CollationController.java
+++ b/src/java/org/apache/cassandra/db/CollationController.java
@@ -283,7 +283,7 @@ public class CollationController
             if (iterators.isEmpty())
                 return null;
 
-            logger.debug("Merging data from memtables and sstables");
+            logger.debug("Merging data from {} memtables and sstables", iterators.size());
             filter.collateOnDiskAtom(returnCF, iterators, gcBefore);
 
             // Caller is responsible for final removeDeletedCF.  This is important for cacheRow
to work correctly:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/018ea85d/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 1338d91..4664760 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1386,6 +1386,10 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
         QueryFilter filter = new QueryFilter(null, new QueryPath(columnFamily, superColumn,
null), columnFilter);
 
         final ViewFragment view = markReferenced(startWith, stopAt);
+        if (logger.isDebugEnabled())
+            logger.debug(String.format("Executing seq scan across %s sstables for %s..%s",
+                                       view.sstables.size(), startWith, stopAt));
+
         try
         {
             final CloseableIterator<Row> iterator = RowIteratorFactory.getIterator(view.memtables,
view.sstables, startWith, stopAt, filter, this);
@@ -1440,7 +1444,6 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
 
     public List<Row> getRangeSlice(ByteBuffer superColumn, final AbstractBounds<RowPosition>
range, int maxResults, IDiskAtomFilter columnFilter, List<IndexExpression> rowFilter,
boolean maxIsColumns, boolean isPaging)
     {
-        logger.debug("Executing seq scan for {}..{}", range.left, range.right);
         return filter(getSequentialIterator(superColumn, range, columnFilter), ExtendedFilter.create(this,
columnFilter, rowFilter, maxResults, maxIsColumns, isPaging));
     }
 


Mime
View raw message