cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r981543 - in /cassandra/trunk: src/java/org/apache/cassandra/db/ src/java/org/apache/cassandra/db/columniterator/ src/java/org/apache/cassandra/db/filter/ src/java/org/apache/cassandra/io/sstable/ test/unit/org/apache/cassandra/ test/unit/o...
Date Mon, 02 Aug 2010 15:05:49 GMT
Author: jbellis
Date: Mon Aug  2 15:05:48 2010
New Revision: 981543

URL: http://svn.apache.org/viewvc?rev=981543&view=rev
Log:
move column iterators to own subpackage of db
patch by jbellis; reviewed by gdusbabek for CASSANDRA-1338


Added:
    cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/
    cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IColumnIterator.java
      - copied, changed from r981542, cassandra/trunk/src/java/org/apache/cassandra/db/filter/IColumnIterator.java
    cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IdentityQueryFilter.java
      - copied, changed from r981542, cassandra/trunk/src/java/org/apache/cassandra/db/filter/IdentityQueryFilter.java
    cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java
      - copied, changed from r981542, cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java
    cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java
      - copied, changed from r981542, cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java
    cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SimpleAbstractColumnIterator.java
      - copied, changed from r981542, cassandra/trunk/src/java/org/apache/cassandra/db/filter/SimpleAbstractColumnIterator.java
Removed:
    cassandra/trunk/src/java/org/apache/cassandra/db/filter/IColumnIterator.java
    cassandra/trunk/src/java/org/apache/cassandra/db/filter/IdentityQueryFilter.java
    cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java
    cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java
    cassandra/trunk/src/java/org/apache/cassandra/db/filter/SimpleAbstractColumnIterator.java
Modified:
    cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
    cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java
    cassandra/trunk/src/java/org/apache/cassandra/db/RowIterator.java
    cassandra/trunk/src/java/org/apache/cassandra/db/RowIteratorFactory.java
    cassandra/trunk/src/java/org/apache/cassandra/db/filter/AbstractColumnIterator.java
    cassandra/trunk/src/java/org/apache/cassandra/db/filter/IFilter.java
    cassandra/trunk/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
    cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryFilter.java
    cassandra/trunk/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
    cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
    cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
    cassandra/trunk/test/unit/org/apache/cassandra/Util.java
    cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
    cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTest.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=981543&r1=981542&r2=981543&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Mon Aug  2 15:05:48
2010
@@ -43,6 +43,8 @@ import org.apache.cassandra.config.Colum
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.IClock.ClockRelationship;
 import org.apache.cassandra.db.clock.TimestampReconciler;
+import org.apache.cassandra.db.columniterator.IColumnIterator;
+import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
 import org.apache.cassandra.db.commitlog.CommitLog;
 import org.apache.cassandra.db.commitlog.CommitLogSegment;
 import org.apache.cassandra.db.filter.*;

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java?rev=981543&r1=981542&r2=981543&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java Mon Aug  2 15:05:48 2010
@@ -32,6 +32,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.db.columniterator.IColumnIterator;
+import org.apache.cassandra.db.columniterator.SimpleAbstractColumnIterator;
 import org.apache.cassandra.db.filter.*;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.dht.IPartitioner;

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/RowIterator.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/RowIterator.java?rev=981543&r1=981542&r2=981543&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/RowIterator.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/RowIterator.java Mon Aug  2 15:05:48
2010
@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.cassandra.db.filter.IColumnIterator;
+import org.apache.cassandra.db.columniterator.IColumnIterator;
 import org.apache.cassandra.utils.ReducingIterator;
 
 /**

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/RowIteratorFactory.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/RowIteratorFactory.java?rev=981543&r1=981542&r2=981543&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/RowIteratorFactory.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/RowIteratorFactory.java Mon Aug  2 15:05:48
2010
@@ -18,7 +18,6 @@
 package org.apache.cassandra.db;
 
 import java.io.Closeable;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
@@ -27,7 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.cassandra.db.filter.IColumnIterator;
+import org.apache.cassandra.db.columniterator.IColumnIterator;
 import org.apache.cassandra.db.filter.QueryFilter;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.io.sstable.SSTableReader;

Copied: cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IColumnIterator.java
(from r981542, cassandra/trunk/src/java/org/apache/cassandra/db/filter/IColumnIterator.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IColumnIterator.java?p2=cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IColumnIterator.java&p1=cassandra/trunk/src/java/org/apache/cassandra/db/filter/IColumnIterator.java&r1=981542&r2=981543&rev=981543&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/filter/IColumnIterator.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IColumnIterator.java Mon
Aug  2 15:05:48 2010
@@ -1,4 +1,4 @@
-package org.apache.cassandra.db.filter;
+package org.apache.cassandra.db.columniterator;
 /*
  * 
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IdentityQueryFilter.java
(from r981542, cassandra/trunk/src/java/org/apache/cassandra/db/filter/IdentityQueryFilter.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IdentityQueryFilter.java?p2=cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IdentityQueryFilter.java&p1=cassandra/trunk/src/java/org/apache/cassandra/db/filter/IdentityQueryFilter.java&r1=981542&r2=981543&rev=981543&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/filter/IdentityQueryFilter.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IdentityQueryFilter.java
Mon Aug  2 15:05:48 2010
@@ -1,4 +1,4 @@
-package org.apache.cassandra.db.filter;
+package org.apache.cassandra.db.columniterator;
 /*
  * 
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,6 +24,7 @@ package org.apache.cassandra.db.filter;
 import org.apache.commons.lang.ArrayUtils;
 
 import org.apache.cassandra.db.SuperColumn;
+import org.apache.cassandra.db.filter.SliceQueryFilter;
 
 public class IdentityQueryFilter extends SliceQueryFilter
 {

Copied: cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java
(from r981542, cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java?p2=cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java&p1=cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java&r1=981542&r2=981543&rev=981543&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java
Mon Aug  2 15:05:48 2010
@@ -1,4 +1,4 @@
-package org.apache.cassandra.db.filter;
+package org.apache.cassandra.db.columniterator;
 /*
  * 
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java
(from r981542, cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java?p2=cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java&p1=cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java&r1=981542&r2=981543&rev=981543&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java
Mon Aug  2 15:05:48 2010
@@ -1,4 +1,4 @@
-package org.apache.cassandra.db.filter;
+package org.apache.cassandra.db.columniterator;
 /*
  * 
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -41,7 +41,7 @@ import org.apache.cassandra.utils.FBUtil
 /**
  *  A Column Iterator over SSTable
  */
