Merge remote-tracking branch 'upstream/0.6.0' into 0.6.0

CHANGELOG.md

@@ -30,6 +30,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - \#227 - Support new index types SPTAG-KDT and SPTAG-BKT
 - \#346 - Support build index with multiple gpu
 - \#488 - Add log in scheduler/optimizer
+- \#502 - C++ SDK support IVFPQ and SPTAG
 
 ## Improvement
 - \#255 - Add ivfsq8 test report detailed version

README_CN.md

@@ -15,7 +15,7 @@ Milvus 是一款开源的、针对海量特征向量的相似性搜索引擎。
 
 若要了解 Milvus 详细介绍和整体架构，请访问 [Milvus 简介](https://www.milvus.io/docs/zh-CN/aboutmilvus/overview/)。
 
-Milvus 提供稳定的 [Python](https://github.com/milvus-io/pymilvus)、[Java](https://github.com/milvus-io/milvus-sdk-java) 以及 C++ 的 API 接口。
+Milvus 提供稳定的 [Python](https://github.com/milvus-io/pymilvus)、[Java](https://github.com/milvus-io/milvus-sdk-java) 以及[C++](https://github.com/milvus-io/milvus/tree/master/core/src/sdk) 的 API 接口。
 
 通过 [版本发布说明](https://milvus.io/docs/zh-CN/release/v0.5.3/) 获取最新版本的功能和更新。
 

ci/jenkins/Jenkinsfile

@@ -114,7 +114,7 @@ pipeline {
 
                         stage("Deploy to Development") {
                             environment {
-                                FROMAT_SEMVER = "${env.SEMVER}".replaceAll(".", "-")
+                                FROMAT_SEMVER = "${env.SEMVER}".replaceAll("\\.", "-")
                                 HELM_RELEASE_NAME = "${env.PIPELINE_NAME}-${env.FROMAT_SEMVER}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION}".toLowerCase()
                             }
 
@@ -249,7 +249,7 @@ pipeline {
 
                         stage("Deploy to Development") {
                             environment {
-                                FROMAT_SEMVER = "${env.SEMVER}".replaceAll(".", "-")
+                                FROMAT_SEMVER = "${env.SEMVER}".replaceAll("\\.", "-")
                                 HELM_RELEASE_NAME = "${env.PIPELINE_NAME}-${env.FROMAT_SEMVER}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION}".toLowerCase()
                             }
 

core/src/sdk/examples/utils/Utils.cpp

@@ -99,6 +99,12 @@ Utils::IndexTypeName(const milvus::IndexType& index_type) {
             return "NSG";
         case milvus::IndexType::IVFSQ8H:
             return "IVFSQ8H";
+        case milvus::IndexType::IVFPQ:
+            return "IVFPQ";
+        case milvus::IndexType::SPTAGKDT:
+            return "SPTAGKDT";
+        case milvus::IndexType::SPTAGBKT:
+            return "SPTAGBKT";
         default:
             return "Unknown index type";
     }

core/src/sdk/include/MilvusApi.h

@@ -37,6 +37,9 @@ enum class IndexType {
     IVFSQ8 = 3,
     NSG = 4,
     IVFSQ8H = 5,
+    IVFPQ = 6,
+    SPTAGKDT = 7,
+    SPTAGBKT = 8,
 };
 
 enum class MetricType {