Merge branch 'main' into angela/funcdeps_bump

Author: angelamayxie

go/cmd/dolt/doltversion/version.go

@@ -15,5 +15,5 @@
 package doltversion
 
 const (
-	Version = "1.76.3"
+	Version = "1.76.4"
 )

go/libraries/doltcore/dbfactory/grpc.go

@@ -25,7 +25,6 @@ import (
 	remotesapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1"
 	"github.com/dolthub/dolt/go/libraries/doltcore/grpcendpoint"
 	"github.com/dolthub/dolt/go/libraries/doltcore/remotestorage"
-	"github.com/dolthub/dolt/go/libraries/events"
 	"github.com/dolthub/dolt/go/store/chunks"
 	"github.com/dolthub/dolt/go/store/datas"
 	"github.com/dolthub/dolt/go/store/prolly/tree"
@@ -117,8 +116,7 @@ func (fact DoltRemoteFactory) newChunkStore(ctx context.Context, nbf *types.Noms
 		return nil, err
 	}
 
-	opts := append(cfg.DialOptions, grpc.WithChainUnaryInterceptor(remotestorage.EventsUnaryClientInterceptor(events.GlobalCollector())))
-	opts = append(opts, grpc.WithChainUnaryInterceptor(remotestorage.RetryingUnaryClientInterceptor))
+	opts := append(cfg.DialOptions, grpc.WithChainUnaryInterceptor(remotestorage.RetryingUnaryClientInterceptor))
 
 	conn, err := grpc.Dial(cfg.Endpoint, opts...)
 	if err != nil {

go/libraries/doltcore/diff/diff_stat.go

@@ -38,7 +38,7 @@ type DiffStatProgress struct {
 	Adds, Removes, Changes, CellChanges, NewRowSize, OldRowSize, NewCellSize, OldCellSize uint64
 }
 
-type prollyReporter func(ctx context.Context, vMapping val.OrdinalMapping, fromD, toD val.TupleDesc, change tree.Diff, ch chan<- DiffStatProgress) error
+type prollyReporter func(ctx context.Context, vMapping val.OrdinalMapping, fromD, toD *val.TupleDesc, change tree.Diff, ch chan<- DiffStatProgress) error
 type nomsReporter func(ctx context.Context, change *diff.Difference, fromSch, toSch schema.Schema, ch chan<- DiffStatProgress) error
 
 // Stat reports a stat of diff changes between two values
@@ -234,7 +234,7 @@ func statWithReporter(ctx context.Context, ch chan DiffStatProgress, from, to ty
 	return nil
 }
 
-func reportPkChanges(ctx context.Context, vMapping val.OrdinalMapping, fromD, toD val.TupleDesc, change tree.Diff, ch chan<- DiffStatProgress) error {
+func reportPkChanges(ctx context.Context, vMapping val.OrdinalMapping, fromD, toD *val.TupleDesc, change tree.Diff, ch chan<- DiffStatProgress) error {
 	var stat DiffStatProgress
 	switch change.Type {
 	case tree.AddedDiff:
@@ -255,7 +255,7 @@ func reportPkChanges(ctx context.Context, vMapping val.OrdinalMapping, fromD, to
 	}
 }
 
-func reportKeylessChanges(ctx context.Context, vMapping val.OrdinalMapping, fromD, toD val.TupleDesc, change tree.Diff, ch chan<- DiffStatProgress) error {
+func reportKeylessChanges(ctx context.Context, vMapping val.OrdinalMapping, fromD, toD *val.TupleDesc, change tree.Diff, ch chan<- DiffStatProgress) error {
 	var stat DiffStatProgress
 	var n, n2 uint64
 	switch change.Type {
@@ -286,7 +286,7 @@ func reportKeylessChanges(ctx context.Context, vMapping val.OrdinalMapping, from
 
 // prollyCountCellDiff counts the number of changes columns between two tuples
 // |from| and |to|. |mapping| should map columns from |from| to |to|.
-func prollyCountCellDiff(ctx context.Context, mapping val.OrdinalMapping, fromD, toD val.TupleDesc, from, to val.Tuple) uint64 {
+func prollyCountCellDiff(ctx context.Context, mapping val.OrdinalMapping, fromD, toD *val.TupleDesc, from, to val.Tuple) uint64 {
 	newCols := uint64(toD.Count())
 	changed := uint64(0)
 	for i, j := range mapping {

go/libraries/doltcore/doltdb/durable/index.go

@@ -168,15 +168,15 @@ func newEmptyIndex(ctx context.Context, vrw types.ValueReadWriter, ns tree.NodeS
 	}
 }
 
-func NewEmptyProllyIndex(ctx context.Context, ns tree.NodeStore, kd, vd val.TupleDesc) (Index, error) {
+func NewEmptyProllyIndex(ctx context.Context, ns tree.NodeStore, kd, vd *val.TupleDesc) (Index, error) {
 	m, err := prolly.NewMapFromTuples(ctx, ns, kd, vd)
 	if err != nil {
 		return nil, err
 	}
 	return IndexFromProllyMap(m), nil
 }
 
-func NewEmptyProximityIndex(ctx context.Context, ns tree.NodeStore, kd, vd val.TupleDesc) (Index, error) {
+func NewEmptyProximityIndex(ctx context.Context, ns tree.NodeStore, kd, vd *val.TupleDesc) (Index, error) {
 	proximityMapBuilder, err := prolly.NewProximityMapBuilder(ctx, ns, vector.DistanceL2Squared{}, kd, vd, prolly.DefaultLogChunkSize)
 	if err != nil {
 		return nil, err

go/libraries/doltcore/doltdb/durable/table.go

@@ -75,7 +75,7 @@ type Table interface {
 	// GetTableRows returns this table's rows.
 	GetTableRows(ctx context.Context) (Index, error)
 	// GetTableRowsWithDescriptors returns this table's rows with fewer deserialization calls
-	GetTableRowsWithDescriptors(ctx context.Context, kd, vd val.TupleDesc) (Index, error)
+	GetTableRowsWithDescriptors(ctx context.Context, kd, vd *val.TupleDesc) (Index, error)
 	// SetTableRows sets this table's rows.
 	SetTableRows(ctx context.Context, rows Index) (Table, error)
 
@@ -330,7 +330,7 @@ func (t nomsTable) GetTableRows(ctx context.Context) (Index, error) {
 	return indexFromRef(ctx, t.vrw, t.ns, sch, val.(types.Ref))
 }
 
-func (t nomsTable) GetTableRowsWithDescriptors(ctx context.Context, kd, vd val.TupleDesc) (Index, error) {
+func (t nomsTable) GetTableRowsWithDescriptors(ctx context.Context, kd, vd *val.TupleDesc) (Index, error) {
 	return nil, fmt.Errorf("nomsTable does not implement GetTableRowsWithDescriptors")
 }
 
@@ -857,7 +857,7 @@ func (t doltDevTable) GetTableRows(ctx context.Context) (Index, error) {
 	return IndexFromMapInterface(m), nil
 }
 
-func (t doltDevTable) GetTableRowsWithDescriptors(ctx context.Context, kd, vd val.TupleDesc) (Index, error) {
+func (t doltDevTable) GetTableRowsWithDescriptors(ctx context.Context, kd, vd *val.TupleDesc) (Index, error) {
 	rowbytes := t.msg.PrimaryIndexBytes()
 	m, err := shim.MapFromValueWithDescriptors(types.SerialMessage(rowbytes), kd, vd, t.ns)
 	if err != nil {

go/libraries/doltcore/doltdb/ignore.go

@@ -59,7 +59,7 @@ var ConvertTupleToIgnoreBoolean = convertTupleToIgnoreBoolean
 // GetIgnoreTablePatternKey is a function that converts a Tuple to a string for the pattern field. This is used to handle the Doltgres extended string type.
 var GetIgnoreTablePatternKey = getIgnoreTablePatternKey
 
-func convertTupleToIgnoreBoolean(ctx context.Context, valueDesc val.TupleDesc, valueTuple val.Tuple) (bool, error) {
+func convertTupleToIgnoreBoolean(ctx context.Context, valueDesc *val.TupleDesc, valueTuple val.Tuple) (bool, error) {
 	if !valueDesc.Equals(val.NewTupleDescriptor(val.Type{Enc: val.Int8Enc, Nullable: false})) {
 		return false, fmt.Errorf("dolt_ignore had unexpected value type, this should never happen")
 	}
@@ -70,7 +70,7 @@ func convertTupleToIgnoreBoolean(ctx context.Context, valueDesc val.TupleDesc, v
 	return ignore, nil
 }
 
-func getIgnoreTablePatternKey(ctx context.Context, keyDesc val.TupleDesc, keyTuple val.Tuple) (string, error) {
+func getIgnoreTablePatternKey(ctx context.Context, keyDesc *val.TupleDesc, keyTuple val.Tuple) (string, error) {
 	if !keyDesc.Equals(val.NewTupleDescriptor(val.Type{Enc: val.StringEnc, Nullable: false})) {
 		return "", fmt.Errorf("dolt_ignore had unexpected key type, this should never happen")
 	}

go/libraries/doltcore/doltdb/nonlocal_tables.go

@@ -30,7 +30,7 @@ var GetNonlocalTablesRef = getNonlocalTablesRef
 // GetNonlocalTablesNameColumn is a function that reads the "table_name" column from dolt_nonlocal_tables. This is used to handle the Doltgres extended string type.
 var GetNonlocalTablesNameColumn = getNonlocalTablesNameColumn
 
-func getNonlocalTablesNameColumn(_ context.Context, keyDesc val.TupleDesc, keyTuple val.Tuple) (string, error) {
+func getNonlocalTablesNameColumn(_ context.Context, keyDesc *val.TupleDesc, keyTuple val.Tuple) (string, error) {
 	key, ok := keyDesc.GetString(0, keyTuple)
 	if !ok {
 		return "", fmt.Errorf("failed to read global table")
@@ -44,7 +44,7 @@ type NonlocalTableEntry struct {
 	Options      string
 }
 
-func getNonlocalTablesRef(_ context.Context, valDesc val.TupleDesc, valTuple val.Tuple) (result NonlocalTableEntry) {
+func getNonlocalTablesRef(_ context.Context, valDesc *val.TupleDesc, valTuple val.Tuple) (result NonlocalTableEntry) {
 	result.Ref, _ = valDesc.GetString(0, valTuple)
 	result.NewTableName, _ = valDesc.GetString(1, valTuple)
 	result.Options, _ = valDesc.GetString(2, valTuple)

go/libraries/doltcore/doltdb/table.go

@@ -445,7 +445,7 @@ func (t *Table) GetRowData(ctx context.Context) (durable.Index, error) {
 	return t.table.GetTableRows(ctx)
 }
 
-func (t *Table) GetRowDataWithDescriptors(ctx context.Context, kd, vd val.TupleDesc) (durable.Index, error) {
+func (t *Table) GetRowDataWithDescriptors(ctx context.Context, kd, vd *val.TupleDesc) (durable.Index, error) {
 	return t.table.GetTableRowsWithDescriptors(ctx, kd, vd)
 }
 

go/libraries/doltcore/merge/merge_prolly_rows.go

@@ -493,7 +493,7 @@ func mergeProllyTableData(ctx *sql.Context, tm *TableMerger, finalSch schema.Sch
 	return finalTbl, s, nil
 }
 
-func threeWayDiffer(ctx context.Context, tm *TableMerger, valueMerger *valueMerger, diffInfo tree.ThreeWayDiffInfo) (*tree.ThreeWayDiffer[val.Tuple, val.TupleDesc], error) {
+func threeWayDiffer(ctx context.Context, tm *TableMerger, valueMerger *valueMerger, diffInfo tree.ThreeWayDiffInfo) (*tree.ThreeWayDiffer[val.Tuple, *val.TupleDesc], error) {
 	lr, err := tm.leftTbl.GetRowData(ctx)
 	if err != nil {
 		return nil, err
@@ -586,7 +586,7 @@ func (cv checkValidator) validateDiff(ctx *sql.Context, diff tree.ThreeWayDiff)
 	conflictCount := 0
 
 	var valueTuple val.Tuple
-	var valueDesc val.TupleDesc
+	var valueDesc *val.TupleDesc
 	switch diff.Op {
 	case tree.DiffOpLeftDelete, tree.DiffOpRightDelete, tree.DiffOpConvergentDelete, tree.DiffOpDivergentDeleteResolved:
 		// no need to validate check constraints for deletes
@@ -888,11 +888,11 @@ type uniqIndex struct {
 	def              schema.Index
 	secondary        *prolly.MutableMap
 	clustered        *prolly.MutableMap
+	prefixDesc       *val.TupleDesc
+	clusteredKeyDesc *val.TupleDesc
 	meta             UniqCVMeta
-	prefixDesc       val.TupleDesc
 	secondaryBld     index.SecondaryKeyBuilder
 	clusteredBld     index.ClusteredKeyBuilder
-	clusteredKeyDesc val.TupleDesc
 }
 
 func newUniqIndex(ctx *sql.Context, sch schema.Schema, tableName string, def schema.Index, clustered, secondary prolly.Map) (uniqIndex, error) {
@@ -1605,7 +1605,7 @@ func (m *secondaryMerger) finalize(ctx context.Context) (durable.IndexSet, durab
 
 // remapTuple takes the given |tuple| and the |desc| that describes its data, and uses |mapping| to map the tuple's
 // data into a new [][]byte, as indicated by the specified ordinal mapping.
-func remapTuple(tuple val.Tuple, desc val.TupleDesc, mapping val.OrdinalMapping) [][]byte {
+func remapTuple(tuple val.Tuple, desc *val.TupleDesc, mapping val.OrdinalMapping) [][]byte {
 	result := make([][]byte, len(mapping))
 	for to, from := range mapping {
 		if from == -1 {
@@ -1630,7 +1630,7 @@ func remapTuple(tuple val.Tuple, desc val.TupleDesc, mapping val.OrdinalMapping)
 func remapTupleWithColumnDefaults(
 	ctx *sql.Context,
 	keyTuple, valueTuple val.Tuple,
-	valDesc val.TupleDesc,
+	valDesc *val.TupleDesc,
 	mapping val.OrdinalMapping,
 	tm *TableMerger,
 	rowSch schema.Schema,
@@ -1799,7 +1799,7 @@ func mergeTableArtifacts(ctx context.Context, tm *TableMerger, mergeTbl *doltdb.
 // a three-way cell edit (tree.DiffOpDivergentModifyResolved).
 type valueMerger struct {
 	numCols                                int
-	baseVD, leftVD, rightVD, resultVD      val.TupleDesc
+	baseVD, leftVD, rightVD, resultVD      *val.TupleDesc
 	leftSchema, rightSchema, resultSchema  schema.Schema
 	leftMapping, rightMapping, baseMapping val.OrdinalMapping
 	baseToLeftMapping                      val.OrdinalMapping
@@ -1997,7 +1997,7 @@ func (m *valueMerger) processBaseColumn(ctx context.Context, i int, left, right,
 	var modifiedCol []byte
 	var modifiedColIdx int
 	var modifiedSchema schema.Schema
-	var modifiedVD val.TupleDesc
+	var modifiedVD *val.TupleDesc
 	if !leftColExists {
 		modifiedCol, modifiedColIdx = rightCol, rightColIdx
 		modifiedSchema = m.rightSchema
@@ -2332,7 +2332,7 @@ func getColumn(tuple *val.Tuple, mapping *val.OrdinalMapping, idx int) (col []by
 
 // convert takes the `i`th column in the provided tuple and converts it to the type specified in the provided schema.
 // returns the new representation, and a bool indicating success.
-func convert(ctx context.Context, fromDesc, toDesc val.TupleDesc, toSchema schema.Schema, fromIndex, toIndex int, tuple val.Tuple, originalValue []byte, ns tree.NodeStore) ([]byte, error) {
+func convert(ctx context.Context, fromDesc, toDesc *val.TupleDesc, toSchema schema.Schema, fromIndex, toIndex int, tuple val.Tuple, originalValue []byte, ns tree.NodeStore) ([]byte, error) {
 	if fromDesc.Types[fromIndex] == toDesc.Types[toIndex] {
 		// No conversion is necessary here.
 		return originalValue, nil

go/libraries/doltcore/merge/merge_test.go

@@ -63,7 +63,7 @@ type rowV struct {
 	col1, col2 int
 }
 
-var vD val.TupleDesc
+var vD *val.TupleDesc
 var vB *val.TupleBuilder
 var syncPool = pool.NewBuffPool()
 
@@ -788,7 +788,7 @@ func buildLeftRightAncCommitsAndBranches(t *testing.T, ddb *doltdb.DoltDB, rootT
 	return mergeCommit, ancCm, root, mergeRoot, ancRoot
 }
 
-var kD val.TupleDesc
+var kD *val.TupleDesc
 var kB *val.TupleBuilder
 
 func key(i int) val.Tuple {