From c139871286d9a5858aec0f6e14db70379a5ced62 Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@apache.org>
Date: Fri, 27 Mar 2009 16:38:09 +0000
Subject: [PATCH] use isSuper

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759218 13f79535-47bb-0310-9956-ffa450edef68
---
 src/org/apache/cassandra/db/CountFilter.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/org/apache/cassandra/db/CountFilter.java b/src/org/apache/cassandra/db/CountFilter.java
index a8ddc107a0..25a88db607 100644
--- a/src/org/apache/cassandra/db/CountFilter.java
+++ b/src/org/apache/cassandra/db/CountFilter.java
@@ -21,7 +21,6 @@ import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.Collection;
 
-import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.io.DataInputBuffer;
 import org.apache.cassandra.io.SSTable;
 
@@ -37,19 +36,19 @@ public class CountFilter implements IFilter
 {
 	private long countLimit_;
 	private boolean isDone_;
-	
+
 	CountFilter(int countLimit)
 	{
-		countLimit_ = countLimit;		
+		countLimit_ = countLimit;
 		isDone_ = false;
 	}
-	
+
 	public ColumnFamily filter(String cfNameParam, ColumnFamily columnFamily)
 	{
     	String[] values = RowMutation.getColumnAndColumnFamily(cfNameParam);
         if ( columnFamily == null )
             return columnFamily;
-        
+
 		String cfName = columnFamily.name();
 		ColumnFamily filteredCf = new ColumnFamily(cfName);
 		if( countLimit_ <= 0 )
@@ -71,7 +70,7 @@ public class CountFilter implements IFilter
     			}
     		}
 		}
-		else if(values.length == 2 && DatabaseDescriptor.getColumnType(cfName).equals("Super"))
+		else if(values.length == 2 && columnFamily.isSuper())
 		{
     		Collection<IColumn> columns = columnFamily.getAllColumns();
     		for(IColumn column : columns)
@@ -91,14 +90,14 @@ public class CountFilter implements IFilter
 	    			}
         		}
     		}
-		}    	
-    	else 
+		}
+    	else
     	{
     		throw new UnsupportedOperationException();
     	}
 		return filteredCf;
 	}
-    
+
     public IColumn filter(IColumn column, DataInputStream dis) throws IOException
     {
 		countLimit_--;
@@ -108,7 +107,7 @@ public class CountFilter implements IFilter
 		}
 		return column;
     }
-	
+
 	public boolean isDone()
 	{
 		return isDone_;