From 6d0d912713299d38eafad93b36cd550bb82457cc Mon Sep 17 00:00:00 2001
From: Marius Posta <marius@cockroachlabs.com>
Date: Thu, 7 Apr 2022 19:57:23 +0000
Subject: [PATCH] scstage: rename package import

For no good reason, scgraph was imported as scgraph2. This commit fixes
this.

Release note: None
---
 .../schemachanger/scplan/internal/scstage/stage.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/sql/schemachanger/scplan/internal/scstage/stage.go b/pkg/sql/schemachanger/scplan/internal/scstage/stage.go
index 2c51cb9e1a0d..fb3ec79fb838 100644
--- a/pkg/sql/schemachanger/scplan/internal/scstage/stage.go
+++ b/pkg/sql/schemachanger/scplan/internal/scstage/stage.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scop"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scpb"
-	scgraph2 "github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scplan/internal/scgraph"
+	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scplan/internal/scgraph"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/screl"
 	"github.com/cockroachdb/errors"
 )
@@ -75,7 +75,7 @@ func (s Stage) String() string {
 }
 
 // ValidateStages checks that the plan is valid.
-func ValidateStages(ts scpb.TargetState, stages []Stage, g *scgraph2.Graph) error {
+func ValidateStages(ts scpb.TargetState, stages []Stage, g *scgraph.Graph) error {
 	if len(stages) == 0 {
 		return nil
 	}
@@ -141,9 +141,9 @@ func validateAdjacentStagesStates(previous, next Stage) error {
 	return nil
 }
 
-func validateStageSubgraph(ts scpb.TargetState, stage Stage, g *scgraph2.Graph) error {
+func validateStageSubgraph(ts scpb.TargetState, stage Stage, g *scgraph.Graph) error {
 	// Transform the ops in a non-repeating sequence of their original op edges.
-	var queue []*scgraph2.OpEdge
+	var queue []*scgraph.OpEdge
 	for _, op := range stage.EdgeOps {
 		oe := g.GetOpEdgeFromOp(op)
 		if oe == nil {
@@ -169,8 +169,8 @@ func validateStageSubgraph(ts scpb.TargetState, stage Stage, g *scgraph2.Graph)
 		current[i] = n
 	}
 	{
-		edgesTo := make(map[*screl.Node][]scgraph2.Edge, g.Order())
-		_ = g.ForEachEdge(func(e scgraph2.Edge) error {
+		edgesTo := make(map[*screl.Node][]scgraph.Edge, g.Order())
+		_ = g.ForEachEdge(func(e scgraph.Edge) error {
 			edgesTo[e.To()] = append(edgesTo[e.To()], e)
 			return nil
 		})
@@ -211,7 +211,7 @@ func validateStageSubgraph(ts scpb.TargetState, stage Stage, g *scgraph2.Graph)
 
 			// Prevent making progress on this target if there are unmet dependencies.
 			var hasUnmetDeps bool
-			if err := g.ForEachDepEdgeTo(oe.To(), func(de *scgraph2.DepEdge) error {
+			if err := g.ForEachDepEdgeTo(oe.To(), func(de *scgraph.DepEdge) error {
 				hasUnmetDeps = hasUnmetDeps || !fulfilled[de.From()]
 				return nil
 			}); err != nil {