diff --git a/core/core.go b/core/core.go deleted file mode 100644 index 68c1882ff3..0000000000 --- a/core/core.go +++ /dev/null @@ -1,3 +0,0 @@ -pacakage core - -import "C" \ No newline at end of file diff --git a/core/ubuntu_build_deps.sh b/core/ubuntu_build_deps.sh new file mode 100755 index 0000000000..44bf2c4e52 --- /dev/null +++ b/core/ubuntu_build_deps.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +sudo apt-get install libtbb-dev diff --git a/proxy/milvus/bin/milvus_server b/proxy/milvus/bin/milvus_server new file mode 100755 index 0000000000..1d3babcf3e Binary files /dev/null and b/proxy/milvus/bin/milvus_server differ diff --git a/proxy/src/version.h b/proxy/src/version.h index 59e389708e..03da6b7074 100644 --- a/proxy/src/version.h +++ b/proxy/src/version.h @@ -10,6 +10,6 @@ // or implied. See the License for the specific language governing permissions and limitations under the License. #define MILVUS_VERSION "0.10.0" -#define BUILD_TYPE "Debug" -#define BUILD_TIME "2020-08-28 11:25.21" -#define LAST_COMMIT_ID "ed93e96c6aa3050312a0b7950f04a1193e36bd10" +#define BUILD_TYPE "Release" +#define BUILD_TIME "2020-09-02 17:22.14" +#define LAST_COMMIT_ID "9598d59d297b62bb5327043817e64c74ae9b25df" diff --git a/pulsar/client-cpp/src/pb/milvus.proto b/pulsar/client-cpp/src/pb/milvus.proto index 6f58ae1fae..a88894e644 100644 --- a/pulsar/client-cpp/src/pb/milvus.proto +++ b/pulsar/client-cpp/src/pb/milvus.proto @@ -742,3 +742,93 @@ service MilvusService { rpc SearchPB(SearchParamPB) returns (QueryResult) {} } + +/////////////////////////////////////////////////////////////////// +enum OpType { + Insert = 0; + Delete = 1; + Search = 2; + TimeSync = 3; + Key2Seg = 4; + Statistics = 5; +} + +message Key2SegmentRecord { + repeated uint64 segment_id = 1; +} + +message AttrRowRecord { + int32 int32_value = 1; + int64 int64_value = 2; + float float_value = 3; + double double_value = 4; +} + +message VectorRowParam { + string json = 1; + VectorRowRecord row_record = 2; +} + +message FieldRowValue { + string field_name = 1; + DataType type = 2; + AttrRowRecord attr_record = 3; + VectorRowRecord vector_record = 4; +} + +message PulsarMessage { + string collection_name = 1; + repeated FieldRowValue fields = 2; + uint64 entity_id = 3; + string partition_tag = 4; + VectorRowParam vector_param =5; + Key2SegmentRecord segments = 6; + int64 timestamp = 7; + int64 client_id = 8; + OpType msg_type = 9; + string topic_name = 10; + int64 partition_id = 11; + uint64 segment_id = 12; +} + +message InsertMsg { + string collection_name = 1; + repeated FieldRowValue fields = 2; + uint64 entity_id = 3; + string partition_tag = 4; + int64 timestamp = 5; + int64 client_id = 6; + OpType msg_type = 7; + string topic_name = 8; + int64 partition_id = 9; + uint64 segment_id = 10; +} + +message DeleteMsg { + string collection_name = 1; + uint64 entity_id = 3; + int64 timestamp = 5; + int64 client_id = 6; + OpType msg_type = 7; +} + +message SearchMsg { + string collection_name = 1; + string partition_tag = 2; + VectorRowParam vector_param = 3; + int64 timestamp = 4; + int64 client_id = 5; + OpType msg_type = 6; +} + +message TimeSyncMsg { + int64 timestamp = 1; + int64 client_id = 2; + OpType msg_type = 3; + } + +message Key2SegMsg { + int64 client_id = 1; + Key2SegmentRecord segments = 2; + OpType msg_type = 3; +} \ No newline at end of file