Skip to content
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.

Sign up for GitHub

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

fix: repeated error code in milvus and segcore #37359

Merged
merged 1 commit into from
Nov 5, 2024
Merged

fix: repeated error code in milvus and segcore #37359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions internal/core/src/common/EasyAssert.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ enum ErrorCode {
MemAllocateFailed = 2034,
MemAllocateSizeNotMatch = 2035,
MmapError = 2036,
OutOfRange = 2037,
GcpNativeError = 2038,
KnowhereError = 2100,
// timeout or cancel related
FollyOtherException = 2037,
FollyCancel = 2038,
OutOfRange = 2039,
GcpNativeError = 2040,

// timeout or cancel related.
FollyOtherException = 2200,
FollyCancel = 2201
KnowhereError = 2099
};
namespace impl {
void
Expand Down
7 changes: 5 additions & 2 deletions pkg/util/merr/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,11 @@ var (
ErrSegcore = newMilvusError("segcore error", 2000, false)
ErrSegcoreUnsupported = newMilvusError("segcore unsupported error", 2001, false)
ErrSegcorePretendFinished = newMilvusError("segcore pretend finished", 2002, false)
ErrSegcoreFollyOtherException = newMilvusError("segcore folly other exception", 2200, false) // throw from segcore.
ErrSegcoreFollyCancel = newMilvusError("segcore Future was canceled", 2201, false) // throw from segcore.
ErrSegcoreFollyOtherException = newMilvusError("segcore folly other exception", 2037, false) // throw from segcore.
ErrSegcoreFollyCancel = newMilvusError("segcore Future was canceled", 2038, false) // throw from segcore.
ErrSegcoreOutOfRange = newMilvusError("segcore out of range", 2039, false) // throw from segcore.
ErrSegcoreGCPNativeError = newMilvusError("segcore GCP native error", 2040, false) // throw from segcore.
KnowhereError = newMilvusError("knowhere error", 2099, false) // throw from segcore.

// Do NOT export this,
// never allow programmer using this, keep only for converting unknown error to milvusError
Expand Down
Loading