cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [1/3] cassandra git commit: Fix sstableupgrade throws exception
Date Wed, 28 Jan 2015 16:34:01 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 b788bb371 -> ffd0ae4bf
  refs/heads/trunk 8896a70b0 -> 71abd2208


Fix sstableupgrade throws exception

patch by yukim; reviewed by krummas for CASSANDRA-8688


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ffd0ae4b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffd0ae4b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffd0ae4b

Branch: refs/heads/cassandra-2.1
Commit: ffd0ae4bf97591fbd2147b3dc6107e9bc69a4936
Parents: b788bb3
Author: Yuki Morishita <yukim@apache.org>
Authored: Wed Jan 28 10:31:52 2015 -0600
Committer: Yuki Morishita <yukim@apache.org>
Committed: Wed Jan 28 10:31:52 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                               | 1 +
 src/java/org/apache/cassandra/db/compaction/Upgrader.java | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffd0ae4b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b976a16..7a38735 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -75,6 +75,7 @@
  * Improve JBOD disk utilization (CASSANDRA-7386)
  * Log failed host when preparing incremental repair (CASSANDRA-8228)
  * Force config client mode in CQLSSTableWriter (CASSANDRA-8281)
+ * Fix sstableupgrade throws exception (CASSANDRA-8688)
 Merged from 2.0:
  * Add batch remove iterator to ABSC (CASSANDRA-8414, 8666)
  * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffd0ae4b/src/java/org/apache/cassandra/db/compaction/Upgrader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/Upgrader.java b/src/java/org/apache/cassandra/db/compaction/Upgrader.java
index 39f668d..5d245ac 100644
--- a/src/java/org/apache/cassandra/db/compaction/Upgrader.java
+++ b/src/java/org/apache/cassandra/db/compaction/Upgrader.java
@@ -18,7 +18,6 @@
 package org.apache.cassandra.db.compaction;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.*;
 
 import com.google.common.base.Throwables;
@@ -28,8 +27,6 @@ import org.apache.cassandra.db.ColumnFamilyStore;
 import org.apache.cassandra.db.DecoratedKey;
 import org.apache.cassandra.io.sstable.*;
 import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
-import org.apache.cassandra.utils.CLibrary;
-import org.apache.cassandra.utils.CloseableIterator;
 import org.apache.cassandra.utils.OutputHandler;
 
 public class Upgrader
@@ -92,8 +89,7 @@ public class Upgrader
                 writer.append(row);
             }
 
-            List<SSTableReader> sstables = writer.finish();
-            cfs.getDataTracker().markCompactedSSTablesReplaced(toUpgrade, sstables, OperationType.UPGRADE_SSTABLES);
+            writer.finish();
             outputHandler.output("Upgrade of " + sstable + " complete.");
 
         }


Mime
View raw message