Skip to content

Commit 46be0c8

Browse files
addressing comments
Signed-off-by: Sarthak Aggarwal <[email protected]>
1 parent 9d3a745 commit 46be0c8

File tree

5 files changed

+4
-52
lines changed

5 files changed

+4
-52
lines changed

server/src/main/java/org/apache/lucene/codecs/lucene90/Lucene90DocValuesProducerWrapper.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
import org.apache.lucene.codecs.DocValuesProducer;
1212
import org.apache.lucene.index.SegmentReadState;
13-
import org.apache.lucene.index.SortedNumericDocValues;
1413
import org.opensearch.index.codec.composite.CompositeDocValuesProducer;
1514

1615
import java.io.IOException;
@@ -25,7 +24,6 @@
2524
public class Lucene90DocValuesProducerWrapper implements CompositeDocValuesProducer {
2625

2726
private final Lucene90DocValuesProducer lucene90DocValuesProducer;
28-
private final SegmentReadState state;
2927

3028
public Lucene90DocValuesProducerWrapper(
3129
SegmentReadState state,
@@ -35,13 +33,6 @@ public Lucene90DocValuesProducerWrapper(
3533
String metaExtension
3634
) throws IOException {
3735
lucene90DocValuesProducer = new Lucene90DocValuesProducer(state, dataCodec, dataExtension, metaCodec, metaExtension);
38-
this.state = state;
39-
}
40-
41-
// returns the field doc id set iterator based on field name
42-
@Override
43-
public SortedNumericDocValues getSortedNumeric(String fieldName) throws IOException {
44-
return this.lucene90DocValuesProducer.getSortedNumeric(state.fieldInfos.fieldInfo(fieldName));
4536
}
4637

4738
@Override

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99
package org.opensearch.index.codec.composite;
1010

1111
import org.apache.lucene.codecs.DocValuesProducer;
12-
import org.apache.lucene.index.SortedNumericDocValues;
1312

1413
import java.io.Closeable;
15-
import java.io.IOException;
1614

1715
/**
1816
* An interface that provides access to document values for a specific field.
@@ -21,15 +19,6 @@
2119
*/
2220
public interface CompositeDocValuesProducer extends Closeable {
2321

24-
/**
25-
* Returns the sorted numeric document values for the specified field.
26-
*
27-
* @param fieldName The name of the field for which to retrieve the sorted numeric document values.
28-
* @return The sorted numeric document values for the specified field.
29-
* @throws IOException If an error occurs while retrieving the sorted numeric document values.
30-
*/
31-
SortedNumericDocValues getSortedNumeric(String fieldName) throws IOException;
32-
3322
/**
3423
* Returns the DocValuesProducer instance.
3524
*

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,15 @@
2323
public class LuceneDocValuesConsumerFactory {
2424

2525
public static DocValuesConsumer getDocValuesConsumerForCompositeCodec(
26-
String compositeCodec,
2726
SegmentWriteState state,
2827
String dataCodec,
2928
String dataExtension,
3029
String metaCodec,
3130
String metaExtension
3231
) throws IOException {
3332

34-
switch (compositeCodec) {
35-
case CompositeCodecFactory.COMPOSITE_CODEC:
36-
return new Lucene90DocValuesConsumerWrapper(state, dataCodec, dataExtension, metaCodec, metaExtension)
37-
.getLucene90DocValuesConsumer();
38-
default:
39-
throw new IllegalStateException("Invalid composite codec " + "[" + compositeCodec + "]");
40-
}
41-
33+
return new Lucene90DocValuesConsumerWrapper(state, dataCodec, dataExtension, metaCodec, metaExtension)
34+
.getLucene90DocValuesConsumer();
4235
}
4336

4437
}

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

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
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.composite99.Composite99Codec;
2021
import org.opensearch.test.OpenSearchTestCase;
2122
import org.junit.After;
2223
import org.junit.Before;
@@ -26,9 +27,6 @@
2627
import java.util.HashMap;
2728
import java.util.UUID;
2829

29-
import static org.opensearch.index.codec.composite.composite99.Composite99Codec.COMPOSITE_INDEX_CODEC_NAME;
30-
import static org.mockito.Mockito.mock;
31-
3230
public class LuceneDocValuesConsumerFactoryTests extends OpenSearchTestCase {
3331

3432
private Directory directory;
@@ -67,7 +65,6 @@ public void testGetDocValuesConsumerForCompositeCodec() throws IOException {
6765
);
6866

6967
DocValuesConsumer consumer = LuceneDocValuesConsumerFactory.getDocValuesConsumerForCompositeCodec(
70-
COMPOSITE_INDEX_CODEC_NAME,
7168
state,
7269
dataCodec,
7370
dataExtension,
@@ -76,26 +73,10 @@ public void testGetDocValuesConsumerForCompositeCodec() throws IOException {
7673
);
7774

7875
assertEquals("org.apache.lucene.codecs.lucene90.Lucene90DocValuesConsumer", consumer.getClass().getName());
76+
assertEquals(CompositeCodecFactory.COMPOSITE_CODEC, Composite99Codec.COMPOSITE_INDEX_CODEC_NAME);
7977
consumer.close();
8078
}
8179

82-
public void testGetDocValuesConsumerForCompositeCodec_InvalidCodec() {
83-
String compositeCodec = "invalid_codec";
84-
SegmentWriteState state = mock(SegmentWriteState.class);
85-
86-
IllegalStateException exception = expectThrows(IllegalStateException.class, () -> {
87-
LuceneDocValuesConsumerFactory.getDocValuesConsumerForCompositeCodec(
88-
compositeCodec,
89-
state,
90-
dataCodec,
91-
dataExtension,
92-
metaCodec,
93-
metaExtension
94-
);
95-
});
96-
assertTrue(exception.getMessage().contains("Invalid composite codec"));
97-
}
98-
9980
@After
10081
public void teardown() throws Exception {
10182
super.tearDown();

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import java.util.HashMap;
2929
import java.util.UUID;
3030

31-
import static org.opensearch.index.codec.composite.composite99.Composite99Codec.COMPOSITE_INDEX_CODEC_NAME;
3231
import static org.mockito.Mockito.mock;
3332

3433
public class LuceneDocValuesProducerFactoryTests extends OpenSearchTestCase {
@@ -70,7 +69,6 @@ public void testGetDocValuesProducerForCompositeCodec99() throws IOException {
7069
newIOContext(random())
7170
);
7271
DocValuesConsumer consumer = LuceneDocValuesConsumerFactory.getDocValuesConsumerForCompositeCodec(
73-
COMPOSITE_INDEX_CODEC_NAME,
7472
state,
7573
dataCodec,
7674
dataExtension,

0 commit comments

Comments
 (0)