Fix merge issues

rohit-nayak-ps · rohit-nayak-ps · commit e4b292ddb9b8 · 2024-11-28T14:24:19.000+01:00
Signed-off-by: Rohit Nayak &lt;rohit@planetscale.com&gt;
diff --git a/go/summarize/reading.go b/go/summarize/reading.go
@@ -22,8 +22,8 @@ import (
 	"sort"
 	"strconv"
 
+	"github.com/vitessio/vt/go/dbinfo"
 	"github.com/vitessio/vt/go/keys"
-	"github.com/vitessio/vt/go/schema"
 	"github.com/vitessio/vt/go/transactions"
 )
 
@@ -103,7 +103,7 @@ func readKeysFile(fileName string) func(s *Summary) error {
 }
 
 func readDBInfoFile(fileName string) func(s *Summary) error {
-	schemaInfo, err := schema.Load(fileName)
+	schemaInfo, err := dbinfo.Load(fileName)
 	if err != nil {
 		panic(err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ import (`
`22`	`22`	`"sort"`
`23`	`23`	`"strconv"`
`24`	`24`
	`25`	`+ "github.com/vitessio/vt/go/dbinfo"`
`25`	`26`	`"github.com/vitessio/vt/go/keys"`
`26`		`- "github.com/vitessio/vt/go/schema"`
`27`	`27`	`"github.com/vitessio/vt/go/transactions"`
`28`	`28`	`)`
`29`	`29`
`@@ -103,7 +103,7 @@ func readKeysFile(fileName string) func(s *Summary) error {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`func readDBInfoFile(fileName string) func(s *Summary) error {`
`106`		`- schemaInfo, err := schema.Load(fileName)`
	`106`	`+ schemaInfo, err := dbinfo.Load(fileName)`
`107`	`107`	`if err != nil {`
`108`	`108`	`panic(err)`
`109`	`109`	`}`