fetcher: return spanID from NextRowDecoded()

Previously, Fetcher.NextRowDecoded() discarded the spanID it got from
Fetcher.NextRow(). This information is needed for a future use of
NextRowDecoded(), so this patch passes it through. Existing users ignore
this return value.

Informs: #146046
Release note: None

Author: mw5h

pkg/sql/delete_preserving_index_test.go

@@ -802,7 +802,7 @@ func fetchIndex(
 	))
 	var rows []tree.Datums
 	for {
-		datums, err := fetcher.NextRowDecoded(ctx)
+		datums, _, err := fetcher.NextRowDecoded(ctx)
 		require.NoError(t, err)
 		if datums == nil {
 			break

pkg/sql/indexbackfiller_test.go

@@ -420,7 +420,7 @@ INSERT INTO foo VALUES (1), (10), (100);
 		))
 		var rows []tree.Datums
 		for {
-			datums, err := fetcher.NextRowDecoded(ctx)
+			datums, _, err := fetcher.NextRowDecoded(ctx)
 			require.NoError(t, err)
 			if datums == nil {
 				break

pkg/sql/row/errors.go

@@ -287,7 +287,7 @@ func DecodeRowInfo(
 	if err := rf.ConsumeKVProvider(ctx, &f); err != nil {
 		return nil, nil, nil, err
 	}
-	datums, err := rf.NextRowDecoded(ctx)
+	datums, _, err := rf.NextRowDecoded(ctx)
 	if err != nil {
 		return nil, nil, nil, err
 	}

pkg/sql/row/fetcher.go

@@ -1221,13 +1221,13 @@ func (rf *Fetcher) NextRowInto(
 // NextRowDecoded calls NextRow and decodes the EncDatumRow into a Datums.
 // The Datums should not be modified and is only valid until the next call.
 // When there are no more rows, the Datums is nil.
-func (rf *Fetcher) NextRowDecoded(ctx context.Context) (datums tree.Datums, err error) {
-	row, _, err := rf.NextRow(ctx)
+func (rf *Fetcher) NextRowDecoded(ctx context.Context) (datums tree.Datums, spanID int, err error) {
+	row, spanID, err := rf.NextRow(ctx)
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
 	if row == nil {
-		return nil, nil
+		return nil, 0, nil
 	}
 
 	for i, encDatum := range row {
@@ -1236,12 +1236,12 @@ func (rf *Fetcher) NextRowDecoded(ctx context.Context) (datums tree.Datums, err
 			continue
 		}
 		if err := encDatum.EnsureDecoded(rf.table.spec.FetchedColumns[i].Type, rf.args.Alloc); err != nil {
-			return nil, err
+			return nil, 0, err
 		}
 		rf.table.decodedRow[i] = encDatum.Datum
 	}
 
-	return rf.table.decodedRow, nil
+	return rf.table.decodedRow, spanID, nil
 }
 
 // NextRowDecodedInto calls NextRow and decodes the EncDatumRow into Datums,

pkg/sql/row/fetcher_mvcc_test.go

@@ -135,7 +135,7 @@ func TestRowFetcherMVCCMetadata(t *testing.T) {
 		}
 		var rows []rowWithMVCCMetadata
 		for {
-			datums, err := rf.NextRowDecoded(ctx)
+			datums, _, err := rf.NextRowDecoded(ctx)
 			if err != nil {
 				t.Fatal(err)
 			}

pkg/sql/row/fetcher_test.go

@@ -167,7 +167,7 @@ func TestNextRowSingle(t *testing.T) {
 
 			expectedVals := [2]int64{1, 1}
 			for {
-				datums, err := rf.NextRowDecoded(ctx)
+				datums, _, err := rf.NextRowDecoded(ctx)
 				if err != nil {
 					t.Fatal(err)
 				}
@@ -272,7 +272,7 @@ func TestNextRowBatchLimiting(t *testing.T) {
 
 			expectedVals := [2]int64{1, 1}
 			for {
-				datums, err := rf.NextRowDecoded(ctx)
+				datums, _, err := rf.NextRowDecoded(ctx)
 				if err != nil {
 					t.Fatal(err)
 				}
@@ -450,7 +450,7 @@ INDEX(c)
 	for {
 		// Just try to grab the row - we don't need to validate the contents
 		// in this test.
-		datums, err := rf.NextRowDecoded(ctx)
+		datums, _, err := rf.NextRowDecoded(ctx)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -607,7 +607,7 @@ func TestNextRowSecondaryIndex(t *testing.T) {
 			nullCount := 0
 			var prevIdxVal int64
 			for {
-				datums, err := rf.NextRowDecoded(ctx)
+				datums, _, err := rf.NextRowDecoded(ctx)
 				if err != nil {
 					t.Fatal(err)
 				}