From 1cb631adda3f38af1059e4c63bbee95d87c52650 Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@apache.org>
Date: Thu, 5 Apr 2018 16:59:09 +0900
Subject: [PATCH] fix #1590 fix index.scroll.search.timeout
---
.../org/codelibs/fess/es/client/FessEsClient.java | 3 +--
.../codelibs/fess/mylasta/direction/FessConfig.java | 12 ++++++------
src/main/resources/fess_config.properties | 2 +-
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
index d4a3f4a47..6054f0a17 100644
--- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
@@ -644,8 +644,7 @@ public class FessEsClient implements Client {
SearchResponse response =
client.prepareSearch(index).setTypes(type).setScroll(scrollForDelete).setSize(sizeForDelete)
.setFetchSource(new String[] { fessConfig.getIndexFieldId() }, null).setQuery(queryBuilder)
- .setPreference(Constants.SEARCH_PREFERENCE_LOCAL).execute()
- .actionGet(fessConfig.getIndexScrollSearchTimeoutTimeout());
+ .setPreference(Constants.SEARCH_PREFERENCE_LOCAL).execute().actionGet(fessConfig.getIndexScrollSearchTimeout());
int count = 0;
String scrollId = response.getScrollId();
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
index c16f84e0f..1726fac6d 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
@@ -531,7 +531,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
String INDEX_SEARCH_TIMEOUT = "index.search.timeout";
/** The key of the configuration. e.g. 3m */
- String INDEX_SCROLL_SEARCH_TIMEOUT_TIMEOUT = "index.scroll.search.timeout.timeout";
+ String INDEX_SCROLL_SEARCH_TIMEOUT = "index.scroll.search.timeout";
/** The key of the configuration. e.g. 3m */
String INDEX_INDEX_TIMEOUT = "index.index.timeout";
@@ -2873,11 +2873,11 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
String getIndexSearchTimeout();
/**
- * Get the value for the key 'index.scroll.search.timeout.timeout'. <br>
+ * Get the value for the key 'index.scroll.search.timeout'. <br>
* The value is, e.g. 3m <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
- String getIndexScrollSearchTimeoutTimeout();
+ String getIndexScrollSearchTimeout();
/**
* Get the value for the key 'index.index.timeout'. <br>
@@ -6489,8 +6489,8 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
return get(FessConfig.INDEX_SEARCH_TIMEOUT);
}
- public String getIndexScrollSearchTimeoutTimeout() {
- return get(FessConfig.INDEX_SCROLL_SEARCH_TIMEOUT_TIMEOUT);
+ public String getIndexScrollSearchTimeout() {
+ return get(FessConfig.INDEX_SCROLL_SEARCH_TIMEOUT);
}
public String getIndexIndexTimeout() {
@@ -8156,7 +8156,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.INDEX_ADMIN_DOUBLE_FIELDS, "");
defaultMap.put(FessConfig.INDEX_ADMIN_REQUIRED_FIELDS, "url,title,role,boost");
defaultMap.put(FessConfig.INDEX_SEARCH_TIMEOUT, "3m");
- defaultMap.put(FessConfig.INDEX_SCROLL_SEARCH_TIMEOUT_TIMEOUT, "3m");
+ defaultMap.put(FessConfig.INDEX_SCROLL_SEARCH_TIMEOUT, "3m");
defaultMap.put(FessConfig.INDEX_INDEX_TIMEOUT, "3m");
defaultMap.put(FessConfig.INDEX_BULK_TIMEOUT, "3m");
defaultMap.put(FessConfig.INDEX_DELETE_TIMEOUT, "3m");
diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties
index 9f2f3ca19..d66d442a9 100644
--- a/src/main/resources/fess_config.properties
+++ b/src/main/resources/fess_config.properties
@@ -271,7 +271,7 @@ index.admin.required.fields=url,title,role,boost
# timeout
index.search.timeout=3m
-index.scroll.search.timeout.timeout=3m
+index.scroll.search.timeout=3m
index.index.timeout=3m
index.bulk.timeout=3m
index.delete.timeout=3m
--
GitLab