Skip to content

Commit 9f0775f

Browse files
committed
util/vector: remove unused error return argument from Encode
Release note: None
1 parent 7d0c456 commit 9f0775f

File tree

10 files changed

+14
-34
lines changed

10 files changed

+14
-34
lines changed

pkg/sql/backfill/backfill.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1551,10 +1551,7 @@ func (ib *IndexBackfiller) BuildIndexEntriesChunk(
15511551
}
15521552

15531553
vectorValue := tree.MustBeDPGVector(ib.rowVals[vectorIndexHelper.vectorOrd]).T
1554-
encodedVector, err := vector.Encode([]byte{}, vectorValue)
1555-
if err != nil {
1556-
return nil, nil, memUsedPerChunk, err
1557-
}
1554+
encodedVector := vector.Encode([]byte{}, vectorValue)
15581555
ib.vectorEncodingHelper.QuantizedVecs[indexID] = tree.NewDBytes(tree.DBytes(encodedVector))
15591556
ib.vectorEncodingHelper.PartitionKeys[indexID] = tree.NewDInt(tree.DInt(cspann.RootKey))
15601557
}

pkg/sql/rowenc/index_encoding_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,8 +1305,7 @@ func TestVectorEncoding(t *testing.T) {
13051305
tableDesc := desctestutils.TestingGetPublicTableDescriptor(kvDB, codec, "defaultdb", "prefix_cols")
13061306

13071307
testVector := vector.T{1, 2, 4}
1308-
encodedVector, err := vecencoding.EncodeUnquantizerVector([]byte{}, testVector)
1309-
require.NoError(t, err)
1308+
encodedVector := vecencoding.EncodeUnquantizerVector([]byte{}, testVector)
13101309

13111310
vh := VectorIndexEncodingHelper{
13121311
PartitionKeys: make(map[descpb.IndexID]tree.Datum),
@@ -1395,8 +1394,7 @@ func TestVectorCompositeEncoding(t *testing.T) {
13951394
tableDesc := desctestutils.TestingGetPublicTableDescriptor(kvDB, codec, "defaultdb", "prefix_cols")
13961395

13971396
testVector := vector.T{1, 2, 4}
1398-
encodedVector, err := vecencoding.EncodeUnquantizerVector([]byte{}, testVector)
1399-
require.NoError(t, err)
1397+
encodedVector := vecencoding.EncodeUnquantizerVector([]byte{}, testVector)
14001398

14011399
vh := VectorIndexEncodingHelper{
14021400
PartitionKeys: make(map[descpb.IndexID]tree.Datum),

pkg/sql/rowenc/valueside/array.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,10 +353,7 @@ func encodeArrayElement(b []byte, d tree.Datum) ([]byte, error) {
353353
}
354354
return encoding.EncodeUntaggedBytesValue(b, encoded), nil
355355
case *tree.DPGVector:
356-
encoded, err := vector.Encode(nil, t.T)
357-
if err != nil {
358-
return nil, err
359-
}
356+
encoded := vector.Encode(nil, t.T)
360357
return encoding.EncodeUntaggedBytesValue(b, encoded), nil
361358
case *tree.DLTree:
362359
return encoding.EncodeUntaggedLTreeValue(b, t.LTree), nil

pkg/sql/rowenc/valueside/encode.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,7 @@ func EncodeWithScratch(
108108
}
109109
return encoding.EncodeTSVectorValue(appendTo, uint32(colID), scratch), scratch, nil
110110
case *tree.DPGVector:
111-
scratch, err = vector.Encode(scratch[:0], t.T)
112-
if err != nil {
113-
return nil, nil, err
114-
}
111+
scratch = vector.Encode(scratch[:0], t.T)
115112
return encoding.EncodePGVectorValue(appendTo, uint32(colID), scratch), scratch, nil
116113
case *tree.DArray:
117114
scratch, err = encodeArray(t, scratch[:0])

pkg/sql/rowenc/valueside/legacy.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,7 @@ func MarshalLegacy(colType *types.T, val tree.Datum) (roachpb.Value, error) {
168168
}
169169
case types.PGVectorFamily:
170170
if v, ok := val.(*tree.DPGVector); ok {
171-
data, err := vector.Encode(nil, v.T)
172-
if err != nil {
173-
return r, err
174-
}
171+
data := vector.Encode(nil, v.T)
175172
r.SetBytes(data)
176173
return r, nil
177174
}

pkg/sql/vecindex/vecencoding/encoding.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,7 @@ func EncodeMetadataValue(metadata cspann.PartitionMetadata) []byte {
199199
buf = encoding.EncodeUint64Ascending(buf, uint64(metadata.StateDetails.Source))
200200
buf = encoding.EncodeUntaggedTimeValue(buf, metadata.StateDetails.Timestamp)
201201

202-
// vector.Encode never returns a non-nil error, so suppress return value.
203-
buf, _ = vector.Encode(buf, metadata.Centroid)
204-
return buf
202+
return vector.Encode(buf, metadata.Centroid)
205203
}
206204

207205
// EncodeRaBitQVector encodes a RaBitQ vector into the given byte slice.
@@ -222,7 +220,7 @@ func EncodeRaBitQVectorFromSet(
222220

223221
// EncodeUnquantizerVector encodes an Unquantizer vector into the given byte
224222
// slice.
225-
func EncodeUnquantizerVector(appendTo []byte, v vector.T) ([]byte, error) {
223+
func EncodeUnquantizerVector(appendTo []byte, v vector.T) []byte {
226224
// For backwards compatibility, encode a zero float32. Previously, the
227225
// distance of the vector to the centroid was encoded, but that is no longer
228226
// necessary.

pkg/sql/vecindex/vecencoding/encoding_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,7 @@ func testEncodeDecodeRoundTripImpl(t *testing.T, rnd *rand.Rand, set vector.Set)
9090
for i := range set.Count {
9191
switch quantizedSet := quantizedSet.(type) {
9292
case *quantize.UnQuantizedVectorSet:
93-
var err error
94-
buf, err = vecencoding.EncodeUnquantizerVector(buf, set.At(i))
95-
require.NoError(t, err)
93+
buf = vecencoding.EncodeUnquantizerVector(buf, set.At(i))
9694
case *quantize.RaBitQuantizedVectorSet:
9795
buf = vecencoding.EncodeRaBitQVectorFromSet(buf, quantizedSet, i)
9896
}

pkg/sql/vecindex/vecstore/codec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (sc *storeCodec) EncodeVector(w *workspace.T, v vector.T, centroid vector.T
7070

7171
switch t := sc.tmpVectorSet.(type) {
7272
case *quantize.UnQuantizedVectorSet:
73-
return vecencoding.EncodeUnquantizerVector([]byte{}, t.Vectors.At(0))
73+
return vecencoding.EncodeUnquantizerVector([]byte{}, t.Vectors.At(0)), nil
7474
case *quantize.RaBitQuantizedVectorSet:
7575
return vecencoding.EncodeRaBitQVectorFromSet([]byte{}, t, 0), nil
7676
default:

pkg/util/vector/vector.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@ func (v T) Compare(v2 T) (int, error) {
116116
}
117117

118118
// Encode encodes the vector as a byte array suitable for storing in KV.
119-
func Encode(appendTo []byte, t T) ([]byte, error) {
119+
func Encode(appendTo []byte, t T) []byte {
120120
appendTo = encoding.EncodeUint32Ascending(appendTo, uint32(len(t)))
121121
for i := range t {
122122
appendTo = encoding.EncodeUntaggedFloat32Value(appendTo, t[i])
123123
}
124-
return appendTo, nil
124+
return appendTo
125125
}
126126

127127
// Decode decodes the byte array into a vector and returns any remaining bytes.

pkg/util/vector/vector_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,13 @@ func TestRoundtripRandomPGVector(t *testing.T) {
6868
extra := randutil.RandBytes(rng, 10)
6969
for i := 0; i < 1000; i++ {
7070
v := Random(rng, 1000 /* maxDim */)
71-
encoded, err := Encode(nil, v)
72-
assert.NoError(t, err)
71+
encoded := Encode(nil, v)
7372
encoded = append(encoded, extra...)
7473
remaining, roundtripped, err := Decode(encoded)
7574
assert.NoError(t, err)
7675
assert.Equal(t, v.String(), roundtripped.String())
7776
assert.Equal(t, extra, remaining)
78-
reEncoded, err := Encode(nil, roundtripped)
79-
assert.NoError(t, err)
77+
reEncoded := Encode(nil, roundtripped)
8078
assert.Equal(t, encoded, append(reEncoded, extra...))
8179
}
8280
}

0 commit comments

Comments
 (0)