You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/05/23 23:12:16 UTC
[2/2] git commit: rename stopped -> stopRequested
rename stopped -> stopRequested
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/512d97f3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/512d97f3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/512d97f3
Branch: refs/heads/trunk
Commit: 512d97f3bddb450681af4d05e0815618533fcb89
Parents: a1386f9
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 23 16:11:28 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 23 16:11:28 2012 -0500
----------------------------------------------------------------------
.../cassandra/db/compaction/CompactionInfo.java | 8 ++++----
.../cassandra/db/compaction/CompactionManager.java | 6 +++---
.../cassandra/db/compaction/CompactionTask.java | 2 +-
.../cassandra/db/index/SecondaryIndexBuilder.java | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/512d97f3/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index f82e952..937557f 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@ -102,17 +102,17 @@ public final class CompactionInfo implements Serializable
public static abstract class Holder
{
- private volatile boolean isStopped = false;
+ private volatile boolean stopRequested = false;
public abstract CompactionInfo getCompactionInfo();
public void stop()
{
- isStopped = true;
+ stopRequested = true;
}
- public boolean isStopped()
+ public boolean isStopRequested()
{
- return isStopped;
+ return stopRequested;
}
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/512d97f3/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 03f1c18..f8bab20 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -492,7 +492,7 @@ public class CompactionManager implements CompactionManagerMBean
while (!dataFile.isEOF())
{
- if (scrubInfo.isStopped())
+ if (scrubInfo.isStopRequested())
throw new CompactionInterruptedException(scrubInfo.getCompactionInfo());
long rowStart = dataFile.getFilePointer();
if (logger.isDebugEnabled())
@@ -709,7 +709,7 @@ public class CompactionManager implements CompactionManagerMBean
{
while (scanner.hasNext())
{
- if (ci.isStopped())
+ if (ci.isStopRequested())
throw new CompactionInterruptedException(ci.getCompactionInfo());
SSTableIdentityIterator row = (SSTableIdentityIterator) scanner.next();
if (Range.isInRanges(row.getKey().token, ranges))
@@ -860,7 +860,7 @@ public class CompactionManager implements CompactionManagerMBean
validator.prepare(cfs);
while (nni.hasNext())
{
- if (ci.isStopped())
+ if (ci.isStopRequested())
throw new CompactionInterruptedException(ci.getCompactionInfo());
AbstractCompactedRow row = nni.next();
validator.add(row);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/512d97f3/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 02fadb1..a697b1f 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@ -149,7 +149,7 @@ public class CompactionTask extends AbstractCompactionTask
writers.add(writer);
while (nni.hasNext())
{
- if (ci.isStopped())
+ if (ci.isStopRequested())
throw new CompactionInterruptedException(ci.getCompactionInfo());
AbstractCompactedRow row = nni.next();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/512d97f3/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java b/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java
index 037245e..5cdd26a 100644
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java
@@ -59,7 +59,7 @@ public class SecondaryIndexBuilder extends CompactionInfo.Holder
{
while (iter.hasNext())
{
- if (isStopped())
+ if (isStopRequested())
throw new CompactionInterruptedException(getCompactionInfo());
DecoratedKey<?> key = iter.next();
Table.indexRow(key, cfs, columns);