kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #808 from peng-yongsheng/feature/searchService 

Change the elasticsearch analyzer type to stop that can tokenizer the…
This commit is contained in:
吴晟 Wu Sheng 2018-02-12 08:36:32 +08:00 committed by GitHub
parent f84961d011 d2eb0b8241
commit 778731f17a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/base/define/ElasticSearchStorageInstaller.java
View File

@ -16,20 +16,19 @@
*
*/
package org.apache.skywalking.apm.collector.storage.es.base.define;
import java.io.IOException;
import java.util.List;
import org.apache.skywalking.apm.collector.client.Client;
import org.apache.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient;
import org.apache.skywalking.apm.collector.core.data.ColumnDefine;
import org.apache.skywalking.apm.collector.core.data.TableDefine;
import org.apache.skywalking.apm.collector.storage.StorageInstaller;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.IndexNotFoundException;
import org.apache.skywalking.apm.collector.client.Client;
import org.apache.skywalking.apm.collector.core.data.ColumnDefine;
import org.apache.skywalking.apm.collector.core.data.TableDefine;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -82,9 +81,7 @@ public class ElasticSearchStorageInstaller extends StorageInstaller {
.put("index.number_of_replicas", indexReplicasNumber)
.put("index.refresh_interval", String.valueOf(tableDefine.refreshInterval()) + "s")
.put("analysis.analyzer.collector_analyzer.tokenizer", "collector_tokenizer")
.put("analysis.tokenizer.collector_tokenizer.type", "standard")
.put("analysis.tokenizer.collector_tokenizer.max_token_length", 5)
.put("analysis.analyzer.collector_analyzer.type", "stop")
.build();
}
@ -100,7 +97,7 @@ public class ElasticSearchStorageInstaller extends StorageInstaller {
mappingBuilder
.startObject(elasticSearchColumnDefine.getName())
.field("type", elasticSearchColumnDefine.getType().toLowerCase())
.field("fielddata", true)
.field("analyzer", "collector_analyzer")
.endObject();
} else {
mappingBuilder