Additional handling of vector types.

Author: nicktobey

enginetest/server_engine.go

@@ -16,6 +16,7 @@ package enginetest
 
 import (
 	gosql "database/sql"
+	"encoding/binary"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -397,6 +398,11 @@ func convertValue(ctx *sql.Context, sch sql.Schema, row sql.Row) sql.Row {
 					row[i] = r
 				}
 			}
+		case query.Type_VECTOR:
+			r := row[i].([]byte)
+			dimensions := len(r) / 4
+			row[i] = make([]float32, dimensions)
+			binary.Decode(r, binary.LittleEndian, row[i])
 		case query.Type_TIME:
 			if row[i] != nil {
 				r, _, err := types.TimespanType_{}.Convert(ctx, string(row[i].([]byte)))
@@ -584,7 +590,7 @@ func emptyValuePointerForType(t sql.Type) (any, error) {
 	case query.Type_FLOAT32, query.Type_FLOAT64:
 		var f gosql.NullFloat64
 		return &f, nil
-	case query.Type_JSON, query.Type_BLOB, query.Type_TIME, query.Type_GEOMETRY:
+	case query.Type_JSON, query.Type_BLOB, query.Type_TIME, query.Type_GEOMETRY, query.Type_VECTOR:
 		var f []byte
 		return &f, nil
 	case query.Type_NULL_TYPE:
@@ -677,6 +683,9 @@ func convertGoSqlType(columnType *gosql.ColumnType) (sql.Type, error) {
 		return types.Null, nil
 	case "geometry":
 		return types.GeometryType{}, nil
+	case "vector":
+		length, _ := columnType.Length()
+		return types.VectorType{Dimensions: int(length)}, nil
 	default:
 		return nil, fmt.Errorf("unhandled type %s", columnType.DatabaseTypeName())
 	}

sql/types/vector.go

@@ -33,6 +33,9 @@ var vectorValueType = reflect.TypeOf([]float32{})
 // VectorType represents the VECTOR(N) type.
 // It stores a fixed-length array of N floating point numbers.
 type VectorType struct {
+	// The number of floats in the vector.
+	// If Dimensions is 0, then the type can hold a variable number of floats, but this is only used
+	// as the return type of some functions, and in values sent over the wire.
 	Dimensions int
 }
 
@@ -99,15 +102,15 @@ func (t VectorType) Convert(ctx context.Context, v interface{}) (interface{}, sq
 		}
 		return result, sql.InRange, nil
 	case []float32:
-		if len(val) != t.Dimensions {
+		if t.Dimensions != 0 && len(val) != t.Dimensions {
 			return nil, sql.OutOfRange, fmt.Errorf("VECTOR dimension mismatch: expected %d, got %d", t.Dimensions, len(val))
 		}
 		return val, sql.InRange, nil
 	case []interface{}:
-		if len(val) != t.Dimensions {
+		if t.Dimensions != 0 && len(val) != t.Dimensions {
 			return nil, sql.OutOfRange, fmt.Errorf("VECTOR dimension mismatch: expected %d, got %d", t.Dimensions, len(val))
 		}
-		result := make([]float32, t.Dimensions)
+		result := make([]float32, len(val))
 		for i, elem := range val {
 			switch e := elem.(type) {
 			case float64:
@@ -182,7 +185,7 @@ func (t VectorType) String() string {
 
 // Type implements Type interface.
 func (t VectorType) Type() query.Type {
-	return sqltypes.TypeJSON
+	return sqltypes.Vector
 }
 
 // ValueType implements Type interface.