scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-06 00:25:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #87 from benbjohnson/fix-client-fragment-nodes

Browse source 
Fix Client.FragmentNodes()
This commit is contained in:
tgruben 2016-06-08 11:27:31 -05:00
commit 2359f3975e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
client.go
View file

@ -91,13 +91,13 @@ func (c *Client) Schema() ([]*DBInfo, error) {
}
// FragmentNodes returns a list of nodes that own a slice.
func (c *Client) FragmentNodes(slice uint64) ([]*Node, error) {
func (c *Client) FragmentNodes(db string, slice uint64) ([]*Node, error) {
// Execute request against the host.
u := url.URL{
Scheme: "http",
Host: c.host,
Path: "/fragment/nodes",
RawQuery: (url.Values{"db": {"d"}, "slice": {strconv.FormatUint(slice, 10)}}).Encode(),
RawQuery: (url.Values{"db": {db}, "slice": {strconv.FormatUint(slice, 10)}}).Encode(),
}
resp, err := c.HTTPClient.Get(u.String())
if err != nil {
@ -182,7 +182,7 @@ func (c *Client) Import(db, frame string, slice uint64, bits []Bit) error {
}
// Retrieve a list of nodes that own the slice.
nodes, err := c.FragmentNodes(slice)
nodes, err := c.FragmentNodes(db, slice)
if err != nil {
return fmt.Errorf("slice nodes: %s", err)
@ -327,7 +327,7 @@ func (c *Client) backupSliceTo(tw *tar.Writer, db, frame string, slice uint64) e
// This function tries slice owners until one succeeds.
func (c *Client) BackupSlice(db, frame string, slice uint64) (io.ReadCloser, error) {
// Retrieve a list of nodes that own the slice.
nodes, err := c.FragmentNodes(slice)
nodes, err := c.FragmentNodes(db, slice)
if err != nil {
return nil, fmt.Errorf("slice nodes: %s", err)
}
@ -418,7 +418,7 @@ func (c *Client) RestoreFrom(r io.Reader, db, frame string) error {
// restoreSliceFrom restores a single slice to all owning nodes.
func (c *Client) restoreSliceFrom(buf []byte, db, frame string, slice uint64) error {
// Retrieve a list of nodes that own the slice.
nodes, err := c.FragmentNodes(slice)
nodes, err := c.FragmentNodes(db, slice)
if err != nil {
return fmt.Errorf("slice nodes: %s", err)
}