From 4a155c24d69a3ad1a3d563e517bb38af55c6f9a3 Mon Sep 17 00:00:00 2001
From: hengfeiyang <hengfei.yang@gmail.com>
Date: Fri, 3 Jun 2022 21:28:22 +0800
Subject: [PATCH] fix: update setting and mapping api

---
 pkg/handlers/index/mapping.go  |  8 ++++----
 pkg/handlers/index/settings.go | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkg/handlers/index/mapping.go b/pkg/handlers/index/mapping.go
index 8b0188e04..171bff78a 100644
--- a/pkg/handlers/index/mapping.go
+++ b/pkg/handlers/index/mapping.go
@@ -49,13 +49,13 @@ func SetMapping(c *gin.Context) {
 		return
 	}
 
-	var newIndex meta.IndexSimple
-	if err := c.BindJSON(&newIndex); err != nil {
+	var mappingRequest map[string]interface{}
+	if err := c.BindJSON(&mappingRequest); err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
-	mappings, err := mappings.Request(nil, newIndex.Mappings)
+	mappings, err := mappings.Request(nil, mappingRequest)
 	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
@@ -79,7 +79,7 @@ func SetMapping(c *gin.Context) {
 		mappings = index.Mappings
 	} else {
 		// create index
-		index, err = core.NewIndex(indexName, newIndex.StorageType, nil)
+		index, err = core.NewIndex(indexName, "", nil)
 		if err != nil {
 			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 			return
diff --git a/pkg/handlers/index/settings.go b/pkg/handlers/index/settings.go
index c61598ea2..a815796d1 100644
--- a/pkg/handlers/index/settings.go
+++ b/pkg/handlers/index/settings.go
@@ -49,18 +49,18 @@ func SetSettings(c *gin.Context) {
 		return
 	}
 
-	var newIndex core.Index
-	if err := c.BindJSON(&newIndex); err != nil {
+	var settings *meta.IndexSettings
+	if err := c.BindJSON(&settings); err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
-	if newIndex.Settings == nil {
+	if settings == nil {
 		c.JSON(http.StatusOK, gin.H{"message": "ok"})
 		return
 	}
 
-	analyzers, err := zincanalysis.RequestAnalyzer(newIndex.Settings.Analysis)
+	analyzers, err := zincanalysis.RequestAnalyzer(settings.Analysis)
 	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
@@ -69,10 +69,10 @@ func SetSettings(c *gin.Context) {
 	index, exists := core.GetIndex(indexName)
 	if exists {
 		// it can only change settings.NumberOfReplicas when index exists
-		if newIndex.Settings.NumberOfReplicas > 0 {
-			index.Settings.NumberOfReplicas = newIndex.Settings.NumberOfReplicas
+		if settings.NumberOfReplicas > 0 {
+			index.Settings.NumberOfReplicas = settings.NumberOfReplicas
 		}
-		if newIndex.Settings.Analysis != nil && len(newIndex.Settings.Analysis.Analyzer) > 0 {
+		if settings.Analysis != nil && len(settings.Analysis.Analyzer) > 0 {
 			c.JSON(http.StatusBadRequest, gin.H{"error": "can't update analyzer for existing index"})
 			return
 		}
@@ -90,14 +90,14 @@ func SetSettings(c *gin.Context) {
 	if analyzers != nil {
 		defaultSearchAnalyzer = analyzers["default"]
 	}
-	index, err = core.NewIndex(indexName, newIndex.StorageType, defaultSearchAnalyzer)
+	index, err = core.NewIndex(indexName, "", defaultSearchAnalyzer)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
 	// update settings
-	_ = index.SetSettings(newIndex.Settings)
+	_ = index.SetSettings(settings)
 
 	// update analyzers
 	_ = index.SetAnalyzers(analyzers)