Use generic map to store entries

.excludecoverage

@@ -0,0 +1,7 @@
+_mock.go
+_gen.go
+_matcher.go
+generated/
+tools/
+vendor/
+integration/

.excludelint

@@ -1,3 +1,5 @@
 (vendor/)
 (generated/)
 (_mock.go)
+(_gen.go)
+(_string.go)

.excludemetalint

@@ -1,3 +1,4 @@
 vendor/
 generated/
 _mock.go
+_gen.go

.metalinter.json

@@ -1,20 +1,32 @@
 {
   "Linters": {
-    "badtime":   {"Command": "badtime", "Pattern": "PATH:LINE:COL:MESSAGE"},
-    "deadcode":  { "Command": "deadcode  -tags integration" },
-    "varcheck":  { "Command": "varcheck  -tags integration" },
-    "megacheck": { "Command": "megacheck -tags integration" } },
-  "Enable":
-    [ "deadcode"
-    , "varcheck"
-    , "structcheck"
-    , "goconst"
-    , "ineffassign"
-    , "unconvert"
-    , "misspell"
-    , "unparam"
-    , "badtime"
-    , "megacheck" ],
+    "badtime": {
+      "Command": "badtime",
+      "Pattern": "PATH:LINE:COL:MESSAGE"
+    },
+    "deadcode": {
+      "Command": "deadcode  -tags integration"
+    },
+    "varcheck": {
+      "Command": "varcheck  -tags integration"
+    },
+    "megacheck": {
+      "Command": "megacheck -tags integration"
+    }
+  },
+  "Enable": [
+    "golint",
+    "deadcode",
+    "varcheck",
+    "structcheck",
+    "goconst",
+    "ineffassign",
+    "unconvert",
+    "misspell",
+    "unparam",
+    "badtime",
+    "megacheck"
+  ],
   "Deadline": "3m",
   "EnableGC": true
 }

.travis.yml

@@ -1,12 +1,16 @@
 language: go
 go:
-  - 1.8.3
-  - 1.9.2
+  - "1.9.x"
+  - "1.10.x"
 install: make install-ci
-env:
- # Set higher timeouts and package name for travis
- - TEST_TIMEOUT_SCALE=20 PACKAGE=github.com/m3db/m3aggregator
 sudo: required
 dist: trusty
-script:
- - make all
+env:
+  global:
+    - TEST_TIMEOUT_SCALE=20 PACKAGE=github.com/m3db/m3aggregator
+  matrix:
+    - MAKE_TARGET="test-ci-unit"
+    - MAKE_TARGET="test-ci-integration"
+    - MAKE_TARGET="metalint"
+    - MAKE_TARGET="test-genny-all"
+script: "make $MAKE_TARGET"

Makefile

@@ -11,7 +11,6 @@ coverfile            := cover.out
 coverage_xml         := coverage.xml
 junit_xml            := junit.xml
 test_log             := test.log
-lint_check           := .ci/lint.sh
 metalint_check       := .ci/metalint.sh
 metalint_config      := .metalinter.json
 metalint_exclude     := .excludemetalint
@@ -28,6 +27,8 @@ auto_gen             := .ci/auto-gen.sh
 license_dir          := .ci/uber-licence
 license_node_modules := $(license_dir)/node_modules
 
+include $(SELF_DIR)/generated-source-files.mk
+
 BUILD           := $(abspath ./bin)
 LINUX_AMD64_ENV := GOOS=linux GOARCH=amd64 CGO_ENABLED=0
 
@@ -60,11 +61,6 @@ services-linux-amd64:
 
 $(foreach SERVICE,$(SERVICES),$(eval $(SERVICE_RULES)))
 
-.PHONY: lint
-lint:
-	@which golint > /dev/null || go get -u github.com/golang/lint/golint
-	$(lint_check)
-
 .PHONY: metalint
 metalint: install-metalinter install-linter-badtime
 	@($(metalint_check) $(metalint_config) $(metalint_exclude) && echo "metalinted successfully!") || (echo "metalinter failed" && exit 1)
@@ -139,7 +135,7 @@ clean:
 	@rm -f *.html *.xml *.out *.test
 
 .PHONY: all
-all: lint metalint test-ci-unit test-ci-integration m3aggregator
+all: metalint test-ci-unit test-ci-integration test-genny-all m3aggregator
 	@echo Made all successfully
 
 .DEFAULT_GOAL := all

aggregator/aggregator_test.go

@@ -283,7 +283,7 @@ func TestAggregatorAddMetricWithPoliciesListSuccessNoPlacementUpdate(t *testing.
 	agg.shardFn = func([]byte, int) uint32 { return 1 }
 	err := agg.AddMetricWithPoliciesList(testValidMetric, testPoliciesList)
 	require.NoError(t, err)
-	require.Equal(t, 1, len(agg.shards[1].metricMap.entries))
+	require.Equal(t, 1, agg.shards[1].metricMap.entries.Len())
 }
 
 func TestAggregatorAddMetricWithPoliciesListSuccessWithPlacementUpdate(t *testing.T) {
@@ -347,7 +347,7 @@ func TestAggregatorAddMetricWithPoliciesListSuccessWithPlacementUpdate(t *testin
 			require.Equal(t, expected.latestNanos, agg.shards[i].latestWriteableNanos)
 		}
 	}
-	require.Equal(t, 1, len(agg.shards[1].metricMap.entries))
+	require.Equal(t, 1, agg.shards[1].metricMap.entries.Len())
 	require.Equal(t, newPlacementCutoverNanos, agg.currPlacement.CutoverNanos())
 
 	for {