mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-15 11:20:37 -05:00
Code Issues Packages Projects Releases 147 Wiki Activity

Part of feedback

Browse Source
This commit is contained in:
Taylor Bantle
2022-11-22 12:05:40 -08:00
parent 2aa112355e
commit 5fdcdc92d2
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go/libraries/doltcore/remotesrv/grpc.go
View File

@@ -388,7 +388,7 @@ func (rs *RemoteChunkStore) Rebase(ctx context.Context, req *remotesapi.RebaseRe
err = cs.Rebase(ctx)
if err != nil {
logger.Printf("error occurred during processing of Rebace rpc of %s details: %v", repoPath, err)
logger.Printf("error occurred during processing of Rebase rpc of %s details: %v", repoPath, err)
return nil, status.Errorf(codes.Internal, "failed to rebase: %v", err)
}

5
go/store/nbs/store.go
View File

@@ -262,7 +262,7 @@ func (nbs *NomsBlockStore) UpdateManifest(ctx context.Context, updates map[hash.
contents.lock = generateLockHash(contents.root, contents.specs, contents.appendix)
// ensure we dont drop existing appendices
// ensure we don't drop existing appendices
if contents.appendix != nil && len(contents.appendix) > 0 {
contents, err = fromManifestAppendixOptionNewContents(contents, contents.appendix, ManifestAppendixOption_Set)
if err != nil {
@@ -1500,7 +1500,8 @@ func (nbs *NomsBlockStore) MarkAndSweepChunks(ctx context.Context, last hash.Has
return nbs.upstream
}()
return nbs.p.PruneTableFiles(ctx, currentContents, time.Now())
t := time.Now()
return nbs.p.PruneTableFiles(ctx, currentContents, t)
} else {
fileIdToNumChunks := tableSpecsToMap(specs)
err = destNBS.AddTableFilesToManifest(ctx, fileIdToNumChunks)