Updated Branches: refs/heads/trunk 57e51b4bd -> 46595896c
finish s/markCompacted/markObsolete/ Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/46595896 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46595896 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46595896 Branch: refs/heads/trunk Commit: 46595896c0bc74f7305cab890778cc411dd38375 Parents: 57e51b4 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Apr 16 12:45:08 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Apr 16 12:45:08 2013 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 6 +++--- src/java/org/apache/cassandra/db/DataTracker.java | 6 +++--- .../cassandra/db/compaction/CompactionManager.java | 2 +- .../cassandra/db/compaction/CompactionTask.java | 2 +- .../apache/cassandra/io/sstable/SSTableReader.java | 4 ++-- .../cassandra/db/compaction/CompactionsTest.java | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46595896/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 8dbe52a..3d930bd 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -1050,10 +1050,10 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean CompactionManager.instance.performSSTableRewrite(ColumnFamilyStore.this, excludeCurrentVersion); } - public void markCompacted(Collection<SSTableReader> sstables, OperationType compactionType) + public void markObsolete(Collection<SSTableReader> sstables, OperationType compactionType) { assert !sstables.isEmpty(); - data.markCompacted(sstables, compactionType); + data.markObsolete(sstables, compactionType); } public void replaceCompactedSSTables(Collection<SSTableReader> sstables, Iterable<SSTableReader> replacements, OperationType compactionType) @@ -2190,7 +2190,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean if (truncatedSSTables.isEmpty()) return ReplayPosition.NONE; - markCompacted(truncatedSSTables, OperationType.UNKNOWN); + markObsolete(truncatedSSTables, OperationType.UNKNOWN); return ReplayPosition.getReplayPosition(truncatedSSTables); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/46595896/src/java/org/apache/cassandra/db/DataTracker.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/DataTracker.java b/src/java/org/apache/cassandra/db/DataTracker.java index 311099d..6d14d24 100644 --- a/src/java/org/apache/cassandra/db/DataTracker.java +++ b/src/java/org/apache/cassandra/db/DataTracker.java @@ -183,7 +183,7 @@ public class DataTracker * @return true if we are able to mark the given @param sstables as compacted, before anyone else * * Note that we could acquire references on the marked sstables and release them in - * unmarkCompacting, but since we will never call markCompacted on a sstable marked + * unmarkCompacting, but since we will never call markObsolete on a sstable marked * as compacting (unless there is a serious bug), we can skip this. */ public boolean markCompacting(Iterable<SSTableReader> sstables) @@ -200,7 +200,7 @@ public class DataTracker } /** - * Removes files from compacting status: this is different from 'markCompacted' + * Removes files from compacting status: this is different from 'markObsolete' * because it should be run regardless of whether a compaction succeeded. */ public void unmarkCompacting(Iterable<SSTableReader> unmark) @@ -224,7 +224,7 @@ public class DataTracker while (!view.compareAndSet(currentView, newView)); } - public void markCompacted(Collection<SSTableReader> sstables, OperationType compactionType) + public void markObsolete(Collection<SSTableReader> sstables, OperationType compactionType) { replace(sstables, Collections.<SSTableReader>emptyList()); notifySSTablesChanged(sstables, Collections.<SSTableReader>emptyList(), compactionType); http://git-wip-us.apache.org/repos/asf/cassandra/blob/46595896/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java index f420efd..f62e077 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -418,7 +418,7 @@ public class CompactionManager implements CompactionManagerMBean cfs.addSSTable(scrubber.getNewInOrderSSTable()); if (scrubber.getNewSSTable() == null) - cfs.markCompacted(Collections.singletonList(sstable), OperationType.SCRUB); + cfs.markObsolete(Collections.singletonList(sstable), OperationType.SCRUB); else cfs.replaceCompactedSSTables(Collections.singletonList(sstable), Collections.singletonList(scrubber.getNewSSTable()), OperationType.SCRUB); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/46595896/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java index e7e0ec6..3b4fdc8 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java @@ -144,7 +144,7 @@ public class CompactionTask extends AbstractCompactionTask // don't mark compacted in the finally block, since if there _is_ nondeleted data, // we need to sync it (via closeAndOpen) first, so there is no period during which // a crash could cause data loss. - cfs.markCompacted(toCompact, compactionType); + cfs.markObsolete(toCompact, compactionType); return; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/46595896/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java index 153729d..f92e9ec 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java @@ -969,8 +969,8 @@ public class SSTableReader extends SSTable * When calling this function, the caller must ensure that the SSTableReader is not referenced anywhere * except for threads holding a reference. * - * @return true if the this is the first time the file was marked compacted. With rare exceptions - * (see DataTracker.unmarkCompacted) calling this multiple times would be buggy. + * @return true if the this is the first time the file was marked compacted. Calling this + * multiple times would be buggy. */ public boolean markObsolete() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/46595896/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java index 1f3aef0..f066b9b 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java @@ -210,7 +210,7 @@ public class CompactionsTest extends SchemaLoader assertEquals(2, cfs.getSSTables().size()); // Now, we remove the sstable that was just created to force the use of EchoedRow (so that it doesn't hide the problem) - cfs.markCompacted(Collections.singleton(tmpSSTable), OperationType.UNKNOWN); + cfs.markObsolete(Collections.singleton(tmpSSTable), OperationType.UNKNOWN); assertEquals(1, cfs.getSSTables().size()); // Now assert we do have the 4 keys
