Merge branch 'branch-0.4.0' into 'branch-0.4.0'

add back knowhere

See merge request megasearch/milvus!322

Former-commit-id: 1561db0024203239affef806c8961461998fc28f
This commit is contained in:
jinhai 2019-08-08 19:17:06 +08:00
commit 49c39c450a
3 changed files with 4 additions and 0 deletions

1
.gitignore vendored
View File

@ -3,6 +3,7 @@ cpp/cmake-build-debug/
cpp/cmake-build-release/
cpp/cmake_build
cpp/.idea/
cpp/thirdparty/knowhere_build
.idea/
.ycm_extra_conf.py

View File

@ -107,6 +107,8 @@ CreateTableTask::CreateTableTask(const ::milvus::grpc::TableSchema& schema)
BaseTaskPtr
CreateTableTask::Create(const ::milvus::grpc::TableSchema& schema) {
// BaseTaskPtr create_table_task_ptr = std::make_shared<CreateTableTask>(schema);
// return create_table_task_ptr;
return std::shared_ptr<BaseTask>(new CreateTableTask(schema));
}

1
cpp/thirdparty/knowhere vendored Submodule

@ -0,0 +1 @@
Subproject commit 98c56500b5b26a3502e2fea474586267ac6625f0