0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #2590 remove content_minhash

Browse source
This commit is contained in:
Shinsuke Sugaya 2021-08-09 13:43:53 +09:00
parent 0562548d2f
commit 4528bbb255
5 changed files with 11 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/org/codelibs/fess/helper/IndexingHelper.java
View file

@ -45,11 +45,6 @@ public class IndexingHelper {
return;
}
final FessConfig fessConfig = ComponentUtil.getFessConfig();
if (fessConfig.isResultCollapsed()) {
docList.forEach(doc -> {
doc.put(fessConfig.getIndexFieldContentMinhash(), doc.get(fessConfig.getIndexFieldContent()));
});
}
final long execTime = System.currentTimeMillis();
if (logger.isDebugEnabled()) {
logger.debug("Sending {} documents to a server.", docList.size());

17
src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
View file

@ -540,9 +540,6 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/** The key of the configuration. e.g. content */
String INDEX_FIELD_CONTENT = "index.field.content";
/** The key of the configuration. e.g. content_minhash */
String INDEX_FIELD_content_minhash = "index.field.content_minhash";
/** The key of the configuration. e.g. content_minhash_bits */
String INDEX_FIELD_content_minhash_bits = "index.field.content_minhash_bits";
@ -3300,13 +3297,6 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
*/
String getIndexFieldContent();
/**
* Get the value for the key 'index.field.content_minhash'. <br>
* The value is, e.g. content_minhash <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
String getIndexFieldContentMinhash();
/**
* Get the value for the key 'index.field.content_minhash_bits'. <br>
* The value is, e.g. content_minhash_bits <br>
@ -7983,10 +7973,6 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
return get(FessConfig.INDEX_FIELD_CONTENT);
}
public String getIndexFieldContentMinhash() {
return get(FessConfig.INDEX_FIELD_content_minhash);
}
public String getIndexFieldContentMinhashBits() {
return get(FessConfig.INDEX_FIELD_content_minhash_bits);
}
@ -10178,7 +10164,6 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.INDEX_FIELD_parent_id, "parent_id");
defaultMap.put(FessConfig.INDEX_FIELD_important_content, "important_content");
defaultMap.put(FessConfig.INDEX_FIELD_CONTENT, "content");
defaultMap.put(FessConfig.INDEX_FIELD_content_minhash, "content_minhash");
defaultMap.put(FessConfig.INDEX_FIELD_content_minhash_bits, "content_minhash_bits");
defaultMap.put(FessConfig.INDEX_FIELD_CACHE, "cache");
defaultMap.put(FessConfig.INDEX_FIELD_DIGEST, "digest");
@ -10539,7 +10524,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.PLUGIN_VERSION_FILTER, "");
defaultMap.put(FessConfig.STORAGE_MAX_ITEMS_IN_PAGE, "1000");
defaultMap.put(FessConfig.PASSWORD_INVALID_ADMIN_PASSWORDS, "admin");
defaultMap.put(FessConfig.lasta_di_SMART_DEPLOY_MODE, "hot");
defaultMap.put(FessConfig.lasta_di_SMART_DEPLOY_MODE, "warm");
defaultMap.put(FessConfig.DEVELOPMENT_HERE, "true");
defaultMap.put(FessConfig.ENVIRONMENT_TITLE, "Local Development");
defaultMap.put(FessConfig.FRAMEWORK_DEBUG, "false");

6
src/main/java/org/codelibs/fess/mylasta/direction/FessEnv.java
View file

@ -23,7 +23,7 @@ import org.lastaflute.core.direction.exception.ConfigPropertyNotFoundException;
*/
public interface FessEnv {
/** The key of the configuration. e.g. hot */
/** The key of the configuration. e.g. warm */
String lasta_di_SMART_DEPLOY_MODE = "lasta_di.smart.deploy.mode";
/** The key of the configuration. e.g. true */
@ -68,7 +68,7 @@ public interface FessEnv {
/**
* Get the value for the key 'lasta_di.smart.deploy.mode'. <br>
* The value is, e.g. hot <br>
* The value is, e.g. warm <br>
* comment: The mode of Lasta Di's smart-deploy, should be cool in production (e.g. hot, cool, warm)
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
@ -235,7 +235,7 @@ public interface FessEnv {
@Override
protected java.util.Map<String, String> prepareGeneratedDefaultMap() {
java.util.Map<String, String> defaultMap = super.prepareGeneratedDefaultMap();
defaultMap.put(FessEnv.lasta_di_SMART_DEPLOY_MODE, "hot");
defaultMap.put(FessEnv.lasta_di_SMART_DEPLOY_MODE, "warm");
defaultMap.put(FessEnv.DEVELOPMENT_HERE, "true");
defaultMap.put(FessEnv.ENVIRONMENT_TITLE, "Local Development");
defaultMap.put(FessEnv.FRAMEWORK_DEBUG, "false");

1
src/main/resources/fess_config.properties
View file

@ -289,7 +289,6 @@ index.field.mimetype=mimetype
index.field.parent_id=parent_id
index.field.important_content=important_content
index.field.content=content
index.field.content_minhash=content_minhash
index.field.content_minhash_bits=content_minhash_bits
index.field.cache=cache
index.field.digest=digest

12
src/main/resources/fess_indices/fess/doc.json
View file

@ -501,15 +501,17 @@
"type": "text",
"analyzer": "standard_analyzer",
"search_analyzer": "standard_search_analyzer",
"term_vector": "with_positions_offsets"
"term_vector": "with_positions_offsets",
"copy_to": ["content_minhash_bits"]
},
"content_minhash": {
"type": "minhash",
"minhash_analyzer": "minhash_analyzer",
"copy_bits_to": "content_minhash_bits"
"type": "text",
"index": false
},
"content_minhash_bits": {
"type": "keyword"
"type": "minhash",
"bit_string": true,
"minhash_analyzer": "minhash_analyzer"
},
"content_length": {
"type": "long"