You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/03/25 20:09:35 UTC
[2/2] git commit: Optimize min/max timestamp collection
Optimize min/max timestamp collection
patch by slebresne; reviewed by jbellis for CASSANDRA-5373
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e580ef10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e580ef10
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e580ef10
Branch: refs/heads/cassandra-1.2
Commit: e580ef10472a52c1e96c153a8e93c7164812d563
Parents: 37010e9
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Mar 25 20:08:46 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Mar 25 20:08:46 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/ColumnFamilyStore.java | 2 --
2 files changed, 1 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e580ef10/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8ad51a2..e0d3869 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,7 @@
* Change Kernel Page Cache skipping into row preheating (disabled by default)
(CASSANDRA-4937)
* Make upgradeSSTable skip current version sstables by default (CASSANDRA-5366)
+ * Optimize min/max timestamp collection (CASSANDRA-5373)
Merged from 1.1:
* cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052)
* Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e580ef10/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 642a404..4ed7f82 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1939,8 +1939,6 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
// and adds generation of live ancestors
for (SSTableReader sstable : sstables)
{
- sstableMetadataCollector.updateMinTimestamp(sstable.getMinTimestamp());
- sstableMetadataCollector.updateMaxTimestamp(sstable.getMaxTimestamp());
sstableMetadataCollector.addAncestor(sstable.descriptor.generation);
for (Integer i : sstable.getAncestors())
{