incorporating review comments

Signed-off-by: Sarthak Aggarwal <sarthagg@amazon.com>
sarthakaggarwal97 · Sep 1, 2023 · e9eddc9 · e9eddc9
1 parent 54de39b
commit e9eddc9
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -172,6 +172,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - [Remote Store] Implicitly use replication type SEGMENT for remote store clusters ([#9264](https://github.com/opensearch-project/OpenSearch/pull/9264))
 - Use non-concurrent path for sort request on timeseries index and field([#9562](https://github.com/opensearch-project/OpenSearch/pull/9562))
 - Added sampler based on `Blanket Probabilistic Sampling rate` and `Override for on demand` ([#9621](https://github.com/opensearch-project/OpenSearch/issues/9621))
+- Move ZStd to a plugin ([#9658](https://github.com/opensearch-project/OpenSearch/pull/9658))
 
 ### Deprecated
 

diff --git a/plugins/custom-codecs/licenses/zstd-jni-LICENSE.txt b/plugins/custom-codecs/licenses/zstd-jni-LICENSE.txt
diff --git a/plugins/custom-codecs/licenses/zstd-jni-NOTICE.txt b/plugins/custom-codecs/licenses/zstd-jni-NOTICE.txt
diff --git a/server/src/internalClusterTest/java/org/opensearch/index/codec/ZstdNotEnabledIT.java b/server/src/internalClusterTest/java/org/opensearch/index/codec/ZstdNotEnabledIT.java
@@ -13,7 +13,7 @@
 import org.opensearch.test.OpenSearchIntegTestCase;
 
 @OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST)
-public class ZstdNotEnabledIT extends OpenSearchIntegTestCase  {
+public class ZstdNotEnabledIT extends OpenSearchIntegTestCase {
 
     public void testZStdCodecsWithoutPluginInstalled() {
 
@@ -34,5 +34,4 @@ public void testZStdCodecsWithoutPluginInstalled() {
         );
     }
 
-
 }
diff --git a/server/src/main/java/org/opensearch/index/engine/EngineConfig.java b/server/src/main/java/org/opensearch/index/engine/EngineConfig.java
@@ -139,7 +139,7 @@ public Supplier<RetentionLeases> retentionLeasesSupplier() {
                 // Though the external visible codec name is zstd or zstd_no_dict, internally it is registered as Lucene95CustomCodec
                 // Hence this check is required, Lucene95CustomCodec will not be part of availableCodecs if the custom-codecs plugin
                 // is not installed
-                if (("zstd".equals(s) || "zstd_no_dict".equals(s)) && Codec.availableCodecs().contains("Lucene95CustomCodec")){
+                if (("zstd".equals(s) || "zstd_no_dict".equals(s)) && Codec.availableCodecs().contains("Lucene95CustomCodec")) {
                     return s;
                 }
                 if (Codec.availableCodecs().contains(s) == false) { // we don't error message the not officially supported ones

diff --git a/settings.gradle b/settings.gradle
@@ -153,6 +153,3 @@ if (extraProjects.exists()) {
     addSubProjects('', extraProjectDir)
   }
 }
-include 'plugins:custom-codecs'
-findProject(':plugins:custom-codecs')?.name = 'custom-codecs'
-