From c9aadf289c95f22f61f923fdda600f591ba26ed3 Mon Sep 17 00:00:00 2001
From: peng-yongsheng <8082209@qq.com>
Date: Mon, 12 Feb 2018 01:05:22 +0800
Subject: [PATCH] =?UTF-8?q?Change=20the=20elasticsearch=20analyzer=20type?=
 =?UTF-8?q?=20to=20stop=20that=20can=20tokenizer=20the=20sentence=20such?=
 =?UTF-8?q?=20as=20=E2=80=9C=20org.apache.skywalking=E2=80=9D=20to=20?=
 =?UTF-8?q?=E2=80=9Corg=E2=80=9D=20=E2=80=9Capache=E2=80=9D=20=E2=80=9Csky?=
 =?UTF-8?q?walking=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/define/ElasticSearchStorageInstaller.java  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/base/define/ElasticSearchStorageInstaller.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/base/define/ElasticSearchStorageInstaller.java
index c6ede5dce..7f99754b3 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/base/define/ElasticSearchStorageInstaller.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/base/define/ElasticSearchStorageInstaller.java
@@ -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