Author: eevans
Date: Tue Aug 10 16:48:12 2010
New Revision: 984115
URL: http://svn.apache.org/viewvc?rev=984115&view=rev
Log:
tagged 0.7.0 beta1 release
Added:
cassandra/tags/cassandra-0.7.0-beta1/
- copied from r984103, cassandra/trunk/
cassandra/tags/cassandra-0.7.0-beta1/.rat-excludes
- copied unchanged from r984113, cassandra/trunk/.rat-excludes
cassandra/tags/cassandra-0.7.0-beta1/CHANGES.txt
- copied unchanged from r984113, cassandra/trunk/CHANGES.txt
cassandra/tags/cassandra-0.7.0-beta1/build.xml
- copied unchanged from r984113, cassandra/trunk/build.xml
cassandra/tags/cassandra-0.7.0-beta1/debian/changelog
- copied unchanged from r984113, cassandra/trunk/debian/changelog
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/config/ColumnDefinition.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/config/ColumnDefinition.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/config/Config.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/config/Config.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/config/Converter.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/config/Converter.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/config/RawColumnDefinition.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/config/RawColumnDefinition.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/config/RawColumnFamily.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/config/RawColumnFamily.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/config/RawKeyspace.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/config/RawKeyspace.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/config/ReplicationStrategy.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/config/ReplicationStrategy.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/io/AbstractCompactedRow.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/io/AbstractCompactedRow.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/io/LazilyCompactedRow.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/io/LazilyCompactedRow.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/io/PrecompactedRow.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/io/PrecompactedRow.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/io/sstable/BloomFilterTracker.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/BloomFilterTracker.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/io/sstable/Descriptor.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/Descriptor.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/io/util/BufferedSegmentedFile.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/io/util/BufferedSegmentedFile.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/io/util/IIterableColumns.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/io/util/IIterableColumns.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/service/CassandraDaemon.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/service/CassandraDaemon.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/service/DatacenterQuorumResponseHandler.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumResponseHandler.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/utils/Mx4jTool.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/utils/Mx4jTool.java
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/utils/ResourceWatcher.java
- copied unchanged from r984113,
cassandra/trunk/src/java/org/apache/cassandra/utils/ResourceWatcher.java
cassandra/tags/cassandra-0.7.0-beta1/test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java
- copied unchanged from r984113,
cassandra/trunk/test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java
cassandra/tags/cassandra-0.7.0-beta1/test/unit/org/apache/cassandra/db/RecoveryManager3Test.java
- copied unchanged from r984113,
cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager3Test.java
cassandra/tags/cassandra-0.7.0-beta1/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java
- copied unchanged from r984113,
cassandra/trunk/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java
cassandra/tags/cassandra-0.7.0-beta1/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
- copied unchanged from r984113,
cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
cassandra/tags/cassandra-0.7.0-beta1/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTest.java
- copied unchanged from r984113,
cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTest.java
Modified:
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/db/filter/IFilter.java
Modified:
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/db/filter/IFilter.java
URL:
http://svn.apache.org/viewvc/cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/db/filter/IFilter.java?rev=984115&r1=984103&r2=984115&view=diff
==============================================================================
---
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/db/filter/IFilter.java
(original)
+++
cassandra/tags/cassandra-0.7.0-beta1/src/java/org/apache/cassandra/db/filter/IFilter.java
Tue Aug 10 16:48:12 2010
@@ -1,77 +1,77 @@
-package org.apache.cassandra.db.filter;
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-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;
-
-/**
- * Given an implementation-specific description of what columns to look for,
provides methods
- * to extract the desired columns from a Memtable, SSTable, or SuperColumn.
Either the get*ColumnIterator
- * methods will be called, or filterSuperColumn, but not both on the same
object. QueryFilter
- * takes care of putting the two together if subcolumn filtering needs to be
done, based on the
- * querypath that it knows (but that IFilter implementations are oblivious to).
- */
-public interface IFilter
-{
- /**
- * returns an iterator that returns columns from the given memtable
- * matching the Filter criteria in sorted order.
- */
- public abstract IColumnIterator getMemtableColumnIterator(ColumnFamily cf,
DecoratedKey key, AbstractType comparator);
-
- /**
- * Get an iterator that returns columns from the given SSTable using the
opened file
- * matching the Filter criteria in sorted order.
- * @param sstable SSTable we are reading from
- * @param file Already opened file data input, saves us opening another one
- * @param key The key of the row we are about to iterate over
- * @param dataStart Used to seek to the start of the data
- */
- public abstract IColumnIterator getSSTableColumnIterator(SSTableReader
sstable, FileDataInput file, DecoratedKey key, long dataStart);
-
- /**
- * returns an iterator that returns columns from the given SSTable
- * matching the Filter criteria in sorted order.
- */
- public abstract IColumnIterator getSSTableColumnIterator(SSTableReader
sstable, DecoratedKey key);
-
- /**
- * collects columns from reducedColumns into returnCF. Termination is
determined
- * by the filter code, which should have some limit on the number of
columns
- * to avoid running out of memory on large rows.
- */
- public abstract void collectReducedColumns(IColumnContainer container,
Iterator<IColumn> reducedColumns, int gcBefore);
-
- /**
- * subcolumns of a supercolumn are unindexed, so to pick out parts of
those we operate in-memory.
- * @param superColumn may be modified by filtering op.
- */
- public abstract SuperColumn filterSuperColumn(SuperColumn superColumn, int
gcBefore);
-
- public Comparator<IColumn> getColumnComparator(AbstractType comparator);
-}
+package org.apache.cassandra.db.filter;
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+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;
+
+/**
+ * Given an implementation-specific description of what columns to look for,
provides methods
+ * to extract the desired columns from a Memtable, SSTable, or SuperColumn.
Either the get*ColumnIterator
+ * methods will be called, or filterSuperColumn, but not both on the same
object. QueryFilter
+ * takes care of putting the two together if subcolumn filtering needs to be
done, based on the
+ * querypath that it knows (but that IFilter implementations are oblivious to).
+ */
+public interface IFilter
+{
+ /**
+ * returns an iterator that returns columns from the given memtable
+ * matching the Filter criteria in sorted order.
+ */
+ public abstract IColumnIterator getMemtableColumnIterator(ColumnFamily cf,
DecoratedKey key, AbstractType comparator);
+
+ /**
+ * Get an iterator that returns columns from the given SSTable using the
opened file
+ * matching the Filter criteria in sorted order.
+ * @param sstable SSTable we are reading from
+ * @param file Already opened file data input, saves us opening another one
+ * @param key The key of the row we are about to iterate over
+ * @param dataStart Used to seek to the start of the data
+ */
+ public abstract IColumnIterator getSSTableColumnIterator(SSTableReader
sstable, FileDataInput file, DecoratedKey key, long dataStart);
+
+ /**
+ * returns an iterator that returns columns from the given SSTable
+ * matching the Filter criteria in sorted order.
+ */
+ public abstract IColumnIterator getSSTableColumnIterator(SSTableReader
sstable, DecoratedKey key);
+
+ /**
+ * collects columns from reducedColumns into returnCF. Termination is
determined
+ * by the filter code, which should have some limit on the number of
columns
+ * to avoid running out of memory on large rows.
+ */
+ public abstract void collectReducedColumns(IColumnContainer container,
Iterator<IColumn> reducedColumns, int gcBefore);
+
+ /**
+ * subcolumns of a supercolumn are unindexed, so to pick out parts of
those we operate in-memory.
+ * @param superColumn may be modified by filtering op.
+ */
+ public abstract SuperColumn filterSuperColumn(SuperColumn superColumn, int
gcBefore);
+
+ public Comparator<IColumn> getColumnComparator(AbstractType comparator);
+}
