Merge pull request #5994 from influxdata/single-server-lite

Single Server
influxdata · Mar 14, 2016 · ba6a95e · ba6a95e
2 parents 0b50042 + 207bafa
commit ba6a95e
Show file tree

Hide file tree

Showing 68 changed files with 2,101 additions and 8,894 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
 

diff --git a/client/v2/client.go b/client/v2/client.go
@@ -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

diff --git a/cluster/internal/data.pb.go b/cluster/internal/data.pb.go
diff --git a/cluster/internal/data.proto b/cluster/internal/data.proto
@@ -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;
+}
diff --git a/cluster/meta_client.go b/cluster/meta_client.go
@@ -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