diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene60/Lucene60Codec.java b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene60/Lucene60Codec.java deleted file mode 100644 index f9b8671fcb6..00000000000 --- a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene60/Lucene60Codec.java +++ /dev/null @@ -1,177 +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.codecs.lucene60; - -import java.util.Objects; - -import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.CompoundFormat; -import org.apache.lucene.codecs.DocValuesFormat; -import org.apache.lucene.codecs.FieldInfosFormat; -import org.apache.lucene.codecs.FilterCodec; -import org.apache.lucene.codecs.LiveDocsFormat; -import org.apache.lucene.codecs.NormsFormat; -import org.apache.lucene.codecs.PointsFormat; -import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.SegmentInfoFormat; -import org.apache.lucene.codecs.StoredFieldsFormat; -import org.apache.lucene.codecs.TermVectorsFormat; -import org.apache.lucene.codecs.lucene50.Lucene50CompoundFormat; -import org.apache.lucene.codecs.lucene50.Lucene50LiveDocsFormat; -import org.apache.lucene.codecs.lucene50.Lucene50SegmentInfoFormat; -import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat.Mode; -import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat; -import org.apache.lucene.codecs.lucene50.Lucene50TermVectorsFormat; -import org.apache.lucene.codecs.lucene53.Lucene53NormsFormat; -import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat; -import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat; - -/** - * Implements the Lucene 6.0 index format, with configurable per-field postings - * and docvalues formats. - *

- * If you want to reuse functionality of this codec in another codec, extend - * {@link FilterCodec}. - * - * @see org.apache.lucene.codecs.lucene60 package documentation for file format details. - * - * @lucene.experimental - * @deprecated Only for 6.0 back compat - */ -@Deprecated -public class Lucene60Codec extends Codec { - private final TermVectorsFormat vectorsFormat = new Lucene50TermVectorsFormat(); - private final FieldInfosFormat fieldInfosFormat = new Lucene60FieldInfosFormat(); - private final SegmentInfoFormat segmentInfosFormat = new Lucene50SegmentInfoFormat(); - private final LiveDocsFormat liveDocsFormat = new Lucene50LiveDocsFormat(); - private final CompoundFormat compoundFormat = new Lucene50CompoundFormat(); - - private final PostingsFormat postingsFormat = new PerFieldPostingsFormat() { - @Override - public PostingsFormat getPostingsFormatForField(String field) { - return Lucene60Codec.this.getPostingsFormatForField(field); - } - }; - - private final DocValuesFormat docValuesFormat = new PerFieldDocValuesFormat() { - @Override - public DocValuesFormat getDocValuesFormatForField(String field) { - return Lucene60Codec.this.getDocValuesFormatForField(field); - } - }; - - private final StoredFieldsFormat storedFieldsFormat; - - /** - * Instantiates a new codec. - */ - public Lucene60Codec() { - this(Mode.BEST_SPEED); - } - - /** - * Instantiates a new codec, specifying the stored fields compression - * mode to use. - * @param mode stored fields compression mode to use for newly - * flushed/merged segments. - */ - public Lucene60Codec(Mode mode) { - super("Lucene60"); - this.storedFieldsFormat = new Lucene50StoredFieldsFormat(Objects.requireNonNull(mode)); - } - - @Override - public final StoredFieldsFormat storedFieldsFormat() { - return storedFieldsFormat; - } - - @Override - public final TermVectorsFormat termVectorsFormat() { - return vectorsFormat; - } - - @Override - public final PostingsFormat postingsFormat() { - return postingsFormat; - } - - @Override - public final FieldInfosFormat fieldInfosFormat() { - return fieldInfosFormat; - } - - @Override - public SegmentInfoFormat segmentInfoFormat() { - return segmentInfosFormat; - } - - @Override - public final LiveDocsFormat liveDocsFormat() { - return liveDocsFormat; - } - - @Override - public final CompoundFormat compoundFormat() { - return compoundFormat; - } - - @Override - public final PointsFormat pointsFormat() { - return new Lucene60PointsFormat(); - } - - /** Returns the postings format that should be used for writing - * new segments of field. - * - * The default implementation always returns "Lucene50". - *

- * WARNING: if you subclass, you are responsible for index - * backwards compatibility: future version of Lucene are only - * guaranteed to be able to read the default implementation. - */ - public PostingsFormat getPostingsFormatForField(String field) { - return defaultFormat; - } - - /** Returns the docvalues format that should be used for writing - * new segments of field. - * - * The default implementation always returns "Lucene54". - *

- * WARNING: if you subclass, you are responsible for index - * backwards compatibility: future version of Lucene are only - * guaranteed to be able to read the default implementation. - */ - public DocValuesFormat getDocValuesFormatForField(String field) { - return defaultDVFormat; - } - - @Override - public final DocValuesFormat docValuesFormat() { - return docValuesFormat; - } - - private final PostingsFormat defaultFormat = PostingsFormat.forName("Lucene50"); - private final DocValuesFormat defaultDVFormat = DocValuesFormat.forName("Lucene54"); - - private final NormsFormat normsFormat = new Lucene53NormsFormat(); - - @Override - public NormsFormat normsFormat() { - return normsFormat; - } -} diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene60/package.html b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene60/package.html deleted file mode 100644 index 6b4e234826d..00000000000 --- a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene60/package.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - -Lucene 6.0 file format. - - diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene62/Lucene62Codec.java b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene62/Lucene62Codec.java deleted file mode 100644 index 3dd7daa3aa0..00000000000 --- a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene62/Lucene62Codec.java +++ /dev/null @@ -1,176 +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.codecs.lucene62; - -import java.util.Objects; - -import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.CompoundFormat; -import org.apache.lucene.codecs.DocValuesFormat; -import org.apache.lucene.codecs.FieldInfosFormat; -import org.apache.lucene.codecs.FilterCodec; -import org.apache.lucene.codecs.LiveDocsFormat; -import org.apache.lucene.codecs.NormsFormat; -import org.apache.lucene.codecs.PointsFormat; -import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.SegmentInfoFormat; -import org.apache.lucene.codecs.StoredFieldsFormat; -import org.apache.lucene.codecs.TermVectorsFormat; -import org.apache.lucene.codecs.lucene50.Lucene50CompoundFormat; -import org.apache.lucene.codecs.lucene50.Lucene50LiveDocsFormat; -import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat; -import org.apache.lucene.codecs.lucene50.Lucene50TermVectorsFormat; -import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat.Mode; -import org.apache.lucene.codecs.lucene53.Lucene53NormsFormat; -import org.apache.lucene.codecs.lucene60.Lucene60FieldInfosFormat; -import org.apache.lucene.codecs.lucene60.Lucene60PointsFormat; -import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat; -import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat; - -/** - * Implements the Lucene 6.2 index format, with configurable per-field postings - * and docvalues formats. - *

- * If you want to reuse functionality of this codec in another codec, extend - * {@link FilterCodec}. - * - * @see org.apache.lucene.codecs.lucene60 package documentation for file format details. - * - * @lucene.experimental - */ -public class Lucene62Codec extends Codec { - private final TermVectorsFormat vectorsFormat = new Lucene50TermVectorsFormat(); - private final FieldInfosFormat fieldInfosFormat = new Lucene60FieldInfosFormat(); - private final SegmentInfoFormat segmentInfosFormat = new Lucene62SegmentInfoFormat(); - private final LiveDocsFormat liveDocsFormat = new Lucene50LiveDocsFormat(); - private final CompoundFormat compoundFormat = new Lucene50CompoundFormat(); - - private final PostingsFormat postingsFormat = new PerFieldPostingsFormat() { - @Override - public PostingsFormat getPostingsFormatForField(String field) { - return Lucene62Codec.this.getPostingsFormatForField(field); - } - }; - - private final DocValuesFormat docValuesFormat = new PerFieldDocValuesFormat() { - @Override - public DocValuesFormat getDocValuesFormatForField(String field) { - return Lucene62Codec.this.getDocValuesFormatForField(field); - } - }; - - private final StoredFieldsFormat storedFieldsFormat; - - /** - * Instantiates a new codec. - */ - public Lucene62Codec() { - this(Mode.BEST_SPEED); - } - - /** - * Instantiates a new codec, specifying the stored fields compression - * mode to use. - * @param mode stored fields compression mode to use for newly - * flushed/merged segments. - */ - public Lucene62Codec(Mode mode) { - super("Lucene62"); - this.storedFieldsFormat = new Lucene50StoredFieldsFormat(Objects.requireNonNull(mode)); - } - - @Override - public final StoredFieldsFormat storedFieldsFormat() { - return storedFieldsFormat; - } - - @Override - public final TermVectorsFormat termVectorsFormat() { - return vectorsFormat; - } - - @Override - public final PostingsFormat postingsFormat() { - return postingsFormat; - } - - @Override - public final FieldInfosFormat fieldInfosFormat() { - return fieldInfosFormat; - } - - @Override - public SegmentInfoFormat segmentInfoFormat() { - return segmentInfosFormat; - } - - @Override - public final LiveDocsFormat liveDocsFormat() { - return liveDocsFormat; - } - - @Override - public final CompoundFormat compoundFormat() { - return compoundFormat; - } - - @Override - public final PointsFormat pointsFormat() { - return new Lucene60PointsFormat(); - } - - /** Returns the postings format that should be used for writing - * new segments of field. - * - * The default implementation always returns "Lucene50". - *

- * WARNING: if you subclass, you are responsible for index - * backwards compatibility: future version of Lucene are only - * guaranteed to be able to read the default implementation. - */ - public PostingsFormat getPostingsFormatForField(String field) { - return defaultFormat; - } - - /** Returns the docvalues format that should be used for writing - * new segments of field. - * - * The default implementation always returns "Lucene54". - *

- * WARNING: if you subclass, you are responsible for index - * backwards compatibility: future version of Lucene are only - * guaranteed to be able to read the default implementation. - */ - public DocValuesFormat getDocValuesFormatForField(String field) { - return defaultDVFormat; - } - - @Override - public final DocValuesFormat docValuesFormat() { - return docValuesFormat; - } - - private final PostingsFormat defaultFormat = PostingsFormat.forName("Lucene50"); - private final DocValuesFormat defaultDVFormat = DocValuesFormat.forName("Lucene54"); - - private final NormsFormat normsFormat = new Lucene53NormsFormat(); - - @Override - public NormsFormat normsFormat() { - return normsFormat; - } -} diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene62/package.html b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene62/package.html deleted file mode 100644 index 74e66d93bc6..00000000000 --- a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene62/package.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - -Lucene 6.2 file format. - - diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/index/package.html b/lucene/backward-codecs/src/java/org/apache/lucene/index/package.html deleted file mode 100644 index 42ff91af613..00000000000 --- a/lucene/backward-codecs/src/java/org/apache/lucene/index/package.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - Tools for handling backwards compatibility issues with indices. - - -Tools for handling backwards compatibility issues with indices. - - diff --git a/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec b/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec index 6954d7a641c..4a812de77e5 100644 --- a/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec +++ b/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec @@ -13,5 +13,3 @@ # See the License for the specific language governing permissions and # limitations under the License. -org.apache.lucene.codecs.lucene60.Lucene60Codec -org.apache.lucene.codecs.lucene62.Lucene62Codec diff --git a/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat b/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat index 26984efd409..4a812de77e5 100644 --- a/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat +++ b/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat @@ -13,4 +13,3 @@ # See the License for the specific language governing permissions and # limitations under the License. -org.apache.lucene.codecs.lucene54.Lucene54DocValuesFormat diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene60/Lucene60RWCodec.java b/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene60/Lucene60RWCodec.java deleted file mode 100644 index eecfe09fa0a..00000000000 --- a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene60/Lucene60RWCodec.java +++ /dev/null @@ -1,38 +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.codecs.lucene60; - -import org.apache.lucene.codecs.NormsFormat; -import org.apache.lucene.codecs.SegmentInfoFormat; -import org.apache.lucene.codecs.lucene50.Lucene50RWSegmentInfoFormat; -import org.apache.lucene.codecs.lucene53.Lucene53RWNormsFormat; - -public class Lucene60RWCodec extends Lucene60Codec { - - private final SegmentInfoFormat segmentInfoFormat = new Lucene50RWSegmentInfoFormat(); - private final NormsFormat normsFormat = new Lucene53RWNormsFormat(); - - @Override - public SegmentInfoFormat segmentInfoFormat() { - return segmentInfoFormat; - } - - @Override - public NormsFormat normsFormat() { - return normsFormat; - } -} diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene62/Lucene62RWCodec.java b/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene62/Lucene62RWCodec.java deleted file mode 100644 index 34d3a7f0eae..00000000000 --- a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene62/Lucene62RWCodec.java +++ /dev/null @@ -1,44 +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.codecs.lucene62; - -import org.apache.lucene.codecs.NormsFormat; -import org.apache.lucene.codecs.SegmentInfoFormat; -import org.apache.lucene.codecs.lucene53.Lucene53RWNormsFormat; -import org.apache.lucene.codecs.lucene62.Lucene62Codec; - -/** - * Read-write version of 6.2 codec for testing - * @deprecated for test purposes only - */ -@Deprecated -public class Lucene62RWCodec extends Lucene62Codec { - - private final SegmentInfoFormat segmentInfoFormat = new Lucene62RWSegmentInfoFormat(); - private final NormsFormat normsFormat = new Lucene53RWNormsFormat(); - - @Override - public SegmentInfoFormat segmentInfoFormat() { - return segmentInfoFormat; - } - - @Override - public NormsFormat normsFormat() { - return normsFormat; - } - -} diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene62/Lucene62RWSegmentInfoFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene62/Lucene62RWSegmentInfoFormat.java deleted file mode 100644 index f2fbe9d70b9..00000000000 --- a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene62/Lucene62RWSegmentInfoFormat.java +++ /dev/null @@ -1,193 +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.codecs.lucene62; - -import java.io.IOException; -import java.util.Set; - -import org.apache.lucene.codecs.CodecUtil; -import org.apache.lucene.index.IndexFileNames; -import org.apache.lucene.index.SegmentInfo; -import org.apache.lucene.search.Sort; -import org.apache.lucene.search.SortField; -import org.apache.lucene.search.SortedNumericSelector; -import org.apache.lucene.search.SortedNumericSortField; -import org.apache.lucene.search.SortedSetSelector; -import org.apache.lucene.search.SortedSetSortField; -import org.apache.lucene.store.Directory; -import org.apache.lucene.store.IOContext; -import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.Version; - -/** - * Read-write version of 6.2 SegmentInfoFormat for testing - * @deprecated for test purposes only - */ -@Deprecated -public class Lucene62RWSegmentInfoFormat extends Lucene62SegmentInfoFormat { - - @Override - public void write(Directory dir, SegmentInfo si, IOContext ioContext) throws IOException { - final String fileName = IndexFileNames.segmentFileName(si.name, "", Lucene62SegmentInfoFormat.SI_EXTENSION); - - try (IndexOutput output = dir.createOutput(fileName, ioContext)) { - // Only add the file once we've successfully created it, else IFD assert can trip: - si.addFile(fileName); - CodecUtil.writeIndexHeader(output, - Lucene62SegmentInfoFormat.CODEC_NAME, - Lucene62SegmentInfoFormat.VERSION_CURRENT, - si.getId(), - ""); - Version version = si.getVersion(); - if (version.major < 5) { - throw new IllegalArgumentException("invalid major version: should be >= 5 but got: " + version.major + " segment=" + si); - } - // Write the Lucene version that created this segment, since 3.1 - output.writeInt(version.major); - output.writeInt(version.minor); - output.writeInt(version.bugfix); - assert version.prerelease == 0; - output.writeInt(si.maxDoc()); - - output.writeByte((byte) (si.getUseCompoundFile() ? SegmentInfo.YES : SegmentInfo.NO)); - output.writeMapOfStrings(si.getDiagnostics()); - Set files = si.files(); - for (String file : files) { - if (!IndexFileNames.parseSegmentName(file).equals(si.name)) { - throw new IllegalArgumentException("invalid files: expected segment=" + si.name + ", got=" + files); - } - } - output.writeSetOfStrings(files); - output.writeMapOfStrings(si.getAttributes()); - - Sort indexSort = si.getIndexSort(); - int numSortFields = indexSort == null ? 0 : indexSort.getSort().length; - output.writeVInt(numSortFields); - for (int i = 0; i < numSortFields; ++i) { - SortField sortField = indexSort.getSort()[i]; - SortField.Type sortType = sortField.getType(); - output.writeString(sortField.getField()); - int sortTypeID; - switch (sortField.getType()) { - case STRING: - sortTypeID = 0; - break; - case LONG: - sortTypeID = 1; - break; - case INT: - sortTypeID = 2; - break; - case DOUBLE: - sortTypeID = 3; - break; - case FLOAT: - sortTypeID = 4; - break; - case CUSTOM: - if (sortField instanceof SortedSetSortField) { - sortTypeID = 5; - sortType = SortField.Type.STRING; - } else if (sortField instanceof SortedNumericSortField) { - sortTypeID = 6; - sortType = ((SortedNumericSortField) sortField).getNumericType(); - } else { - throw new IllegalStateException("Unexpected SortedNumericSortField " + sortField); - } - break; - default: - throw new IllegalStateException("Unexpected sort type: " + sortField.getType()); - } - output.writeVInt(sortTypeID); - if (sortTypeID == 5) { - SortedSetSortField ssf = (SortedSetSortField) sortField; - if (ssf.getSelector() == SortedSetSelector.Type.MIN) { - output.writeByte((byte) 0); - } else if (ssf.getSelector() == SortedSetSelector.Type.MAX) { - output.writeByte((byte) 1); - } else if (ssf.getSelector() == SortedSetSelector.Type.MIDDLE_MIN) { - output.writeByte((byte) 2); - } else if (ssf.getSelector() == SortedSetSelector.Type.MIDDLE_MAX) { - output.writeByte((byte) 3); - } else { - throw new IllegalStateException("Unexpected SortedSetSelector type: " + ssf.getSelector()); - } - } else if (sortTypeID == 6) { - SortedNumericSortField snsf = (SortedNumericSortField) sortField; - if (snsf.getNumericType() == SortField.Type.LONG) { - output.writeByte((byte) 0); - } else if (snsf.getNumericType() == SortField.Type.INT) { - output.writeByte((byte) 1); - } else if (snsf.getNumericType() == SortField.Type.DOUBLE) { - output.writeByte((byte) 2); - } else if (snsf.getNumericType() == SortField.Type.FLOAT) { - output.writeByte((byte) 3); - } else { - throw new IllegalStateException("Unexpected SortedNumericSelector type: " + snsf.getNumericType()); - } - if (snsf.getSelector() == SortedNumericSelector.Type.MIN) { - output.writeByte((byte) 0); - } else if (snsf.getSelector() == SortedNumericSelector.Type.MAX) { - output.writeByte((byte) 1); - } else { - throw new IllegalStateException("Unexpected sorted numeric selector type: " + snsf.getSelector()); - } - } - output.writeByte((byte) (sortField.getReverse() ? 0 : 1)); - - // write missing value - Object missingValue = sortField.getMissingValue(); - if (missingValue == null) { - output.writeByte((byte) 0); - } else { - switch(sortType) { - case STRING: - if (missingValue == SortField.STRING_LAST) { - output.writeByte((byte) 1); - } else if (missingValue == SortField.STRING_FIRST) { - output.writeByte((byte) 2); - } else { - throw new AssertionError("unrecognized missing value for STRING field \"" + sortField.getField() + "\": " + missingValue); - } - break; - case LONG: - output.writeByte((byte) 1); - output.writeLong(((Long) missingValue).longValue()); - break; - case INT: - output.writeByte((byte) 1); - output.writeInt(((Integer) missingValue).intValue()); - break; - case DOUBLE: - output.writeByte((byte) 1); - output.writeLong(Double.doubleToLongBits(((Double) missingValue).doubleValue())); - break; - case FLOAT: - output.writeByte((byte) 1); - output.writeInt(Float.floatToIntBits(((Float) missingValue).floatValue())); - break; - default: - throw new IllegalStateException("Unexpected sort type: " + sortField.getType()); - } - } - } - - CodecUtil.writeFooter(output); - } - } - -} diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene62/TestLucene62SegmentInfoFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene62/TestLucene62SegmentInfoFormat.java deleted file mode 100644 index e0efa9521a3..00000000000 --- a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene62/TestLucene62SegmentInfoFormat.java +++ /dev/null @@ -1,48 +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.codecs.lucene62; - -import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseSegmentInfoFormatTestCase; -import org.apache.lucene.util.Version; - -/** - * Tests Lucene62SegmentInfoFormat - */ -public class TestLucene62SegmentInfoFormat extends BaseSegmentInfoFormatTestCase { - - @Override - protected int getCreatedVersionMajor() { - return Version.LUCENE_6_2_0.major; - } - - @Override - protected Version[] getVersions() { - return new Version[] { Version.LUCENE_6_2_0 }; - } - - @Override - protected Codec getCodec() { - return new Lucene62RWCodec(); - } - - @Override - protected boolean supportsMinVersion() { - return false; - } -} diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java index ad50382120d..22b0ab6c726 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java @@ -1436,9 +1436,10 @@ public class TestBackwardsCompatibility extends LuceneTestCase { } } - public static final String emptyIndex = "empty.6.0.0.zip"; + public static final String emptyIndex = "empty.7.0.0.zip"; public void testUpgradeEmptyOldIndex() throws Exception { + assumeTrue("Reenable when 7.0 is released", false); Path oldIndexDir = createTempDir("emptyIndex"); TestUtil.unzip(getDataInputStream(emptyIndex), oldIndexDir); Directory dir = newFSDirectory(oldIndexDir); @@ -1450,9 +1451,10 @@ public class TestBackwardsCompatibility extends LuceneTestCase { dir.close(); } - public static final String moreTermsIndex = "moreterms.6.0.0.zip"; + public static final String moreTermsIndex = "moreterms.7.0.0.zip"; public void testMoreTerms() throws Exception { + assumeTrue("Reenable when 7.0 is released", false); Path oldIndexDir = createTempDir("moreterms"); TestUtil.unzip(getDataInputStream(moreTermsIndex), oldIndexDir); Directory dir = newFSDirectory(oldIndexDir); @@ -1462,7 +1464,7 @@ public class TestBackwardsCompatibility extends LuceneTestCase { dir.close(); } - public static final String dvUpdatesIndex = "dvupdates.6.0.0.zip"; + public static final String dvUpdatesIndex = "dvupdates.7.0.0.zip"; private void assertNumericDocValues(LeafReader r, String f, String cf) throws IOException { NumericDocValues ndvf = r.getNumericDocValues(f); @@ -1497,6 +1499,7 @@ public class TestBackwardsCompatibility extends LuceneTestCase { } public void testDocValuesUpdates() throws Exception { + assumeTrue("Reenable when 7.0 is released", false); Path oldIndexDir = createTempDir("dvupdates"); TestUtil.unzip(getDataInputStream(dvUpdatesIndex), oldIndexDir); Directory dir = newFSDirectory(oldIndexDir); @@ -1559,7 +1562,8 @@ public class TestBackwardsCompatibility extends LuceneTestCase { } public void testSortedIndex() throws Exception { - String[] versions = new String[] {"6.2.0", "6.2.1", "6.3.0"}; + assumeTrue("Reenable when 7.0 is released", false); + String[] versions = new String[] {}; for(String version : versions) { Path path = createTempDir("sorted"); InputStream resource = TestBackwardsCompatibility.class.getResourceAsStream("sorted." + version + ".zip"); diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestIndexWriterOnOldIndex.java b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestIndexWriterOnOldIndex.java index b48b0fd44e2..db33fb3a8f8 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestIndexWriterOnOldIndex.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestIndexWriterOnOldIndex.java @@ -29,14 +29,15 @@ import org.apache.lucene.util.Version; public class TestIndexWriterOnOldIndex extends LuceneTestCase { public void testOpenModeAndCreatedVersion() throws IOException { - InputStream resource = getClass().getResourceAsStream("unsupported.index.single-empty-doc.630.zip"); + assumeTrue("Reenable when 7.0 is released", false); + InputStream resource = getClass().getResourceAsStream("unsupported.index.single-empty-doc.7.0.0.zip"); assertNotNull(resource); Path path = createTempDir(); TestUtil.unzip(resource, path); Directory dir = newFSDirectory(path); for (OpenMode openMode : OpenMode.values()) { Directory tmpDir = newDirectory(dir); - assertEquals(6 /** 6.3.0 */, SegmentInfos.readLatestCommit(tmpDir).getIndexCreatedVersionMajor()); + assertEquals(7 /** 7.0.0 */, SegmentInfos.readLatestCommit(tmpDir).getIndexCreatedVersionMajor()); IndexWriter w = new IndexWriter(tmpDir, newIndexWriterConfig().setOpenMode(openMode)); w.commit(); w.close(); @@ -45,7 +46,7 @@ public class TestIndexWriterOnOldIndex extends LuceneTestCase { assertEquals(Version.LATEST.major, SegmentInfos.readLatestCommit(tmpDir).getIndexCreatedVersionMajor()); break; default: - assertEquals(6 /** 6.3.0 */, SegmentInfos.readLatestCommit(tmpDir).getIndexCreatedVersionMajor()); + assertEquals(7 /** 7.0.0 */, SegmentInfos.readLatestCommit(tmpDir).getIndexCreatedVersionMajor()); } tmpDir.close(); } diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestManyPointsInOldIndex.java b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestManyPointsInOldIndex.java index 043979b5c27..c567bec9d54 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestManyPointsInOldIndex.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestManyPointsInOldIndex.java @@ -59,6 +59,7 @@ public class TestManyPointsInOldIndex extends LuceneTestCase { } public void testCheckOldIndex() throws IOException { + assumeTrue("Reenable when 7.0 is released", false); Path path = createTempDir("manypointsindex"); InputStream resource = getClass().getResourceAsStream("manypointsindex.zip"); assertNotNull("manypointsindex not found", resource); diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/dvupdates.6.0.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/dvupdates.6.0.0.zip deleted file mode 100644 index 38ac8e11cf1..00000000000 Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/dvupdates.6.0.0.zip and /dev/null differ diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/empty.6.0.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/empty.6.0.0.zip deleted file mode 100644 index 8ca64d39c40..00000000000 Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/empty.6.0.0.zip and /dev/null differ diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/manypointsindex.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/manypointsindex.zip deleted file mode 100644 index c7c0bf77dfb..00000000000 Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/manypointsindex.zip and /dev/null differ diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/maxposindex.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/maxposindex.zip deleted file mode 100644 index aaabb569730..00000000000 Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/maxposindex.zip and /dev/null differ diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/moreterms.6.0.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/moreterms.6.0.0.zip deleted file mode 100644 index 77c448d1d9f..00000000000 Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/moreterms.6.0.0.zip and /dev/null differ diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.2.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.2.0.zip deleted file mode 100644 index b595d9b4106..00000000000 Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.2.0.zip and /dev/null differ diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.2.1.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.2.1.zip deleted file mode 100644 index 40d1ccc33ef..00000000000 Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.2.1.zip and /dev/null differ diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.3.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.3.0.zip deleted file mode 100644 index 6d89d781ef2..00000000000 Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.3.0.zip and /dev/null differ diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.630.brokenoffsets.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.630.brokenoffsets.zip deleted file mode 100644 index 3cf476a07d5..00000000000 Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.630.brokenoffsets.zip and /dev/null differ diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.single-empty-doc.630.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.single-empty-doc.630.zip deleted file mode 100644 index 1bf1d08ba24..00000000000 Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.single-empty-doc.630.zip and /dev/null differ