inline ISSTableColumnIterator -> OnDiskAtomIterator
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/245ad45a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/245ad45a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/245ad45a Branch: refs/heads/trunk Commit: 245ad45a55eb2bf9a34983d848ea86b48143ab73 Parents: 177bf5f Author: Jonathan Ellis <[email protected]> Authored: Wed May 15 17:22:21 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed May 15 17:22:21 2013 -0500 ---------------------------------------------------------------------- .../db/columniterator/ISSTableColumnIterator.java | 26 --------------- .../db/columniterator/SSTableNamesIterator.java | 7 +--- .../db/columniterator/SSTableSliceIterator.java | 7 +--- .../cassandra/db/filter/IDiskAtomFilter.java | 6 ++-- .../cassandra/db/filter/NamesQueryFilter.java | 6 ++-- .../apache/cassandra/db/filter/QueryFilter.java | 6 ++-- .../cassandra/db/filter/SliceQueryFilter.java | 6 ++-- 7 files changed, 14 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/245ad45a/src/java/org/apache/cassandra/db/columniterator/ISSTableColumnIterator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/columniterator/ISSTableColumnIterator.java b/src/java/org/apache/cassandra/db/columniterator/ISSTableColumnIterator.java deleted file mode 100644 index 01e3850..0000000 --- a/src/java/org/apache/cassandra/db/columniterator/ISSTableColumnIterator.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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. - */ -package org.apache.cassandra.db.columniterator; - -import org.apache.cassandra.io.sstable.SSTableReader; - -public interface ISSTableColumnIterator extends OnDiskAtomIterator -{ - public SSTableReader getSStable(); -} http://git-wip-us.apache.org/repos/asf/cassandra/blob/245ad45a/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java b/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java index f0e6dc7..36f240d 100644 --- a/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java +++ b/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java @@ -35,7 +35,7 @@ import org.apache.cassandra.io.util.FileMark; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.ByteBufferUtil; -public class SSTableNamesIterator extends SimpleAbstractColumnIterator implements ISSTableColumnIterator +public class SSTableNamesIterator extends SimpleAbstractColumnIterator implements OnDiskAtomIterator { private ColumnFamily cf; private final SSTableReader sstable; @@ -95,11 +95,6 @@ public class SSTableNamesIterator extends SimpleAbstractColumnIterator implement return fileToClose; } - public SSTableReader getSStable() - { - return sstable; - } - private void read(SSTableReader sstable, FileDataInput file, RowIndexEntry indexEntry) throws IOException { http://git-wip-us.apache.org/repos/asf/cassandra/blob/245ad45a/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java b/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java index caa067d..5d5279a 100644 --- a/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java +++ b/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java @@ -30,7 +30,7 @@ import org.apache.cassandra.io.util.FileDataInput; /** * A Column Iterator over SSTable */ -public class SSTableSliceIterator implements ISSTableColumnIterator +public class SSTableSliceIterator implements OnDiskAtomIterator { private final OnDiskAtomIterator reader; private final DecoratedKey key; @@ -70,11 +70,6 @@ public class SSTableSliceIterator implements ISSTableColumnIterator : new IndexedSliceReader(sstable, indexEntry, file, slices, reversed); } - public SSTableReader getSStable() - { - return sstable; - } - public DecoratedKey getKey() { return key; http://git-wip-us.apache.org/repos/asf/cassandra/blob/245ad45a/src/java/org/apache/cassandra/db/filter/IDiskAtomFilter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/IDiskAtomFilter.java b/src/java/org/apache/cassandra/db/filter/IDiskAtomFilter.java index e9d3682..668db4d 100644 --- a/src/java/org/apache/cassandra/db/filter/IDiskAtomFilter.java +++ b/src/java/org/apache/cassandra/db/filter/IDiskAtomFilter.java @@ -25,7 +25,7 @@ import java.util.Iterator; import java.nio.ByteBuffer; import org.apache.cassandra.db.*; -import org.apache.cassandra.db.columniterator.ISSTableColumnIterator; +import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.io.IVersionedSerializer; @@ -54,13 +54,13 @@ public interface IDiskAtomFilter * @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 */ - public ISSTableColumnIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey key, RowIndexEntry indexEntry); + public OnDiskAtomIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey key, RowIndexEntry indexEntry); /** * returns an iterator that returns columns from the given SSTable * matching the Filter criteria in sorted order. */ - public ISSTableColumnIterator getSSTableColumnIterator(SSTableReader sstable, DecoratedKey key); + public OnDiskAtomIterator getSSTableColumnIterator(SSTableReader sstable, DecoratedKey key); /** * collects columns from reducedColumns into returnCF. Termination is determined http://git-wip-us.apache.org/repos/asf/cassandra/blob/245ad45a/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java b/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java index 4e31cf2..349ec2e 100644 --- a/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java +++ b/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java @@ -29,7 +29,7 @@ import java.util.TreeSet; import org.apache.commons.lang.StringUtils; import org.apache.cassandra.db.*; -import org.apache.cassandra.db.columniterator.ISSTableColumnIterator; +import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.columniterator.SSTableNamesIterator; import org.apache.cassandra.db.marshal.AbstractType; @@ -82,12 +82,12 @@ public class NamesQueryFilter implements IDiskAtomFilter return Memtable.getNamesIterator(key, cf, this); } - public ISSTableColumnIterator getSSTableColumnIterator(SSTableReader sstable, DecoratedKey key) + public OnDiskAtomIterator getSSTableColumnIterator(SSTableReader sstable, DecoratedKey key) { return new SSTableNamesIterator(sstable, key, columns); } - public ISSTableColumnIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey key, RowIndexEntry indexEntry) + public OnDiskAtomIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey key, RowIndexEntry indexEntry) { return new SSTableNamesIterator(sstable, file, key, columns, indexEntry); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/245ad45a/src/java/org/apache/cassandra/db/filter/QueryFilter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/QueryFilter.java b/src/java/org/apache/cassandra/db/filter/QueryFilter.java index 740240c..03e9509 100644 --- a/src/java/org/apache/cassandra/db/filter/QueryFilter.java +++ b/src/java/org/apache/cassandra/db/filter/QueryFilter.java @@ -22,7 +22,7 @@ import java.nio.ByteBuffer; import java.util.*; import org.apache.cassandra.db.*; -import org.apache.cassandra.db.columniterator.ISSTableColumnIterator; +import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.io.sstable.SSTableReader; @@ -57,12 +57,12 @@ public class QueryFilter return filter.getMemtableColumnIterator(cf, key); } - public ISSTableColumnIterator getSSTableColumnIterator(SSTableReader sstable) + public OnDiskAtomIterator getSSTableColumnIterator(SSTableReader sstable) { return filter.getSSTableColumnIterator(sstable, key); } - public ISSTableColumnIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey key, RowIndexEntry indexEntry) + public OnDiskAtomIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey key, RowIndexEntry indexEntry) { return filter.getSSTableColumnIterator(sstable, file, key, indexEntry); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/245ad45a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java index 4f93e34..996955b 100644 --- a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java +++ b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.db.*; -import org.apache.cassandra.db.columniterator.ISSTableColumnIterator; +import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.columniterator.SSTableSliceIterator; import org.apache.cassandra.db.marshal.AbstractType; @@ -105,12 +105,12 @@ public class SliceQueryFilter implements IDiskAtomFilter return Memtable.getSliceIterator(key, cf, this); } - public ISSTableColumnIterator getSSTableColumnIterator(SSTableReader sstable, DecoratedKey key) + public OnDiskAtomIterator getSSTableColumnIterator(SSTableReader sstable, DecoratedKey key) { return new SSTableSliceIterator(sstable, key, slices, reversed); } - public ISSTableColumnIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey key, RowIndexEntry indexEntry) + public OnDiskAtomIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey key, RowIndexEntry indexEntry) { return new SSTableSliceIterator(sstable, file, key, slices, reversed, indexEntry); }
