未验证 提交 b4caa81a 编写于 作者: X Xiaohai Xu 提交者: GitHub

fix binary issue (#3468)

Signed-off-by: Nsahuang <xiaohai.xu@zilliz.com>
上级 9350ee4a
......@@ -354,25 +354,10 @@ ValidateSegmentRowCount(int64_t segment_row_count) {
Status
ValidateIndexMetricType(const std::string& metric_type, const std::string& index_type) {
static std::set<std::string> s_valid_metric = {
milvus::knowhere::Metric::L2,
milvus::knowhere::Metric::IP,
milvus::knowhere::Metric::HAMMING,
milvus::knowhere::Metric::JACCARD,
milvus::knowhere::Metric::TANIMOTO,
milvus::knowhere::Metric::SUBSTRUCTURE,
milvus::knowhere::Metric::SUPERSTRUCTURE,
};
if (index_type == knowhere::IndexEnum::INDEX_FAISS_IDMAP) {
if (s_valid_metric.find(metric_type) == s_valid_metric.end()) {
std::string msg =
"Invalid index metric type: " + metric_type + ". " + "Make sure the metric type is in MetricType list.";
LOG_SERVER_ERROR_ << msg;
return Status(SERVER_INVALID_INDEX_METRIC_TYPE, msg);
}
} else if (index_type == knowhere::IndexEnum::INDEX_FAISS_BIN_IVFFLAT ||
index_type == knowhere::IndexEnum::INDEX_FAISS_BIN_IDMAP) {
if (index_type == knowhere::IndexEnum::INDEX_FAISS_IDMAP ||
index_type == knowhere::IndexEnum::INDEX_FAISS_BIN_IDMAP) {
// pass
} else if (index_type == knowhere::IndexEnum::INDEX_FAISS_BIN_IVFFLAT) {
// binary
if (metric_type != knowhere::Metric::HAMMING && metric_type != knowhere::Metric::JACCARD &&
metric_type != knowhere::Metric::TANIMOTO) {
......
......@@ -585,9 +585,11 @@ class TestIndexBinary:
# insert 6000 vectors
ids = connect.insert(binary_collection, binary_entities)
connect.flush([binary_collection])
with pytest.raises(Exception) as e:
if get_l2_index["index_type"] == "BIN_FLAT":
res = connect.create_index(binary_collection, binary_field_name, get_l2_index)
else:
with pytest.raises(Exception) as e:
res = connect.create_index(binary_collection, binary_field_name, get_l2_index)
"""
******************************************************************
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册