-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
enhance: remove CheckVecIndexWithDataTypeExist function in pkg and re…
…move some cgo call (#34102) issue: #22837 related pr: #34104 Signed-off-by: cqy123456 <qianya.cheng@zilliz.com>
- Loading branch information
Showing
4 changed files
with
103 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
// Licensed to the LF AI & Data foundation under one | ||
// or more contributor license agreements. See the NOTICE file | ||
// distributed with this work for additional information | ||
// regarding copyright ownership. The ASF licenses this file | ||
// to you under the Apache License, Version 2.0 (the | ||
// "License"); you may not use this file except in compliance | ||
// with the License. You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package proxy | ||
|
||
/* | ||
#cgo pkg-config: milvus_segcore | ||
#include "segcore/check_vec_index_c.h" | ||
#include <stdlib.h> | ||
*/ | ||
import "C" | ||
|
||
import ( | ||
"unsafe" | ||
|
||
"github.com/milvus-io/milvus-proto/go-api/v2/schemapb" | ||
) | ||
|
||
func CheckVecIndexWithDataTypeExist(name string, dType schemapb.DataType) bool { | ||
cIndexName := C.CString(name) | ||
cType := uint32(dType) | ||
defer C.free(unsafe.Pointer(cIndexName)) | ||
check := bool(C.CheckVecIndexWithDataType(cIndexName, cType)) | ||
return check | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
// Licensed to the LF AI & Data foundation under one | ||
// or more contributor license agreements. See the NOTICE file | ||
// distributed with this work for additional information | ||
// regarding copyright ownership. The ASF licenses this file | ||
// to you under the Apache License, Version 2.0 (the | ||
// "License"); you may not use this file except in compliance | ||
// with the License. You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package proxy | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/milvus-io/milvus-proto/go-api/v2/schemapb" | ||
"github.com/milvus-io/milvus/pkg/util/indexparamcheck" | ||
) | ||
|
||
func Test_CheckVecIndexWithDataTypeExist(t *testing.T) { | ||
cases := []struct { | ||
indexType string | ||
dataType schemapb.DataType | ||
want bool | ||
}{ | ||
{indexparamcheck.IndexHNSW, schemapb.DataType_FloatVector, true}, | ||
{indexparamcheck.IndexHNSW, schemapb.DataType_BinaryVector, false}, | ||
{indexparamcheck.IndexHNSW, schemapb.DataType_Float16Vector, true}, | ||
|
||
{indexparamcheck.IndexSparseWand, schemapb.DataType_SparseFloatVector, true}, | ||
{indexparamcheck.IndexSparseWand, schemapb.DataType_FloatVector, false}, | ||
{indexparamcheck.IndexSparseWand, schemapb.DataType_Float16Vector, false}, | ||
|
||
{indexparamcheck.IndexGpuBF, schemapb.DataType_FloatVector, true}, | ||
{indexparamcheck.IndexGpuBF, schemapb.DataType_Float16Vector, false}, | ||
{indexparamcheck.IndexGpuBF, schemapb.DataType_BinaryVector, false}, | ||
|
||
{indexparamcheck.IndexFaissBinIvfFlat, schemapb.DataType_BinaryVector, true}, | ||
{indexparamcheck.IndexFaissBinIvfFlat, schemapb.DataType_FloatVector, false}, | ||
|
||
{indexparamcheck.IndexDISKANN, schemapb.DataType_FloatVector, true}, | ||
{indexparamcheck.IndexDISKANN, schemapb.DataType_Float16Vector, true}, | ||
{indexparamcheck.IndexDISKANN, schemapb.DataType_BFloat16Vector, true}, | ||
{indexparamcheck.IndexDISKANN, schemapb.DataType_BinaryVector, false}, | ||
} | ||
|
||
for _, test := range cases { | ||
if got := CheckVecIndexWithDataTypeExist(test.indexType, test.dataType); got != test.want { | ||
t.Errorf("CheckVecIndexWithDataTypeExist(%v, %v) = %v", test.indexType, test.dataType, test.want) | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters