Skip to content

Commit 0299b5f

Browse files
Update spotless
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
1 parent aa800b3 commit 0299b5f

15 files changed

+47
-64
lines changed

src/integrationTest/java/org/opensearch/index/codec/rest/CreateIndexWithCodecIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import org.opensearch.cluster.metadata.IndexMetadata;
2727
import org.opensearch.common.settings.Settings;
2828
import org.opensearch.core.common.Strings;
29-
import org.opensearch.index.codec.customcodecs.backward_codecs.lucene912.Lucene912QatCodec;
3029
import org.opensearch.index.codec.customcodecs.QatZipperFactory;
30+
import org.opensearch.index.codec.customcodecs.backward_codecs.lucene912.Lucene912QatCodec;
3131
import org.opensearch.test.rest.OpenSearchRestTestCase;
3232

3333
import javax.net.ssl.SSLEngine;

src/main/java/org/opensearch/index/codec/customcodecs/Lucene101CustomStoredFieldsFormat.java

+6-8
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import org.apache.lucene.index.SegmentInfo;
1818
import org.apache.lucene.store.Directory;
1919
import org.apache.lucene.store.IOContext;
20-
import org.opensearch.index.codec.customcodecs.ZstdCompressionMode;
21-
import org.opensearch.index.codec.customcodecs.ZstdNoDictCompressionMode;
2220

