mirror of
https://github.com/featurebasedb/featurebase.git
synced 2026-08-28 02:44:59 +00:00
tests passing
This commit is contained in:
Matt Jaffee
parent
6417f468bb
commit
cd8c63c125
4 changed files with 30 additions and 33 deletions
17
api.go
17
api.go
|
|
@ -185,12 +185,11 @@ func (api *API) CreateIndex(ctx context.Context, indexName string, options Index
|
|||
}
|
||||
// Send the create index message to all nodes.
|
||||
err = api.server.SendSync(
|
||||
&internal.CreateIndexMessage{
|
||||
&CreateIndexMessage{
|
||||
Index: indexName,
|
||||
Meta: options.Encode(),
|
||||
Meta: &options,
|
||||
})
|
||||
if err != nil {
|
||||
api.server.logger.Printf("problem sending CreateIndex message: %s", err)
|
||||
return nil, errors.Wrap(err, "sending CreateIndex message")
|
||||
}
|
||||
api.holder.Stats.Count("createIndex", 1, 1.0)
|
||||
|
|
@ -224,7 +223,7 @@ func (api *API) DeleteIndex(ctx context.Context, indexName string) error {
|
|||
}
|
||||
// Send the delete index message to all nodes.
|
||||
err = api.server.SendSync(
|
||||
&internal.DeleteIndexMessage{
|
||||
&DeleteIndexMessage{
|
||||
Index: indexName,
|
||||
})
|
||||
if err != nil {
|
||||
|
|
@ -264,10 +263,10 @@ func (api *API) CreateField(ctx context.Context, indexName string, fieldName str
|
|||
|
||||
// Send the create field message to all nodes.
|
||||
err = api.server.SendSync(
|
||||
&internal.CreateFieldMessage{
|
||||
&CreateFieldMessage{
|
||||
Index: indexName,
|
||||
Field: fieldName,
|
||||
Meta: fo.Encode(),
|
||||
Meta: &fo,
|
||||
})
|
||||
if err != nil {
|
||||
api.server.logger.Printf("problem sending CreateField message: %s", err)
|
||||
|
|
@ -311,7 +310,7 @@ func (api *API) DeleteField(ctx context.Context, indexName string, fieldName str
|
|||
|
||||
// Send the delete field message to all nodes.
|
||||
err := api.server.SendSync(
|
||||
&internal.DeleteFieldMessage{
|
||||
&DeleteFieldMessage{
|
||||
Index: indexName,
|
||||
Field: fieldName,
|
||||
})
|
||||
|
|
@ -489,7 +488,7 @@ func (api *API) RecalculateCaches(ctx context.Context) error {
|
|||
return errors.Wrap(err, "validating api method")
|
||||
}
|
||||
|
||||
err := api.server.SendSync(&internal.RecalculateCaches{})
|
||||
err := api.server.SendSync(&RecalculateCaches{})
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "broacasting message")
|
||||
}
|
||||
|
|
@ -568,7 +567,7 @@ func (api *API) DeleteView(ctx context.Context, indexName string, fieldName stri
|
|||
|
||||
// Send the delete view message to all nodes.
|
||||
err := api.server.SendSync(
|
||||
&internal.DeleteViewMessage{
|
||||
&DeleteViewMessage{
|
||||
Index: indexName,
|
||||
Field: fieldName,
|
||||
View: viewName,
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ import (
|
|||
"testing/quick"
|
||||
|
||||
"github.com/davecgh/go-spew/spew"
|
||||
"github.com/pilosa/pilosa/internal"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
|
@ -175,19 +174,19 @@ func TestFragSources(t *testing.T) {
|
|||
from *cluster
|
||||
to *cluster
|
||||
idx *Index
|
||||
expected map[string][]*internal.ResizeSource
|
||||
expected map[string][]*ResizeSource
|
||||
err string
|
||||
}{
|
||||
{
|
||||
from: c1,
|
||||
to: c2,
|
||||
idx: idx,
|
||||
expected: map[string][]*internal.ResizeSource{
|
||||
"node0": []*internal.ResizeSource{},
|
||||
"node1": []*internal.ResizeSource{},
|
||||
"node2": []*internal.ResizeSource{
|
||||
{&internal.Node{"node0", &internal.URI{"http", "host0", 10101}, false}, "i", "f", "standard", uint64(0)},
|
||||
{&internal.Node{"node1", &internal.URI{"http", "host1", 10101}, false}, "i", "f", "standard", uint64(2)},
|
||||
expected: map[string][]*ResizeSource{
|
||||
"node0": []*ResizeSource{},
|
||||
"node1": []*ResizeSource{},
|
||||
"node2": []*ResizeSource{
|
||||
{&Node{"node0", URI{"http", "host0", 10101}, false}, "i", "f", "standard", uint64(0)},
|
||||
{&Node{"node1", URI{"http", "host1", 10101}, false}, "i", "f", "standard", uint64(2)},
|
||||
},
|
||||
},
|
||||
err: "",
|
||||
|
|
@ -196,13 +195,13 @@ func TestFragSources(t *testing.T) {
|
|||
from: c4,
|
||||
to: c3,
|
||||
idx: idx,
|
||||
expected: map[string][]*internal.ResizeSource{
|
||||
"node0": []*internal.ResizeSource{
|
||||
{&internal.Node{"node1", &internal.URI{"http", "host1", 10101}, false}, "i", "f", "standard", uint64(1)},
|
||||
expected: map[string][]*ResizeSource{
|
||||
"node0": []*ResizeSource{
|
||||
{&Node{"node1", URI{"http", "host1", 10101}, false}, "i", "f", "standard", uint64(1)},
|
||||
},
|
||||
"node1": []*internal.ResizeSource{
|
||||
{&internal.Node{"node0", &internal.URI{"http", "host0", 10101}, false}, "i", "f", "standard", uint64(0)},
|
||||
{&internal.Node{"node0", &internal.URI{"http", "host0", 10101}, false}, "i", "f", "standard", uint64(2)},
|
||||
"node1": []*ResizeSource{
|
||||
{&Node{"node0", URI{"http", "host0", 10101}, false}, "i", "f", "standard", uint64(0)},
|
||||
{&Node{"node0", URI{"http", "host0", 10101}, false}, "i", "f", "standard", uint64(2)},
|
||||
},
|
||||
},
|
||||
err: "",
|
||||
|
|
@ -211,15 +210,15 @@ func TestFragSources(t *testing.T) {
|
|||
from: c5,
|
||||
to: c4,
|
||||
idx: idx,
|
||||
expected: map[string][]*internal.ResizeSource{
|
||||
"node0": []*internal.ResizeSource{
|
||||
{&internal.Node{"node2", &internal.URI{"http", "host2", 10101}, false}, "i", "f", "standard", uint64(0)},
|
||||
{&internal.Node{"node2", &internal.URI{"http", "host2", 10101}, false}, "i", "f", "standard", uint64(2)},
|
||||
expected: map[string][]*ResizeSource{
|
||||
"node0": []*ResizeSource{
|
||||
{&Node{"node2", URI{"http", "host2", 10101}, false}, "i", "f", "standard", uint64(0)},
|
||||
{&Node{"node2", URI{"http", "host2", 10101}, false}, "i", "f", "standard", uint64(2)},
|
||||
},
|
||||
"node1": []*internal.ResizeSource{
|
||||
{&internal.Node{"node0", &internal.URI{"http", "host0", 10101}, false}, "i", "f", "standard", uint64(3)},
|
||||
"node1": []*ResizeSource{
|
||||
{&Node{"node0", URI{"http", "host0", 10101}, false}, "i", "f", "standard", uint64(3)},
|
||||
},
|
||||
"node2": []*internal.ResizeSource{},
|
||||
"node2": []*ResizeSource{},
|
||||
},
|
||||
err: "",
|
||||
},
|
||||
|
|
|
|||
2
field.go
2
field.go
|
|
@ -605,7 +605,7 @@ func (f *Field) createViewIfNotExists(name string) (*view, error) {
|
|||
if created {
|
||||
// Broadcast view creation to the cluster.
|
||||
err = f.broadcaster.SendSync(
|
||||
&internal.CreateViewMessage{
|
||||
&CreateViewMessage{
|
||||
Index: f.index,
|
||||
Field: f.name,
|
||||
View: name,
|
||||
|
|
|
|||
3
view.go
3
view.go
|
|
@ -22,7 +22,6 @@ import (
|
|||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/pilosa/pilosa/internal"
|
||||
"github.com/pilosa/pilosa/pql"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
|
@ -232,7 +231,7 @@ func (v *view) createFragmentIfNotExists(shard uint64) (*fragment, error) {
|
|||
|
||||
// Send the create shard message to all nodes.
|
||||
err := v.broadcaster.SendSync(
|
||||
&internal.CreateShardMessage{
|
||||
&CreateShardMessage{
|
||||
Index: v.index,
|
||||
Shard: shard,
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue