sql: move maybeIncrementVersion to sqlbase

Release note: None

pkg/sql/lease.go

@@ -329,34 +329,6 @@ func (s LeaseStore) WaitForOneVersion(
 	return tableDesc.Version, nil
 }
 
-func maybeIncrementVersion(
-	ctx context.Context, desc *sqlbase.MutableTableDescriptor, txn *client.Txn,
-) error {
-	// Already incremented, no-op.
-	if desc.Version == desc.ClusterVersion.Version+1 {
-		return nil
-	}
-	desc.Version++
-	// We need to set ModificationTime to the transaction's commit
-	// timestamp. Using CommitTimestamp() guarantees that the
-	// transaction will commit at the CommitTimestamp().
-	//
-	// TODO(vivek): Stop needing to do this by deprecating the
-	// ModificationTime. A Descriptor modification time can be
-	// the mvcc timestamp of the descriptor. This requires moving the
-	// schema change lease out of the descriptor making the
-	// descriptor truly immutable at a version.
-	// Also recognize that the leases are released before the transaction
-	// is committed through a call to TableCollection.releaseLeases(),
-	// so updating this policy will also need to consider not doing
-	// that.
-	modTime := txn.CommitTimestamp()
-	desc.ModificationTime = modTime
-	log.Infof(ctx, "publish: descID=%d (%s) version=%d mtime=%s",
-		desc.ID, desc.Name, desc.Version, modTime.GoTime())
-	return nil
-}
-
 var errDidntUpdateDescriptor = errors.New("didn't update the table descriptor")
 
 // Publish updates a table descriptor. It also maintains the invariant that
@@ -416,7 +388,7 @@ func (s LeaseStore) Publish(
 					tableDesc.Version, version)
 			}
 
-			if err := maybeIncrementVersion(ctx, tableDesc, txn); err != nil {
+			if err := tableDesc.MaybeIncrementVersion(ctx, txn); err != nil {
 				return err
 			}
 			if err := tableDesc.ValidateTable(s.execCfg.Settings); err != nil {

pkg/sql/sqlbase/structured.go

@@ -1053,6 +1053,35 @@ func (desc *MutableTableDescriptor) allocateColumnFamilyIDs(columnNames map[stri
 	}
 }
 
+// MaybeIncrementVersion increments the version of a descriptor if necessary.
+func (desc *MutableTableDescriptor) MaybeIncrementVersion(
+	ctx context.Context, txn *client.Txn,
+) error {
+	// Already incremented, no-op.
+	if desc.Version == desc.ClusterVersion.Version+1 {
+		return nil
+	}
+	desc.Version++
+	// We need to set ModificationTime to the transaction's commit
+	// timestamp. Using CommitTimestamp() guarantees that the
+	// transaction will commit at the CommitTimestamp().
+	//
+	// TODO(vivek): Stop needing to do this by deprecating the
+	// ModificationTime. A Descriptor modification time can be
+	// the mvcc timestamp of the descriptor. This requires moving the
+	// schema change lease out of the descriptor making the
+	// descriptor truly immutable at a version.
+	// Also recognize that the leases are released before the transaction
+	// is committed through a call to TableCollection.releaseLeases(),
+	// so updating this policy will also need to consider not doing
+	// that.
+	modTime := txn.CommitTimestamp()
+	desc.ModificationTime = modTime
+	log.Infof(ctx, "publish: descID=%d (%s) version=%d mtime=%s",
+		desc.ID, desc.Name, desc.Version, modTime.GoTime())
+	return nil
+}
+
 // Validate validates that the table descriptor is well formed. Checks include
 // both single table and cross table invariants.
 func (desc *TableDescriptor) Validate(

pkg/sql/table.go

@@ -893,7 +893,7 @@ func (p *planner) writeTableDescToBatch(
 		}
 	} else {
 		// Only increment the table descriptor version once in this transaction.
-		if err := maybeIncrementVersion(ctx, tableDesc, p.txn); err != nil {
+		if err := tableDesc.MaybeIncrementVersion(ctx, p.txn); err != nil {
 			return err
 		}