Skip to content

Commit 35f1106

Browse files
committed
quantize: rename NewQuantizedVectorSet to NewSet
Rename the NewQuantizedVectorSet method on the Quantizer interface to NewSet. "QuantizedVector" is already implied by context and consistent with other methdods like "QuantizeInSet". Epic: CRDB-42943 Release note: None
1 parent adf7f39 commit 35f1106

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

pkg/sql/vecindex/cspann/partition.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,6 @@ func (p *Partition) Clear() int {
282282
// CreateEmptyPartition returns an empty partition for the given quantizer and
283283
// level.
284284
func CreateEmptyPartition(quantizer quantize.Quantizer, metadata PartitionMetadata) *Partition {
285-
quantizedSet := quantizer.NewQuantizedVectorSet(0, metadata.Centroid)
285+
quantizedSet := quantizer.NewSet(0, metadata.Centroid)
286286
return NewPartition(metadata, quantizer, quantizedSet, []ChildKey(nil), []ValueBytes(nil))
287287
}

pkg/sql/vecindex/cspann/quantize/quantizer.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ type Quantizer interface {
4141
// vectors.
4242
QuantizeInSet(w *workspace.T, quantizedSet QuantizedVectorSet, vectors vector.Set)
4343

44-
// NewQuantizedVectorSet returns a new empty vector set preallocated to the
45-
// number of vectors specified.
46-
NewQuantizedVectorSet(capacity int, centroid vector.T) QuantizedVectorSet
44+
// NewSet returns a new empty vector set preallocated to the number of vectors
45+
// specified.
46+
NewSet(capacity int, centroid vector.T) QuantizedVectorSet
4747

4848
// EstimateDistances returns the estimated distances of the query vector from
4949
// each data vector represented in the given quantized vector set, as well as

pkg/sql/vecindex/cspann/quantize/quantizer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func (s *testState) estimateDistances(t *testing.T, d *datadriven.TestData) stri
103103

104104
// Now add the vectors one-by-one and ensure that distances and error
105105
// bounds stay the same.
106-
quantizedSet = quantizer.NewQuantizedVectorSet(vectors.Count, centroid)
106+
quantizedSet = quantizer.NewSet(vectors.Count, centroid)
107107
for i := range vectors.Count {
108108
quantizer.QuantizeInSet(&s.Workspace, quantizedSet, vectors.Slice(i, 1))
109109
}

pkg/sql/vecindex/cspann/quantize/rabitq.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func (q *RaBitQuantizer) Quantize(w *workspace.T, vectors vector.Set) QuantizedV
112112
centroid = vectors.Centroid(make(vector.T, vectors.Dims))
113113
}
114114

115-
quantizedSet := q.NewQuantizedVectorSet(vectors.Count, centroid)
115+
quantizedSet := q.NewSet(vectors.Count, centroid)
116116
q.quantizeHelper(w, quantizedSet.(*RaBitQuantizedVectorSet), vectors)
117117
return quantizedSet
118118
}
@@ -124,8 +124,8 @@ func (q *RaBitQuantizer) QuantizeInSet(
124124
q.quantizeHelper(w, quantizedSet.(*RaBitQuantizedVectorSet), vectors)
125125
}
126126

