svn commit: r1197771 - in /cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db: ColumnFamilyStore.java compaction/CompactionManager.java

[jbellis]

Author: jbellis
Date: Fri Nov  4 21:03:33 2011
New Revision: 1197771

URL: http://svn.apache.org/viewvc?rev=1197771&view=rev
Log:
refactor CFS.invalid -> !CFS.valid

Modified:
    
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
    
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/CompactionManager.java

Modified: 
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1197771&r1=1197770&r2=1197771&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 (original)
+++ 
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 Fri Nov  4 21:03:33 2011
@@ -50,7 +50,6 @@ import org.apache.cassandra.db.compactio
 import org.apache.cassandra.db.filter.IFilter;
 import org.apache.cassandra.db.filter.QueryFilter;
 import org.apache.cassandra.db.filter.QueryPath;
-import org.apache.cassandra.db.filter.SliceQueryFilter;
 import org.apache.cassandra.db.index.SecondaryIndexManager;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.dht.*;
@@ -99,7 +98,7 @@ public class ColumnFamilyStore implement
     public final CFMetaData metadata;
     public final IPartitioner partitioner;
     private final String mbeanName;
-    private boolean invalid = false;
+    private boolean valid = false;
 
     /* Memtables and SSTables on disk for this column family */
     private final DataTracker data;
@@ -263,7 +262,7 @@ public class ColumnFamilyStore implement
     {
         try
         {
-            invalid = true;   
+            valid = false;
             MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
             ObjectName nameObj = new ObjectName(mbeanName);
             if (mbs.isRegistered(nameObj))
@@ -983,9 +982,9 @@ public class ColumnFamilyStore implement
         CompactionManager.instance.submitBackground(this);
     }
 
-    public boolean isInvalid()
+    public boolean isValid()
     {
-        return invalid;
+        return valid;
     }
 
     public void removeAllSSTables() throws IOException

Modified: 
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/CompactionManager.java?rev=1197771&r1=1197770&r2=1197771&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
 (original)
+++ 
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
 Fri Nov  4 21:03:33 2011
@@ -117,7 +117,7 @@ public class CompactionManager implement
                 compactionLock.readLock().lock();
                 try
                 {
-                    if (cfs.isInvalid())
+                    if (!cfs.isValid())
                         return 0;
 
                     AbstractCompactionStrategy strategy = 
cfs.getCompactionStrategy();
@@ -160,7 +160,7 @@ public class CompactionManager implement
                 compactionLock.writeLock().lock();
                 try 
                 {
-                    if (cfStore.isInvalid())
+                    if (!cfStore.isValid())
                         return this;
                     Collection<SSTableReader> tocleanup = 
cfStore.getDataTracker().markCompacting(cfStore.getSSTables(), 1, 
Integer.MAX_VALUE);
                     if (tocleanup == null || tocleanup.isEmpty())
@@ -206,7 +206,7 @@ public class CompactionManager implement
                 compactionLock.writeLock().lock();
                 try
                 {
-                    if (cfStore.isInvalid())
+                    if (!cfStore.isValid())
                         return this;
 
                     Collection<SSTableReader> toscrub = 
cfStore.getDataTracker().markCompacting(cfStore.getSSTables(), 1, 
Integer.MAX_VALUE);
@@ -258,7 +258,7 @@ public class CompactionManager implement
                 compactionLock.writeLock().lock();
                 try
                 {
-                    if (cfStore.isInvalid())
+                    if (!cfStore.isValid())
                         return this;
                     AbstractCompactionStrategy strategy = 
cfStore.getCompactionStrategy();
                     for (AbstractCompactionTask task : 
strategy.getMaximalTasks(gcBefore))
@@ -339,7 +339,7 @@ public class CompactionManager implement
                 compactionLock.readLock().lock();
                 try
                 {
-                    if (cfs.isInvalid())
+                    if (!cfs.isValid())
                         return this;
 
                     // look up the sstables now that we're on the compaction 
executor, so we don't try to re-compact
@@ -433,7 +433,7 @@ public class CompactionManager implement
                 compactionLock.readLock().lock();
                 try
                 {
-                    if (!cfStore.isInvalid())
+                    if (cfStore.isValid())
                         doValidationCompaction(cfStore, validator);
                     return this;
                 }