Bh/clone2 #83
Merged
Bh/clone2 #83
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bheni
commented
Sep 17, 2019
| @@ -83,42 +83,45 @@ func main() { | |||
| func runMain() int { | |||
| args := os.Args[1:] | |||
|
|
|||
There was a problem hiding this comment.
this isn't really part of this feature. Just cleanup of debug flag processing.
zachmu
approved these changes
Sep 17, 2019
| doneChan := make(chan struct{}) | ||
| go progFunc(progChan, doneChan) | ||
| for _, brnch := range branches { | ||
| branch = brnch.GetPath() |
There was a problem hiding this comment.
So you're just taking the last branch in the case that there isn't a master? Intended behavior?
There was a problem hiding this comment.
matches previous behavior
| return hash.New(resp.RootHash), tblFiles, nil | ||
| } | ||
|
|
||
| // SetRootChunk sets the root chunk changes the root chunk hash from the previous value to the new root. |
| @@ -35,6 +35,8 @@ service ChunkStoreService { | |||
| rpc Root(RootRequest) returns (RootResponse); | |||
|
|
|||
| rpc Commit(CommitRequest) returns (CommitResponse); | |||
|
|
|||
| rpc EnumerateTables(EnumerateTablesRequest) returns (EnumerateTablesResponse); | |||
| panic("Not Implemented") | ||
| } | ||
|
|
||
| // DoltRemoteTableFile is an implementation of a TableFile that live in a DoltChunkStore |
| @@ -123,3 +123,16 @@ func (c RetryingChunkStoreServiceClient) Commit(ctx context.Context, in *remotes | |||
|
|
|||
| return resp, err | |||
| } | |||
|
|
|||
| func (c RetryingChunkStoreServiceClient) EnumerateTables(ctx context.Context, in *remotesapi.EnumerateTablesRequest, opts ...grpc.CallOption) (*remotesapi.EnumerateTablesResponse, error) { | |||
There was a problem hiding this comment.
Don't forget this reference when you rename the proto method
go/store/nbs/store.go
Outdated
| return NomsBlockStoreTableSink{fileId, numChunks, f, nbs}, nil | ||
| } | ||
|
|
||
| // SetRootChunk sets the root chunk changes the root chunk hash from the previous value to the new root. |
|
|
||
| func TestNBSAsTableFileStore(t *testing.T) { | ||
| ctx := context.Background() | ||
| testDir := filepath.Join(os.TempDir(), uuid.New().String()) |
There was a problem hiding this comment.
ioutil has a better way of making a randomly named temp dir for tests
|
|
||
| if err != nil { | ||
| logger("failed to write data to response. err : " + err.Error()) | ||
| return -1 |
| return -1 | ||
| } | ||
|
|
||
| return -1 |
go/cmd/dolt/commands/clone.go
Outdated
| } else { | ||
| var err error | ||
| branches, err = srcDB.GetBranches(ctx) | ||
| err := actions.Clone(ctx, srcDB, dEnv.DoltDB) |
There was a problem hiding this comment.
Does this mean we lose progress indicators?
added 2 commits
September 17, 2019 16:06
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This version of clone works on the table files directly. It enumerates all the table files and downloads them. It does not inspect the chunks as v1 did.