Unverified Commit 4744c0cc authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #361 from yhmo/0.6.0 

#266 Rpc request source code refactor
parents ef5256d4 661a6037

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#316 - Some files not merged after vectors added

- \#327 - Search does not use GPU when index type is FLAT

- \#340 - Test cases run failed on 0.6.0

- \#353 - Rename config.h.in to version.h.in

- \#374 - sdk_simple return empty result



## Feature
@@ -22,6 +23,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#275 - Rename C++ SDK IndexType

- \#284 - Change C++ SDK to shared library

- \#260 - C++ SDK README

- \#266 - Rpc request source code refactor

- \#314 - add Find FAISS in CMake

- \#310 - Add Q&A for 'protocol https not supported or disable in libcurl' issue

- \#322 - Add option to enable / disable prometheus

core/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ if (MILVUS_VERSION_MAJOR STREQUAL "" 
endif()



message(STATUS "Build version = ${MILVUS_VERSION}")

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/config.h @ONLY)

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/version.h @ONLY)



message(STATUS "Milvus version: "

        "${MILVUS_VERSION_MAJOR}.${MILVUS_VERSION_MINOR}.${MILVUS_VERSION_PATCH} "

core/src/CMakeLists.txt

+7 −1
Original line number Diff line number Diff line
@@ -75,7 +75,13 @@ set(thirdparty_files 
        )



aux_source_directory(${MILVUS_ENGINE_SRC}/server server_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/server/grpc_impl grpc_server_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/server/grpc_impl/request grpc_request_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/server/grpc_impl grpc_impl_files)

set(grpc_server_files

        ${grpc_request_files}

        ${grpc_impl_files}

        )



aux_source_directory(${MILVUS_ENGINE_SRC}/utils utils_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/wrapper wrapper_files)

core/src/db/meta/MetaTypes.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#include "db/Constants.h"

#include "db/engine/ExecutionEngine.h"

#include "src/config.h"

#include "src/version.h"



#include <map>

#include <memory>

core/src/grpc/gen-milvus/milvus.pb.h

+16 −41
Original line number Diff line number Diff line
@@ -1321,8 +1321,7 @@ class RowRecord : 
  void clear_vector_data();

  float vector_data(int index) const;

  void set_vector_data(int index, float value);

//  void add_vector_data(float value);

  void add_vector_data(std::vector<float>::const_iterator begin, std::vector<float>::const_iterator end);

  void add_vector_data(float value);

  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< float >&

      vector_data() const;

  ::PROTOBUF_NAMESPACE_ID::RepeatedField< float >*
@@ -1474,9 +1473,7 @@ class InsertParam : 
  void clear_row_id_array();

  ::PROTOBUF_NAMESPACE_ID::int64 row_id_array(int index) const;

  void set_row_id_array(int index, ::PROTOBUF_NAMESPACE_ID::int64 value);

//  void add_row_id_array(::PROTOBUF_NAMESPACE_ID::int64 value);

  void add_row_id_array(std::vector<::PROTOBUF_NAMESPACE_ID::int64>::const_iterator begin,

                        std::vector<::PROTOBUF_NAMESPACE_ID::int64>::const_iterator end);

  void add_row_id_array(::PROTOBUF_NAMESPACE_ID::int64 value);

  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::int64 >&

      row_id_array() const;

  ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::int64 >*
@@ -2139,9 +2136,7 @@ class TopKQueryResult : 
  void clear_ids();

  ::PROTOBUF_NAMESPACE_ID::int64 ids(int index) const;

  void set_ids(int index, ::PROTOBUF_NAMESPACE_ID::int64 value);

//  void add_ids(::PROTOBUF_NAMESPACE_ID::int64 value);

  void add_ids(std::vector<::PROTOBUF_NAMESPACE_ID::int64>::const_iterator begin,

               std::vector<::PROTOBUF_NAMESPACE_ID::int64>::const_iterator end);

  void add_ids(::PROTOBUF_NAMESPACE_ID::int64 value);

  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::int64 >&

      ids() const;

  ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::int64 >*
@@ -2152,8 +2147,7 @@ class TopKQueryResult : 
  void clear_distances();

  float distances(int index) const;

  void set_distances(int index, float value);

//  void add_distances(float value);

  void add_distances(std::vector<float>::const_iterator begin, std::vector<float>::const_iterator end);

  void add_distances(float value);

  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< float >&

      distances() const;

  ::PROTOBUF_NAMESPACE_ID::RepeatedField< float >*
@@ -3928,13 +3922,8 @@ inline void RowRecord::set_vector_data(int index, float value) { 
  vector_data_.Set(index, value);

  // @@protoc_insertion_point(field_set:milvus.grpc.RowRecord.vector_data)

}

//inline void RowRecord::add_vector_data(float value) {

//  vector_data_.Add(value);

//  // @@protoc_insertion_point(field_add:milvus.grpc.RowRecord.vector_data)

//}

inline void RowRecord::add_vector_data(std::vector<float>::const_iterator begin,

                                       std::vector<float>::const_iterator end) {

    vector_data_.Add(begin, end);

inline void RowRecord::add_vector_data(float value) {

  vector_data_.Add(value);

  // @@protoc_insertion_point(field_add:milvus.grpc.RowRecord.vector_data)

}

inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< float >&
@@ -4048,13 +4037,8 @@ inline void InsertParam::set_row_id_array(int index, ::PROTOBUF_NAMESPACE_ID::in 
  row_id_array_.Set(index, value);

  // @@protoc_insertion_point(field_set:milvus.grpc.InsertParam.row_id_array)

}

//inline void InsertParam::add_row_id_array(::PROTOBUF_NAMESPACE_ID::int64 value) {

//  row_id_array_.Add(value);

//  // @@protoc_insertion_point(field_add:milvus.grpc.InsertParam.row_id_array)

//}

inline void InsertParam::add_row_id_array(std::vector<::PROTOBUF_NAMESPACE_ID::int64>::const_iterator begin,

                                          std::vector<::PROTOBUF_NAMESPACE_ID::int64>::const_iterator end) {

    row_id_array_.Add(begin, end);

inline void InsertParam::add_row_id_array(::PROTOBUF_NAMESPACE_ID::int64 value) {

  row_id_array_.Add(value);

  // @@protoc_insertion_point(field_add:milvus.grpc.InsertParam.row_id_array)

}

inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::int64 >&
@@ -4604,13 +4588,8 @@ inline void TopKQueryResult::set_ids(int index, ::PROTOBUF_NAMESPACE_ID::int64 v 
  ids_.Set(index, value);

  // @@protoc_insertion_point(field_set:milvus.grpc.TopKQueryResult.ids)

}

//inline void TopKQueryResult::add_ids(::PROTOBUF_NAMESPACE_ID::int64 value) {

//  ids_.Add(value);

//  // @@protoc_insertion_point(field_add:milvus.grpc.TopKQueryResult.ids)

//}

inline void TopKQueryResult::add_ids(std::vector<::PROTOBUF_NAMESPACE_ID::int64>::const_iterator begin,

                                     std::vector<::PROTOBUF_NAMESPACE_ID::int64>::const_iterator end) {

    ids_.Add(begin,end);

inline void TopKQueryResult::add_ids(::PROTOBUF_NAMESPACE_ID::int64 value) {

  ids_.Add(value);

  // @@protoc_insertion_point(field_add:milvus.grpc.TopKQueryResult.ids)

}

inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::int64 >&
@@ -4639,12 +4618,8 @@ inline void TopKQueryResult::set_distances(int index, float value) { 
  distances_.Set(index, value);

  // @@protoc_insertion_point(field_set:milvus.grpc.TopKQueryResult.distances)

}

//inline void TopKQueryResult::add_distances(float value) {

//  distances_.Add(value);

//  // @@protoc_insertion_point(field_add:milvus.grpc.TopKQueryResult.distances)

//}

inline void TopKQueryResult::add_distances(std::vector<float>::const_iterator begin, std::vector<float>::const_iterator end) {

    distances_.Add(begin, end);

inline void TopKQueryResult::add_distances(float value) {

  distances_.Add(value);

  // @@protoc_insertion_point(field_add:milvus.grpc.TopKQueryResult.distances)

}

inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< float >&