mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-11 02:59:34 -06:00
Code Issues Packages Projects Releases 128 Wiki Activity

Gave MultiEnv its own file system and config

Browse Source
This commit is contained in:
Zach Musgrave
2021-11-04 09:25:10 -07:00
parent dd120d83a1
commit e487a84ea2
3 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go/libraries/doltcore/env/config.go vendored
View File

@@ -93,7 +93,7 @@ type DoltCliConfig struct {
var _ config.ReadableConfig = &DoltCliConfig{}
func loadDoltCliConfig(hdp HomeDirProvider, fs filesys.ReadWriteFS) (*DoltCliConfig, error) {
func LoadDoltCliConfig(hdp HomeDirProvider, fs filesys.ReadWriteFS) (*DoltCliConfig, error) {
ch := config.NewConfigHierarchy()
gPath, err := getGlobalCfgPath(hdp)

2
go/libraries/doltcore/env/environment.go vendored
View File

@@ -132,7 +132,7 @@ type DoltEnv struct {
// Load loads the DoltEnv for the current directory of the cli
func Load(ctx context.Context, hdp HomeDirProvider, fs filesys.Filesys, urlStr, version string) *DoltEnv {
config, cfgErr := loadDoltCliConfig(hdp, fs)
config, cfgErr := LoadDoltCliConfig(hdp, fs)
repoState, rsErr := LoadRepoState(fs)
docs, docsErr := doltdocs.LoadDocs(fs)

33
go/libraries/doltcore/env/multi_repo_env.go vendored
View File

@@ -23,6 +23,7 @@ import (
"strings"
"unicode"
"github.com/dolthub/dolt/go/libraries/utils/config"
"github.com/dolthub/dolt/go/libraries/utils/earl"
"github.com/dolthub/dolt/go/libraries/doltcore/dbfactory"
@@ -41,6 +42,8 @@ type EnvNameAndPath struct {
// MultiRepoEnv is a type used to store multiple environments which can be retrieved by name
type MultiRepoEnv struct {
envs []NamedEnv
fs filesys.Filesys
cfg config.ReadWriteConfig
}
type NamedEnv struct {
@@ -176,9 +179,18 @@ func DoltEnvAsMultiEnv(ctx context.Context, dEnv *DoltEnv) (*MultiRepoEnv, error
}
}
// TODO: revisit this, callers should specify which config they want to use in a multi-DB environment
localCfg, ok := dEnv.Config.GetConfig(LocalConfig)
if !ok {
return nil, fmt.Errorf("Couldn't load local config")
}
mrEnv := &MultiRepoEnv{
envs: make([]NamedEnv, 0),
fs: dEnv.FS,
cfg: localCfg,
}
mrEnv.AddEnv(dbName, dEnv)
// If there are other directories in the same root, try to load them as additional databases
@@ -207,7 +219,13 @@ func DoltEnvAsMultiEnv(ctx context.Context, dEnv *DoltEnv) (*MultiRepoEnv, error
// LoadMultiEnv takes a variable list of EnvNameAndPath objects loads each of the environments, and returns a new
// MultiRepoEnv
func LoadMultiEnv(ctx context.Context, hdp HomeDirProvider, fs filesys.Filesys, version string, envNamesAndPaths ...EnvNameAndPath) (*MultiRepoEnv, error) {
func LoadMultiEnv(
ctx context.Context,
hdp HomeDirProvider,
fs filesys.Filesys,
version string,
envNamesAndPaths ...EnvNameAndPath,
) (*MultiRepoEnv, error) {
nameToPath := make(map[string]string)
for _, nameAndPath := range envNamesAndPaths {
existingPath, ok := nameToPath[nameAndPath.Name]
@@ -223,8 +241,21 @@ func LoadMultiEnv(ctx context.Context, hdp HomeDirProvider, fs filesys.Filesys,
nameToPath[nameAndPath.Name] = nameAndPath.Path
}
cfg, err := LoadDoltCliConfig(hdp, fs)
if err != nil {
return nil, err
}
// TODO: revisit this, callers should specify which config they want to use in a multi-DB environment
localCfg, ok := cfg.GetConfig(LocalConfig)
if !ok {
return nil, fmt.Errorf("Couldn't load local config")
}
mrEnv := &MultiRepoEnv{
envs: make([]NamedEnv, 0),
fs: fs,
cfg: localCfg,
}
for name, path := range nameToPath {