mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-13 19:29:58 -05:00
Code Issues Packages Projects Releases 146 Wiki Activity

cleanup some uses of types.Format_Default

Browse Source
This commit is contained in:
Andy Arthur
2022-09-27 14:39:58 -07:00
parent f99a1717c2
commit 1da3024e12
6 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
go/cmd/dolt/commands/backup.go
View File

@@ -19,16 +19,14 @@ import (
"encoding/json"
"strings"
"github.com/dolthub/dolt/go/libraries/doltcore/env/actions"
"github.com/dolthub/dolt/go/store/datas/pull"
"github.com/dolthub/dolt/go/store/types"
"github.com/dolthub/dolt/go/cmd/dolt/cli"
"github.com/dolthub/dolt/go/cmd/dolt/errhand"
eventsapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1"
"github.com/dolthub/dolt/go/libraries/doltcore/dbfactory"
"github.com/dolthub/dolt/go/libraries/doltcore/env"
"github.com/dolthub/dolt/go/libraries/doltcore/env/actions"
"github.com/dolthub/dolt/go/libraries/utils/argparser"
"github.com/dolthub/dolt/go/store/datas/pull"
)
var backupDocs = cli.CommandDocumentationContent{
@@ -311,7 +309,7 @@ func restoreBackup(ctx context.Context, dEnv *env.DoltEnv, apr *argparser.ArgPar
}
r := env.NewRemote("", remoteUrl, params)
srcDb, err := r.GetRemoteDB(ctx, types.Format_Default, dEnv)
srcDb, err := r.GetRemoteDB(ctx, dEnv.DoltDB.Format(), dEnv)
if err != nil {
return errhand.VerboseErrorFromError(err)
}

3
go/cmd/dolt/commands/clone.go
View File

@@ -29,7 +29,6 @@ import (
"github.com/dolthub/dolt/go/libraries/events"
"github.com/dolthub/dolt/go/libraries/utils/argparser"
"github.com/dolthub/dolt/go/libraries/utils/earl"
"github.com/dolthub/dolt/go/store/types"
)
var cloneDocs = cli.CommandDocumentationContent{
@@ -201,7 +200,7 @@ func createRemote(ctx context.Context, remoteName, remoteUrl string, params map[
cli.Printf("cloning %s\n", remoteUrl)
r := env.NewRemote(remoteName, remoteUrl, params)
ddb, err := r.GetRemoteDB(ctx, types.Format_Default, dEnv)
ddb, err := r.GetRemoteDB(ctx, dEnv.DoltDB.Format(), dEnv)
if err != nil {
bdr := errhand.BuildDError("error: failed to get remote db").AddCause(err)
return env.NoRemote, nil, bdr.Build()

3
go/cmd/dolt/commands/engine/utils.go
View File

@@ -27,7 +27,6 @@ import (
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess"
"github.com/dolthub/dolt/go/libraries/doltcore/table/editor"
"github.com/dolthub/dolt/go/libraries/utils/filesys"
"github.com/dolthub/dolt/go/store/types"
)
// CollectDBs takes a MultiRepoEnv and creates Database objects from each environment and returns a slice of these
@@ -163,7 +162,7 @@ func getPushOnWriteHook(ctx context.Context, dEnv *env.DoltEnv) (*doltdb.PushOnW
return nil, fmt.Errorf("%w: '%s'", env.ErrRemoteNotFound, remoteName)
}
ddb, err := rem.GetRemoteDB(ctx, types.Format_Default, dEnv)
ddb, err := rem.GetRemoteDB(ctx, dEnv.DoltDB.Format(), dEnv)
if err != nil {
return nil, err
}

15
go/libraries/doltcore/sqle/database_provider.go
View File

@@ -23,7 +23,6 @@ import (
"github.com/dolthub/go-mysql-server/sql"
"github.com/dolthub/dolt/go/cmd/dolt/cli"
"github.com/dolthub/dolt/go/cmd/dolt/errhand"
"github.com/dolthub/dolt/go/libraries/doltcore/dbfactory"
"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
"github.com/dolthub/dolt/go/libraries/doltcore/env"
@@ -460,7 +459,7 @@ func (p DoltDatabaseProvider) cloneDatabaseFromRemote(
// TODO: params for AWS, others that need them
r := env.NewRemote(remoteName, remoteUrl, nil)
srcDB, err := getRemoteDb(ctx, r, p.remoteDialer)
srcDB, err := r.GetRemoteDB(ctx, types.Format_Default, p.remoteDialer)
if err != nil {
return err
}
@@ -507,18 +506,6 @@ func (p DoltDatabaseProvider) cloneDatabaseFromRemote(
return sess.AddDB(ctx, dbstate)
}
// TODO: extract a shared library for this functionality
// TODO: this method only adds error handling. Remove?
func getRemoteDb(ctx *sql.Context, r env.Remote, dialer dbfactory.GRPCDialProvider) (*doltdb.DoltDB, error) {
ddb, err := r.GetRemoteDB(ctx, types.Format_Default, dialer)
if err != nil {
bdr := errhand.BuildDError("error: failed to get remote db").AddCause(err)
return nil, bdr.Build()
}
return ddb, nil
}
// DropDatabase implements the sql.MutableDatabaseProvider interface
func (p DoltDatabaseProvider) DropDatabase(ctx *sql.Context, name string) error {
isRevisionDatabase, err := p.IsRevisionDatabase(ctx, name)

3
go/libraries/doltcore/sqle/read_replica_database.go
View File

@@ -28,7 +28,6 @@ import (
"github.com/dolthub/dolt/go/libraries/doltcore/env/actions"
"github.com/dolthub/dolt/go/libraries/doltcore/ref"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess"
"github.com/dolthub/dolt/go/store/types"
)
type ReadReplicaDatabase struct {
@@ -67,7 +66,7 @@ func NewReadReplicaDatabase(ctx context.Context, db Database, remoteName string,
return EmptyReadReplica, fmt.Errorf("%w: '%s'", env.ErrRemoteNotFound, remoteName)
}
srcDB, err := remote.GetRemoteDB(ctx, types.Format_Default, dEnv)
srcDB, err := remote.GetRemoteDB(ctx, dEnv.DoltDB.Format(), dEnv)
if err != nil {
return EmptyReadReplica, err
}

3
go/libraries/doltcore/sqle/replication.go
View File

@@ -26,7 +26,6 @@ import (
"github.com/dolthub/dolt/go/libraries/doltcore/env"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess"
"github.com/dolthub/dolt/go/libraries/doltcore/table/editor"
"github.com/dolthub/dolt/go/store/types"
)
func getPushOnWriteHook(ctx context.Context, bThreads *sql.BackgroundThreads, dEnv *env.DoltEnv, logger io.Writer) (doltdb.CommitHook, error) {
@@ -52,7 +51,7 @@ func getPushOnWriteHook(ctx context.Context, bThreads *sql.BackgroundThreads, dE
return nil, fmt.Errorf("%w: '%s'", env.ErrRemoteNotFound, remoteName)
}
ddb, err := rem.GetRemoteDB(ctx, types.Format_Default, dEnv)
ddb, err := rem.GetRemoteDB(ctx, dEnv.DoltDB.Format(), dEnv)
if err != nil {
return nil, err
}