Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Single Server #5994

Merged
merged 14 commits into from Mar 14, 2016
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -28,6 +28,7 @@
- [#5593](https://github.com/influxdata/influxdb/issues/5593): Modify `SHOW TAG VALUES` output for the new query engine to normalize the output.
- [#5862](https://github.com/influxdata/influxdb/pull/5862): Make Admin UI dynamically fetch both client and server versions
- [#2715](https://github.com/influxdata/influxdb/issues/2715): Support using field regex comparisons in the WHERE clause
- [#5994](https://github.com/influxdata/influxdb/issues/5994): Single server

### Bugfixes

Expand Down
5 changes: 5 additions & 0 deletions client/v2/client.go
Expand Up @@ -392,6 +392,11 @@ func (p *Point) Fields() map[string]interface{} {
return p.pt.Fields()
}

// NewPointFrom returns a point from the provided models.Point.
func NewPointFrom(pt models.Point) *Point {
return &Point{pt: pt}
}

func (uc *udpclient) Write(bp BatchPoints) error {
var b bytes.Buffer
var d time.Duration
Expand Down
106 changes: 72 additions & 34 deletions cluster/internal/data.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions cluster/internal/data.proto
Expand Up @@ -52,3 +52,12 @@ message SeriesKeysResponse {
optional string Err = 2;
}

message ExpandSourcesRequest {
repeated uint64 ShardIDs = 1;
required bytes Sources = 2;
}

message ExpandSourcesResponse {
required bytes Sources = 1;
optional string Err = 2;
}
5 changes: 0 additions & 5 deletions cluster/meta_client.go
Expand Up @@ -17,16 +17,11 @@ type MetaClient interface {
CreateUser(name, password string, admin bool) (*meta.UserInfo, error)
Database(name string) (*meta.DatabaseInfo, error)
Databases() ([]meta.DatabaseInfo, error)
DataNode(id uint64) (*meta.NodeInfo, error)
DataNodes() ([]meta.NodeInfo, error)
DeleteDataNode(id uint64) error
DeleteMetaNode(id uint64) error
DropContinuousQuery(database, name string) error
DropDatabase(name string) error
DropRetentionPolicy(database, name string) error
DropSubscription(database, rp, name string) error
DropUser(name string) error
MetaNodes() ([]meta.NodeInfo, error)
RetentionPolicy(database, name string) (rpi *meta.RetentionPolicyInfo, err error)
SetAdminPrivilege(username string, admin bool) error
SetDefaultRetentionPolicy(database, name string) error
Expand Down