Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into m/delete-partitio…
Browse files Browse the repository at this point in the history 
…nkey2id
  • Loading branch information
@XuanYang-cn
XuanYang-cn committed Dec 18, 2024
2 parents ec32599 + 06d410b commit 19ff350
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
5 changes: 3 additions & 2 deletions internal/core/src/segcore/DeletedRecord.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,10 @@ class DeletedRecord {
}
if (loc >= 0) {
next_iter = snap_next_iter_[loc];
Assert(snapshots_[loc].second.size() <= bitset.size());
auto or_size =
std::min(snapshots_[loc].second.size(), bitset.size());
bitset.inplace_or_with_count(snapshots_[loc].second,
snapshots_[loc].second.size());
or_size);
hit_snapshot = true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/core/thirdparty/knowhere/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# Update KNOWHERE_VERSION for the first occurrence
milvus_add_pkg_config("knowhere")
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES "")
set( KNOWHERE_VERSION cae8d1ff )
set( KNOWHERE_VERSION v2.5.0 )
set( GIT_REPOSITORY "https://github.com/zilliztech/knowhere.git")
message(STATUS "Knowhere repo: ${GIT_REPOSITORY}")
message(STATUS "Knowhere version: ${KNOWHERE_VERSION}")
Expand Down
2 changes: 1 addition & 1 deletion internal/proxy/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ func validatePartitionTag(partitionTag string, strictCheck bool) error {
tagSize := len(partitionTag)
for i := 1; i < tagSize; i++ {
c := partitionTag[i]
if c != '_' && !isAlpha(c) && !isNumber(c) {
if c != '_' && !isAlpha(c) && !isNumber(c) && c != '-' {
msg := invalidMsg + "Partition name can only contain numbers, letters and underscores."
return errors.New(msg)
}
Expand Down
1 change: 0 additions & 1 deletion tests/go_client/common/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ func GenInvalidNames() []string {
invalidNames := []string{
"",
" ",
"12-s",
"(mn)",
"中文",
"%$#",
Expand Down
4 changes: 2 additions & 2 deletions tests/python_client/milvus_client/test_milvus_client_insert.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ def test_milvus_client_insert_not_matched_data(self):
check_task=CheckTasks.err_res, check_items=error)

@pytest.mark.tags(CaseLabel.L1)
@pytest.mark.parametrize("partition_name", ["12-s", "12 s", "(mn)", "中文", "%$#", " "])
@pytest.mark.parametrize("partition_name", ["12 s", "(mn)", "中文", "%$#", " "])
def test_milvus_client_insert_invalid_partition_name(self, partition_name):
"""
target: test milvus client: insert extra field than schema
Expand Down Expand Up @@ -739,7 +739,7 @@ def test_milvus_client_upsert_not_matched_data(self):
check_task=CheckTasks.err_res, check_items=error)

@pytest.mark.tags(CaseLabel.L1)
@pytest.mark.parametrize("partition_name", ["12-s", "12 s", "(mn)", "中文", "%$#", " "])
@pytest.mark.parametrize("partition_name", ["12 s", "(mn)", "中文", "%$#", " "])
def test_milvus_client_upsert_invalid_partition_name(self, partition_name):
"""
target: test milvus client: insert extra field than schema
Expand Down
10 changes: 5 additions & 5 deletions tests/python_client/milvus_client/test_milvus_client_partition.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def test_milvus_client_partition_not_exist_collection_name(self):
check_task=CheckTasks.err_res, check_items=error)

@pytest.mark.tags(CaseLabel.L1)
@pytest.mark.parametrize("partition_name", ["12-s", "12 s", "(mn)", "中文", "%$#"])
@pytest.mark.parametrize("partition_name", ["12 s", "(mn)", "中文", "%$#"])
def test_milvus_client_partition_invalid_partition_name(self, partition_name):
"""
target: test fast create collection normal case
Expand Down Expand Up @@ -384,7 +384,7 @@ def test_milvus_client_drop_partition_not_exist_collection_name(self):
check_task=CheckTasks.err_res, check_items=error)

@pytest.mark.tags(CaseLabel.L1)
@pytest.mark.parametrize("partition_name", ["12-s", "12 s", "(mn)", "中文", "%$#"])
@pytest.mark.parametrize("partition_name", ["12 s", "(mn)", "中文", "%$#"])
def test_milvus_client_drop_partition_invalid_partition_name(self, partition_name):
"""
target: test fast create collection normal case
Expand Down Expand Up @@ -483,7 +483,7 @@ def test_milvus_client_release_partition_not_exist_collection_name(self):

@pytest.mark.tags(CaseLabel.L1)
@pytest.mark.xfail(reason="pymilvus issue 1896")
@pytest.mark.parametrize("partition_name", ["12-s", "12 s", "(mn)", "中文", "%$#"])
@pytest.mark.parametrize("partition_name", ["12 s", "(mn)", "中文", "%$#"])
def test_milvus_client_release_partition_invalid_partition_name(self, partition_name):
"""
target: test release partition -- invalid partition name value
Expand Down Expand Up @@ -809,7 +809,7 @@ def test_milvus_client_has_partition_not_exist_collection_name(self):
check_task=CheckTasks.err_res, check_items=error)

@pytest.mark.tags(CaseLabel.L1)
@pytest.mark.parametrize("partition_name", ["12-s", "12 s", "(mn)", "中文", "%$#"])
@pytest.mark.parametrize("partition_name", ["12 s", "(mn)", "中文", "%$#"])
def test_milvus_client_has_partition_invalid_partition_name(self, partition_name):
"""
target: test fast create collection normal case
Expand Down Expand Up @@ -930,7 +930,7 @@ def test_milvus_client_load_partitions_collection_name_over_max_length(self):
check_task=CheckTasks.err_res, check_items=error)

@pytest.mark.tags(CaseLabel.L1)
@pytest.mark.parametrize("name", ["12-s", "12 s", "(mn)", "中文", "%$#"])
@pytest.mark.parametrize("name", ["12 s", "(mn)", "中文", "%$#"])
def test_milvus_client_load_partitions_invalid_partition_name(self, name):
"""
target: test fast create collection normal case
Expand Down

0 comments on commit 19ff350

Please sign in to comment.