修复search接口查询havenask索引时转发到havenask search模块的索引类型判断异常 (#344)

alibaba · Nov 30, 2023 · ec313bc · ec313bc
1 parent 93bf0ad
commit ec313bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...ask-engine/src/test/java/org/havenask/engine/search/action/HavenaskSearchActionTests.java b/...ask-engine/src/test/java/org/havenask/engine/search/action/HavenaskSearchActionTests.java
@@ -81,11 +81,11 @@ public void testIsSearchHavenask() {
 
     private Metadata initMetadata() {
         IndexMetadata.Builder index1 = IndexMetadata.builder("havenask-1")
-            .settings(Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT).put("index.engine.type", "havenask"))
+            .settings(Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT).put("index.engine", "havenask"))
             .numberOfShards(1)
             .numberOfReplicas(0);
         IndexMetadata.Builder index2 = IndexMetadata.builder("havenask-2")
-            .settings(Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT).put("index.engine.type", "havenask"))
+            .settings(Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT).put("index.engine", "havenask"))
             .numberOfShards(1)
             .numberOfReplicas(0)
             .putAlias(AliasMetadata.builder("havenask-alias-1"));

diff --git a/elastic-fed/server/src/main/java/org/havenask/action/search/TransportSearchAction.java b/elastic-fed/server/src/main/java/org/havenask/action/search/TransportSearchAction.java
@@ -271,7 +271,7 @@ public static boolean isSearchHavenask(Metadata metadata, SearchRequest searchRe
 
         if (indexAbstraction instanceof IndexAbstraction.Index) {
             IndexMetadata indexMetadata = indexAbstraction.getWriteIndex();
-            if ("havenask".equals(indexMetadata.getSettings().get("index.engine.type"))) {
+            if ("havenask".equals(indexMetadata.getSettings().get("index.engine"))) {
                 // havenask索引
                 return true;
             } else {
@@ -286,7 +286,7 @@ public static boolean isSearchHavenask(Metadata metadata, SearchRequest searchRe
             }
 
             IndexMetadata indexMetadata = indexAbstraction.getWriteIndex();
-            if ("havenask".equals(indexMetadata.getSettings().get("index.engine.type"))) {
+            if ("havenask".equals(indexMetadata.getSettings().get("index.engine"))) {
                 // havenask索引
                 return true;
             } else {