127-
// NewQuantizedVectorSet implements the Quantizer interface
128-
func (q *RaBitQuantizer) NewQuantizedVectorSet(capacity int, centroid vector.T) QuantizedVectorSet {
127+
// NewSet implements the Quantizer interface
128+
func (q *RaBitQuantizer) NewSet(capacity int, centroid vector.T) QuantizedVectorSet {
129129
codeWidth := RaBitQCodeSetWidth(q.GetDims())
130130
dataBuffer := make([]uint64, 0, capacity*codeWidth)
131131
if capacity <= 1 {

pkg/sql/vecindex/cspann/quantize/rabitq_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TestRaBitQuantizerSimple(t *testing.T) {
8383
for i := range centroid {
8484
centroid[i] = float32(i)
8585
}
86-
quantizedSet := quantizer.NewQuantizedVectorSet(5, centroid).(*RaBitQuantizedVectorSet)
86+
quantizedSet := quantizer.NewSet(5, centroid).(*RaBitQuantizedVectorSet)
8787
require.Equal(t, centroid, quantizedSet.Centroid)
8888
require.Equal(t, 0, quantizedSet.Codes.Count)
8989
require.Equal(t, 2, quantizedSet.Codes.Width)
@@ -198,7 +198,7 @@ func TestRaBitQuantizerInnerProduct(t *testing.T) {
198198
require.Equal(t, []float32{1.41, 3.16, 2.83}, testutils.RoundFloats(errorBounds, 2))
199199

200200
// Call NewQuantizedSet and ensure capacity.
201-
quantizedSet = quantizer.NewQuantizedVectorSet(
201+
quantizedSet = quantizer.NewSet(
202202
5, quantizedSet.Centroid).(*RaBitQuantizedVectorSet)
203203
require.Equal(t, 5, cap(quantizedSet.CentroidDotProducts))
204204

@@ -233,7 +233,7 @@ func TestRaBitQuantizerCosine(t *testing.T) {
233233
// Call NewQuantizedSet and ensure capacity.
234234
centroid := slices.Clone(quantizedSet.Centroid)
235235
num32.Normalize(centroid)
236-
quantizedSet = quantizer.NewQuantizedVectorSet(5, centroid).(*RaBitQuantizedVectorSet)
236+
quantizedSet = quantizer.NewSet(5, centroid).(*RaBitQuantizedVectorSet)
237237
require.Equal(t, 5, cap(quantizedSet.CentroidDotProducts))
238238

239239
// Add vectors to already-created set.

pkg/sql/vecindex/cspann/quantize/unquantizer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ func (q *UnQuantizer) QuantizeInSet(
6969
unquantizedSet.AddSet(vectors)
7070
}
7171

72-
// NewQuantizedVectorSet implements the Quantizer interface
73-
func (q *UnQuantizer) NewQuantizedVectorSet(capacity int, centroid vector.T) QuantizedVectorSet {
72+
// NewSet implements the Quantizer interface
73+
func (q *UnQuantizer) NewSet(capacity int, centroid vector.T) QuantizedVectorSet {
7474
dataBuffer := make([]float32, 0, capacity*q.GetDims())
7575
unquantizedSet := &UnQuantizedVectorSet{
7676
Vectors: vector.MakeSetFromRawData(dataBuffer, q.GetDims()),

pkg/sql/vecindex/vecencoding/encoding_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func testEncodeDecodeRoundTripImpl(t *testing.T, rnd *rand.Rand, set vector.Set)
118118

119119
switch quantizedSet.(type) {
120120
case *quantize.UnQuantizedVectorSet:
121-
decodedSet = quantizer.NewQuantizedVectorSet(set.Count, decodedMetadata.Centroid)
121+
decodedSet = quantizer.NewSet(set.Count, decodedMetadata.Centroid)
122122
for range set.Count {
123123
remainder, err = vecencoding.DecodeUnquantizerVectorToSet(
124124
remainder, decodedSet.(*quantize.UnQuantizedVectorSet),
@@ -128,7 +128,7 @@ func testEncodeDecodeRoundTripImpl(t *testing.T, rnd *rand.Rand, set vector.Set)
128128
// Verify remaining bytes match trailing data
129129
require.Equal(t, trailingData, testutils.NormalizeSlice(remainder))
130130
case *quantize.RaBitQuantizedVectorSet:
131-
decodedSet = quantizer.NewQuantizedVectorSet(set.Count, decodedMetadata.Centroid)
131+
decodedSet = quantizer.NewSet(set.Count, decodedMetadata.Centroid)
132132
for range set.Count {
133133
remainder, err = vecencoding.DecodeRaBitQVectorToSet(
134134
remainder,

pkg/sql/vecindex/vecstore/codec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func makeStoreCodec(quantizer quantize.Quantizer) storeCodec {
3434
// possible.
3535
func (sc *storeCodec) Init(centroid vector.T, minCapacity int) {
3636
if sc.tmpVectorSet == nil {
37-
sc.tmpVectorSet = sc.quantizer.NewQuantizedVectorSet(minCapacity, centroid)
37+
sc.tmpVectorSet = sc.quantizer.NewSet(minCapacity, centroid)
3838
} else {
3939
sc.tmpVectorSet.Clear(centroid)
4040
}

0 commit comments

Comments
 (0)