Merge #83941

83941: sql/catalog/descs: fix typo r=ajwerner a=ajwerner Release note: None Co-authored-by: Andrew Werner <[email protected]>
cockroachdb · Jul 8, 2022 · 8edc7ba · 8edc7ba
2 parents 365b9c4 + f424ee0
commit 8edc7ba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/sql/catalog/descs/descriptor.go b/pkg/sql/catalog/descs/descriptor.go
@@ -233,7 +233,7 @@ func (q *byIDLookupContext) lookupUncommitted(id descpb.ID) (_ catalog.Descripto
 	// Hydrate any types in the descriptor if necessary, for uncomitted
 	// descriptors we are going to include offline and get non-cached view.
 	if tableDesc, isTableDesc := ud.(catalog.TableDescriptor); isTableDesc {
-		ud, err = q.tc.hydrateTypesInTableDescWitOptions(q.ctx, q.txn, tableDesc, true, true)
+		ud, err = q.tc.hydrateTypesInTableDescWithOptions(q.ctx, q.txn, tableDesc, true, true)
 		if err != nil {
 			return nil, err
 		}

diff --git a/pkg/sql/catalog/descs/hydrate.go b/pkg/sql/catalog/descs/hydrate.go
@@ -25,24 +25,24 @@ import (
 )
 
 // hydrateTypesInTableDesc installs user defined type metadata in all types.T
-//// present in the input TableDescriptor. See hydrateTypesInTableDescWitOptions.
+// present in the input TableDescriptor. See hydrateTypesInTableDescWithOptions.
 func (tc *Collection) hydrateTypesInTableDesc(
 	ctx context.Context, txn *kv.Txn, desc catalog.TableDescriptor,
 ) (catalog.TableDescriptor, error) {
-	return tc.hydrateTypesInTableDescWitOptions(ctx,
+	return tc.hydrateTypesInTableDescWithOptions(ctx,
 		txn,
 		desc,
 		false, /* includeOffline */
 		false /*avoidLeased*/)
 }
 
-// hydrateTypesInTableDescWitOptions installs user defined type metadata in all types.T
+// hydrateTypesInTableDescWithOptions installs user defined type metadata in all types.T
 // present in the input TableDescriptor. It always returns the same type of
 // TableDescriptor that was passed in. It ensures that ImmutableTableDescriptors
 // are not modified during the process of metadata installation. Dropped tables
 // do not get hydrated. Optionally, when hydrating types we can include offline
 // descriptors and avoid leasing depending on the context.
-func (tc *Collection) hydrateTypesInTableDescWitOptions(
+func (tc *Collection) hydrateTypesInTableDescWithOptions(
 	ctx context.Context,
 	txn *kv.Txn,
 	desc catalog.TableDescriptor,