admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Align the options of WKT/WKB conversions to ensure consistent behavior (#46828)

Browse Source 
issue: #46823

---------

Signed-off-by: Cai Zhang <cai.zhang@zilliz.com>
This commit is contained in:
cai.zhang 2026-01-07 12:31:24 +08:00 committed by GitHub
parent c0664b78ca
commit f46ab9cea1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/proxy/validate_util.go
View File

@ -6,8 +6,6 @@ import (
"reflect"
"github.com/samber/lo"
"github.com/twpayne/go-geom/encoding/wkb"
"github.com/twpayne/go-geom/encoding/wkt"
"go.uber.org/zap"
"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
@ -74,13 +72,7 @@ func validateGeometryFieldSearchResult(fieldData **schemapb.FieldData) error {
if validData != nil && !validData[i] {
continue
}
geomT, err := wkb.Unmarshal(data)
if err != nil {
log.Error("translate the wkb format search result into geometry failed")
return err
}
// now remove MaxDecimalDigits limit
wktStr, err := wkt.Marshal(geomT)
wktStr, err := common.ConvertWKBToWKT(data)
if err != nil {
log.Error("translate the geomery into its wkt failed")
return err

6
internal/storage/print_binlog.go
View File

@ -21,14 +21,13 @@ import (
"os"
"github.com/cockroachdb/errors"
"github.com/twpayne/go-geom/encoding/wkb"
"github.com/twpayne/go-geom/encoding/wkt"
"golang.org/x/exp/mmap"
"google.golang.org/protobuf/proto"
"github.com/milvus-io/milvus-proto/go-api/v2/msgpb"
"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
"github.com/milvus-io/milvus/internal/json"
"github.com/milvus-io/milvus/pkg/v2/common"
"github.com/milvus-io/milvus/pkg/v2/util/tsoutil"
)
@ -403,8 +402,7 @@ func printPayloadValues(colType schemapb.DataType, reader PayloadReaderInterface
return err
}
for i := 0; i < rows; i++ {
geomT, _ := wkb.Unmarshal(val[i])
wktStr, _ := wkt.Marshal(geomT)
wktStr, _ := common.ConvertWKBToWKT(val[i])
fmt.Printf("\t\t%d : %s\n", i, wktStr)
}
for i, v := range valids {

7
internal/util/importutilv2/csv/row_parser_test.go
View File

@ -23,9 +23,6 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
"github.com/twpayne/go-geom/encoding/wkb"
"github.com/twpayne/go-geom/encoding/wkbcommon"
"github.com/twpayne/go-geom/encoding/wkt"
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
@ -542,9 +539,7 @@ func (suite *RowParserSuite) runValid(c *testCase) {
suite.Equal(expectedFlat, vf.GetFloatVector().GetData())
}
case schemapb.DataType_Geometry:
geomT, err := wkt.Unmarshal(rawVal)
suite.NoError(err)
wkbValue, err := wkb.Marshal(geomT, wkb.NDR, wkbcommon.WKBOptionEmptyPointHandling(wkbcommon.EmptyPointHandlingNaN))
wkbValue, err := common.ConvertWKTToWKB(rawVal)
suite.NoError(err)
suite.Equal(wkbValue, val)
default:

7
internal/util/importutilv2/json/row_parser_test.go
View File

@ -22,9 +22,6 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
"github.com/twpayne/go-geom/encoding/wkb"
"github.com/twpayne/go-geom/encoding/wkbcommon"
"github.com/twpayne/go-geom/encoding/wkt"
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
@ -586,9 +583,7 @@ func (suite *RowParserSuite) runValid(c *testCase) {
continue
}
case schemapb.DataType_Geometry:
geomT, err := wkt.Unmarshal(rawVal.(string))
suite.NoError(err)
wkbValue, err := wkb.Marshal(geomT, wkb.NDR, wkbcommon.WKBOptionEmptyPointHandling(wkbcommon.EmptyPointHandlingNaN))
wkbValue, err := common.ConvertWKTToWKB(rawVal.(string))
suite.NoError(err)
suite.Equal(wkbValue, val)
default:

9
internal/util/importutilv2/parquet/reader_test.go
View File

@ -32,9 +32,6 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/suite"
"github.com/twpayne/go-geom/encoding/wkb"
"github.com/twpayne/go-geom/encoding/wkbcommon"
"github.com/twpayne/go-geom/encoding/wkt"
"golang.org/x/exp/slices"
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
@ -233,11 +230,7 @@ func (s *ReaderSuite) run(dataType schemapb.DataType, elemType schemapb.DataType
}
} else if fieldDataType == schemapb.DataType_Geometry && expect != nil {
expectData := expect.([]byte)
geomT, err := wkt.Unmarshal(string(expectData))
if err != nil {
s.Fail("unmarshal wkt failed")
}
wkbValue, err := wkb.Marshal(geomT, wkb.NDR, wkbcommon.WKBOptionEmptyPointHandling(wkbcommon.EmptyPointHandlingNaN))
wkbValue, err := common.ConvertWKTToWKB(string(expectData))
if err != nil {
s.Fail("marshal wkb failed")
}

8
pkg/common/common.go
View File

@ -655,3 +655,11 @@ func ConvertWKTToWKB(wktStr string) ([]byte, error) {
}
return wkb.Marshal(geomT, wkb.NDR, wkbcommon.WKBOptionEmptyPointHandling(wkbcommon.EmptyPointHandlingNaN))
}
func ConvertWKBToWKT(wkbData []byte) (string, error) {
geomT, err := wkb.Unmarshal(wkbData, wkbcommon.WKBOptionEmptyPointHandling(wkbcommon.EmptyPointHandlingNaN))
if err != nil {
return "", err
}
return wkt.Marshal(geomT)
}

24
pkg/common/common_test.go
View File

@ -290,3 +290,27 @@ func TestGetCollectionTTL(t *testing.T) {
assert.EqualValues(t, -1, result)
})
}
func TestWKTWKBConversion(t *testing.T) {
testCases := []struct {
name string
wkt string
}{
{"Point Empty", "POINT EMPTY"},
{"Polygon Empty", "POLYGON EMPTY"},
{"Point with coords", "POINT (1 2)"},
{"Polygon with coords", "POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))"},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
wkb, err := ConvertWKTToWKB(tc.wkt)
assert.NoError(t, err)
assert.NotNil(t, wkb)
wktResult, err := ConvertWKBToWKT(wkb)
assert.NoError(t, err)
assert.Equal(t, tc.wkt, wktResult)
})
}
}

