address comments, reuse bitset, create policy/unaggregated

m3db · May 24, 2017 · fada1b2 · fada1b2
1 parent dc33b9a
commit fada1b2
Show file tree

Hide file tree

Showing 37 changed files with 1,918 additions and 1,640 deletions.
diff --git a/generated/proto/policy.proto b/generated/proto/policy.proto
@@ -22,18 +22,22 @@ syntax = "proto3";
 package schema;
 
 message Resolution {
-	int64 window_size = 1;
-	int64 precision = 2;
+  int64 window_size = 1;
+  int64 precision = 2;
 }
 
 message Retention {
-	int64 period = 1;
+  int64 period = 1;
 }
 
 message Policy {
-	Resolution resolution = 1;
-	Retention retention = 2;
-	repeated AggregationType aggregation_types = 3;
+  Resolution resolution = 1;
+  Retention retention = 2;
+}
+
+message UnaggregatedPolicy {
+  Policy policy = 1;
+  repeated AggregationType aggregation_types = 2;
 }
 
 enum AggregationType {

diff --git a/generated/proto/rule.proto b/generated/proto/rule.proto
@@ -28,7 +28,7 @@ message MappingRuleSnapshot {
   bool tombstoned = 2;
   int64 cutover_time = 3;
   map<string,string> tag_filters = 4;
-  repeated Policy policies = 5;
+  repeated UnaggregatedPolicy policies = 5;
 }
 
 message MappingRule {
@@ -39,7 +39,7 @@ message MappingRule {
 message RollupTarget {
   string name = 1;
   repeated string tags = 2;
-  repeated Policy policies = 3;
+  repeated UnaggregatedPolicy policies = 3;
 }
 
 message RollupRuleSnapshot {

diff --git a/generated/proto/schema/namespace.pb.go b/generated/proto/schema/namespace.pb.go
diff --git a/generated/proto/schema/policy.pb.go b/generated/proto/schema/policy.pb.go
diff --git a/generated/proto/schema/rule.pb.go b/generated/proto/schema/rule.pb.go
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -58,3 +58,5 @@ testImport:
   version: d77da356e56a7428ad25149ca77381849a6a5232
   subpackages:
   - require
+- package: github.com/cw9/bitset
+  version: d79da395ef228e37d81befaf8c71827ab0cb2275
diff --git a/metric/unaggregated/types.go b/metric/unaggregated/types.go
@@ -24,7 +24,7 @@ import (
 	"fmt"
 
 	"github.com/m3db/m3metrics/metric/id"
-	"github.com/m3db/m3metrics/policy"
+	uaggregatedp "github.com/m3db/m3metrics/policy/unaggregated"
 	"github.com/m3db/m3x/pool"
 )
 
@@ -73,19 +73,19 @@ type Gauge struct {
 // CounterWithPoliciesList is a counter with applicable policies list.
 type CounterWithPoliciesList struct {
 	Counter
-	policy.PoliciesList
+	uaggregatedp.PoliciesList
 }
 
 // BatchTimerWithPoliciesList is a batch timer with applicable policies list.
 type BatchTimerWithPoliciesList struct {
 	BatchTimer
-	policy.PoliciesList
+	uaggregatedp.PoliciesList
 }
 
 // GaugeWithPoliciesList is a gauge with applicable policies list.
 type GaugeWithPoliciesList struct {
 	Gauge
-	policy.PoliciesList
+	uaggregatedp.PoliciesList
 }
 
 // MetricUnion is a union of different types of metrics, only one of which is valid