You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dr...@apache.org on 2016/06/09 04:59:26 UTC
[3/8] lucene-solr:SOLR-9191: LUCENE-7313: Remove DocValuesDocIdSet.
LUCENE-7313: Remove DocValuesDocIdSet.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/73045a4c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/73045a4c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/73045a4c
Branch: refs/heads/SOLR-9191
Commit: 73045a4cd8ea5f0c8c4f418b6fbe99a94a21cf4a
Parents: fb37b3e
Author: Adrien Grand <jp...@gmail.com>
Authored: Wed Jun 8 14:20:40 2016 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Wed Jun 8 14:20:40 2016 +0200
----------------------------------------------------------------------
.../apache/lucene/search/DocValuesDocIdSet.java | 157 -------------------
1 file changed, 157 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/73045a4c/lucene/core/src/java/org/apache/lucene/search/DocValuesDocIdSet.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/DocValuesDocIdSet.java b/lucene/core/src/java/org/apache/lucene/search/DocValuesDocIdSet.java
deleted file mode 100644
index 22c090c..0000000
--- a/lucene/core/src/java/org/apache/lucene/search/DocValuesDocIdSet.java
+++ /dev/null
@@ -1,157 +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.lucene.search;
-
-import java.io.IOException;
-
-import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BitDocIdSet;
-import org.apache.lucene.util.FixedBitSet;
-
-/**
- * Base class for DocIdSet to be used with DocValues. The implementation
- * of its iterator is very stupid and slow if the implementation of the
- * {@link #matchDoc} method is not optimized, as iterators simply increment
- * the document id until {@code matchDoc(int)} returns true. Because of this
- * {@code matchDoc(int)} must be as fast as possible.
- * @lucene.internal
- */
-public abstract class DocValuesDocIdSet extends DocIdSet {
-
- protected final int maxDoc;
- protected final Bits acceptDocs;
-
- public DocValuesDocIdSet(int maxDoc, Bits acceptDocs) {
- this.maxDoc = maxDoc;
- this.acceptDocs = acceptDocs;
- }
-
- /**
- * this method checks, if a doc is a hit
- */
- protected abstract boolean matchDoc(int doc);
-
- @Override
- public long ramBytesUsed() {
- return 0L;
- }
-
- @Override
- public final Bits bits() {
- return (acceptDocs == null) ? new Bits() {
- @Override
- public boolean get(int docid) {
- return matchDoc(docid);
- }
-
- @Override
- public int length() {
- return maxDoc;
- }
- } : new Bits() {
- @Override
- public boolean get(int docid) {
- return acceptDocs.get(docid) && matchDoc(docid);
- }
-
- @Override
- public int length() {
- return maxDoc;
- }
- };
- }
-
- @Override
- public final DocIdSetIterator iterator() throws IOException {
- if (acceptDocs == null) {
- // Specialization optimization disregard acceptDocs
- return new DocIdSetIterator() {
- private int doc = -1;
-
- @Override
- public int docID() {
- return doc;
- }
-
- @Override
- public int nextDoc() {
- do {
- doc++;
- if (doc >= maxDoc) {
- return doc = NO_MORE_DOCS;
- }
- } while (!matchDoc(doc));
- return doc;
- }
-
- @Override
- public int advance(int target) {
- for(doc=target; doc<maxDoc; doc++) {
- if (matchDoc(doc)) {
- return doc;
- }
- }
- return doc = NO_MORE_DOCS;
- }
-
- @Override
- public long cost() {
- return maxDoc;
- }
- };
- } else if (acceptDocs instanceof FixedBitSet) {
- // special case for FixedBitSet: use the iterator and filter it
- // (used e.g. when Filters are chained by FilteredQuery)
- return new FilteredDocIdSetIterator(new BitDocIdSet((FixedBitSet) acceptDocs).iterator()) {
- @Override
- protected boolean match(int doc) {
- return DocValuesDocIdSet.this.matchDoc(doc);
- }
- };
- } else {
- // Stupid consultation of acceptDocs and matchDoc()
- return new DocIdSetIterator() {
- private int doc = -1;
-
- @Override
- public int docID() {
- return doc;
- }
-
- @Override
- public int nextDoc() {
- return advance(doc + 1);
- }
-
- @Override
- public int advance(int target) {
- for(doc=target; doc<maxDoc; doc++) {
- if (acceptDocs.get(doc) && matchDoc(doc)) {
- return doc;
- }
- }
- return doc = NO_MORE_DOCS;
- }
-
- @Override
- public long cost() {
- return maxDoc;
- }
- };
- }
- }
-}