You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2012/11/14 00:54:33 UTC
[5/6] git commit: Use Stats.db when bulk loading if present;
patch by yukim reviewed by brandonwilliams for CASSANDRA-4957
Use Stats.db when bulk loading if present; patch by yukim reviewed by brandonwilliams for CASSANDRA-4957
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9dffa573
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9dffa573
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9dffa573
Branch: refs/heads/cassandra-1.2.0
Commit: 9dffa57360d4fc08729bb68046d45dcd535bc342
Parents: acda527
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Nov 13 17:53:47 2012 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Nov 13 17:53:47 2012 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/io/sstable/SSTableLoader.java | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9dffa573/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4f54598..fd6ab95 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@
* Better printing of AbstractBounds for tracing (CASSANDRA-4931)
* Optimize mostRecentTomstone check in CC.collectAllData (CASSANDRA-4883)
* Change stream session ID to UUID to avoid collision from same node (CASSANDRA-4813)
+ * Use Stats.db when bulk loading if present (CASSANDRA-4957)
Merged from 1.1:
* reset getRangeSlice filter after finishing a row for get_paged_slice
(CASSANDRA-4919)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9dffa573/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
index 13e2b99..32dbbc3 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
@@ -90,6 +90,8 @@ public class SSTableLoader
components.add(Component.PRIMARY_INDEX);
if (new File(desc.filenameFor(Component.COMPRESSION_INFO)).exists())
components.add(Component.COMPRESSION_INFO);
+ if (new File(desc.filenameFor(Component.STATS)).exists())
+ components.add(Component.STATS);
try
{