-
Notifications
You must be signed in to change notification settings - Fork 3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Milvus support multi index engines #27178
Milvus support multi index engines #27178
Conversation
@foxspy E2e jenkins job failed, comment |
@foxspy ut workflow job failed, comment |
02619a1
to
3f4f077
Compare
@@ -82,6 +83,9 @@ while getopts "p:t:s:f:o:ulrcghzme" arg; do | |||
n) | |||
BUILD_DISK_ANN="OFF" | |||
;; | |||
x) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If BUILD_DISK_ANN is no longer in use, then let's remove the associated logic.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, BUILD_DISK_ANN
will be reserved to transfer option to knowhere. But we remove all BUILD_DISK_ANN
in segcore because VectorDiskIndex.cpp
will process more than DISKANN
index.
Makefile
Outdated
@@ -37,6 +37,8 @@ MOCKERY_VERSION := 2.32.4 | |||
MOCKERY_OUTPUT := $(shell $(INSTALL_PATH)/mockery --version 2>/dev/null) | |||
INSTALL_MOCKERY := $(findstring $(MOCKERY_VERSION),$(MOCKERY_OUTPUT)) | |||
|
|||
build_cardinal = OFF |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The parameter name is called "engine_type", which may be better. The options are "knowhere" or "cardinal".
@@ -14,15 +14,9 @@ set(INDEX_FILES | |||
Utils.cpp | |||
VectorMemIndex.cpp | |||
IndexFactory.cpp | |||
VectorDiskIndex.cpp |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can DISK_ANN be compiled on a Mac?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, libaio can not be install in mac. For this commit, VectorDiskIndex.cpp
will process all vector index create/serialize/deserialize from file, not only DISKANN.
internal/indexnode/task.go
Outdated
@@ -337,6 +337,11 @@ func (it *indexBuildTask) BuildIndex(ctx context.Context) error { | |||
} | |||
} | |||
|
|||
if err := buildIndexInfo.AppendIndexEngineVersion(it.req.GetIndexEngineVersion()); err != nil { | |||
log.Ctx(ctx).Warn("append index engine version failed") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
log the err
?
@@ -11,7 +11,14 @@ | |||
# or implied. See the License for the specific language governing permissions and limitations under the License. | |||
#------------------------------------------------------------------------------- | |||
|
|||
set( KNOWHERE_VERSION 9aa3e21 ) | |||
set( KNOWHERE_VERSION add_version_support ) | |||
set( GIT_REPOSITORY "https://github.com/foxspy/knowhere.git") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please utilize the official repository instead and refrain from linking personal repositories.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
knowhere merged and fixed it.
@@ -27,6 +27,27 @@ | |||
#include "log/Log.h" | |||
|
|||
namespace milvus::storage { | |||
enum class FileManagerType { MemFile, DiskFile }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It appears that the FileManagerType is not being utilized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removed
83960aa
to
1c9775c
Compare
@foxspy E2e jenkins job failed, comment |
@foxspy ut workflow job failed, comment |
1c9775c
to
b008d27
Compare
@foxspy E2e jenkins job failed, comment |
@foxspy ut workflow job failed, comment |
128b4c8
to
798e8df
Compare
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: czs007, foxspy The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
/hold |
2b43f25
to
66b0331
Compare
@foxspy E2e jenkins job failed, comment |
/run-cpu-e2e |
@foxspy E2e jenkins job failed, comment |
/run-cpu-e2e |
internal/core/build.sh
Outdated
@@ -82,6 +83,9 @@ while getopts "p:t:s:f:o:ulrcghzme" arg; do | |||
n) | |||
BUILD_DISK_ANN="OFF" | |||
;; | |||
x) | |||
INDEX_ENGINE="cardinal" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the default INDEX_ENGINE is cardinal ?
return status; | ||
} catch (std::exception& e) { | ||
auto status = CStatus(); | ||
status.error_code = UnexpectedError; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do not use UnexpectedError, use FailureCStatus to handle it
return status; | ||
} catch (std::exception& e) { | ||
auto status = CStatus(); | ||
status.error_code = milvus::UnexpectedError; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ditto
return chunkManagerPtr != nullptr; | ||
} | ||
|
||
FieldDataMeta fieldDataMeta; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not use pointer 🤔?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a config object transferred from outside. It is a little strange to use it with pointer.
|
||
p.IndexEngineVersion = ParamItem{ | ||
Key: "common.indexEngineVersion", | ||
Version: "2.3.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shoud be 2.3.2 or later
@foxspy E2e jenkins job failed, comment |
66b0331
to
d17367d
Compare
@foxspy ut workflow job failed, comment |
@foxspy E2e jenkins job failed, comment |
/run-cpu-e2e |
d17367d
to
0c53c5a
Compare
@foxspy E2e jenkins job failed, comment |
Signed-off-by: xianliang <xianliang.li@zilliz.com> Co-authored-by: longjiquan <jiquan.long@zilliz.com>
0c53c5a
to
eda1885
Compare
@foxspy E2e jenkins job failed, comment |
/run-cpu-e2e |
/unhold |
/lgtm |
issue: #27177
/kind enhancement