Index: oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexDefinition.java =================================================================== --- oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexDefinition.java (revision 1847558) +++ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexDefinition.java (working copy) @@ -25,6 +25,7 @@ import com.google.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.plugins.index.lucene.util.TokenizerChain; import org.apache.jackrabbit.oak.plugins.index.lucene.writer.CommitMitigatingTieredMergePolicy; +import org.apache.jackrabbit.oak.plugins.index.lucene.writer.OakCodec; import org.apache.jackrabbit.oak.plugins.index.search.FieldNames; import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; import org.apache.jackrabbit.oak.plugins.index.search.IndexFormatVersion; Index: oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java =================================================================== --- oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java (revision 1847558) +++ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java (working copy) @@ -69,6 +69,7 @@ import org.apache.jackrabbit.oak.plugins.index.lucene.property.PropertyIndexCleaner; import org.apache.jackrabbit.oak.plugins.index.lucene.reader.DefaultIndexReaderFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.score.ScorerProviderFactory; +import org.apache.jackrabbit.oak.plugins.index.lucene.writer.OakCodec; import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache; import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; import org.apache.jackrabbit.oak.plugins.index.search.TextExtractionStatsMBean; @@ -85,9 +86,7 @@ import org.apache.jackrabbit.oak.spi.whiteboard.Registration; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; import org.apache.jackrabbit.oak.stats.Clock; -import org.apache.jackrabbit.oak.stats.MeterStats; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.stats.StatsOptions; import org.apache.lucene.analysis.util.CharFilterFactory; import org.apache.lucene.analysis.util.TokenFilterFactory; import org.apache.lucene.analysis.util.TokenizerFactory; Index: oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakCodec.java =================================================================== --- oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakCodec.java (revision 1847558) +++ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakCodec.java (nonexistent) @@ -1,98 +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.jackrabbit.oak.plugins.index.lucene; - -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.PostingsFormat; -import org.apache.lucene.codecs.SegmentInfoFormat; -import org.apache.lucene.codecs.StoredFieldsFormat; -import org.apache.lucene.codecs.TermVectorsFormat; -import org.apache.lucene.codecs.lucene40.Lucene40LiveDocsFormat; -import org.apache.lucene.codecs.lucene40.Lucene40StoredFieldsFormat; -import org.apache.lucene.codecs.lucene42.Lucene42NormsFormat; -import org.apache.lucene.codecs.lucene42.Lucene42TermVectorsFormat; -import org.apache.lucene.codecs.lucene46.Lucene46Codec; -import org.apache.lucene.codecs.lucene46.Lucene46FieldInfosFormat; -import org.apache.lucene.codecs.lucene46.Lucene46SegmentInfoFormat; - -/** - * Oak specific {@link org.apache.lucene.codecs.Codec}. - * - * It simply mimics {@link Lucene46Codec} but - * with uncompressed {@link StoredFieldsFormat}. - */ -public class OakCodec extends FilterCodec { - - private final TermVectorsFormat vectorsFormat = new Lucene42TermVectorsFormat(); - private final FieldInfosFormat fieldInfosFormat = new Lucene46FieldInfosFormat(); - private final SegmentInfoFormat segmentInfosFormat = new Lucene46SegmentInfoFormat(); - private final LiveDocsFormat liveDocsFormat = new Lucene40LiveDocsFormat(); - private final PostingsFormat defaultFormat = PostingsFormat.forName("Lucene41"); - private final DocValuesFormat defaultDVFormat = DocValuesFormat.forName("Lucene45"); - private final NormsFormat normsFormat = new Lucene42NormsFormat(); - private final StoredFieldsFormat fieldsFormat = new Lucene40StoredFieldsFormat(); - - public OakCodec() { - super("oakCodec", new Lucene46Codec()); - } - - @Override - public PostingsFormat postingsFormat() { - return defaultFormat; - } - - @Override - public DocValuesFormat docValuesFormat() { - return defaultDVFormat; - } - - @Override - public StoredFieldsFormat storedFieldsFormat() { - return fieldsFormat; - } - - @Override - public TermVectorsFormat termVectorsFormat() { - return vectorsFormat; - } - - @Override - public FieldInfosFormat fieldInfosFormat() { - return fieldInfosFormat; - } - - @Override - public SegmentInfoFormat segmentInfoFormat() { - return segmentInfosFormat; - } - - @Override - public NormsFormat normsFormat() { - return normsFormat; - } - - @Override - public LiveDocsFormat liveDocsFormat() { - return liveDocsFormat; - } -} Property changes on: oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakCodec.java ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Index: oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/OakCodec.java =================================================================== --- oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/OakCodec.java (revision 1847558) +++ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/OakCodec.java (working copy) @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.plugins.index.lucene; +package org.apache.jackrabbit.oak.plugins.index.lucene.writer; import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.FieldInfosFormat; Index: oak-lucene/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec =================================================================== --- oak-lucene/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec (revision 1847558) +++ oak-lucene/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec (working copy) @@ -17,4 +17,5 @@ org.apache.lucene.codecs.lucene42.Lucene42Codec org.apache.lucene.codecs.lucene45.Lucene45Codec org.apache.lucene.codecs.lucene46.Lucene46Codec -org.apache.jackrabbit.oak.plugins.index.lucene.OakCodec \ No newline at end of file +org.apache.jackrabbit.oak.plugins.index.lucene.writer.OakCodec +org.apache.jackrabbit.oak.plugins.index.lucene.writer.CompressingCodec \ No newline at end of file Index: oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexDefinitionTest.java =================================================================== --- oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexDefinitionTest.java (revision 1847558) +++ oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexDefinitionTest.java (working copy) @@ -31,6 +31,7 @@ import org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder; import org.apache.jackrabbit.oak.plugins.index.lucene.util.TokenizerChain; import org.apache.jackrabbit.oak.plugins.index.lucene.writer.CommitMitigatingTieredMergePolicy; +import org.apache.jackrabbit.oak.plugins.index.lucene.writer.OakCodec; import org.apache.jackrabbit.oak.plugins.index.search.Aggregate; import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants; import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition;