You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2016/02/18 12:42:24 UTC
cassandra git commit: Remove unused method added in CASSANDRA-6696
Repository: cassandra
Updated Branches:
refs/heads/trunk 9492efb3c -> 295250050
Remove unused method added in CASSANDRA-6696
Patch by marcuse; reviewed by Carl Yeksigian for CASSANDRA-11151
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29525005
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29525005
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29525005
Branch: refs/heads/trunk
Commit: 29525005071dd7321c5d444cb7e898a18057ba67
Parents: 9492efb
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Feb 9 07:33:29 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Feb 18 12:41:22 2016 +0100
----------------------------------------------------------------------
.../db/compaction/writers/CompactionAwareWriter.java | 2 --
.../db/compaction/writers/DefaultCompactionWriter.java | 7 -------
.../db/compaction/writers/MajorLeveledCompactionWriter.java | 6 ------
.../cassandra/db/compaction/writers/MaxSSTableSizeWriter.java | 5 -----
.../writers/SplittingSizeTieredCompactionWriter.java | 6 ------
5 files changed, 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29525005/src/java/org/apache/cassandra/db/compaction/writers/CompactionAwareWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/writers/CompactionAwareWriter.java b/src/java/org/apache/cassandra/db/compaction/writers/CompactionAwareWriter.java
index ca3e29e..13d76a8 100644
--- a/src/java/org/apache/cassandra/db/compaction/writers/CompactionAwareWriter.java
+++ b/src/java/org/apache/cassandra/db/compaction/writers/CompactionAwareWriter.java
@@ -121,8 +121,6 @@ public abstract class CompactionAwareWriter extends Transactional.AbstractTransa
return sstableWriter.finished();
}
- public abstract List<SSTableReader> finish(long repairedAt);
-
/**
* estimated number of keys we should write
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29525005/src/java/org/apache/cassandra/db/compaction/writers/DefaultCompactionWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/writers/DefaultCompactionWriter.java b/src/java/org/apache/cassandra/db/compaction/writers/DefaultCompactionWriter.java
index 51bd33a..f8ecd87 100644
--- a/src/java/org/apache/cassandra/db/compaction/writers/DefaultCompactionWriter.java
+++ b/src/java/org/apache/cassandra/db/compaction/writers/DefaultCompactionWriter.java
@@ -18,7 +18,6 @@
package org.apache.cassandra.db.compaction.writers;
-import java.util.List;
import java.util.Set;
import org.slf4j.Logger;
@@ -82,12 +81,6 @@ public class DefaultCompactionWriter extends CompactionAwareWriter
}
@Override
- public List<SSTableReader> finish(long repairedAt)
- {
- return sstableWriter.setRepairedAt(repairedAt).finish();
- }
-
- @Override
public long estimatedKeys()
{
return estimatedTotalKeys;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29525005/src/java/org/apache/cassandra/db/compaction/writers/MajorLeveledCompactionWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/writers/MajorLeveledCompactionWriter.java b/src/java/org/apache/cassandra/db/compaction/writers/MajorLeveledCompactionWriter.java
index 0e21b84..91a18da 100644
--- a/src/java/org/apache/cassandra/db/compaction/writers/MajorLeveledCompactionWriter.java
+++ b/src/java/org/apache/cassandra/db/compaction/writers/MajorLeveledCompactionWriter.java
@@ -116,10 +116,4 @@ public class MajorLeveledCompactionWriter extends CompactionAwareWriter
sstablesWritten = 0;
}
-
- @Override
- public List<SSTableReader> finish(long repairedAt)
- {
- return sstableWriter.setRepairedAt(repairedAt).finish();
- }
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29525005/src/java/org/apache/cassandra/db/compaction/writers/MaxSSTableSizeWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/writers/MaxSSTableSizeWriter.java b/src/java/org/apache/cassandra/db/compaction/writers/MaxSSTableSizeWriter.java
index a810774..228a3a5 100644
--- a/src/java/org/apache/cassandra/db/compaction/writers/MaxSSTableSizeWriter.java
+++ b/src/java/org/apache/cassandra/db/compaction/writers/MaxSSTableSizeWriter.java
@@ -107,11 +107,6 @@ public class MaxSSTableSizeWriter extends CompactionAwareWriter
sstableWriter.switchWriter(writer);
}
- public List<SSTableReader> finish(long repairedAt)
- {
- return sstableWriter.setRepairedAt(repairedAt).finish();
- }
-
@Override
public long estimatedKeys()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29525005/src/java/org/apache/cassandra/db/compaction/writers/SplittingSizeTieredCompactionWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/writers/SplittingSizeTieredCompactionWriter.java b/src/java/org/apache/cassandra/db/compaction/writers/SplittingSizeTieredCompactionWriter.java
index 46183dc..75a42e7 100644
--- a/src/java/org/apache/cassandra/db/compaction/writers/SplittingSizeTieredCompactionWriter.java
+++ b/src/java/org/apache/cassandra/db/compaction/writers/SplittingSizeTieredCompactionWriter.java
@@ -116,10 +116,4 @@ public class SplittingSizeTieredCompactionWriter extends CompactionAwareWriter
logger.trace("Switching writer, currentPartitionsToWrite = {}", currentPartitionsToWrite);
sstableWriter.switchWriter(writer);
}
-
- @Override
- public List<SSTableReader> finish(long repairedAt)
- {
- return sstableWriter.setRepairedAt(repairedAt).finish();
- }
}