From 5fdcdc92d2d0ed1f8208120452b79cc756ce99b3 Mon Sep 17 00:00:00 2001 From: Taylor Bantle Date: Tue, 22 Nov 2022 12:05:40 -0800 Subject: [PATCH] Part of feedback --- go/libraries/doltcore/remotesrv/grpc.go | 2 +- go/store/nbs/store.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/go/libraries/doltcore/remotesrv/grpc.go b/go/libraries/doltcore/remotesrv/grpc.go index 89d26d465e..7eac328e15 100644 --- a/go/libraries/doltcore/remotesrv/grpc.go +++ b/go/libraries/doltcore/remotesrv/grpc.go @@ -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) } diff --git a/go/store/nbs/store.go b/go/store/nbs/store.go index 84d6991aaf..e8a0d8b3b0 100644 --- a/go/store/nbs/store.go +++ b/go/store/nbs/store.go @@ -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)