You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by mi...@apache.org on 2009/12/10 22:38:39 UTC
svn commit: r889432 - in /lucene/java/trunk:
contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedAllTermDocs.java
src/java/org/apache/lucene/index/AbstractAllTermDocs.java
Author: mikemccand
Date: Thu Dec 10 21:38:39 2009
New Revision: 889432
URL: http://svn.apache.org/viewvc?rev=889432&view=rev
Log:
LUCENE-2144: fix InstantiatedIndex to handle termDocs(null)
Added:
lucene/java/trunk/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedAllTermDocs.java (with props)
lucene/java/trunk/src/java/org/apache/lucene/index/AbstractAllTermDocs.java (with props)
Added: lucene/java/trunk/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedAllTermDocs.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedAllTermDocs.java?rev=889432&view=auto
==============================================================================
--- lucene/java/trunk/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedAllTermDocs.java (added)
+++ lucene/java/trunk/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedAllTermDocs.java Thu Dec 10 21:38:39 2009
@@ -0,0 +1,34 @@
+/**
+ * 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.store.instantiated;
+
+import org.apache.lucene.index.AbstractAllTermDocs;
+
+class InstantiatedAllTermDocs extends AbstractAllTermDocs {
+
+ private InstantiatedIndexReader reader;
+
+ InstantiatedAllTermDocs(InstantiatedIndexReader reader) {
+ super(reader.maxDoc());
+ this.reader = reader;
+ }
+
+ public boolean isDeleted(int doc) {
+ return reader.isDeleted(doc);
+ }
+}
Propchange: lucene/java/trunk/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedAllTermDocs.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: lucene/java/trunk/src/java/org/apache/lucene/index/AbstractAllTermDocs.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/AbstractAllTermDocs.java?rev=889432&view=auto
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/AbstractAllTermDocs.java (added)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/AbstractAllTermDocs.java Thu Dec 10 21:38:39 2009
@@ -0,0 +1,84 @@
+/**
+ * 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.index;
+
+import java.io.IOException;
+
+public abstract class AbstractAllTermDocs implements TermDocs {
+
+ protected int maxDoc;
+ protected int doc = -1;
+
+ protected AbstractAllTermDocs(int maxDoc) {
+ this.maxDoc = maxDoc;
+ }
+
+ public void seek(Term term) throws IOException {
+ if (term==null) {
+ doc = -1;
+ } else {
+ throw new UnsupportedOperationException();
+ }
+ }
+
+ public void seek(TermEnum termEnum) throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ public int doc() {
+ return doc;
+ }
+
+ public int freq() {
+ return 1;
+ }
+
+ public boolean next() throws IOException {
+ return skipTo(doc+1);
+ }
+
+ public int read(int[] docs, int[] freqs) throws IOException {
+ final int length = docs.length;
+ int i = 0;
+ while (i < length && doc < maxDoc) {
+ if (!isDeleted(doc)) {
+ docs[i] = doc;
+ freqs[i] = 1;
+ ++i;
+ }
+ doc++;
+ }
+ return i;
+ }
+
+ public boolean skipTo(int target) throws IOException {
+ doc = target;
+ while (doc < maxDoc) {
+ if (!isDeleted(doc)) {
+ return true;
+ }
+ doc++;
+ }
+ return false;
+ }
+
+ public void close() throws IOException {
+ }
+
+ public abstract boolean isDeleted(int doc);
+}
\ No newline at end of file
Propchange: lucene/java/trunk/src/java/org/apache/lucene/index/AbstractAllTermDocs.java
------------------------------------------------------------------------------
svn:eol-style = native