You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/05/23 20:16:47 UTC
[1/3] git commit: tracing improvements
Updated Branches:
refs/heads/cassandra-1.2 6abb1d499 -> cc301de4f
refs/heads/trunk f5cc4760b -> 71a7aeae5
tracing improvements
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc301de4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc301de4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc301de4
Branch: refs/heads/cassandra-1.2
Commit: cc301de4f7236f411a621566f749ff53ad962ca9
Parents: 6abb1d4
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu May 23 13:08:52 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu May 23 13:08:52 2013 -0500
----------------------------------------------------------------------
.../apache/cassandra/db/CollationController.java | 4 +---
.../db/columniterator/IndexedSliceReader.java | 2 ++
.../db/columniterator/SimpleSliceReader.java | 2 ++
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc301de4/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 dafcdd3..908df3b 100644
--- a/src/java/org/apache/cassandra/db/CollationController.java
+++ b/src/java/org/apache/cassandra/db/CollationController.java
@@ -76,7 +76,6 @@ public class CollationController
*/
private ColumnFamily collectTimeOrderedData()
{
- logger.trace("collectTimeOrderedData");
ColumnFamily container = ColumnFamily.create(cfs.metadata, factory, filter.filter.isReversed());
List<OnDiskAtomIterator> iterators = new ArrayList<OnDiskAtomIterator>();
Tracing.trace("Acquiring sstable references");
@@ -230,7 +229,6 @@ public class CollationController
*/
private ColumnFamily collectAllData()
{
- logger.trace("collectAllData");
Tracing.trace("Acquiring sstable references");
ColumnFamilyStore.ViewFragment view = cfs.markReferenced(filter.key);
List<OnDiskAtomIterator> iterators = new ArrayList<OnDiskAtomIterator>(Iterables.size(view.memtables) + view.sstables.size());
@@ -238,7 +236,7 @@ public class CollationController
try
{
- Tracing.trace("Merging memtable contents");
+ Tracing.trace("Merging memtable tombstones");
for (Memtable memtable : view.memtables)
{
OnDiskAtomIterator iter = filter.getMemtableColumnIterator(memtable);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc301de4/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java b/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
index 0493819..4ca0ea5 100644
--- a/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
+++ b/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
@@ -39,6 +39,7 @@ import org.apache.cassandra.io.sstable.IndexHelper.IndexInfo;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.util.FileDataInput;
import org.apache.cassandra.io.util.FileMark;
+import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.ByteBufferUtil;
/**
@@ -67,6 +68,7 @@ class IndexedSliceReader extends AbstractIterator<OnDiskAtom> implements OnDiskA
*/
public IndexedSliceReader(SSTableReader sstable, RowIndexEntry indexEntry, FileDataInput input, ColumnSlice[] slices, boolean reversed)
{
+ Tracing.trace("Seeking to partition indexed section in data file");
this.sstable = sstable;
this.originalInput = input;
this.reversed = reversed;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc301de4/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java b/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
index 83cdeaa..19a73df 100644
--- a/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
+++ b/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
@@ -34,6 +34,7 @@ import org.apache.cassandra.io.sstable.IndexHelper;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.util.FileDataInput;
import org.apache.cassandra.io.util.FileMark;
+import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.ByteBufferUtil;
class SimpleSliceReader extends AbstractIterator<OnDiskAtom> implements OnDiskAtomIterator
@@ -51,6 +52,7 @@ class SimpleSliceReader extends AbstractIterator<OnDiskAtom> implements OnDiskAt
public SimpleSliceReader(SSTableReader sstable, RowIndexEntry indexEntry, FileDataInput input, ByteBuffer finishColumn)
{
+ Tracing.trace("Seeking to partition beginning in data file");
this.sstable = sstable;
this.finishColumn = finishColumn;
this.comparator = sstable.metadata.comparator;
[3/3] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71a7aeae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71a7aeae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71a7aeae
Branch: refs/heads/trunk
Commit: 71a7aeae5d6a9c2489ad80e0be9b7422c6ac6c43
Parents: f5cc476 cc301de
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu May 23 13:16:42 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu May 23 13:16:42 2013 -0500
----------------------------------------------------------------------
.../apache/cassandra/db/CollationController.java | 4 +---
.../db/columniterator/IndexedSliceReader.java | 2 ++
.../db/columniterator/SimpleSliceReader.java | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71a7aeae/src/java/org/apache/cassandra/db/CollationController.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/CollationController.java
index eb5192e,908df3b..4bba554
--- a/src/java/org/apache/cassandra/db/CollationController.java
+++ b/src/java/org/apache/cassandra/db/CollationController.java
@@@ -67,8 -76,7 +67,7 @@@ public class CollationControlle
*/
private ColumnFamily collectTimeOrderedData()
{
- logger.trace("collectTimeOrderedData");
- ColumnFamily container = ColumnFamily.create(cfs.metadata, factory, filter.filter.isReversed());
+ final ColumnFamily container = ArrayBackedSortedColumns.factory.create(cfs.metadata, filter.filter.isReversed());
List<OnDiskAtomIterator> iterators = new ArrayList<OnDiskAtomIterator>();
Tracing.trace("Acquiring sstable references");
ColumnFamilyStore.ViewFragment view = cfs.markReferenced(filter.key);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71a7aeae/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71a7aeae/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
index 5711fa2,19a73df..6d7055c
--- a/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
+++ b/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
@@@ -29,8 -30,11 +29,9 @@@ import org.apache.cassandra.db.*
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.io.sstable.CorruptSSTableException;
import org.apache.cassandra.io.sstable.Descriptor;
-import org.apache.cassandra.io.sstable.IndexHelper;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.util.FileDataInput;
-import org.apache.cassandra.io.util.FileMark;
+ import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.ByteBufferUtil;
class SimpleSliceReader extends AbstractIterator<OnDiskAtom> implements OnDiskAtomIterator
@@@ -46,7 -52,8 +47,7 @@@
public SimpleSliceReader(SSTableReader sstable, RowIndexEntry indexEntry, FileDataInput input, ByteBuffer finishColumn)
{
- logger.debug("Slicing {}", sstable);
+ Tracing.trace("Seeking to partition beginning in data file");
- this.sstable = sstable;
this.finishColumn = finishColumn;
this.comparator = sstable.metadata.comparator;
try
[2/3] git commit: tracing improvements
Posted by jb...@apache.org.
tracing improvements
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc301de4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc301de4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc301de4
Branch: refs/heads/trunk
Commit: cc301de4f7236f411a621566f749ff53ad962ca9
Parents: 6abb1d4
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu May 23 13:08:52 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu May 23 13:08:52 2013 -0500
----------------------------------------------------------------------
.../apache/cassandra/db/CollationController.java | 4 +---
.../db/columniterator/IndexedSliceReader.java | 2 ++
.../db/columniterator/SimpleSliceReader.java | 2 ++
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc301de4/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 dafcdd3..908df3b 100644
--- a/src/java/org/apache/cassandra/db/CollationController.java
+++ b/src/java/org/apache/cassandra/db/CollationController.java
@@ -76,7 +76,6 @@ public class CollationController
*/
private ColumnFamily collectTimeOrderedData()
{
- logger.trace("collectTimeOrderedData");
ColumnFamily container = ColumnFamily.create(cfs.metadata, factory, filter.filter.isReversed());
List<OnDiskAtomIterator> iterators = new ArrayList<OnDiskAtomIterator>();
Tracing.trace("Acquiring sstable references");
@@ -230,7 +229,6 @@ public class CollationController
*/
private ColumnFamily collectAllData()
{
- logger.trace("collectAllData");
Tracing.trace("Acquiring sstable references");
ColumnFamilyStore.ViewFragment view = cfs.markReferenced(filter.key);
List<OnDiskAtomIterator> iterators = new ArrayList<OnDiskAtomIterator>(Iterables.size(view.memtables) + view.sstables.size());
@@ -238,7 +236,7 @@ public class CollationController
try
{
- Tracing.trace("Merging memtable contents");
+ Tracing.trace("Merging memtable tombstones");
for (Memtable memtable : view.memtables)
{
OnDiskAtomIterator iter = filter.getMemtableColumnIterator(memtable);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc301de4/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java b/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
index 0493819..4ca0ea5 100644
--- a/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
+++ b/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
@@ -39,6 +39,7 @@ import org.apache.cassandra.io.sstable.IndexHelper.IndexInfo;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.util.FileDataInput;
import org.apache.cassandra.io.util.FileMark;
+import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.ByteBufferUtil;
/**
@@ -67,6 +68,7 @@ class IndexedSliceReader extends AbstractIterator<OnDiskAtom> implements OnDiskA
*/
public IndexedSliceReader(SSTableReader sstable, RowIndexEntry indexEntry, FileDataInput input, ColumnSlice[] slices, boolean reversed)
{
+ Tracing.trace("Seeking to partition indexed section in data file");
this.sstable = sstable;
this.originalInput = input;
this.reversed = reversed;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc301de4/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java b/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
index 83cdeaa..19a73df 100644
--- a/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
+++ b/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
@@ -34,6 +34,7 @@ import org.apache.cassandra.io.sstable.IndexHelper;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.util.FileDataInput;
import org.apache.cassandra.io.util.FileMark;
+import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.ByteBufferUtil;
class SimpleSliceReader extends AbstractIterator<OnDiskAtom> implements OnDiskAtomIterator
@@ -51,6 +52,7 @@ class SimpleSliceReader extends AbstractIterator<OnDiskAtom> implements OnDiskAt
public SimpleSliceReader(SSTableReader sstable, RowIndexEntry indexEntry, FileDataInput input, ByteBuffer finishColumn)
{
+ Tracing.trace("Seeking to partition beginning in data file");
this.sstable = sstable;
this.finishColumn = finishColumn;
this.comparator = sstable.metadata.comparator;