Index: lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat =================================================================== --- lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat (revision 1359302) +++ lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat (working copy) @@ -19,4 +19,6 @@ org.apache.lucene.codecs.memory.MemoryPostingsFormat org.apache.lucene.codecs.pfor.ForPostingsFormat org.apache.lucene.codecs.pfor.PForPostingsFormat +org.apache.lucene.codecs.pfor.PulsingForPostingsFormat +org.apache.lucene.codecs.pfor.PulsingPForPostingsFormat org.apache.lucene.codecs.bulkvint.BulkVIntPostingsFormat Index: lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (revision 1359302) +++ lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (working copy) @@ -76,7 +76,7 @@ // we won't even be running the actual code, only the impostor // @SuppressCodecs("Lucene4x") // Sep codec cannot yet handle the offsets in our 4.x index! -@SuppressCodecs({"MockFixedIntBlock", "MockVariableIntBlock", "MockSep", "MockRandom","For","PFor"}) +@SuppressCodecs({"MockFixedIntBlock", "MockVariableIntBlock", "MockSep", "MockRandom","For","PFor","PulsingPFor","PulsingFor"}) public class TestBackwardsCompatibility extends LuceneTestCase { // Uncomment these cases & run them on an older Lucene Index: lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java (revision 1359302) +++ lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java (working copy) @@ -49,7 +49,7 @@ // TODO: we really need to test indexingoffsets, but then getting only docs / docs + freqs. // not all codecs store prx separate... // TODO: fix sep codec to index offsets so we can greatly reduce this list! -@SuppressCodecs({"MockFixedIntBlock", "MockVariableIntBlock", "MockSep", "MockRandom","For","PFor"}) +@SuppressCodecs({"MockFixedIntBlock", "MockVariableIntBlock", "MockSep", "MockRandom","For","PFor","PulsingFor","PulsingPFor"}) public class TestPostingsOffsets extends LuceneTestCase { IndexWriterConfig iwc; Index: lucene/core/src/java/org/apache/lucene/codecs/pfor/ForPostingsBaseFormat.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/pfor/ForPostingsBaseFormat.java (revision 0) +++ lucene/core/src/java/org/apache/lucene/codecs/pfor/ForPostingsBaseFormat.java (working copy) @@ -0,0 +1,58 @@ +package org.apache.lucene.codecs.pfor; +/** + * 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 org.apache.lucene.store.IOContext; +import org.apache.lucene.index.SegmentInfo; +import org.apache.lucene.index.SegmentWriteState; +import org.apache.lucene.index.SegmentReadState; +import org.apache.lucene.codecs.FieldsConsumer; +import org.apache.lucene.codecs.FieldsProducer; +import org.apache.lucene.codecs.BlockTreeTermsWriter; +import org.apache.lucene.codecs.BlockTreeTermsReader; +import org.apache.lucene.codecs.TermsIndexReaderBase; +import org.apache.lucene.codecs.TermsIndexWriterBase; +import org.apache.lucene.codecs.FixedGapTermsIndexReader; +import org.apache.lucene.codecs.FixedGapTermsIndexWriter; +import org.apache.lucene.codecs.PostingsBaseFormat; +import org.apache.lucene.codecs.PostingsWriterBase; +import org.apache.lucene.codecs.PostingsReaderBase; +import org.apache.lucene.codecs.sep.SepPostingsReader; +import org.apache.lucene.codecs.sep.SepPostingsWriter; + +public final class ForPostingsBaseFormat extends PostingsBaseFormat { + + public ForPostingsBaseFormat() { + super("For"); + } + @Override + public PostingsReaderBase postingsReaderBase(SegmentReadState state) throws IOException { + return new SepPostingsReader(state.dir, + state.fieldInfos, + state.segmentInfo, + state.context, + new ForFactory(), + state.segmentSuffix); + } + + @Override + public PostingsWriterBase postingsWriterBase(SegmentWriteState state) throws IOException { + return new SepPostingsWriter(state, new ForFactory()); + } +} Index: lucene/core/src/java/org/apache/lucene/codecs/pfor/PulsingForPostingsFormat.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/pfor/PulsingForPostingsFormat.java (revision 0) +++ lucene/core/src/java/org/apache/lucene/codecs/pfor/PulsingForPostingsFormat.java (working copy) @@ -0,0 +1,35 @@ +package org.apache.lucene.codecs.pfor; +/** + * 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.util.Set; +import java.io.IOException; + +import org.apache.lucene.codecs.BlockTreeTermsWriter; +import org.apache.lucene.codecs.pulsing.PulsingPostingsFormat; + +public final class PulsingForPostingsFormat extends PulsingPostingsFormat { + public PulsingForPostingsFormat() { + this(1); + } + public PulsingForPostingsFormat(int freqCutoff) { + this(freqCutoff, BlockTreeTermsWriter.DEFAULT_MIN_BLOCK_SIZE, BlockTreeTermsWriter.DEFAULT_MAX_BLOCK_SIZE); + } + public PulsingForPostingsFormat(int freqCutoff,int minBlockSize, int maxBlockSize) { + super("PulsingFor", new ForPostingsBaseFormat(), freqCutoff, minBlockSize, maxBlockSize); + } +} Index: lucene/core/src/java/org/apache/lucene/codecs/pfor/PForPostingsBaseFormat.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/pfor/PForPostingsBaseFormat.java (revision 0) +++ lucene/core/src/java/org/apache/lucene/codecs/pfor/PForPostingsBaseFormat.java (working copy) @@ -0,0 +1,58 @@ +package org.apache.lucene.codecs.pfor; +/** + * 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 org.apache.lucene.store.IOContext; +import org.apache.lucene.index.SegmentInfo; +import org.apache.lucene.index.SegmentWriteState; +import org.apache.lucene.index.SegmentReadState; +import org.apache.lucene.codecs.FieldsConsumer; +import org.apache.lucene.codecs.FieldsProducer; +import org.apache.lucene.codecs.BlockTreeTermsWriter; +import org.apache.lucene.codecs.BlockTreeTermsReader; +import org.apache.lucene.codecs.TermsIndexReaderBase; +import org.apache.lucene.codecs.TermsIndexWriterBase; +import org.apache.lucene.codecs.FixedGapTermsIndexReader; +import org.apache.lucene.codecs.FixedGapTermsIndexWriter; +import org.apache.lucene.codecs.PostingsBaseFormat; +import org.apache.lucene.codecs.PostingsWriterBase; +import org.apache.lucene.codecs.PostingsReaderBase; +import org.apache.lucene.codecs.sep.SepPostingsReader; +import org.apache.lucene.codecs.sep.SepPostingsWriter; + +public final class PForPostingsBaseFormat extends PostingsBaseFormat { + + public PForPostingsBaseFormat() { + super("PFor"); + } + @Override + public PostingsReaderBase postingsReaderBase(SegmentReadState state) throws IOException { + return new SepPostingsReader(state.dir, + state.fieldInfos, + state.segmentInfo, + state.context, + new PForFactory(), + state.segmentSuffix); + } + + @Override + public PostingsWriterBase postingsWriterBase(SegmentWriteState state) throws IOException { + return new SepPostingsWriter(state, new PForFactory()); + } +} Index: lucene/core/src/java/org/apache/lucene/codecs/pfor/PulsingPForPostingsFormat.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/pfor/PulsingPForPostingsFormat.java (revision 0) +++ lucene/core/src/java/org/apache/lucene/codecs/pfor/PulsingPForPostingsFormat.java (working copy) @@ -0,0 +1,35 @@ +package org.apache.lucene.codecs.pfor; +/** + * 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.util.Set; +import java.io.IOException; + +import org.apache.lucene.codecs.BlockTreeTermsWriter; +import org.apache.lucene.codecs.pulsing.PulsingPostingsFormat; + +public final class PulsingPForPostingsFormat extends PulsingPostingsFormat { + public PulsingPForPostingsFormat() { + this(1); + } + public PulsingPForPostingsFormat(int freqCutoff) { + this(freqCutoff, BlockTreeTermsWriter.DEFAULT_MIN_BLOCK_SIZE, BlockTreeTermsWriter.DEFAULT_MAX_BLOCK_SIZE); + } + public PulsingPForPostingsFormat(int freqCutoff,int minBlockSize, int maxBlockSize) { + super("PulsingPFor", new PForPostingsBaseFormat(), freqCutoff, minBlockSize, maxBlockSize); + } +} Index: lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java (revision 1359302) +++ lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java (working copy) @@ -488,6 +488,8 @@ add("MockRandom"); add("For"); add("PFor"); + add("PulsingFor"); + add("PulsingPFor"); }}; private static void checkRandomData(Random random, Analyzer a, int iterations, int maxWordLength, boolean useCharFilter, boolean simple, boolean offsetsAreCorrect, RandomIndexWriter iw) throws IOException {