review comments

Signed-off-by: Sarthak Aggarwal <sarthagg@amazon.com>
sarthakaggarwal97 · Sep 3, 2023 · a473a9e · a473a9e
1 parent 518a90d
commit a473a9e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/...tom-codecs/src/main/java/org/opensearch/index/codec/customcodecs/Lucene95CustomCodec.java b/...tom-codecs/src/main/java/org/opensearch/index/codec/customcodecs/Lucene95CustomCodec.java
@@ -32,11 +32,11 @@ public enum Mode {
         /**
          * ZStandard mode with dictionary
          */
-        ZSTD("zstd"),
+        ZSTD("Lucene95CustomCodec"),
         /**
          * ZStandard mode without dictionary
          */
-        ZSTD_NO_DICT("zstdnodict");
+        ZSTD_NO_DICT("Lucene95CustomCodec");
 
         private final String codec;
 

diff --git a/...custom-codecs/src/test/java/org/opensearch/index/codec/customcodecs/CustomCodecTests.java b/...custom-codecs/src/test/java/org/opensearch/index/codec/customcodecs/CustomCodecTests.java
@@ -113,9 +113,6 @@ public void testBestCompressionWithCompressionLevel() {
     }
 
     public void testLuceneCodecsWithCompressionLevel() {
-        String codecName = randomFrom(Codec.availableCodecs());
-        Codec codec = Codec.forName(codecName);
-
         final Settings customCodecSettings = Settings.builder()
             .put(INDEX_CODEC_COMPRESSION_LEVEL_SETTING.getKey(), randomIntBetween(1, 6))
             .put(EngineConfig.INDEX_CODEC_SETTING.getKey(), randomFrom("zstd", "zstd_no_dict"))

diff --git a/server/src/main/java/org/opensearch/index/codec/CodecAliases.java b/server/src/main/java/org/opensearch/index/codec/CodecAliases.java
@@ -13,10 +13,16 @@
 import java.util.Set;
 
 /**
- * This {@link CodecAliases} allows us to manage the settings with {@link Codec}.
+ * This {@link CodecAliases} to provide aliases for the {@link Codec}.
  *
  * @opensearch.internal
  */
 public interface CodecAliases {
+
+    /**
+     * Retrieves a set of aliases for an codec.
+     *
+     * @return A non-null set of alias strings. If no aliases are available, an empty set should be returned.
+     */
     Set<String> aliases();
 }
diff --git a/server/src/main/java/org/opensearch/index/engine/EngineConfig.java b/server/src/main/java/org/opensearch/index/engine/EngineConfig.java
@@ -145,7 +145,7 @@ public Supplier<RetentionLeases> retentionLeasesSupplier() {
                     Codec codec = Codec.forName(codecName);
                     if (codec instanceof CodecAliases) {
                         CodecAliases codecWithAlias = (CodecAliases) codec;
-                        if (codecWithAlias.aliases() != null && codecWithAlias.aliases().contains(s)) {
+                        if (codecWithAlias.aliases().contains(s)) {
                             return s;
                         }
                     }
@@ -208,7 +208,7 @@ private static void doValidateCodecSettings(final String codec) {
                     Codec availableCodec = Codec.forName(codecName);
                     if (availableCodec instanceof CodecAliases) {
                         CodecAliases availableCodecWithAlias = (CodecAliases) availableCodec;
-                        if (availableCodecWithAlias.aliases() != null && availableCodecWithAlias.aliases().contains(codec)) {
+                        if (availableCodecWithAlias.aliases().contains(codec)) {
                             if (availableCodec instanceof CodecSettings
                                 && ((CodecSettings) availableCodec).supports(INDEX_CODEC_COMPRESSION_LEVEL_SETTING)) {
                                 return;