9
pkg/util/testutils/gen_data.go
View File

@ -26,11 +26,10 @@ import (
"strconv"
"strings"
"github.com/twpayne/go-geom/encoding/wkb"
"github.com/twpayne/go-geom/encoding/wkt"
"github.com/x448/float16"
"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
"github.com/milvus-io/milvus/pkg/v2/common"
"github.com/milvus-io/milvus/pkg/v2/util/funcutil"
"github.com/milvus-io/milvus/pkg/v2/util/typeutil"
)
@ -176,13 +175,11 @@ func GenerateGeometryArray(numRows int) [][]byte {
for i := 0; i < numRows; i++ {
// data of wkt string bytes ,consider to be process by proxy
if i == numRows-1 {
geomT, _ := wkt.Unmarshal("POINT (-84.036 39.997)") // add a special point finally for test
wkbdata, _ := wkb.Marshal(geomT, wkb.NDR)
wkbdata, _ := common.ConvertWKTToWKB("POINT (-84.036 39.997)") // add a special point finally for test
ret = append(ret, wkbdata)
continue
}
geomT, _ := wkt.Unmarshal(wktArray[i%6])
wkbdata, _ := wkb.Marshal(geomT, wkb.NDR)
wkbdata, _ := common.ConvertWKTToWKB(wktArray[i%6])
ret = append(ret, wkbdata)
}
return ret

11
tests/python_client/milvus_client/test_milvus_client_geometry.py
View File

@ -978,14 +978,9 @@ class TestMilvusClientGeometryBasic(TestMilvusClientV2Base):
output_fields=["id", "geo"],
)
assert len(results) == 1, f"Should be able to query {empty_wkt}"
if empty_wkt != "POINT EMPTY":
assert results[0]["geo"] == empty_wkt, (
f"Retrieved geometry should match inserted {empty_wkt}"
)
else:
assert results[0]["geo"] == "POINT (NaN NaN)", (
f"Retrieved geometry should match inserted {empty_wkt}"
)
assert results[0]["geo"] == empty_wkt, (
f"Retrieved geometry should match inserted {empty_wkt}"
)
@pytest.mark.tags(CaseLabel.L1)
@pytest.mark.parametrize("index_type", ["RTREE", "AUTOINDEX"])