You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/11/01 18:04:39 UTC
svn commit: r1196133 - in /lucene/dev/branches/lucene2621/lucene/src:
test-framework/java/org/apache/lucene/index/codecs/nestedpulsing/
test-framework/resources/META-INF/services/
test/org/apache/lucene/index/codecs/pulsing/
Author: rmuir
Date: Tue Nov 1 17:04:39 2011
New Revision: 1196133
URL: http://svn.apache.org/viewvc?rev=1196133&view=rev
Log:
LUCENE-3490: register NestedPulsing
Added:
lucene/dev/branches/lucene2621/lucene/src/test-framework/java/org/apache/lucene/index/codecs/nestedpulsing/
lucene/dev/branches/lucene2621/lucene/src/test-framework/java/org/apache/lucene/index/codecs/nestedpulsing/NestedPulsingPostingsFormat.java (with props)
Modified:
lucene/dev/branches/lucene2621/lucene/src/test-framework/resources/META-INF/services/org.apache.lucene.index.codecs.PostingsFormat
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/TestPulsingReuse.java
Added: lucene/dev/branches/lucene2621/lucene/src/test-framework/java/org/apache/lucene/index/codecs/nestedpulsing/NestedPulsingPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/java/org/apache/lucene/index/codecs/nestedpulsing/NestedPulsingPostingsFormat.java?rev=1196133&view=auto
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/java/org/apache/lucene/index/codecs/nestedpulsing/NestedPulsingPostingsFormat.java (added)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/java/org/apache/lucene/index/codecs/nestedpulsing/NestedPulsingPostingsFormat.java Tue Nov 1 17:04:39 2011
@@ -0,0 +1,96 @@
+package org.apache.lucene.index.codecs.nestedpulsing;
+
+/**
+ * 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.Set;
+
+import org.apache.lucene.index.SegmentInfo;
+import org.apache.lucene.index.SegmentReadState;
+import org.apache.lucene.index.SegmentWriteState;
+import org.apache.lucene.index.codecs.BlockTreeTermsReader;
+import org.apache.lucene.index.codecs.BlockTreeTermsWriter;
+import org.apache.lucene.index.codecs.FieldsConsumer;
+import org.apache.lucene.index.codecs.FieldsProducer;
+import org.apache.lucene.index.codecs.PostingsFormat;
+import org.apache.lucene.index.codecs.PostingsReaderBase;
+import org.apache.lucene.index.codecs.PostingsWriterBase;
+import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsReader;
+import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsWriter;
+import org.apache.lucene.index.codecs.pulsing.PulsingPostingsReader;
+import org.apache.lucene.index.codecs.pulsing.PulsingPostingsWriter;
+import org.apache.lucene.store.Directory;
+
+/**
+ * Pulsing(1, Pulsing(2, Lucene40))
+ * @lucene.experimental
+ */
+public class NestedPulsingPostingsFormat extends PostingsFormat {
+ public NestedPulsingPostingsFormat() {
+ super("NestedPulsing");
+ }
+
+ @Override
+ public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
+ PostingsWriterBase docsWriter = new Lucene40PostingsWriter(state);
+
+ PostingsWriterBase pulsingWriterInner = new PulsingPostingsWriter(2, docsWriter);
+ PostingsWriterBase pulsingWriter = new PulsingPostingsWriter(1, pulsingWriterInner);
+
+ // Terms dict
+ boolean success = false;
+ try {
+ FieldsConsumer ret = new BlockTreeTermsWriter(state, pulsingWriter,
+ BlockTreeTermsWriter.DEFAULT_MIN_BLOCK_SIZE, BlockTreeTermsWriter.DEFAULT_MAX_BLOCK_SIZE);
+ success = true;
+ return ret;
+ } finally {
+ if (!success) {
+ pulsingWriter.close();
+ }
+ }
+ }
+
+ @Override
+ public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
+ PostingsReaderBase docsReader = new Lucene40PostingsReader(state.dir, state.segmentInfo, state.context, state.formatId);
+ PostingsReaderBase pulsingReaderInner = new PulsingPostingsReader(docsReader);
+ PostingsReaderBase pulsingReader = new PulsingPostingsReader(pulsingReaderInner);
+ boolean success = false;
+ try {
+ FieldsProducer ret = new BlockTreeTermsReader(
+ state.dir, state.fieldInfos, state.segmentInfo.name,
+ pulsingReader,
+ state.context,
+ state.formatId,
+ state.termsIndexDivisor);
+ success = true;
+ return ret;
+ } finally {
+ if (!success) {
+ pulsingReader.close();
+ }
+ }
+ }
+
+ @Override
+ public void files(Directory dir, SegmentInfo segmentInfo, int id, Set<String> files) throws IOException {
+ Lucene40PostingsReader.files(dir, segmentInfo, id, files);
+ BlockTreeTermsReader.files(dir, segmentInfo, id, files);
+ }
+}
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/resources/META-INF/services/org.apache.lucene.index.codecs.PostingsFormat
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/resources/META-INF/services/org.apache.lucene.index.codecs.PostingsFormat?rev=1196133&r1=1196132&r2=1196133&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/resources/META-INF/services/org.apache.lucene.index.codecs.PostingsFormat (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/resources/META-INF/services/org.apache.lucene.index.codecs.PostingsFormat Tue Nov 1 17:04:39 2011
@@ -17,3 +17,4 @@ org.apache.lucene.index.codecs.mockintbl
org.apache.lucene.index.codecs.mockintblock.MockVariableIntBlockPostingsFormat
org.apache.lucene.index.codecs.mockrandom.MockRandomPostingsFormat
org.apache.lucene.index.codecs.mocksep.MockSepPostingsFormat
+org.apache.lucene.index.codecs.nestedpulsing.NestedPulsingPostingsFormat
\ No newline at end of file
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/TestPulsingReuse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/TestPulsingReuse.java?rev=1196133&r1=1196132&r2=1196133&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/TestPulsingReuse.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/TestPulsingReuse.java Tue Nov 1 17:04:39 2011
@@ -17,10 +17,8 @@ package org.apache.lucene.index.codecs.p
* limitations under the License.
*/
-import java.io.IOException;
import java.util.IdentityHashMap;
import java.util.Map;
-import java.util.Set;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
@@ -31,20 +29,9 @@ import org.apache.lucene.index.DocsAndPo
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
-import org.apache.lucene.index.SegmentInfo;
-import org.apache.lucene.index.SegmentReadState;
-import org.apache.lucene.index.SegmentWriteState;
import org.apache.lucene.index.TermsEnum;
-import org.apache.lucene.index.codecs.BlockTreeTermsReader;
-import org.apache.lucene.index.codecs.BlockTreeTermsWriter;
import org.apache.lucene.index.codecs.Codec;
-import org.apache.lucene.index.codecs.FieldsConsumer;
-import org.apache.lucene.index.codecs.FieldsProducer;
-import org.apache.lucene.index.codecs.PostingsFormat;
-import org.apache.lucene.index.codecs.PostingsReaderBase;
-import org.apache.lucene.index.codecs.PostingsWriterBase;
-import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsReader;
-import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsWriter;
+import org.apache.lucene.index.codecs.nestedpulsing.NestedPulsingPostingsFormat;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.LuceneTestCase;
@@ -97,7 +84,7 @@ public class TestPulsingReuse extends Lu
/** tests reuse with Pulsing1(Pulsing2(Standard)) */
public void testNestedPulsing() throws Exception {
// we always run this test with pulsing codec.
- Codec cp = _TestUtil.alwaysFormat(new NestedPulsing());
+ Codec cp = _TestUtil.alwaysFormat(new NestedPulsingPostingsFormat());
MockDirectoryWrapper dir = newDirectory();
dir.setCheckIndexOnClose(false); // will do this ourselves, custom codec
RandomIndexWriter iw = new RandomIndexWriter(random, dir,
@@ -137,59 +124,4 @@ public class TestPulsingReuse extends Lu
ci.checkIndex(null);
dir.close();
}
-
- static class NestedPulsing extends PostingsFormat {
- public NestedPulsing() {
- super("NestedPulsing");
- }
-
- @Override
- public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
- PostingsWriterBase docsWriter = new Lucene40PostingsWriter(state);
-
- PostingsWriterBase pulsingWriterInner = new PulsingPostingsWriter(2, docsWriter);
- PostingsWriterBase pulsingWriter = new PulsingPostingsWriter(1, pulsingWriterInner);
-
- // Terms dict
- boolean success = false;
- try {
- FieldsConsumer ret = new BlockTreeTermsWriter(state, pulsingWriter,
- BlockTreeTermsWriter.DEFAULT_MIN_BLOCK_SIZE, BlockTreeTermsWriter.DEFAULT_MAX_BLOCK_SIZE);
- success = true;
- return ret;
- } finally {
- if (!success) {
- pulsingWriter.close();
- }
- }
- }
-
- @Override
- public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
- PostingsReaderBase docsReader = new Lucene40PostingsReader(state.dir, state.segmentInfo, state.context, state.formatId);
- PostingsReaderBase pulsingReaderInner = new PulsingPostingsReader(docsReader);
- PostingsReaderBase pulsingReader = new PulsingPostingsReader(pulsingReaderInner);
- boolean success = false;
- try {
- FieldsProducer ret = new BlockTreeTermsReader(
- state.dir, state.fieldInfos, state.segmentInfo.name,
- pulsingReader,
- state.context,
- state.formatId,
- state.termsIndexDivisor);
- success = true;
- return ret;
- } finally {
- if (!success) {
- pulsingReader.close();
- }
- }
- }
-
- @Override
- public void files(Directory dir, SegmentInfo segmentInfo, int id, Set<String> files) throws IOException {
- Lucene40PostingsReader.files(dir, segmentInfo, id, files);
- BlockTreeTermsReader.files(dir, segmentInfo, id, files);
- }
- }
}