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 18:25:01 UTC
[1/5] git commit: improve cell index tracing
Updated Branches:
refs/heads/cassandra-1.2 44c462cb7 -> 57e6888e6
refs/heads/trunk 19047b894 -> 1c8e627a6
improve cell index tracing
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d0dff7a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d0dff7a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d0dff7a
Branch: refs/heads/cassandra-1.2
Commit: 2d0dff7acec0c36f43536c92480892d9c92bd27f
Parents: 44c462c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu May 23 11:23:18 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu May 23 11:24:45 2013 -0500
----------------------------------------------------------------------
.../apache/cassandra/io/sstable/SSTableReader.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d0dff7a/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 6b71223..ea9c451 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@ -732,7 +732,7 @@ public class SSTableReader extends SSTable
assert key instanceof DecoratedKey; // EQ only make sense if the key is a valid row key
if (!bf.isPresent(((DecoratedKey)key).key))
{
- logger.debug("Bloom filter allows skipping sstable {}", descriptor.generation);
+ Tracing.trace("Bloom filter allows skipping sstable {}", descriptor.generation);
return null;
}
}
@@ -745,7 +745,6 @@ public class SSTableReader extends SSTable
RowIndexEntry cachedPosition = getCachedPosition(cacheKey, updateCacheAndStats);
if (cachedPosition != null)
{
- logger.trace("Cache hit for {} -> {}", cacheKey, cachedPosition);
Tracing.trace("Key cache hit for sstable {}", descriptor.generation);
return cachedPosition;
}
@@ -835,7 +834,7 @@ public class SSTableReader extends SSTable
}
if (op == Operator.EQ && updateCacheAndStats)
bloomFilterTracker.addTruePositive();
- Tracing.trace("Partition index lookup complete for sstable {}", descriptor.generation);
+ Tracing.trace("Partition index with {} entries found for sstable {}", indexEntry.columnsIndex().size(), descriptor.generation);
return indexEntry;
}
[2/5] git commit: improve cell index tracing
Posted by jb...@apache.org.
improve cell index tracing
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d0dff7a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d0dff7a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d0dff7a
Branch: refs/heads/trunk
Commit: 2d0dff7acec0c36f43536c92480892d9c92bd27f
Parents: 44c462c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu May 23 11:23:18 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu May 23 11:24:45 2013 -0500
----------------------------------------------------------------------
.../apache/cassandra/io/sstable/SSTableReader.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d0dff7a/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 6b71223..ea9c451 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@ -732,7 +732,7 @@ public class SSTableReader extends SSTable
assert key instanceof DecoratedKey; // EQ only make sense if the key is a valid row key
if (!bf.isPresent(((DecoratedKey)key).key))
{
- logger.debug("Bloom filter allows skipping sstable {}", descriptor.generation);
+ Tracing.trace("Bloom filter allows skipping sstable {}", descriptor.generation);
return null;
}
}
@@ -745,7 +745,6 @@ public class SSTableReader extends SSTable
RowIndexEntry cachedPosition = getCachedPosition(cacheKey, updateCacheAndStats);
if (cachedPosition != null)
{
- logger.trace("Cache hit for {} -> {}", cacheKey, cachedPosition);
Tracing.trace("Key cache hit for sstable {}", descriptor.generation);
return cachedPosition;
}
@@ -835,7 +834,7 @@ public class SSTableReader extends SSTable
}
if (op == Operator.EQ && updateCacheAndStats)
bloomFilterTracker.addTruePositive();
- Tracing.trace("Partition index lookup complete for sstable {}", descriptor.generation);
+ Tracing.trace("Partition index with {} entries found for sstable {}", indexEntry.columnsIndex().size(), descriptor.generation);
return indexEntry;
}
[3/5] git commit: fix NPE
Posted by jb...@apache.org.
fix NPE
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57e6888e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57e6888e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57e6888e
Branch: refs/heads/trunk
Commit: 57e6888e6aa8cc726fadb4087fe0cb77853c12eb
Parents: 2d0dff7
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu May 23 11:24:35 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu May 23 11:24:46 2013 -0500
----------------------------------------------------------------------
.../cassandra/db/commitlog/CommitLogReplayer.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57e6888e/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index e1fefa1..6b401fb 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@ -80,7 +80,8 @@ public class CommitLogReplayer
ReplayPosition rp = ReplayPosition.getReplayPosition(cfs.getSSTables());
// but, if we've truncted the cf in question, then we need to need to start replay after the truncation
- ReplayPosition truncatedAt = truncationPositions.get(cfs.metadata.cfId).left;
+ Pair<ReplayPosition, Long> truncateRecord = truncationPositions.get(cfs.metadata.cfId);
+ ReplayPosition truncatedAt = truncateRecord == null ? null : truncateRecord.left;
if (truncatedAt != null)
rp = replayPositionOrdering.max(Arrays.asList(rp, truncatedAt));
[5/5] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c8e627a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c8e627a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c8e627a
Branch: refs/heads/trunk
Commit: 1c8e627a6a274207d3ee18d44f3808107631b94e
Parents: 19047b8 57e6888
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu May 23 11:24:56 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu May 23 11:24:56 2013 -0500
----------------------------------------------------------------------
.../cassandra/db/commitlog/CommitLogReplayer.java | 3 ++-
.../apache/cassandra/io/sstable/SSTableReader.java | 5 ++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c8e627a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c8e627a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------
[4/5] git commit: fix NPE
Posted by jb...@apache.org.
fix NPE
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57e6888e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57e6888e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57e6888e
Branch: refs/heads/cassandra-1.2
Commit: 57e6888e6aa8cc726fadb4087fe0cb77853c12eb
Parents: 2d0dff7
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu May 23 11:24:35 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu May 23 11:24:46 2013 -0500
----------------------------------------------------------------------
.../cassandra/db/commitlog/CommitLogReplayer.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57e6888e/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index e1fefa1..6b401fb 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@ -80,7 +80,8 @@ public class CommitLogReplayer
ReplayPosition rp = ReplayPosition.getReplayPosition(cfs.getSSTables());
// but, if we've truncted the cf in question, then we need to need to start replay after the truncation
- ReplayPosition truncatedAt = truncationPositions.get(cfs.metadata.cfId).left;
+ Pair<ReplayPosition, Long> truncateRecord = truncationPositions.get(cfs.metadata.cfId);
+ ReplayPosition truncatedAt = truncateRecord == null ? null : truncateRecord.left;
if (truncatedAt != null)
rp = replayPositionOrdering.max(Arrays.asList(rp, truncatedAt));