-class SSTableSliceIterator implements IColumnIterator
+public class SSTableSliceIterator implements IColumnIterator
 {
     private final boolean reversed;
     private final byte[] startColumn;

Copied: cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SimpleAbstractColumnIterator.java
(from r981542, cassandra/trunk/src/java/org/apache/cassandra/db/filter/SimpleAbstractColumnIterator.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SimpleAbstractColumnIterator.java?p2=cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SimpleAbstractColumnIterator.java&p1=cassandra/trunk/src/java/org/apache/cassandra/db/filter/SimpleAbstractColumnIterator.java&r1=981542&r2=981543&rev=981543&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/filter/SimpleAbstractColumnIterator.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SimpleAbstractColumnIterator.java
Mon Aug  2 15:05:48 2010
@@ -1,4 +1,4 @@
-package org.apache.cassandra.db.filter;
+package org.apache.cassandra.db.columniterator;
 /*
  * 
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,6 +24,7 @@ package org.apache.cassandra.db.filter;
 import java.io.IOException;
 
 import org.apache.cassandra.db.IColumn;
+
 import com.google.common.collect.AbstractIterator;
 
 public abstract class SimpleAbstractColumnIterator extends AbstractIterator<IColumn>
implements IColumnIterator

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/filter/AbstractColumnIterator.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/filter/AbstractColumnIterator.java?rev=981543&r1=981542&r2=981543&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/filter/AbstractColumnIterator.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/filter/AbstractColumnIterator.java Mon
Aug  2 15:05:48 2010
@@ -23,6 +23,8 @@ package org.apache.cassandra.db.filter;
 
 import java.io.IOException;
 
+import org.apache.cassandra.db.columniterator.IColumnIterator;
+
 public abstract class AbstractColumnIterator implements IColumnIterator
 {
     public void close() throws IOException

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/filter/IFilter.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/filter/IFilter.java?rev=981543&r1=981542&r2=981543&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/filter/IFilter.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/filter/IFilter.java Mon Aug  2 15:05:48
2010
@@ -24,6 +24,7 @@ import java.util.Comparator;
 import java.util.Iterator;
 
 import org.apache.cassandra.db.*;
+import org.apache.cassandra.db.columniterator.IColumnIterator;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.io.sstable.SSTableReader;
 import org.apache.cassandra.io.util.FileDataInput;

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java?rev=981543&r1=981542&r2=981543&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java Mon Aug
 2 15:05:48 2010
@@ -23,6 +23,8 @@ package org.apache.cassandra.db.filter;
 
 import java.util.*;
 
+import org.apache.cassandra.db.columniterator.IColumnIterator;
+import org.apache.cassandra.db.columniterator.SSTableNamesIterator;
 import org.apache.cassandra.io.sstable.SSTableReader;
 import org.apache.cassandra.io.util.FileDataInput;
 import org.apache.cassandra.db.*;

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryFilter.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryFilter.java?rev=981543&r1=981542&r2=981543&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryFilter.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryFilter.java Mon Aug  2 15:05:48
2010
@@ -23,6 +23,8 @@ package org.apache.cassandra.db.filter;
 
 import java.util.*;
 
+import org.apache.cassandra.db.columniterator.IColumnIterator;
+import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
 import org.apache.cassandra.io.sstable.SSTableReader;
 import org.apache.cassandra.io.util.FileDataInput;
 import org.apache.cassandra.thrift.SlicePredicate;

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java?rev=981543&r1=981542&r2=981543&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java Mon Aug
 2 15:05:48 2010
@@ -29,17 +29,14 @@ import org.apache.commons.collections.co
 import org.apache.commons.collections.iterators.ReverseListIterator;
 import org.apache.commons.collections.IteratorUtils;
 
-import com.google.common.collect.Collections2;
+import org.apache.cassandra.db.columniterator.IColumnIterator;
+import org.apache.cassandra.db.columniterator.SSTableSliceIterator;
 import org.apache.cassandra.io.sstable.SSTableReader;
 import org.apache.cassandra.io.util.FileDataInput;
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.IClock.ClockRelationship;
 import org.apache.cassandra.db.marshal.AbstractType;
 
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Iterators;
-
 public class SliceQueryFilter implements IFilter
 {
     private static Logger logger = LoggerFactory.getLogger(SliceQueryFilter.class);

Modified: cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java?rev=981543&r1=981542&r2=981543&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
Mon Aug  2 15:05:48 2010
@@ -26,7 +26,7 @@ import java.io.*;
 import org.apache.cassandra.db.ColumnFamily;
 import org.apache.cassandra.db.DecoratedKey;
 import org.apache.cassandra.db.IColumn;
-import org.apache.cassandra.db.filter.IColumnIterator;
+import org.apache.cassandra.db.columniterator.IColumnIterator;
 import org.apache.cassandra.io.util.BufferedRandomAccessFile;
 
 public class SSTableIdentityIterator implements Comparable<SSTableIdentityIterator>,
IColumnIterator

Modified: cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java?rev=981543&r1=981542&r2=981543&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java Mon Aug 
2 15:05:48 2010
@@ -26,10 +26,9 @@ import java.util.Iterator;
 import java.util.Arrays;
 
 import org.apache.cassandra.db.DecoratedKey;
-import org.apache.cassandra.db.filter.IColumnIterator;
+import org.apache.cassandra.db.columniterator.IColumnIterator;
 import org.apache.cassandra.db.filter.QueryFilter;
 import org.apache.cassandra.io.util.BufferedRandomAccessFile;
-import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.FBUtilities;
 
 import org.slf4j.Logger;

Modified: cassandra/trunk/test/unit/org/apache/cassandra/Util.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/Util.java?rev=981543&r1=981542&r2=981543&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/Util.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/Util.java Mon Aug  2 15:05:48 2010
@@ -27,7 +27,7 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 
 import org.apache.cassandra.db.*;
-import org.apache.cassandra.db.filter.IdentityQueryFilter;
+import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
 import org.apache.cassandra.db.filter.QueryFilter;
 import org.apache.cassandra.db.filter.QueryPath;
 import org.apache.cassandra.dht.Bounds;

Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java?rev=981543&r1=981542&r2=981543&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java Mon Aug 
2 15:05:48 2010
@@ -19,7 +19,6 @@
 package org.apache.cassandra.db;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
 
@@ -30,6 +29,7 @@ import org.junit.Test;
 import static junit.framework.Assert.assertEquals;
 import org.apache.cassandra.CleanupHelper;
 import org.apache.cassandra.Util;
+import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
 import org.apache.cassandra.db.filter.*;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.thrift.IndexClause;

Modified: cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTest.java?rev=981543&r1=981542&r2=981543&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTest.java Mon Aug
 2 15:05:48 2010
@@ -18,7 +18,7 @@ import org.apache.cassandra.db.RowMutati
 import org.apache.cassandra.db.Table;
 import org.apache.cassandra.db.TimestampClock;
 import org.apache.cassandra.db.filter.IFilter;
-import org.apache.cassandra.db.filter.IdentityQueryFilter;
+import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
 import org.apache.cassandra.db.filter.QueryPath;
 import org.apache.cassandra.io.util.DataOutputBuffer;
 import org.apache.cassandra.thrift.IndexClause;



Mime
View raw message