Merge branch 'branch-0.5.0' into 'branch-0.5.0'

MS-610 Change error code base value from hex to decimal

See merge request megasearch/milvus!660

Former-commit-id: 53ad6bcaaf901bd6f3504fcb35b66bfc37436f7b

cpp/CHANGELOG.md

@@ -39,6 +39,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-590 - Refine cmake code to support cpplint
 - MS-600 - Reconstruct unittest code
 - MS-602 - Remove zilliz namespace
+- MS-610 - Change error code base value from hex to decimal
 
 # Milvus 0.4.0 (2019-09-12)
 

cpp/src/scheduler/task/DeleteTask.cpp

@@ -17,6 +17,8 @@
 
 #include "scheduler/task/DeleteTask.h"
 
+#include <utility>
+
 namespace milvus {
 namespace scheduler {
 

cpp/src/scheduler/task/Task.h

@@ -24,6 +24,7 @@
 
 #include <memory>
 #include <string>
+#include <utility>
 
 namespace milvus {
 namespace scheduler {

cpp/src/scheduler/task/TestTask.cpp

@@ -18,11 +18,12 @@
 #include "scheduler/task/TestTask.h"
 #include "cache/GpuCacheMgr.h"
 
+#include <utility>
+
 namespace milvus {
 namespace scheduler {
 
-TestTask::TestTask(TableFileSchemaPtr& file, TaskLabelPtr label)
-    : XSearchTask(file, std::move(label)) {
+TestTask::TestTask(TableFileSchemaPtr& file, TaskLabelPtr label) : XSearchTask(file, std::move(label)) {
 }
 
 void
@@ -43,9 +44,7 @@ TestTask::Execute() {
 void
 TestTask::Wait() {
     std::unique_lock<std::mutex> lock(mutex_);
-    cv_.wait(lock, [&] {
-        return done_;
-    });
+    cv_.wait(lock, [&] { return done_; });
 }
 
 }  // namespace scheduler

cpp/src/utils/Error.h

@@ -26,7 +26,7 @@ namespace milvus {
 using ErrorCode = int32_t;
 
 constexpr ErrorCode SERVER_SUCCESS = 0;
-constexpr ErrorCode SERVER_ERROR_CODE_BASE = 0x30000;
+constexpr ErrorCode SERVER_ERROR_CODE_BASE = 30000;
 
 constexpr ErrorCode
 ToServerErrorCode(const ErrorCode error_code) {
@@ -34,7 +34,7 @@ ToServerErrorCode(const ErrorCode error_code) {
 }
 
 constexpr ErrorCode DB_SUCCESS = 0;
-constexpr ErrorCode DB_ERROR_CODE_BASE = 0x40000;
+constexpr ErrorCode DB_ERROR_CODE_BASE = 40000;
 
 constexpr ErrorCode
 ToDbErrorCode(const ErrorCode error_code) {
@@ -42,7 +42,7 @@ ToDbErrorCode(const ErrorCode error_code) {
 }
 
 constexpr ErrorCode KNOWHERE_SUCCESS = 0;
-constexpr ErrorCode KNOWHERE_ERROR_CODE_BASE = 0x50000;
+constexpr ErrorCode KNOWHERE_ERROR_CODE_BASE = 50000;
 
 constexpr ErrorCode
 ToKnowhereErrorCode(const ErrorCode error_code) {

cpp/src/wrapper/ConfAdapterMgr.h

@@ -20,9 +20,9 @@
 #include "ConfAdapter.h"
 #include "VecIndex.h"
 
+#include <functional>
 #include <map>
 #include <memory>
-#include <functional>
 
 namespace milvus {
 namespace engine {