Set the flag for bwc test

Signed-off-by: Louis Chu <clingzhi@amazon.com>
opensearch-project · Jul 18, 2023 · 61be29c · 61be29c
1 parent 0a99734
commit 61be29c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/qa/mixed-cluster/build.gradle b/qa/mixed-cluster/build.gradle
@@ -65,7 +65,11 @@ for (Version bwcVersion : BuildParams.bwcVersions.wireCompatible) {
       numberOfNodes = 4
 
       setting 'path.repo', "${buildDir}/cluster/shared/repo/${baseName}"
-      setting 'opensearch.experimental.feature.search_pipeline.enabled', 'true'
+
+      // TODO: remove the whole block after #8513 backport to 2.x
+      if (bwcVersion.before("3.0.0")) {
+        setting 'opensearch.experimental.feature.search_pipeline.enabled', 'true'
+      }
     }
   }
 

diff --git a/server/src/main/java/org/opensearch/common/util/FeatureFlags.java b/server/src/main/java/org/opensearch/common/util/FeatureFlags.java
@@ -46,12 +46,6 @@ public class FeatureFlags {
      */
     public static final String EXTENSIONS = "opensearch.experimental.feature.extensions.enabled";
 
-    /**
-     * Gates the search pipeline features during initial development.
-     * Once the feature is complete and ready for release, this feature flag can be removed.
-     */
-    public static final String SEARCH_PIPELINE = "opensearch.experimental.feature.search_pipeline.enabled";
-
     /**
      * Gates the functionality of identity.
      */

diff --git a/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java b/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java
@@ -36,10 +36,10 @@
 import org.opensearch.Version;
 import org.opensearch.common.Booleans;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.ParsingException;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.io.stream.Writeable;
+import org.opensearch.core.common.ParsingException;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.Writeable;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.xcontent.XContentHelper;