admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-07 01:28:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: change pymilvus version for hybridsearch-groupby(#36407) (#36451)

Browse Source 
related: #36407

---------

Signed-off-by: MrPresent-Han <chun.han@gmail.com>
Co-authored-by: MrPresent-Han <chun.han@gmail.com>
This commit is contained in:
Chun Han 2024-09-24 14:29:13 +08:00 committed by GitHub
parent 98a917c5d4
commit d55d9d6e1d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 76 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/proxy/search_reduce_util.go
View File

@ -218,9 +218,6 @@ func reduceSearchResultDataWithGroupBy(ctx context.Context, subSearchResultData
totalResCount += subSearchNqOffset[i][nq-1]
}
if subSearchNum == 1 && offset == 0 {
ret.Results = subSearchResultData[0]
} else {
var realTopK int64 = -1
var retSize int64
@ -306,7 +303,6 @@ func reduceSearchResultDataWithGroupBy(ctx context.Context, subSearchResultData
}
}
ret.Results.TopK = realTopK // realTopK is the topK of the nq-th query
}
if !metric.PositivelyRelated(metricType) {
for k := range ret.Results.Scores {
ret.Results.Scores[k] *= -1

4
tests/python_client/requirements.txt
View File

@ -12,8 +12,8 @@ allure-pytest==2.7.0
pytest-print==0.2.1
pytest-level==0.1.1
pytest-xdist==2.5.0
pymilvus==2.5.0rc80
pymilvus[bulk_writer]==2.5.0rc80
pymilvus==2.5.0rc81
pymilvus[bulk_writer]==2.5.0rc81
pytest-rerunfailures==9.1.1
git+https://github.com/Projectplace/pytest-tags
ndg-httpsclient

3
tests/python_client/testcases/test_mix_scenes.py
View File

@ -1266,7 +1266,6 @@ class TestGroupSearch(TestCaseClassBase):
self.collection_wrap.load()
@pytest.mark.tags(CaseLabel.L0)
@pytest.mark.xfail(reason="issue #36407")
@pytest.mark.parametrize("group_by_field", [DataType.VARCHAR.name, "varchar_with_index"])
def test_search_group_size(self, group_by_field):
"""
@ -1308,7 +1307,6 @@ class TestGroupSearch(TestCaseClassBase):
assert len(set(group_values)) == limit
@pytest.mark.tags(CaseLabel.L0)
@pytest.mark.xfail(reason="issue #36407")
def test_hybrid_search_group_size(self):
"""
hybrid search group by on 3 different float vector fields with group by varchar field with group size
@ -1360,7 +1358,6 @@ class TestGroupSearch(TestCaseClassBase):
group_distances = [res[i][l + 1].distance]
@pytest.mark.tags(CaseLabel.L1)
@pytest.mark.xfail(reason="issue #36407")
def test_hybrid_search_group_by(self):
"""
verify hybrid search group by works with different Rankers