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
[1/3] git commit: merge from 1.2
Updated Branches:
refs/heads/cassandra-1.2 f7f01007b -> 3e70d3ac4
refs/heads/trunk 2eaea5a2a -> 120bf9f14
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/120bf9f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/120bf9f1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/120bf9f1
Branch: refs/heads/trunk
Commit: 120bf9f14627e49df940669a2b4bb761d06b800e
Parents: 2eaea5a 3e70d3a
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Dec 17 10:31:15 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Dec 17 10:31:15 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/120bf9f1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d308d51,88eaff1..a52aadc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
+1.3
+ * make index_interval configurable per columnfamily (CASSANDRA-3961)
+ * add default_tim_to_live (CASSANDRA-3974)
+ * add memtable_flush_period_in_ms (CASSANDRA-4237)
+
+
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/120bf9f1/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 8133f78,aa4690c..c173041
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -1363,8 -1343,11 +1363,11 @@@ public class ColumnFamilyStore implemen
public ColumnFamily getTopLevelColumns(QueryFilter filter, int gcBefore, boolean forCache)
{
- Tracing.trace("Executing single-partition query on {}", columnFamily);
+ Tracing.trace("Executing single-partition query on {}", name);
- 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;