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 2012/12/17 17:31:20 UTC
[2/3] git commit: off-heap cache doesn't need mutable column
container patch by jbellis; reviewed by slebresne for CASSANDRA-5057
off-heap cache doesn't need mutable column container
patch by jbellis; reviewed by slebresne for CASSANDRA-5057
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e70d3ac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e70d3ac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e70d3ac
Branch: refs/heads/trunk
Commit: 3e70d3ac41af9167a7e883c3989a1e69703437eb
Parents: f7f0100
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Dec 17 10:30:23 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Dec 17 10:30:28 2012 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/ColumnFamilyStore.java | 5 ++++-
2 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e70d3ac/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fa46681..88eaff1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.1
+ * off-heap cache doesn't need mutable column container (CASSANDRA-5057)
* apply disk_failure_policy to bad disks on initial directory creation
(CASSANDRA-4847)
* Optimize name-based queries to use ArrayBackedSortedColumns (CASSANDRA-5043)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e70d3ac/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 bc043c8..aa4690c 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1344,7 +1344,10 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
public ColumnFamily getTopLevelColumns(QueryFilter filter, int gcBefore, boolean forCache)
{
Tracing.trace("Executing single-partition query on {}", columnFamily);
- CollationController controller = new CollationController(this, forCache, filter, gcBefore);
+ CollationController controller = new CollationController(this,
+ forCache && !CacheService.instance.rowCache.isPutCopying(),
+ filter,
+ gcBefore);
ColumnFamily columns = controller.getTopLevelColumns();
metric.updateSSTableIterated(controller.getSstablesIterated());
return columns;