[incubator-inlong] branch master updated: [INLONG-4388][Manager] Change Elasticsearch scaling_factor use correct mapping info (#4389)

[dockerzhang]

This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 6f7a0d3e6 [INLONG-4388][Manager] Change Elasticsearch scaling_factor 
use correct mapping info (#4389)
6f7a0d3e6 is described below

commit 6f7a0d3e68b633ce56533abf4b8c7156fe656a05
Author: lucaspeng12138 <100204617+lucaspeng12...@users.noreply.github.com>
AuthorDate: Thu May 26 20:41:37 2022 +0800

    [INLONG-4388][Manager] Change Elasticsearch scaling_factor use correct 
mapping info (#4389)
---
 .../pojo/sink/es/ElasticsearchFieldInfo.java       |  2 +-
 .../service/resource/es/ElasticsearchApi.java      | 34 +++++++++++-----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git 
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/es/ElasticsearchFieldInfo.java
 
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/es/ElasticsearchFieldInfo.java
index c155034d2..c4e43fe6e 100644
--- 
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/es/ElasticsearchFieldInfo.java
+++ 
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/es/ElasticsearchFieldInfo.java
@@ -54,7 +54,7 @@ public class ElasticsearchFieldInfo {
     private String searchAnalyzer;
 
     @ApiModelProperty("Elasticsearch Scaling Factor")
-    private Integer scalingFactor;
+    private String scalingFactor;
 
     /**
      * Get the extra param from the Json
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/es/ElasticsearchApi.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/es/ElasticsearchApi.java
index 44f5e6322..ddfd6e3b1 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/es/ElasticsearchApi.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/es/ElasticsearchApi.java
@@ -115,28 +115,28 @@ public class ElasticsearchApi {
      */
     private List<String> getMappingInfo(List<ElasticsearchFieldInfo> 
fieldsInfo) {
         List<String> fieldList = new ArrayList<>();
-        for (ElasticsearchFieldInfo entry : fieldsInfo) {
-            StringBuilder fieldStr = new StringBuilder().append("        
\"").append(entry.getName())
+        for (ElasticsearchFieldInfo field : fieldsInfo) {
+            StringBuilder fieldStr = new StringBuilder().append("        
\"").append(field.getName())
                     .append("\" : {\n          \"type\" : \"")
-                    .append(entry.getType()).append("\"");
-            if (entry.getType().equals("text")) {
-                if (StringUtils.isNotEmpty(entry.getAnalyzer())) {
+                    .append(field.getType()).append("\"");
+            if (field.getType().equals("text")) {
+                if (StringUtils.isNotEmpty(field.getAnalyzer())) {
                     fieldStr.append(",\n          \"analyzer\" : \"")
-                            .append(entry.getAnalyzer()).append("\"");
+                            .append(field.getAnalyzer()).append("\"");
                 }
-                if (StringUtils.isNotEmpty(entry.getSearchAnalyzer())) {
+                if (StringUtils.isNotEmpty(field.getSearchAnalyzer())) {
                     fieldStr.append(",\n          \"search_analyzer\" : \"")
-                            .append(entry.getSearchAnalyzer()).append("\"");
+                            .append(field.getSearchAnalyzer()).append("\"");
                 }
-            } else if (entry.getType().equals("date")) {
-                if (StringUtils.isNotEmpty(entry.getFormat())) {
+            } else if (field.getType().equals("date")) {
+                if (StringUtils.isNotEmpty(field.getFormat())) {
                     fieldStr.append(",\n          \"format\" : \"")
-                            .append(entry.getFormat()).append("\"");
+                            .append(field.getFormat()).append("\"");
                 }
-            } else if (entry.getType().contains("float")) {
-                if (StringUtils.isNotEmpty(entry.getFormat())) {
+            } else if (field.getType().equals("scaled_float")) {
+                if (StringUtils.isNotEmpty(field.getScalingFactor())) {
                     fieldStr.append(",\n          \"scaling_factor\" : \"")
-                            .append(entry.getFormat()).append("\"");
+                            .append(field.getScalingFactor()).append("\"");
                 }
             }
             fieldStr.append("\n        }");
@@ -212,9 +212,9 @@ public class ElasticsearchApi {
         Map<String, MappingMetaData> mapping = getFields(indexName);
         Map<String, Object> filedMap = (Map<String, 
Object>)mapping.get(indexName).getSourceAsMap().get(FIELD_KEY);
         for (String key : filedMap.keySet()) {
-            for (ElasticsearchFieldInfo entry : notExistFieldInfos) {
-                if (entry.getName().equals(key)) {
-                    notExistFieldInfos.remove(entry);
+            for (ElasticsearchFieldInfo field : notExistFieldInfos) {
+                if (field.getName().equals(key)) {
+                    notExistFieldInfos.remove(field);
                     break;
                 }
             }