Skip to content

Commit dab33bb

Browse files
Remaining Lucene103Codec changes (#19713) (#19739)
(cherry picked from commit 226e494) Signed-off-by: Ankit Jain <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 7d6e74d commit dab33bb

File tree

9 files changed

+21
-22
lines changed

9 files changed

+21
-22
lines changed

server/src/main/java/org/opensearch/index/codec/composite/CompositeCodecFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.apache.lucene.codecs.Codec;
1313
import org.apache.lucene.codecs.lucene103.Lucene103Codec;
1414
import org.opensearch.common.annotation.ExperimentalApi;
15-
import org.opensearch.index.codec.composite.backward_codecs.composite101.Composite101Codec;
1615
import org.opensearch.index.codec.composite.composite103.Composite103Codec;
1716
import org.opensearch.index.mapper.MapperService;
1817

@@ -33,7 +32,7 @@
3332
public class CompositeCodecFactory {
3433

3534
// we can use this to track the latest composite codec
36-
public static final String COMPOSITE_CODEC = Composite101Codec.COMPOSITE_INDEX_CODEC_NAME;
35+
public static final String COMPOSITE_CODEC = Composite103Codec.COMPOSITE_INDEX_CODEC_NAME;
3736

3837
public CompositeCodecFactory() {}
3938

server/src/test/java/org/opensearch/index/codec/composite/LuceneDocValuesConsumerFactoryTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88

99
package org.opensearch.index.codec.composite;
1010

11-
import org.apache.lucene.backward_codecs.lucene101.Lucene101Codec;
1211
import org.apache.lucene.codecs.DocValuesConsumer;
12+
import org.apache.lucene.codecs.lucene103.Lucene103Codec;
1313
import org.apache.lucene.index.FieldInfo;
1414
import org.apache.lucene.index.FieldInfos;
1515
import org.apache.lucene.index.SegmentInfo;
1616
import org.apache.lucene.index.SegmentWriteState;
1717
import org.apache.lucene.store.Directory;
1818
import org.apache.lucene.util.InfoStream;
1919
import org.apache.lucene.util.Version;
20-
import org.opensearch.index.codec.composite.backward_codecs.composite101.Composite101Codec;
20+
import org.opensearch.index.codec.composite.composite103.Composite103Codec;
2121
import org.opensearch.test.OpenSearchTestCase;
2222
import org.junit.After;
2323
import org.junit.Before;
@@ -49,7 +49,7 @@ public void testGetDocValuesConsumerForCompositeCodec() throws IOException {
4949
randomInt(),
5050
false,
5151
false,
52-
new Lucene101Codec(),
52+
new Lucene103Codec(),
5353
new HashMap<>(),
5454
UUID.randomUUID().toString().substring(0, 16).getBytes(StandardCharsets.UTF_8),
5555
new HashMap<>(),
@@ -73,7 +73,7 @@ public void testGetDocValuesConsumerForCompositeCodec() throws IOException {
7373
);
7474

7575
assertEquals("org.apache.lucene.codecs.lucene90.Lucene90DocValuesConsumer", consumer.getClass().getName());
76-
assertEquals(CompositeCodecFactory.COMPOSITE_CODEC, Composite101Codec.COMPOSITE_INDEX_CODEC_NAME);
76+
assertEquals(CompositeCodecFactory.COMPOSITE_CODEC, Composite103Codec.COMPOSITE_INDEX_CODEC_NAME);
7777
consumer.close();
7878
}
7979

server/src/test/java/org/opensearch/index/codec/composite/LuceneDocValuesProducerFactoryTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
package org.opensearch.index.codec.composite;
1010

11-
import org.apache.lucene.backward_codecs.lucene101.Lucene101Codec;
1211
import org.apache.lucene.codecs.DocValuesConsumer;
1312
import org.apache.lucene.codecs.DocValuesProducer;
13+
import org.apache.lucene.codecs.lucene103.Lucene103Codec;
1414
import org.apache.lucene.index.FieldInfo;
1515
import org.apache.lucene.index.FieldInfos;
1616
import org.apache.lucene.index.SegmentInfo;
@@ -53,7 +53,7 @@ public void testGetDocValuesProducerForCompositeCodec99() throws IOException {
5353
randomInt(),
5454
false,
5555
false,
56-
new Lucene101Codec(),
56+
new Lucene103Codec(),
5757
new HashMap<>(),
5858
UUID.randomUUID().toString().substring(0, 16).getBytes(StandardCharsets.UTF_8),
5959
new HashMap<>(),

server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/BaseStarTreeBuilderTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
package org.opensearch.index.compositeindex.datacube.startree.builder;
1010

11-
import org.apache.lucene.backward_codecs.lucene101.Lucene101Codec;
1211
import org.apache.lucene.codecs.DocValuesConsumer;
1312
import org.apache.lucene.codecs.DocValuesProducer;
13+
import org.apache.lucene.codecs.lucene103.Lucene103Codec;
1414
import org.apache.lucene.index.DocValuesSkipIndexType;
1515
import org.apache.lucene.index.DocValuesType;
1616
import org.apache.lucene.index.FieldInfo;
@@ -115,7 +115,7 @@ public static void setup() throws IOException {
115115
5,
116116
false,
117117
false,
118-
new Lucene101Codec(),
118+
new Lucene103Codec(),
119119
new HashMap<>(),
120120
UUID.randomUUID().toString().substring(0, 16).getBytes(StandardCharsets.UTF_8),
121121
new HashMap<>(),

server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/BuilderTestsUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
package org.opensearch.index.compositeindex.datacube.startree.builder;
1010

11-
import org.apache.lucene.backward_codecs.lucene101.Lucene101Codec;
1211
import org.apache.lucene.codecs.DocValuesProducer;
12+
import org.apache.lucene.codecs.lucene103.Lucene103Codec;
1313
import org.apache.lucene.index.DocValuesSkipIndexType;
1414
import org.apache.lucene.index.DocValuesType;
1515
import org.apache.lucene.index.FieldInfo;
@@ -526,7 +526,7 @@ public static SegmentReadState getReadState(
526526
numDocs,
527527
false,
528528
false,
529-
new Lucene101Codec(),
529+
new Lucene103Codec(),
530530
new HashMap<>(),
531531
writeState.segmentInfo.getId(),
532532
new HashMap<>(),
@@ -580,7 +580,7 @@ public static SegmentWriteState getWriteState(int numDocs, byte[] id, FieldInfo[
580580
numDocs,
581581
false,
582582
false,
583-
new Lucene101Codec(),
583+
new Lucene103Codec(),
584584
new HashMap<>(),
585585
id,
586586
new HashMap<>(),

server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/StarTreeBuildMetricTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
package org.opensearch.index.compositeindex.datacube.startree.builder;
1010

11-
import org.apache.lucene.backward_codecs.lucene101.Lucene101Codec;
1211
import org.apache.lucene.codecs.DocValuesConsumer;
1312
import org.apache.lucene.codecs.DocValuesProducer;
13+
import org.apache.lucene.codecs.lucene103.Lucene103Codec;
1414
import org.apache.lucene.index.DocValuesSkipIndexType;
1515
import org.apache.lucene.index.DocValuesType;
1616
import org.apache.lucene.index.FieldInfo;
@@ -641,7 +641,7 @@ public void test_build_multipleStarTrees() throws IOException {
641641
7,
642642
false,
643643
false,
644-
new Lucene101Codec(),
644+
new Lucene103Codec(),
645645
new HashMap<>(),
646646
UUID.randomUUID().toString().substring(0, 16).getBytes(StandardCharsets.UTF_8),
647647
new HashMap<>(),
@@ -925,7 +925,7 @@ public void test_build_starTreeDataset() throws IOException {
925925
7,
926926
false,
927927
false,
928-
new Lucene101Codec(),
928+
new Lucene103Codec(),
929929
new HashMap<>(),
930930
UUID.randomUUID().toString().substring(0, 16).getBytes(StandardCharsets.UTF_8),
931931
new HashMap<>(),

server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/StarTreesBuilderTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
package org.opensearch.index.compositeindex.datacube.startree.builder;
1010

11-
import org.apache.lucene.backward_codecs.lucene101.Lucene101Codec;
1211
import org.apache.lucene.codecs.DocValuesConsumer;
1312
import org.apache.lucene.codecs.DocValuesProducer;
13+
import org.apache.lucene.codecs.lucene103.Lucene103Codec;
1414
import org.apache.lucene.index.FieldInfo;
1515
import org.apache.lucene.index.FieldInfos;
1616
import org.apache.lucene.index.SegmentInfo;
@@ -65,7 +65,7 @@ public void setUp() throws Exception {
6565
5,
6666
false,
6767
false,
68-
new Lucene101Codec(),
68+
new Lucene103Codec(),
6969
new HashMap<>(),
7070
UUID.randomUUID().toString().substring(0, 16).getBytes(StandardCharsets.UTF_8),
7171
new HashMap<>(),

server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/fileformats/meta/StarTreeMetadataTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
package org.opensearch.index.compositeindex.datacube.startree.fileformats.meta;
1010

11-
import org.apache.lucene.backward_codecs.lucene101.Lucene101Codec;
11+
import org.apache.lucene.codecs.lucene103.Lucene103Codec;
1212
import org.apache.lucene.index.DocValuesSkipIndexType;
1313
import org.apache.lucene.index.DocValuesType;
1414
import org.apache.lucene.index.FieldInfo;
@@ -81,7 +81,7 @@ public void setup() throws IOException {
8181
6,
8282
false,
8383
false,
84-
new Lucene101Codec(),
84+
new Lucene103Codec(),
8585
new HashMap<>(),
8686
UUID.randomUUID().toString().substring(0, 16).getBytes(StandardCharsets.UTF_8),
8787
new HashMap<>(),

server/src/test/java/org/opensearch/index/engine/CompletionStatsCacheTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
package org.opensearch.index.engine;
3333

34-
import org.apache.lucene.backward_codecs.lucene101.Lucene101Codec;
3534
import org.apache.lucene.codecs.PostingsFormat;
35+
import org.apache.lucene.codecs.lucene103.Lucene103Codec;
3636
import org.apache.lucene.document.Document;
3737
import org.apache.lucene.index.DirectoryReader;
3838
import org.apache.lucene.index.IndexWriter;
@@ -70,7 +70,7 @@ public void testExceptionsAreNotCached() {
7070
public void testCompletionStatsCache() throws IOException, InterruptedException {
7171
final IndexWriterConfig indexWriterConfig = newIndexWriterConfig();
7272
final PostingsFormat postingsFormat = new Completion101PostingsFormat();
73-
indexWriterConfig.setCodec(new Lucene101Codec() {
73+
indexWriterConfig.setCodec(new Lucene103Codec() {
7474
@Override
7575
public PostingsFormat getPostingsFormatForField(String field) {
7676
return postingsFormat; // all fields are suggest fields

0 commit comments

Comments
 (0)