Addressing comments

m3db · Sep 27, 2017 · 68bd1ea · 68bd1ea
1 parent b29fbd0
commit 68bd1ea
Show file tree

Hide file tree

Showing 10 changed files with 153 additions and 151 deletions.
diff --git a/generated/proto/rule.proto b/generated/proto/rule.proto
@@ -26,7 +26,7 @@ import "policy.proto";
 message MappingRuleSnapshot {
   string name = 1;
   bool tombstoned = 2;
-  int64 cutover_time_nanos = 3;
+  int64 cutover_nanos = 3;
   map<string,string> tag_filters = 4;
   repeated Policy policies = 5;
   int64 last_updated_at_nanos = 6;
@@ -47,7 +47,7 @@ message RollupTarget {
 message RollupRuleSnapshot {
   string name = 1;
   bool tombstoned = 2;
-  int64 cutover_time_nanos = 3;
+  int64 cutover_nanos = 3;
   map<string,string> tag_filters = 4;
   repeated RollupTarget targets = 5;
   int64 last_updated_at_nanos = 6;
@@ -65,7 +65,7 @@ message RuleSet {
   int64 created_at_nanos = 3;
   int64 last_updated_at_nanos = 4;
   bool tombstoned = 5;
-  int64 cutover_time_nanos = 6;
+  int64 cutover_nanos = 6;
   repeated MappingRule mapping_rules = 7;
   repeated RollupRule rollup_rules = 8;
   string last_updated_by = 9;

diff --git a/generated/proto/schema/rule.pb.go b/generated/proto/schema/rule.pb.go
diff --git a/matcher/ruleset_test.go b/matcher/ruleset_test.go
@@ -93,9 +93,9 @@ func TestToRuleSetUnmarshalError(t *testing.T) {
 func TestToRuleSetSuccess(t *testing.T) {
 	store, _, rs := testRuleSet()
 	proto := &schema.RuleSet{
-		Namespace:        string(testNamespace),
-		Tombstoned:       false,
-		CutoverTimeNanos: 123456,
+		Namespace:    string(testNamespace),
+		Tombstoned:   false,
+		CutoverNanos: 123456,
 	}
 	_, err := store.SetIfNotExists(testRuleSetKey, proto)
 	require.NoError(t, err)

diff --git a/rules/mapping.go b/rules/mapping.go
@@ -27,6 +27,7 @@ import (
 	"github.com/m3db/m3metrics/filters"
 	"github.com/m3db/m3metrics/generated/proto/schema"
 	"github.com/m3db/m3metrics/policy"
+
 	"github.com/pborman/uuid"
 )
 
@@ -68,7 +69,7 @@ func newMappingRuleSnapshot(
 	return newMappingRuleSnapshotFromFields(
 		r.Name,
 		r.Tombstoned,
-		r.CutoverTimeNanos,
+		r.CutoverNanos,
 		r.TagFilters,
 		policies,
 		filter,
@@ -127,7 +128,7 @@ func (mrs *mappingRuleSnapshot) Schema() (*schema.MappingRuleSnapshot, error) {
 	res := &schema.MappingRuleSnapshot{
 		Name:               mrs.name,
 		Tombstoned:         mrs.tombstoned,
-		CutoverTimeNanos:   mrs.cutoverNanos,
+		CutoverNanos:       mrs.cutoverNanos,
 		TagFilters:         mrs.rawFilters,
 		LastUpdatedAtNanos: mrs.lastUpdatedAtNanos,
 		LastUpdatedBy:      mrs.lastUpdatedBy,

diff --git a/rules/mapping_test.go b/rules/mapping_test.go
@@ -38,7 +38,7 @@ var (
 			&schema.MappingRuleSnapshot{
 				Name:               "foo",
 				Tombstoned:         false,
-				CutoverTimeNanos:   12345,
+				CutoverNanos:       12345,
 				LastUpdatedAtNanos: 1234,
 				LastUpdatedBy:      "someone",
 				TagFilters: map[string]string{
@@ -65,7 +65,7 @@ var (
 			&schema.MappingRuleSnapshot{
 				Name:               "bar",
 				Tombstoned:         true,
-				CutoverTimeNanos:   67890,
+				CutoverNanos:       67890,
 				LastUpdatedAtNanos: 1234,
 				LastUpdatedBy:      "someone",
 				TagFilters: map[string]string{

diff --git a/rules/rollup.go b/rules/rollup.go
@@ -29,6 +29,7 @@ import (
 	"github.com/m3db/m3metrics/filters"
 	"github.com/m3db/m3metrics/generated/proto/schema"
 	"github.com/m3db/m3metrics/policy"
+
 	"github.com/pborman/uuid"
 )
 
@@ -188,7 +189,7 @@ func newRollupRuleSnapshot(
 	return newRollupRuleSnapshotFromFields(
 		r.Name,
 		r.Tombstoned,
-		r.CutoverTimeNanos,
+		r.CutoverNanos,
 		r.TagFilters,
 		targets,
 		filter,
@@ -249,7 +250,7 @@ func (rrs *rollupRuleSnapshot) Schema() (*schema.RollupRuleSnapshot, error) {
 	res := &schema.RollupRuleSnapshot{
 		Name:               rrs.name,
 		Tombstoned:         rrs.tombstoned,
-		CutoverTimeNanos:   rrs.cutoverNanos,
+		CutoverNanos:       rrs.cutoverNanos,
 		TagFilters:         rrs.rawFilters,
 		LastUpdatedAtNanos: rrs.lastUpdatedAtNanos,
 		LastUpdatedBy:      rrs.lastUpdatedBy,

diff --git a/rules/rollup_test.go b/rules/rollup_test.go
@@ -38,7 +38,7 @@ var (
 			&schema.RollupRuleSnapshot{
 				Name:               "foo",
 				Tombstoned:         false,
-				CutoverTimeNanos:   12345,
+				CutoverNanos:       12345,
 				LastUpdatedAtNanos: 12345,
 				LastUpdatedBy:      "someone-else",
 				TagFilters: map[string]string{
@@ -68,7 +68,7 @@ var (
 			&schema.RollupRuleSnapshot{
 				Name:               "bar",
 				Tombstoned:         true,
-				CutoverTimeNanos:   67890,
+				CutoverNanos:       67890,
 				LastUpdatedAtNanos: 67890,
 				LastUpdatedBy:      "someone",
 				TagFilters: map[string]string{

diff --git a/rules/ruleset.go b/rules/ruleset.go
@@ -561,7 +561,7 @@ func NewRuleSetFromSchema(version int, rs *schema.RuleSet, opts Options) (RuleSe
 		lastUpdatedAtNanos: rs.LastUpdatedAtNanos,
 		lastUpdatedBy:      rs.LastUpdatedBy,
 		tombstoned:         rs.Tombstoned,
-		cutoverNanos:       rs.CutoverTimeNanos,
+		cutoverNanos:       rs.CutoverNanos,
 		mappingRules:       mappingRules,
 		rollupRules:        rollupRules,
 		tagsFilterOpts:     tagsFilterOpts,
@@ -625,7 +625,7 @@ func (rs *ruleSet) Schema() (*schema.RuleSet, error) {
 		LastUpdatedAtNanos: rs.lastUpdatedAtNanos,
 		LastUpdatedBy:      rs.lastUpdatedBy,
 		Tombstoned:         rs.tombstoned,
-		CutoverTimeNanos:   rs.cutoverNanos,
+		CutoverNanos:       rs.cutoverNanos,
 	}
 
 	mappingRules := make([]*schema.MappingRule, len(rs.mappingRules))