Index: lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoFormat.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoFormat.java (revision 1560368) +++ lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoFormat.java (working copy) @@ -67,11 +67,12 @@ * * @see SegmentInfos * @lucene.experimental - * @deprecated Only for reading old 4.0-4.5 segments + * @deprecated Only for reading old 4.0-4.5 segments, and supporting IndexWriter.addIndexes */ @Deprecated public class Lucene40SegmentInfoFormat extends SegmentInfoFormat { private final SegmentInfoReader reader = new Lucene40SegmentInfoReader(); + private final SegmentInfoWriter writer = new Lucene40SegmentInfoWriter(); /** Sole constructor. */ public Lucene40SegmentInfoFormat() { @@ -82,9 +83,11 @@ return reader; } + // we must unfortunately support write, to allow addIndexes to write a new .si with rewritten filenames: + // see LUCENE-5377 @Override public SegmentInfoWriter getSegmentInfoWriter() { - throw new UnsupportedOperationException("this codec can only be used for reading"); + return writer; } /** File extension used to store {@link SegmentInfo}. */ Index: lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoWriter.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoWriter.java (revision 0) +++ lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoWriter.java (working copy) @@ -0,0 +1,76 @@ +package org.apache.lucene.codecs.lucene40; + +/* + * 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. + */ + +import java.io.IOException; +import java.util.Collections; + +import org.apache.lucene.codecs.CodecUtil; +import org.apache.lucene.codecs.SegmentInfoWriter; +import org.apache.lucene.index.FieldInfos; +import org.apache.lucene.index.IndexFileNames; +import org.apache.lucene.index.SegmentInfo; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.IOContext; +import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.util.IOUtils; + +/** + * Lucene 4.0 implementation of {@link SegmentInfoWriter}. + * + * @see Lucene40SegmentInfoFormat + * @lucene.experimental + */ +@Deprecated +public class Lucene40SegmentInfoWriter extends SegmentInfoWriter { + + /** Sole constructor. */ + public Lucene40SegmentInfoWriter() { + } + + /** Save a single segment's info. */ + @Override + public void write(Directory dir, SegmentInfo si, FieldInfos fis, IOContext ioContext) throws IOException { + final String fileName = IndexFileNames.segmentFileName(si.name, "", Lucene40SegmentInfoFormat.SI_EXTENSION); + si.addFile(fileName); + + final IndexOutput output = dir.createOutput(fileName, ioContext); + + boolean success = false; + try { + CodecUtil.writeHeader(output, Lucene40SegmentInfoFormat.CODEC_NAME, Lucene40SegmentInfoFormat.VERSION_CURRENT); + // Write the Lucene version that created this segment, since 3.1 + output.writeString(si.getVersion()); + output.writeInt(si.getDocCount()); + + output.writeByte((byte) (si.getUseCompoundFile() ? SegmentInfo.YES : SegmentInfo.NO)); + output.writeStringStringMap(si.getDiagnostics()); + output.writeStringStringMap(Collections.emptyMap()); + output.writeStringSet(si.files()); + + success = true; + } finally { + if (!success) { + IOUtils.closeWhileHandlingException(output); + si.dir.deleteFile(fileName); + } else { + output.close(); + } + } + } +} Property changes on: lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoWriter.java ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (revision 1560368) +++ lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (working copy) @@ -213,6 +213,7 @@ @BeforeClass public static void beforeClass() throws Exception { + assertFalse("test infra is broken!", LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE); List names = new ArrayList(oldNames.length + oldSingleSegmentNames.length); names.addAll(Arrays.asList(oldNames)); names.addAll(Arrays.asList(oldSingleSegmentNames)); Index: lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40RWCodec.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40RWCodec.java (revision 1560368) +++ lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40RWCodec.java (working copy) @@ -41,17 +41,6 @@ } }; - private final SegmentInfoFormat infosFormat = new Lucene40SegmentInfoFormat() { - @Override - public org.apache.lucene.codecs.SegmentInfoWriter getSegmentInfoWriter() { - if (!LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE) { - return super.getSegmentInfoWriter(); - } else { - return new Lucene40SegmentInfoWriter(); - } - } - }; - private final DocValuesFormat docValues = new Lucene40RWDocValuesFormat(); private final NormsFormat norms = new Lucene40RWNormsFormat(); @@ -70,9 +59,4 @@ return norms; } - @Override - public SegmentInfoFormat segmentInfoFormat() { - return infosFormat; - } - } Index: lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoWriter.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoWriter.java (revision 1560368) +++ lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoWriter.java (working copy) @@ -1,76 +0,0 @@ -package org.apache.lucene.codecs.lucene40; - -/* - * 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. - */ - -import java.io.IOException; -import java.util.Collections; - -import org.apache.lucene.codecs.CodecUtil; -import org.apache.lucene.codecs.SegmentInfoWriter; -import org.apache.lucene.index.FieldInfos; -import org.apache.lucene.index.IndexFileNames; -import org.apache.lucene.index.SegmentInfo; -import org.apache.lucene.store.Directory; -import org.apache.lucene.store.IOContext; -import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.IOUtils; - -/** - * Lucene 4.0 implementation of {@link SegmentInfoWriter}. - * - * @see Lucene40SegmentInfoFormat - * @lucene.experimental - */ -@Deprecated -public class Lucene40SegmentInfoWriter extends SegmentInfoWriter { - - /** Sole constructor. */ - public Lucene40SegmentInfoWriter() { - } - - /** Save a single segment's info. */ - @Override - public void write(Directory dir, SegmentInfo si, FieldInfos fis, IOContext ioContext) throws IOException { - final String fileName = IndexFileNames.segmentFileName(si.name, "", Lucene40SegmentInfoFormat.SI_EXTENSION); - si.addFile(fileName); - - final IndexOutput output = dir.createOutput(fileName, ioContext); - - boolean success = false; - try { - CodecUtil.writeHeader(output, Lucene40SegmentInfoFormat.CODEC_NAME, Lucene40SegmentInfoFormat.VERSION_CURRENT); - // Write the Lucene version that created this segment, since 3.1 - output.writeString(si.getVersion()); - output.writeInt(si.getDocCount()); - - output.writeByte((byte) (si.getUseCompoundFile() ? SegmentInfo.YES : SegmentInfo.NO)); - output.writeStringStringMap(si.getDiagnostics()); - output.writeStringStringMap(Collections.emptyMap()); - output.writeStringSet(si.files()); - - success = true; - } finally { - if (!success) { - IOUtils.closeWhileHandlingException(output); - si.dir.deleteFile(fileName); - } else { - output.close(); - } - } - } -} Index: lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (revision 1560368) +++ lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (working copy) @@ -334,12 +334,12 @@ /** * When {@code true}, Codecs for old Lucene version will support writing - * indexes in that format. Defaults to {@code true}, can be disabled by - * spdecific tests on demand. + * indexes in that format. Defaults to {@code false}, can be disabled by + * specific tests on demand. * * @lucene.internal */ - public static boolean OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; + public static boolean OLD_FORMAT_IMPERSONATION_IS_ACTIVE = false; // ----------------------------------------------------------------- Index: lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java (revision 1560368) +++ lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java (working copy) @@ -155,6 +155,9 @@ avoidCodecs.addAll(Arrays.asList(a.value())); } + // set back to default + LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE = false; + savedCodec = Codec.getDefault(); int randomVal = random.nextInt(10); if ("Lucene40".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) && @@ -163,6 +166,7 @@ randomVal == 0 && !shouldAvoidCodec("Lucene40"))) { codec = Codec.forName("Lucene40"); + LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; assert codec instanceof Lucene40RWCodec : "fix your classpath to have tests-framework.jar before lucene-core.jar"; assert (PostingsFormat.forName("Lucene40") instanceof Lucene40RWPostingsFormat) : "fix your classpath to have tests-framework.jar before lucene-core.jar"; } else if ("Lucene41".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) && @@ -171,6 +175,7 @@ randomVal == 1 && !shouldAvoidCodec("Lucene41"))) { codec = Codec.forName("Lucene41"); + LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; assert codec instanceof Lucene41RWCodec : "fix your classpath to have tests-framework.jar before lucene-core.jar"; } else if ("Lucene42".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) && "random".equals(TEST_POSTINGSFORMAT) && @@ -178,6 +183,7 @@ randomVal == 2 && !shouldAvoidCodec("Lucene42"))) { codec = Codec.forName("Lucene42"); + LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; assert codec instanceof Lucene42RWCodec : "fix your classpath to have tests-framework.jar before lucene-core.jar"; } else if ("Lucene45".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) && "random".equals(TEST_POSTINGSFORMAT) && @@ -185,6 +191,7 @@ randomVal == 5 && !shouldAvoidCodec("Lucene45"))) { codec = Codec.forName("Lucene45"); + LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; assert codec instanceof Lucene45RWCodec : "fix your classpath to have tests-framework.jar before lucene-core.jar"; } else if (("random".equals(TEST_POSTINGSFORMAT) == false) || ("random".equals(TEST_DOCVALUESFORMAT) == false)) { // the user wired postings or DV: this is messy