2321
import java.io.IOException;
2422
import java.util.Objects;
@@ -97,7 +95,7 @@ public StoredFieldsWriter fieldsWriter(Directory directory, SegmentInfo si, IOCo
9795
String previous = si.putAttribute(MODE_KEY, mode.name());
9896
if (previous != null && previous.equals(mode.name()) == false) {
9997
throw new IllegalStateException(
100-
"found existing value for " + MODE_KEY + " for segment: " + si.name + " old = " + previous + ", new = " + mode.name()
98+
"found existing value for " + MODE_KEY + " for segment: " + si.name + " old = " + previous + ", new = " + mode.name()
10199
);
102100
}
103101
return impl(mode).fieldsWriter(directory, si, context);
@@ -116,11 +114,11 @@ StoredFieldsFormat impl(Lucene101CustomCodec.Mode mode) {
116114

117115
private StoredFieldsFormat getCustomCompressingStoredFieldsFormat(String formatName, CompressionMode compressionMode) {
118116
return new Lucene90CompressingStoredFieldsFormat(
119-
formatName,
120-
compressionMode,
121-
ZSTD_BLOCK_LENGTH,
122-
ZSTD_MAX_DOCS_PER_BLOCK,
123-
ZSTD_BLOCK_SHIFT
117+
formatName,
118+
compressionMode,
119+
ZSTD_BLOCK_LENGTH,
120+
ZSTD_MAX_DOCS_PER_BLOCK,
121+
ZSTD_BLOCK_SHIFT
124122
);
125123
}
126124

src/main/java/org/opensearch/index/codec/customcodecs/Lucene101QatCodec.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ public Lucene101QatCodec(Mode mode, int compressionLevel, MapperService mapperSe
123123
* @param supplier supplier for QAT mode.
124124
*/
125125
public Lucene101QatCodec(
126-
Mode mode,
127-
int compressionLevel,
128-
MapperService mapperService,
129-
Logger logger,
130-
Supplier<QatZipper.Mode> supplier
126+
Mode mode,
127+
int compressionLevel,
128+
MapperService mapperService,
129+
Logger logger,
130+
Supplier<QatZipper.Mode> supplier
131131
) {
132132
super(mode.getCodec(), new PerFieldMappingPostingFormatCodec(Lucene101Codec.Mode.BEST_SPEED, mapperService, logger));
133133
this.storedFieldsFormat = new Lucene101QatStoredFieldsFormat(mode, compressionLevel, supplier);

src/main/java/org/opensearch/index/codec/customcodecs/Lucene101QatStoredFieldsFormat.java

+16-17
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.function.Supplier;
2424

2525
import com.intel.qat.QatZipper;
26-
import org.opensearch.index.codec.customcodecs.QatCompressionMode;
2726

2827
import static org.opensearch.index.codec.customcodecs.backward_codecs.lucene99.Lucene99QatCodec.DEFAULT_COMPRESSION_LEVEL;
2928
import static org.opensearch.index.codec.customcodecs.backward_codecs.lucene99.Lucene99QatCodec.DEFAULT_QAT_MODE;
@@ -122,7 +121,7 @@ public StoredFieldsWriter fieldsWriter(Directory directory, SegmentInfo si, IOCo
122121
String previous = si.putAttribute(MODE_KEY, mode.name());
123122
if (previous != null && previous.equals(mode.name()) == false) {
124123
throw new IllegalStateException(
125-
"found existing value for " + MODE_KEY + " for segment: " + si.name + " old = " + previous + ", new = " + mode.name()
124+
"found existing value for " + MODE_KEY + " for segment: " + si.name + " old = " + previous + ", new = " + mode.name()
126125
);
127126
}
128127
return impl(mode).fieldsWriter(directory, si, context);
@@ -132,31 +131,31 @@ private StoredFieldsFormat impl(Lucene101QatCodec.Mode mode) {
132131
switch (mode) {
133132
case QAT_LZ4:
134133
return getQatCompressingStoredFieldsFormat(
135-
"QatStoredFieldsLz4",
136-
qatCompressionMode,
137-
QAT_LZ4_BLOCK_LENGTH,
138-
QAT_LZ4_MAX_DOCS_PER_BLOCK,
139-
QAT_LZ4_BLOCK_SHIFT
134+
"QatStoredFieldsLz4",
135+
qatCompressionMode,
136+
QAT_LZ4_BLOCK_LENGTH,
137+
QAT_LZ4_MAX_DOCS_PER_BLOCK,
138+
QAT_LZ4_BLOCK_SHIFT
140139
);
141140
case QAT_DEFLATE:
142141
return getQatCompressingStoredFieldsFormat(
143-
"QatStoredFieldsDeflate",
144-
qatCompressionMode,
145-
QAT_DEFLATE_BLOCK_LENGTH,
146-
QAT_DEFLATE_MAX_DOCS_PER_BLOCK,
147-
QAT_DEFLATE_BLOCK_SHIFT
142+
"QatStoredFieldsDeflate",
143+
qatCompressionMode,
144+
QAT_DEFLATE_BLOCK_LENGTH,
145+
QAT_DEFLATE_MAX_DOCS_PER_BLOCK,
146+
QAT_DEFLATE_BLOCK_SHIFT
148147
);
149148
default:
150149
throw new IllegalStateException("Unsupported compression mode: " + mode);
151150
}
152151
}
153152

154153
private StoredFieldsFormat getQatCompressingStoredFieldsFormat(
155-
String formatName,
156-
CompressionMode compressionMode,
157-
int blockSize,
158-
int maxDocs,
159-
int blockShift
154+
String formatName,
155+
CompressionMode compressionMode,
156+
int blockSize,
157+
int maxDocs,
158+
int blockShift
160159
) {
161160
return new Lucene90CompressingStoredFieldsFormat(formatName, compressionMode, blockSize, maxDocs, blockShift);
162161
}

src/main/java/org/opensearch/index/codec/customcodecs/QatDeflate101Codec.java

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.opensearch.common.settings.Setting;
1313
import org.opensearch.index.codec.CodecAliases;
1414
import org.opensearch.index.codec.CodecSettings;
15-
import org.opensearch.index.codec.customcodecs.QatZipperFactory;
1615
import org.opensearch.index.engine.EngineConfig;
1716
import org.opensearch.index.mapper.MapperService;
1817

src/main/java/org/opensearch/index/codec/customcodecs/QatLz4101Codec.java

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.opensearch.common.settings.Setting;
1313
import org.opensearch.index.codec.CodecAliases;
1414
import org.opensearch.index.codec.CodecSettings;
15-
import org.opensearch.index.codec.customcodecs.QatZipperFactory;
1615
import org.opensearch.index.engine.EngineConfig;
1716
import org.opensearch.index.mapper.MapperService;
1817

src/main/java/org/opensearch/index/codec/customcodecs/backward_codecs/lucene912/Lucene912CustomCodec.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
package org.opensearch.index.codec.customcodecs.backward_codecs.lucene912;
1010

1111
import org.apache.logging.log4j.Logger;
12+
import org.apache.lucene.backward_codecs.lucene912.Lucene912Codec;
1213
import org.apache.lucene.codecs.FilterCodec;
1314
import org.apache.lucene.codecs.StoredFieldsFormat;
14-
import org.apache.lucene.backward_codecs.lucene912.Lucene912Codec;
1515
import org.apache.lucene.codecs.lucene101.Lucene101Codec;
1616
import org.opensearch.index.codec.PerFieldMappingPostingFormatCodec;
1717
import org.opensearch.index.mapper.MapperService;

src/main/java/org/opensearch/index/codec/customcodecs/backward_codecs/lucene912/Lucene912CustomStoredFieldsFormat.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ public Lucene912CustomStoredFieldsFormat(Lucene912CustomCodec.Mode mode) {
6464
public Lucene912CustomStoredFieldsFormat(Lucene912CustomCodec.Mode mode, int compressionLevel) {
6565
this.mode = Objects.requireNonNull(mode);
6666
this.compressionLevel = compressionLevel;
67-
zstdCompressionMode = new ZstdCompressionMode(compressionLevel){
67+
zstdCompressionMode = new ZstdCompressionMode(compressionLevel) {
6868
};
69-
zstdNoDictCompressionMode = new ZstdNoDictCompressionMode(compressionLevel){
69+
zstdNoDictCompressionMode = new ZstdNoDictCompressionMode(compressionLevel) {
7070
};
7171
}
7272

src/main/java/org/opensearch/index/codec/customcodecs/backward_codecs/lucene912/Lucene912QatCodec.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
package org.opensearch.index.codec.customcodecs.backward_codecs.lucene912;
1010

1111
import org.apache.logging.log4j.Logger;
12+
import org.apache.lucene.backward_codecs.lucene912.Lucene912Codec;
1213
import org.apache.lucene.codecs.FilterCodec;
1314
import org.apache.lucene.codecs.StoredFieldsFormat;
14-
import org.apache.lucene.backward_codecs.lucene912.Lucene912Codec;
1515
import org.apache.lucene.codecs.lucene101.Lucene101Codec;
1616
import org.opensearch.index.codec.PerFieldMappingPostingFormatCodec;
1717
import org.opensearch.index.mapper.MapperService;

src/main/java/org/opensearch/index/codec/customcodecs/backward_codecs/lucene912/Lucene912QatStoredFieldsFormat.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
import org.apache.lucene.index.SegmentInfo;
1818
import org.apache.lucene.store.Directory;
1919
import org.apache.lucene.store.IOContext;
20+
import org.opensearch.index.codec.customcodecs.QatCompressionMode;
2021

2122
import java.io.IOException;
2223
import java.util.Objects;
2324
import java.util.function.Supplier;
2425

2526
import com.intel.qat.QatZipper;
26-
import org.opensearch.index.codec.customcodecs.QatCompressionMode;
2727

2828
import static org.opensearch.index.codec.customcodecs.backward_codecs.lucene99.Lucene99QatCodec.DEFAULT_COMPRESSION_LEVEL;
2929
import static org.opensearch.index.codec.customcodecs.backward_codecs.lucene99.Lucene99QatCodec.DEFAULT_QAT_MODE;
@@ -88,7 +88,7 @@ public Lucene912QatStoredFieldsFormat(Lucene912QatCodec.Mode mode, Supplier<QatZ
8888
*/
8989
public Lucene912QatStoredFieldsFormat(Lucene912QatCodec.Mode mode, int compressionLevel, Supplier<QatZipper.Mode> supplier) {
9090
this.mode = Objects.requireNonNull(mode);
91-
qatCompressionMode = new QatCompressionMode(getAlgorithm(mode), compressionLevel, supplier){
91+
qatCompressionMode = new QatCompressionMode(getAlgorithm(mode), compressionLevel, supplier) {
9292
};
9393
}
9494

src/test/java/org/opensearch/index/codec/customcodecs/CustomCodecTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
package org.opensearch.index.codec.customcodecs;
3434

3535
import org.apache.logging.log4j.LogManager;
36+
import org.apache.lucene.backward_codecs.lucene912.Lucene912Codec;
3637
import org.apache.lucene.codecs.Codec;
3738
import org.apache.lucene.codecs.lucene90.Lucene90StoredFieldsFormat;
38-
import org.apache.lucene.backward_codecs.lucene912.Lucene912Codec;
3939
import org.apache.lucene.document.Document;
4040
import org.apache.lucene.index.DirectoryReader;
4141
import org.apache.lucene.index.IndexWriter;

src/test/java/org/opensearch/index/codec/customcodecs/Lucene101CustomStoredFieldsFormatTests.java

+6-10
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88

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

11-
import org.opensearch.index.codec.customcodecs.ZstdCompressionMode;
12-
import org.opensearch.index.codec.customcodecs.ZstdNoDictCompressionMode;
13-
import org.opensearch.index.codec.customcodecs.Lucene101CustomCodec;
14-
import org.opensearch.index.codec.customcodecs.Lucene101CustomStoredFieldsFormat;
1511
import org.opensearch.test.OpenSearchTestCase;
1612

1713
public class Lucene101CustomStoredFieldsFormatTests extends OpenSearchTestCase {
@@ -23,16 +19,16 @@ public void testDefaultLucene101CustomCodecMode() {
2319

2420
public void testZstdNoDictLucene101CustomCodecMode() {
2521
Lucene101CustomStoredFieldsFormat lucene101CustomStoredFieldsFormat = new Lucene101CustomStoredFieldsFormat(
26-
Lucene101CustomCodec.Mode.ZSTD_NO_DICT
22+
Lucene101CustomCodec.Mode.ZSTD_NO_DICT
2723
);
2824
assertEquals(Lucene101CustomCodec.Mode.ZSTD_NO_DICT, lucene101CustomStoredFieldsFormat.getMode());
2925
}
3026

3127
public void testZstdModeWithCompressionLevel() {
3228
int randomCompressionLevel = randomIntBetween(1, 6);
3329
Lucene101CustomStoredFieldsFormat lucene101CustomStoredFieldsFormat = new Lucene101CustomStoredFieldsFormat(
34-
Lucene101CustomCodec.Mode.ZSTD,
35-
randomCompressionLevel
30+
Lucene101CustomCodec.Mode.ZSTD,
31+
randomCompressionLevel
3632
);
3733
assertEquals(Lucene101CustomCodec.Mode.ZSTD, lucene101CustomStoredFieldsFormat.getMode());
3834
assertEquals(randomCompressionLevel, lucene101CustomStoredFieldsFormat.getCompressionLevel());
@@ -41,8 +37,8 @@ public void testZstdModeWithCompressionLevel() {
4137
public void testZstdNoDictLucene101CustomCodecModeWithCompressionLevel() {
4238
int randomCompressionLevel = randomIntBetween(1, 6);
4339
Lucene101CustomStoredFieldsFormat lucene101CustomStoredFieldsFormat = new Lucene101CustomStoredFieldsFormat(
44-
Lucene101CustomCodec.Mode.ZSTD_NO_DICT,
45-
randomCompressionLevel
40+
Lucene101CustomCodec.Mode.ZSTD_NO_DICT,
41+
randomCompressionLevel
4642
);
4743
assertEquals(Lucene101CustomCodec.Mode.ZSTD_NO_DICT, lucene101CustomStoredFieldsFormat.getMode());
4844
assertEquals(randomCompressionLevel, lucene101CustomStoredFieldsFormat.getCompressionLevel());
@@ -55,7 +51,7 @@ public void testCompressionModes() {
5551

5652
public void testZstdNoDictCompressionModes() {
5753
Lucene101CustomStoredFieldsFormat lucene101CustomStoredFieldsFormat = new Lucene101CustomStoredFieldsFormat(
58-
Lucene101CustomCodec.Mode.ZSTD_NO_DICT
54+
Lucene101CustomCodec.Mode.ZSTD_NO_DICT
5955
);
6056
assertTrue(lucene101CustomStoredFieldsFormat.getCompressionMode() instanceof ZstdNoDictCompressionMode);
6157
}

src/test/java/org/opensearch/index/codec/customcodecs/Lucene101QatStoredFieldsFormatTests.java

+6-10
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88

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

11-
import org.opensearch.index.codec.customcodecs.QatCompressionMode;
12-
import org.opensearch.index.codec.customcodecs.QatZipperFactory;
13-
import org.opensearch.index.codec.customcodecs.Lucene101QatCodec;
14-
import org.opensearch.index.codec.customcodecs.Lucene101QatStoredFieldsFormat;
1511
import org.opensearch.test.OpenSearchTestCase;
1612

1713
import static org.hamcrest.Matchers.is;
@@ -28,7 +24,7 @@ public void testLz4Lucene101QatCodecMode() {
2824
public void testDeflateLucene101QatCodecMode() {
2925
assumeThat("Qat library is available", QatZipperFactory.isQatAvailable(), is(true));
3026
Lucene101QatStoredFieldsFormat lucene101QatStoredFieldsFormat = new Lucene101QatStoredFieldsFormat(
31-
Lucene101QatCodec.Mode.QAT_DEFLATE
27+
Lucene101QatCodec.Mode.QAT_DEFLATE
3228
);
3329
assertEquals(Lucene101QatCodec.Mode.QAT_DEFLATE, lucene101QatStoredFieldsFormat.getMode());
3430
}
@@ -37,8 +33,8 @@ public void testLz4Lucene101QatCodecModeWithCompressionLevel() {
3733
assumeThat("Qat library is available", QatZipperFactory.isQatAvailable(), is(true));
3834
int randomCompressionLevel = randomIntBetween(1, 6);
3935
Lucene101QatStoredFieldsFormat lucene101QatStoredFieldsFormat = new Lucene101QatStoredFieldsFormat(
40-
Lucene101QatCodec.Mode.QAT_LZ4,
41-
randomCompressionLevel
36+
Lucene101QatCodec.Mode.QAT_LZ4,
37+
randomCompressionLevel
4238
);
4339
assertEquals(Lucene101QatCodec.Mode.QAT_LZ4, lucene101QatStoredFieldsFormat.getMode());
4440
assertEquals(randomCompressionLevel, lucene101QatStoredFieldsFormat.getCompressionMode().getCompressionLevel());
@@ -48,8 +44,8 @@ public void testDeflateLucene101QatCodecModeWithCompressionLevel() {
4844
assumeThat("Qat library is available", QatZipperFactory.isQatAvailable(), is(true));
4945
int randomCompressionLevel = randomIntBetween(1, 6);
5046
Lucene101QatStoredFieldsFormat lucene101QatStoredFieldsFormat = new Lucene101QatStoredFieldsFormat(
51-
Lucene101QatCodec.Mode.QAT_DEFLATE,
52-
randomCompressionLevel
47+
Lucene101QatCodec.Mode.QAT_DEFLATE,
48+
randomCompressionLevel
5349
);
5450
assertEquals(Lucene101QatCodec.Mode.QAT_DEFLATE, lucene101QatStoredFieldsFormat.getMode());
5551
assertEquals(randomCompressionLevel, lucene101QatStoredFieldsFormat.getCompressionMode().getCompressionLevel());
@@ -64,7 +60,7 @@ public void testLz4CompressionModes() {
6460
public void testDeflateCompressionModes() {
6561
assumeThat("Qat library is available", QatZipperFactory.isQatAvailable(), is(true));
6662
Lucene101QatStoredFieldsFormat lucene101QatStoredFieldsFormat = new Lucene101QatStoredFieldsFormat(
67-
Lucene101QatCodec.Mode.QAT_DEFLATE
63+
Lucene101QatCodec.Mode.QAT_DEFLATE
6864
);
6965
assertTrue(lucene101QatStoredFieldsFormat.getCompressionMode() instanceof QatCompressionMode);
7066
}

src/test/java/org/opensearch/index/codec/customcodecs/backward_codecs/lucene912/Lucene912CustomStoredFieldsFormatTests.java

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
import org.opensearch.index.codec.customcodecs.ZstdCompressionMode;
1212
import org.opensearch.index.codec.customcodecs.ZstdNoDictCompressionMode;
13-
import org.opensearch.index.codec.customcodecs.backward_codecs.lucene912.Lucene912CustomCodec;
14-
import org.opensearch.index.codec.customcodecs.backward_codecs.lucene912.Lucene912CustomStoredFieldsFormat;
1513
import org.opensearch.test.OpenSearchTestCase;
1614

1715
public class Lucene912CustomStoredFieldsFormatTests extends OpenSearchTestCase {

src/test/java/org/opensearch/index/codec/customcodecs/backward_codecs/lucene912/Lucene912QatStoredFieldsFormatTests.java

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
import org.opensearch.index.codec.customcodecs.QatCompressionMode;
1212
import org.opensearch.index.codec.customcodecs.QatZipperFactory;
13-
import org.opensearch.index.codec.customcodecs.backward_codecs.lucene912.Lucene912QatCodec;
14-
import org.opensearch.index.codec.customcodecs.backward_codecs.lucene912.Lucene912QatStoredFieldsFormat;
1513
import org.opensearch.test.OpenSearchTestCase;
1614

1715
import static org.hamcrest.Matchers.is;

0 commit comments

Comments
 (0)