Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4087810308 for ; Sun, 2 Nov 2014 23:54:44 +0000 (UTC) Received: (qmail 14257 invoked by uid 500); 2 Nov 2014 23:54:44 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 14248 invoked by uid 99); 2 Nov 2014 23:54:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Nov 2014 23:54:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Nov 2014 23:54:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D16D22388868; Sun, 2 Nov 2014 23:54:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1636218 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene46/ lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/ lucene/backward-codecs/src/test/org/apache/lucene... Date: Sun, 02 Nov 2014 23:54:11 -0000 To: commits@lucene.apache.org From: mikemccand@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141102235412.D16D22388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mikemccand Date: Sun Nov 2 23:54:10 2014 New Revision: 1636218 URL: http://svn.apache.org/r1636218 Log: LUCENE-6041: remove FieldInfo.isIndex/hasDocValues sugar APIs Modified: lucene/dev/branches/branch_5x/ (props changed) lucene/dev/branches/branch_5x/lucene/ (props changed) lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed) lucene/dev/branches/branch_5x/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene46/Lucene46FieldInfosFormat.java lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40RWFieldInfosFormat.java lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/Lucene42RWFieldInfosFormat.java lucene/dev/branches/branch_5x/lucene/core/ (props changed) lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MultiFields.java lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SimpleMergedSegmentWarmer.java lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java lucene/dev/branches/branch_5x/lucene/misc/ (props changed) lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java lucene/dev/branches/branch_5x/lucene/test-framework/ (props changed) lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java lucene/dev/branches/branch_5x/solr/ (props changed) lucene/dev/branches/branch_5x/solr/core/ (props changed) lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/IndexSchema.java Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original) +++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Sun Nov 2 23:54:10 2014 @@ -190,6 +190,9 @@ Bug Fixes * LUCENE-6043: Fix backcompat support for UAX29URLEmailTokenizer (Ryan Ernst) +* LUCENE-6041: Remove sugar methods FieldInfo.isIndexed and + FieldInfo.hasDocValues. (Robert Muir, Mike McCandless) + Documentation * LUCENE-5392: Add/improve analysis package documentation to reflect Modified: lucene/dev/branches/branch_5x/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene46/Lucene46FieldInfosFormat.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene46/Lucene46FieldInfosFormat.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene46/Lucene46FieldInfosFormat.java (original) +++ lucene/dev/branches/branch_5x/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene46/Lucene46FieldInfosFormat.java Sun Nov 2 23:54:10 2014 @@ -138,7 +138,7 @@ public final class Lucene46FieldInfosFor if (fi.hasVectors()) bits |= Lucene46FieldInfosFormat.STORE_TERMVECTOR; if (fi.omitsNorms()) bits |= Lucene46FieldInfosFormat.OMIT_NORMS; if (fi.hasPayloads()) bits |= Lucene46FieldInfosFormat.STORE_PAYLOADS; - if (fi.isIndexed()) { + if (fi.getIndexOptions() != IndexOptions.NONE) { bits |= Lucene46FieldInfosFormat.IS_INDEXED; assert indexOptions.compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) >= 0 || !fi.hasPayloads(); if (indexOptions == IndexOptions.DOCS) { Modified: lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40RWFieldInfosFormat.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40RWFieldInfosFormat.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40RWFieldInfosFormat.java (original) +++ lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40RWFieldInfosFormat.java Sun Nov 2 23:54:10 2014 @@ -58,7 +58,7 @@ public final class Lucene40RWFieldInfosF if (fi.hasVectors()) bits |= Lucene40FieldInfosFormat.STORE_TERMVECTOR; if (fi.omitsNorms()) bits |= Lucene40FieldInfosFormat.OMIT_NORMS; if (fi.hasPayloads()) bits |= Lucene40FieldInfosFormat.STORE_PAYLOADS; - if (fi.isIndexed()) { + if (fi.getIndexOptions() != IndexOptions.NONE) { bits |= Lucene40FieldInfosFormat.IS_INDEXED; assert indexOptions.compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) >= 0 || !fi.hasPayloads(); if (indexOptions == IndexOptions.DOCS) { Modified: lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/Lucene42RWFieldInfosFormat.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/Lucene42RWFieldInfosFormat.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/Lucene42RWFieldInfosFormat.java (original) +++ lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/Lucene42RWFieldInfosFormat.java Sun Nov 2 23:54:10 2014 @@ -59,7 +59,7 @@ public final class Lucene42RWFieldInfosF if (fi.hasVectors()) bits |= Lucene42FieldInfosFormat.STORE_TERMVECTOR; if (fi.omitsNorms()) bits |= Lucene42FieldInfosFormat.OMIT_NORMS; if (fi.hasPayloads()) bits |= Lucene42FieldInfosFormat.STORE_PAYLOADS; - if (fi.isIndexed()) { + if (fi.getIndexOptions() != IndexOptions.NONE) { bits |= Lucene42FieldInfosFormat.IS_INDEXED; assert indexOptions.compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) >= 0 || !fi.hasPayloads(); if (indexOptions == IndexOptions.DOCS) { Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java Sun Nov 2 23:54:10 2014 @@ -30,6 +30,7 @@ import org.apache.lucene.codecs.DocValue import org.apache.lucene.codecs.DocValuesProducer; import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.index.BinaryDocValues; +import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.SegmentReadState; @@ -251,7 +252,7 @@ public abstract class PerFieldDocValuesF try { // Read field name -> format name for (FieldInfo fi : readState.fieldInfos) { - if (fi.hasDocValues()) { + if (fi.getDocValuesType() != DocValuesType.NONE) { final String fieldName = fi.name; final String formatName = fi.getAttribute(PER_FIELD_FORMAT_KEY); if (formatName != null) { Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java Sun Nov 2 23:54:10 2014 @@ -36,6 +36,7 @@ import org.apache.lucene.codecs.FieldsPr import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.Fields; +import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.Terms; @@ -242,7 +243,7 @@ public abstract class PerFieldPostingsFo try { // Read field name -> format name for (FieldInfo fi : readState.fieldInfos) { - if (fi.isIndexed()) { + if (fi.getIndexOptions() != IndexOptions.NONE) { final String fieldName = fi.name; final String formatName = fi.getAttribute(PER_FIELD_FORMAT_KEY); if (formatName != null) { Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java Sun Nov 2 23:54:10 2014 @@ -53,7 +53,6 @@ import org.apache.lucene.util.LongBitSet import org.apache.lucene.util.StringHelper; import org.apache.lucene.util.Version; - /** * Basic tool and API to check the health of an index and * write a new segments file that removes reference to @@ -907,7 +906,7 @@ public class CheckIndex implements Close if (fieldInfo == null) { throw new RuntimeException("fieldsEnum inconsistent with fieldInfos, no fieldInfos for: " + field); } - if (!fieldInfo.isIndexed()) { + if (fieldInfo.getIndexOptions() == IndexOptions.NONE) { throw new RuntimeException("fieldsEnum inconsistent with fieldInfos, isIndexed == false for: " + field); } @@ -1536,7 +1535,7 @@ public class CheckIndex implements Close infoStream.print(" test: docvalues..........."); } for (FieldInfo fieldInfo : reader.getFieldInfos()) { - if (fieldInfo.hasDocValues()) { + if (fieldInfo.getDocValuesType() != DocValuesType.NONE) { status.totalValueFields++; checkDocValues(fieldInfo, reader, infoStream, status); } else { Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java Sun Nov 2 23:54:10 2014 @@ -128,7 +128,7 @@ final class DefaultIndexingChain extends PerField perField = fieldHash[i]; while (perField != null) { if (perField.docValuesWriter != null) { - if (perField.fieldInfo.hasDocValues() == false) { + if (perField.fieldInfo.getDocValuesType() == DocValuesType.NONE) { // BUG throw new AssertionError("segment=" + state.segmentInfo + ": field=\"" + perField.fieldInfo.name + "\" has no docValues but wrote them"); } @@ -141,7 +141,7 @@ final class DefaultIndexingChain extends perField.docValuesWriter.finish(docCount); perField.docValuesWriter.flush(state, dvConsumer); perField.docValuesWriter = null; - } else if (perField.fieldInfo.hasDocValues()) { + } else if (perField.fieldInfo.getDocValuesType() != DocValuesType.NONE) { // BUG throw new AssertionError("segment=" + state.segmentInfo + ": field=\"" + perField.fieldInfo.name + "\" has docValues but did not write them"); } @@ -198,7 +198,7 @@ final class DefaultIndexingChain extends // we must check the final value of omitNorms for the fieldinfo: it could have // changed for this field since the first time we added it. - if (fi.omitsNorms() == false && fi.isIndexed()) { + if (fi.omitsNorms() == false && fi.getIndexOptions() != IndexOptions.NONE) { assert perField.norms != null: "field=" + fi.name; perField.norms.finish(state.segmentInfo.getDocCount()); perField.norms.flush(state, normsConsumer); @@ -418,9 +418,7 @@ final class DefaultIndexingChain extends * value */ private void indexDocValue(PerField fp, DocValuesType dvType, IndexableField field) throws IOException { - boolean hasDocValues = fp.fieldInfo.hasDocValues(); - - if (hasDocValues == false) { + if (fp.fieldInfo.getDocValuesType() == DocValuesType.NONE) { // This will throw an exc if the caller tried to // change the DV type for the field: fieldInfos.globalFieldNumbers.setDocValuesType(fp.fieldInfo.number, fp.fieldInfo.name, dvType); Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java Sun Nov 2 23:54:10 2014 @@ -144,9 +144,6 @@ public final class FieldInfo { } void setDocValuesType(DocValuesType type) { - if (type == null) { - throw new NullPointerException("DocValuesType cannot be null (field: \"" + name + "\")"); - } if (docValuesType != DocValuesType.NONE && docValuesType != type) { throw new IllegalArgumentException("cannot change DocValues type from " + docValuesType + " to " + type + " for field \"" + name + "\""); } @@ -160,13 +157,6 @@ public final class FieldInfo { } /** - * Returns true if this field has any docValues. - */ - public boolean hasDocValues() { - return docValuesType != DocValuesType.NONE; - } - - /** * Returns {@link DocValuesType} of the docValues; this is * {@code DocValuesType.NONE} if the field has no docvalues. */ @@ -211,14 +201,7 @@ public final class FieldInfo { * Returns true if this field actually has any norms. */ public boolean hasNorms() { - return isIndexed() && omitNorms == false; - } - - /** - * Returns true if this field is indexed ({@link #getIndexOptions} is not IndexOptions.NONE). - */ - public boolean isIndexed() { - return indexOptions != IndexOptions.NONE; + return indexOptions != IndexOptions.NONE && omitNorms == false; } /** Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java Sun Nov 2 23:54:10 2014 @@ -68,11 +68,11 @@ public class FieldInfos implements Itera } hasVectors |= info.hasVectors(); - hasProx |= info.isIndexed() && info.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) >= 0; - hasFreq |= info.isIndexed() && info.getIndexOptions() != IndexOptions.DOCS; - hasOffsets |= info.isIndexed() && info.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) >= 0; + hasProx |= info.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) >= 0; + hasFreq |= info.getIndexOptions() != IndexOptions.DOCS; + hasOffsets |= info.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) >= 0; hasNorms |= info.hasNorms(); - hasDocValues |= info.hasDocValues(); + hasDocValues |= info.getDocValuesType() != DocValuesType.NONE; hasPayloads |= info.hasPayloads(); } @@ -314,7 +314,7 @@ public class FieldInfos implements Itera if (docValues != DocValuesType.NONE) { // Only pay the synchronization cost if fi does not already have a DVType - boolean updateGlobal = !fi.hasDocValues(); + boolean updateGlobal = fi.getDocValuesType() == DocValuesType.NONE; if (updateGlobal) { // Must also update docValuesType map so it's // aware of this field's DocValueType. This will throw IllegalArgumentException if Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java Sun Nov 2 23:54:10 2014 @@ -89,7 +89,7 @@ final class FreqProxTermsWriter extends final FreqProxTermsWriterPerField perField = (FreqProxTermsWriterPerField) f; if (perField.bytesHash.size() > 0) { perField.sortPostings(); - assert perField.fieldInfo.isIndexed(); + assert perField.fieldInfo.getIndexOptions() != IndexOptions.NONE; allFields.add(perField); } } Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MultiFields.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MultiFields.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MultiFields.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MultiFields.java Sun Nov 2 23:54:10 2014 @@ -19,11 +19,11 @@ package org.apache.lucene.index; import java.io.IOException; import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Collection; -import java.util.HashSet; import java.util.concurrent.ConcurrentHashMap; import org.apache.lucene.util.Bits; @@ -271,7 +271,7 @@ public final class MultiFields extends F public static Collection getIndexedFields(IndexReader reader) { final Collection fields = new HashSet<>(); for(final FieldInfo fieldInfo : getMergedFieldInfos(reader)) { - if (fieldInfo.isIndexed()) { + if (fieldInfo.getIndexOptions() != IndexOptions.NONE) { fields.add(fieldInfo.name); } } Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java Sun Nov 2 23:54:10 2014 @@ -56,7 +56,7 @@ class SegmentDocValuesProducer extends D if (ver != null && ver.onOrAfter(Version.LUCENE_4_9_0)) { DocValuesProducer baseProducer = null; for (FieldInfo fi : fieldInfos) { - if (!fi.hasDocValues()) { + if (fi.getDocValuesType() == DocValuesType.NONE) { continue; } long docValuesGen = fi.getDocValuesGen(); @@ -82,7 +82,7 @@ class SegmentDocValuesProducer extends D // we initialize each DocValuesProducer once per gen. Map> genInfos = new HashMap<>(); for (FieldInfo fi : fieldInfos) { - if (!fi.hasDocValues()) { + if (fi.getDocValuesType() == DocValuesType.NONE) { continue; } List genFieldInfos = genInfos.get(fi.getDocValuesGen()); Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SimpleMergedSegmentWarmer.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SimpleMergedSegmentWarmer.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SimpleMergedSegmentWarmer.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SimpleMergedSegmentWarmer.java Sun Nov 2 23:54:10 2014 @@ -44,7 +44,7 @@ public class SimpleMergedSegmentWarmer e int docValuesCount = 0; int normsCount = 0; for (FieldInfo info : reader.getFieldInfos()) { - if (info.isIndexed()) { + if (info.getIndexOptions() != IndexOptions.NONE) { reader.terms(info.name); indexedCount++; @@ -54,7 +54,7 @@ public class SimpleMergedSegmentWarmer e } } - if (info.hasDocValues()) { + if (info.getDocValuesType() != DocValuesType.NONE) { switch(info.getDocValuesType()) { case NUMERIC: reader.getNumericDocValues(info.name); Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java Sun Nov 2 23:54:10 2014 @@ -255,7 +255,7 @@ public class TestDirectoryReader extends for(FieldInfo fieldInfo : fieldInfos) { final String name = fieldInfo.name; allFieldNames.add(name); - if (fieldInfo.isIndexed()) { + if (fieldInfo.getIndexOptions() != IndexOptions.NONE) { indexedFieldNames.add(name); } else { notIndexedFieldNames.add(name); Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java Sun Nov 2 23:54:10 2014 @@ -206,7 +206,7 @@ public class TestDocValuesIndexing exten LeafReader slow = SlowCompositeReaderWrapper.wrap(r); FieldInfos fi = slow.getFieldInfos(); FieldInfo dvInfo = fi.fieldInfo("dv"); - assertTrue(dvInfo.hasDocValues()); + assertTrue(dvInfo.getDocValuesType() != DocValuesType.NONE); NumericDocValues dv = slow.getNumericDocValues("dv"); for (int i = 0; i < 50; i++) { assertEquals(i, dv.get(i)); Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java Sun Nov 2 23:54:10 2014 @@ -93,7 +93,7 @@ public class TestDocumentWriter extends // test that the norms are not present in the segment if // omitNorms is true for (FieldInfo fi : reader.getFieldInfos()) { - if (fi.isIndexed()) { + if (fi.getIndexOptions() != IndexOptions.NONE) { assertTrue(fi.omitsNorms() == (reader.getNormValues(fi.name) == null)); } } Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java Sun Nov 2 23:54:10 2014 @@ -84,14 +84,14 @@ public class TestSegmentReader extends L for(FieldInfo fieldInfo : reader.getFieldInfos()) { final String name = fieldInfo.name; allFieldNames.add(name); - if (fieldInfo.isIndexed()) { + if (fieldInfo.getIndexOptions() != IndexOptions.NONE) { indexedFieldNames.add(name); } else { notIndexedFieldNames.add(name); } if (fieldInfo.hasVectors()) { tvFieldNames.add(name); - } else if (fieldInfo.isIndexed()) { + } else if (fieldInfo.getIndexOptions() != IndexOptions.NONE) { noTVFieldNames.add(name); } } Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java (original) +++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java Sun Nov 2 23:54:10 2014 @@ -24,12 +24,13 @@ import java.util.Collections; import java.util.List; import org.apache.lucene.codecs.PostingsFormat; // javadocs -import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.DocValues; +import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.Fields; +import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.SortedSetDocValues; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; @@ -282,7 +283,7 @@ public class DocTermOrds implements Acco /** Call this only once (if you subclass!) */ protected void uninvert(final LeafReader reader, Bits liveDocs, final BytesRef termPrefix) throws IOException { final FieldInfo info = reader.getFieldInfos().fieldInfo(field); - if (info != null && info.hasDocValues()) { + if (info != null && info.getDocValuesType() != DocValuesType.NONE) { throw new IllegalStateException("Type mismatch: " + field + " was indexed as " + info.getDocValuesType()); } //System.out.println("DTO uninvert field=" + field + " prefix=" + termPrefix); Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java (original) +++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java Sun Nov 2 23:54:10 2014 @@ -26,11 +26,13 @@ import java.util.List; import java.util.Map; import java.util.WeakHashMap; -import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.BinaryDocValues; import org.apache.lucene.index.DocValues; +import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo; +import org.apache.lucene.index.IndexOptions; +import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.SegmentReader; import org.apache.lucene.index.SortedDocValues; @@ -356,9 +358,9 @@ class FieldCacheImpl implements FieldCac if (fieldInfo == null) { // field does not exist or has no value return new Bits.MatchNoBits(reader.maxDoc()); - } else if (fieldInfo.hasDocValues()) { + } else if (fieldInfo.getDocValuesType() != DocValuesType.NONE) { return reader.getDocsWithField(field); - } else if (!fieldInfo.isIndexed()) { + } else if (fieldInfo.getIndexOptions() == IndexOptions.NONE) { return new Bits.MatchNoBits(reader.maxDoc()); } BitsEntry bitsEntry = (BitsEntry) caches.get(DocsWithFieldCache.class).get(reader, new CacheKey(field, null), false); @@ -459,9 +461,9 @@ class FieldCacheImpl implements FieldCac final FieldInfo info = reader.getFieldInfos().fieldInfo(field); if (info == null) { return DocValues.emptyNumeric(); - } else if (info.hasDocValues()) { + } else if (info.getDocValuesType() != DocValuesType.NONE) { throw new IllegalStateException("Type mismatch: " + field + " was indexed as " + info.getDocValuesType()); - } else if (!info.isIndexed()) { + } else if (info.getIndexOptions() == IndexOptions.NONE) { return DocValues.emptyNumeric(); } return (NumericDocValues) caches.get(Long.TYPE).get(reader, new CacheKey(field, parser), setDocsWithField); @@ -634,11 +636,11 @@ class FieldCacheImpl implements FieldCac final FieldInfo info = reader.getFieldInfos().fieldInfo(field); if (info == null) { return DocValues.emptySorted(); - } else if (info.hasDocValues()) { + } else if (info.getDocValuesType() != DocValuesType.NONE) { // we don't try to build a sorted instance from numeric/binary doc // values because dedup can be very costly throw new IllegalStateException("Type mismatch: " + field + " was indexed as " + info.getDocValuesType()); - } else if (!info.isIndexed()) { + } else if (info.getIndexOptions() == IndexOptions.NONE) { return DocValues.emptySorted(); } SortedDocValuesImpl impl = (SortedDocValuesImpl) caches.get(SortedDocValues.class).get(reader, new CacheKey(field, acceptableOverheadRatio), false); @@ -783,9 +785,9 @@ class FieldCacheImpl implements FieldCac final FieldInfo info = reader.getFieldInfos().fieldInfo(field); if (info == null) { return DocValues.emptyBinary(); - } else if (info.hasDocValues()) { + } else if (info.getDocValuesType() != DocValuesType.NONE) { throw new IllegalStateException("Type mismatch: " + field + " was indexed as " + info.getDocValuesType()); - } else if (!info.isIndexed()) { + } else if (info.getIndexOptions() == IndexOptions.NONE) { return DocValues.emptyBinary(); } @@ -906,9 +908,9 @@ class FieldCacheImpl implements FieldCac final FieldInfo info = reader.getFieldInfos().fieldInfo(field); if (info == null) { return DocValues.emptySortedSet(); - } else if (info.hasDocValues()) { + } else if (info.getDocValuesType() != DocValuesType.NONE) { throw new IllegalStateException("Type mismatch: " + field + " was indexed as " + info.getDocValuesType()); - } else if (!info.isIndexed()) { + } else if (info.getIndexOptions() == IndexOptions.NONE) { return DocValues.emptySortedSet(); } Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java (original) +++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java Sun Nov 2 23:54:10 2014 @@ -37,6 +37,7 @@ import org.apache.lucene.index.FieldInfo import org.apache.lucene.index.FieldInfos; import org.apache.lucene.index.FilterDirectoryReader; import org.apache.lucene.index.FilterLeafReader; +import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.SortedDocValues; @@ -185,7 +186,7 @@ public class UninvertingReader extends F ArrayList filteredInfos = new ArrayList<>(); for (FieldInfo fi : in.getFieldInfos()) { DocValuesType type = fi.getDocValuesType(); - if (fi.isIndexed() && !fi.hasDocValues()) { + if (fi.getIndexOptions() != IndexOptions.NONE && fi.getDocValuesType() == DocValuesType.NONE) { Type t = mapping.get(fi.name); if (t != null) { switch(t) { @@ -291,7 +292,7 @@ public class UninvertingReader extends F */ private Type getType(String field) { FieldInfo info = fieldInfos.fieldInfo(field); - if (info == null || info.hasDocValues() == false) { + if (info == null || info.getDocValuesType() == DocValuesType.NONE) { return null; } return mapping.get(field); Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java (original) +++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java Sun Nov 2 23:54:10 2014 @@ -800,11 +800,11 @@ public class AssertingLeafReader extends FieldInfo fi = getFieldInfos().fieldInfo(field); if (docsWithField != null) { assert fi != null; - assert fi.hasDocValues(); + assert fi.getDocValuesType() != DocValuesType.NONE; assert maxDoc() == docsWithField.length(); docsWithField = new AssertingBits(docsWithField); } else { - assert fi == null || fi.hasDocValues() == false; + assert fi == null || fi.getDocValuesType() == DocValuesType.NONE; } return docsWithField; } Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java (original) +++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java Sun Nov 2 23:54:10 2014 @@ -56,8 +56,8 @@ public abstract class BaseFieldInfoForma FieldInfos infos2 = codec.fieldInfosFormat().read(dir, segmentInfo, "", IOContext.DEFAULT); assertEquals(1, infos2.size()); assertNotNull(infos2.fieldInfo("field")); - assertTrue(infos2.fieldInfo("field").isIndexed()); - assertFalse(infos2.fieldInfo("field").hasDocValues()); + assertTrue(infos2.fieldInfo("field").getIndexOptions() != IndexOptions.NONE); + assertFalse(infos2.fieldInfo("field").getDocValuesType() != DocValuesType.NONE); assertFalse(infos2.fieldInfo("field").omitsNorms()); assertFalse(infos2.fieldInfo("field").hasPayloads()); assertFalse(infos2.fieldInfo("field").hasVectors()); @@ -157,11 +157,9 @@ public abstract class BaseFieldInfoForma assertEquals(expected.name, actual.name); assertEquals(expected.getDocValuesType(), actual.getDocValuesType()); assertEquals(expected.getIndexOptions(), actual.getIndexOptions()); - assertEquals(expected.hasDocValues(), actual.hasDocValues()); assertEquals(expected.hasNorms(), actual.hasNorms()); assertEquals(expected.hasPayloads(), actual.hasPayloads()); assertEquals(expected.hasVectors(), actual.hasVectors()); - assertEquals(expected.isIndexed(), actual.isIndexed()); assertEquals(expected.omitsNorms(), actual.omitsNorms()); assertEquals(expected.getDocValuesGen(), actual.getDocValuesGen()); } Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original) +++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Sun Nov 2 23:54:10 2014 @@ -57,8 +57,8 @@ import java.util.logging.Logger; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field.Store; import org.apache.lucene.document.Field; +import org.apache.lucene.document.Field.Store; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; @@ -69,6 +69,7 @@ import org.apache.lucene.index.BinaryDoc import org.apache.lucene.index.CompositeReader; import org.apache.lucene.index.ConcurrentMergeScheduler; import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldFilterLeafReader; @@ -76,8 +77,8 @@ import org.apache.lucene.index.FieldInfo import org.apache.lucene.index.FieldInfos; import org.apache.lucene.index.Fields; import org.apache.lucene.index.IndexOptions; -import org.apache.lucene.index.IndexReader.ReaderClosedListener; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderClosedListener; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexableField; @@ -103,8 +104,8 @@ import org.apache.lucene.index.SortedDoc import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.index.SortedSetDocValues; import org.apache.lucene.index.Terms; -import org.apache.lucene.index.TermsEnum.SeekStatus; import org.apache.lucene.index.TermsEnum; +import org.apache.lucene.index.TermsEnum.SeekStatus; import org.apache.lucene.index.TieredMergePolicy; import org.apache.lucene.search.AssertingIndexSearcher; import org.apache.lucene.search.DocIdSetIterator; @@ -114,12 +115,12 @@ import org.apache.lucene.store.BaseDirec import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.FlushInfo; -import org.apache.lucene.store.IOContext.Context; import org.apache.lucene.store.IOContext; +import org.apache.lucene.store.IOContext.Context; import org.apache.lucene.store.LockFactory; import org.apache.lucene.store.MergeInfo; -import org.apache.lucene.store.MockDirectoryWrapper.Throttling; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.store.MockDirectoryWrapper.Throttling; import org.apache.lucene.store.NRTCachingDirectory; import org.apache.lucene.store.RateLimitedDirectoryWrapper; import org.apache.lucene.util.automaton.AutomatonTestUtil; @@ -136,6 +137,7 @@ import org.junit.Test; import org.junit.rules.RuleChain; import org.junit.rules.TestRule; import org.junit.runner.RunWith; + import com.carrotsearch.randomizedtesting.JUnit4MethodProvider; import com.carrotsearch.randomizedtesting.LifecycleScope; import com.carrotsearch.randomizedtesting.MixWithSuiteName; @@ -146,16 +148,16 @@ import com.carrotsearch.randomizedtestin import com.carrotsearch.randomizedtesting.annotations.SeedDecorators; import com.carrotsearch.randomizedtesting.annotations.TestGroup; import com.carrotsearch.randomizedtesting.annotations.TestMethodProviders; -import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction.Action; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction; +import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction.Action; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; -import com.carrotsearch.randomizedtesting.annotations.ThreadLeakGroup.Group; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakGroup; +import com.carrotsearch.randomizedtesting.annotations.ThreadLeakGroup.Group; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering; -import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope.Scope; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope; -import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies.Consequence; +import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope.Scope; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies; +import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies.Consequence; import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; import com.carrotsearch.randomizedtesting.generators.RandomPicks; import com.carrotsearch.randomizedtesting.rules.NoClassHooksShadowingRule; @@ -2218,7 +2220,7 @@ public abstract class LuceneTestCase ext private static Set getDVFields(IndexReader reader) { Set fields = new HashSet<>(); for(FieldInfo fi : MultiFields.getMergedFieldInfos(reader)) { - if (fi.hasDocValues()) { + if (fi.getDocValuesType() != DocValuesType.NONE) { fields.add(fi.name); } } Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/IndexSchema.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/IndexSchema.java?rev=1636218&r1=1636217&r2=1636218&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/IndexSchema.java (original) +++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/IndexSchema.java Sun Nov 2 23:54:10 2014 @@ -17,9 +17,34 @@ package org.apache.solr.schema; +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.regex.Pattern; + +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpressionException; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.DelegatingAnalyzerWrapper; +import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.FieldInfo; +import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.MultiFields; @@ -32,14 +57,14 @@ import org.apache.solr.common.SolrExcept import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.SimpleOrderedMap; +import org.apache.solr.core.Config; +import org.apache.solr.core.SolrConfig; +import org.apache.solr.core.SolrResourceLoader; import org.apache.solr.request.LocalSolrQueryRequest; import org.apache.solr.response.SchemaXmlWriter; import org.apache.solr.response.SolrQueryResponse; -import org.apache.solr.util.DOMUtil; -import org.apache.solr.core.SolrConfig; -import org.apache.solr.core.Config; -import org.apache.solr.core.SolrResourceLoader; import org.apache.solr.search.similarities.DefaultSimilarityFactory; +import org.apache.solr.util.DOMUtil; import org.apache.solr.util.plugin.SolrCoreAware; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,29 +75,6 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpressionException; - -import java.io.IOException; -import java.io.Writer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; -import java.util.SortedSet; -import java.util.TreeMap; -import java.util.TreeSet; -import java.util.regex.Pattern; - import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; @@ -367,7 +369,7 @@ public class IndexSchema { public Map getUninversionMap(IndexReader reader) { Map map = new HashMap<>(); for (FieldInfo f : MultiFields.getMergedFieldInfos(reader)) { - if (f.hasDocValues() == false && f.isIndexed()) { + if (f.getDocValuesType() == DocValuesType.NONE && f.getIndexOptions() != IndexOptions.NONE) { SchemaField sf = getFieldOrNull(f.name); if (sf != null) { UninvertingReader.Type type = sf.getType().getUninversionType(sf);