inline AbstractColumnIterator
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a3d64339 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3d64339 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3d64339 Branch: refs/heads/trunk Commit: a3d64339550e0f12a98e7a5d1771ef7f114033e2 Parents: 245ad45 Author: Jonathan Ellis <[email protected]> Authored: Wed May 15 17:31:28 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed May 15 17:31:28 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Memtable.java | 11 ++++- .../db/filter/AbstractColumnIterator.java | 33 --------------- 2 files changed, 9 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3d64339/src/java/org/apache/cassandra/db/Memtable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java index 1b88b97..df5f6d7 100644 --- a/src/java/org/apache/cassandra/db/Memtable.java +++ b/src/java/org/apache/cassandra/db/Memtable.java @@ -18,6 +18,7 @@ package org.apache.cassandra.db; import java.io.File; +import java.io.IOException; import java.nio.ByteBuffer; import java.util.*; import java.util.concurrent.*; @@ -41,7 +42,6 @@ import org.apache.cassandra.concurrent.NamedThreadFactory; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.columniterator.SimpleAbstractColumnIterator; import org.apache.cassandra.db.commitlog.ReplayPosition; -import org.apache.cassandra.db.filter.AbstractColumnIterator; import org.apache.cassandra.db.filter.NamesQueryFilter; import org.apache.cassandra.db.filter.SliceQueryFilter; import org.apache.cassandra.db.marshal.AbstractType; @@ -344,7 +344,7 @@ public class Memtable assert cf != null; final Iterator<Column> filteredIter = filter.reversed ? cf.reverseIterator(filter.slices) : cf.iterator(filter.slices); - return new AbstractColumnIterator() + return new OnDiskAtomIterator() { public ColumnFamily getColumnFamily() { @@ -365,6 +365,13 @@ public class Memtable { return filteredIter.next(); } + + public void close() throws IOException { } + + public void remove() + { + throw new UnsupportedOperationException(); + } }; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3d64339/src/java/org/apache/cassandra/db/filter/AbstractColumnIterator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/AbstractColumnIterator.java b/src/java/org/apache/cassandra/db/filter/AbstractColumnIterator.java deleted file mode 100644 index 19c64e0..0000000 --- a/src/java/org/apache/cassandra/db/filter/AbstractColumnIterator.java +++ /dev/null @@ -1,33 +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.filter; - -import java.io.IOException; - -import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; - -public abstract class AbstractColumnIterator implements OnDiskAtomIterator -{ - public void close() throws IOException - {} - - public void remove() - { - throw new UnsupportedOperationException(); - } -}
