From afbe9152e90e76f8a9de6716c14fdf7fe65c9b1c Mon Sep 17 00:00:00 2001
From: "yudong.cai" <yudong.cai@zilliz.com>
Date: Wed, 13 Nov 2019 14:34:07 +0800
Subject: [PATCH] #275 rename c++ sdk IndexType

---
 CHANGELOG.md                                   |  1 +
 .../sdk/examples/partition/src/ClientTest.cpp  |  2 +-
 .../src/sdk/examples/simple/src/ClientTest.cpp |  2 +-
 core/src/sdk/examples/utils/Utils.cpp          | 18 ++++++++++--------
 core/src/sdk/include/MilvusApi.h               | 12 ++++++------
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02fb05d9cc..ce1af3a29b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - \#226 - Experimental shards middleware for Milvus
 
 ## Improvement
+- \#275 - Rename C++ SDK IndexType
 - \#284 - Change C++ SDK to shared library
 - \#260 - C++ SDK README
 
diff --git a/core/src/sdk/examples/partition/src/ClientTest.cpp b/core/src/sdk/examples/partition/src/ClientTest.cpp
index 6e4a7d1826..e58de0ce27 100644
--- a/core/src/sdk/examples/partition/src/ClientTest.cpp
+++ b/core/src/sdk/examples/partition/src/ClientTest.cpp
@@ -41,7 +41,7 @@ constexpr int64_t NQ = 5;
 constexpr int64_t TOP_K = 10;
 constexpr int64_t NPROBE = 32;
 constexpr int64_t SEARCH_TARGET = 5000;  // change this value, result is different
-constexpr milvus::IndexType INDEX_TYPE = milvus::IndexType::gpu_ivfsq8;
+constexpr milvus::IndexType INDEX_TYPE = milvus::IndexType::IVFSQ8;
 constexpr int32_t N_LIST = 15000;
 constexpr int32_t PARTITION_COUNT = 5;
 constexpr int32_t TARGET_PARTITION = 3;
diff --git a/core/src/sdk/examples/simple/src/ClientTest.cpp b/core/src/sdk/examples/simple/src/ClientTest.cpp
index 9045168f2a..9b217a1ed0 100644
--- a/core/src/sdk/examples/simple/src/ClientTest.cpp
+++ b/core/src/sdk/examples/simple/src/ClientTest.cpp
@@ -41,7 +41,7 @@ constexpr int64_t TOP_K = 10;
 constexpr int64_t NPROBE = 32;
 constexpr int64_t SEARCH_TARGET = 5000;  // change this value, result is different
 constexpr int64_t ADD_VECTOR_LOOP = 5;
-constexpr milvus::IndexType INDEX_TYPE = milvus::IndexType::gpu_ivfsq8;
+constexpr milvus::IndexType INDEX_TYPE = milvus::IndexType::IVFSQ8;
 constexpr int32_t N_LIST = 15000;
 
 milvus::TableSchema
diff --git a/core/src/sdk/examples/utils/Utils.cpp b/core/src/sdk/examples/utils/Utils.cpp
index c527cf47e1..3f96a5b6df 100644
--- a/core/src/sdk/examples/utils/Utils.cpp
+++ b/core/src/sdk/examples/utils/Utils.cpp
@@ -89,14 +89,16 @@ Utils::MetricTypeName(const milvus::MetricType& metric_type) {
 std::string
 Utils::IndexTypeName(const milvus::IndexType& index_type) {
     switch (index_type) {
-        case milvus::IndexType::cpu_idmap:
-            return "cpu idmap";
-        case milvus::IndexType::gpu_ivfflat:
-            return "gpu ivflat";
-        case milvus::IndexType::gpu_ivfsq8:
-            return "gpu ivfsq8";
-        case milvus::IndexType::mix_nsg:
-            return "mix nsg";
+        case milvus::IndexType::FLAT:
+            return "FLAT";
+        case milvus::IndexType::IVFFLAT:
+            return "IVFFLAT";
+        case milvus::IndexType::IVFSQ8:
+            return "IVFSQ8";
+        case milvus::IndexType::NSG:
+            return "NSG";
+        case milvus::IndexType::IVFSQ8H:
+            return "IVFSQ8H";
         default:
             return "Unknown index type";
     }
diff --git a/core/src/sdk/include/MilvusApi.h b/core/src/sdk/include/MilvusApi.h
index 8c92375649..ea1dbf6d75 100644
--- a/core/src/sdk/include/MilvusApi.h
+++ b/core/src/sdk/include/MilvusApi.h
@@ -31,12 +31,12 @@ namespace milvus {
  * @brief Index Type
  */
 enum class IndexType {
-    invalid = 0,
-    cpu_idmap,
-    gpu_ivfflat,
-    gpu_ivfsq8,
-    mix_nsg,
-    ivfsq8h,
+    INVALID = 0,
+    FLAT = 1,
+    IVFFLAT = 2,
+    IVFSQ8 = 3,
+    NSG = 4,
+    IVFSQ8H = 5,
 };
 
 enum class MetricType {