Address feedback

m3db · May 5, 2017 · 8bf361c · 8bf361c
1 parent e658d02
commit 8bf361c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/protocol/msgpack/base_iterator.go b/protocol/msgpack/base_iterator.go
@@ -85,7 +85,7 @@ func (it *baseIterator) decodePolicy() policy.Policy {
 func (it *baseIterator) decodeResolution() policy.Resolution {
 	numActualFields := it.decodeNumObjectFields()
 	resolutionType := it.decodeObjectType()
-	numExpectedFields, ok := it.checkNumFieldsForTypeWithActual(
+	numExpectedFields, ok := it.checkExpectedNumFieldsForType(
 		resolutionType,
 		numActualFields,
 	)
@@ -127,7 +127,7 @@ func (it *baseIterator) decodeResolution() policy.Resolution {
 func (it *baseIterator) decodeRetention() policy.Retention {
 	numActualFields := it.decodeNumObjectFields()
 	retentionType := it.decodeObjectType()
-	numExpectedFields, ok := it.checkNumFieldsForTypeWithActual(
+	numExpectedFields, ok := it.checkExpectedNumFieldsForType(
 		retentionType,
 		numActualFields,
 	)
@@ -251,11 +251,11 @@ func (it *baseIterator) skip(numFields int) {
 
 func (it *baseIterator) checkNumFieldsForType(objType objectType) (int, int, bool) {
 	numActualFields := it.decodeNumObjectFields()
-	numExpectedFields, ok := it.checkNumFieldsForTypeWithActual(objType, numActualFields)
+	numExpectedFields, ok := it.checkExpectedNumFieldsForType(objType, numActualFields)
 	return numExpectedFields, numActualFields, ok
 }
 
-func (it *baseIterator) checkNumFieldsForTypeWithActual(
+func (it *baseIterator) checkExpectedNumFieldsForType(
 	objType objectType,
 	numActualFields int,
 ) (int, bool) {

diff --git a/protocol/msgpack/raw_metric_test.go b/protocol/msgpack/raw_metric_test.go
@@ -256,7 +256,7 @@ func (it *mockBaseIterator) checkNumFieldsForType(objType objectType) (int, int,
 	return 0, 0, true
 }
 
-func (it *mockBaseIterator) checkNumFieldsForTypeWithActual(
+func (it *mockBaseIterator) checkExpectedNumFieldsForType(
 	objType objectType,
 	numActualFields int,
 ) (int, bool) {

diff --git a/protocol/msgpack/types.go b/protocol/msgpack/types.go
@@ -193,9 +193,9 @@ type iteratorBase interface {
 	// the number of expected fields for a given object type.
 	checkNumFieldsForType(objType objectType) (int, int, bool)
 
-	// checkNumFieldsForTypeWithActual compares the given number of actual fields with
+	// checkExpectedNumFieldsForType compares the given number of actual fields with
 	// the number of expected fields for a given object type.
-	checkNumFieldsForTypeWithActual(objType objectType, numActualFields int) (int, bool)
+	checkExpectedNumFieldsForType(objType objectType, numActualFields int) (int, bool)
 }
 
 // UnaggregatedEncoder is an encoder for encoding different types of unaggregated metrics.

diff --git a/protocol/msgpack/unaggregated_iterator.go b/protocol/msgpack/unaggregated_iterator.go
@@ -225,7 +225,7 @@ func (it *unaggregatedIterator) decodeGauge() {
 func (it *unaggregatedIterator) decodePoliciesList() {
 	numActualFields := it.decodeNumObjectFields()
 	policiesListType := it.decodeObjectType()
-	numExpectedFields, ok := it.checkNumFieldsForTypeWithActual(
+	numExpectedFields, ok := it.checkExpectedNumFieldsForType(
 		policiesListType,
 		numActualFields,
 	)
@@ -244,8 +244,6 @@ func (it *unaggregatedIterator) decodePoliciesList() {
 		}
 		if len(it.cachedPolicies) < numStagedPolicies {
 			it.cachedPolicies = make([][]policy.Policy, numStagedPolicies)
-		} else {
-			it.cachedPolicies = it.cachedPolicies[:numStagedPolicies]
 		}
 		for policyIdx := 0; policyIdx < numStagedPolicies; policyIdx++ {
 			decodedStagedPolicies := it.decodeStagedPolicies(policyIdx)

diff --git a/protocol/msgpack/unaggregated_iterator_test.go b/protocol/msgpack/unaggregated_iterator_test.go
@@ -56,7 +56,7 @@ func TestUnaggregatedIteratorDecodeSingleCustomPoliciesListWithAlloc(t *testing.
 	require.NoError(t, it.Err())
 	_, pl := it.Value()
 	require.Equal(t, testSingleCustomStagedPoliciesList, pl)
-	require.Equal(t, len(it.cachedPolicies), len(testSingleCustomStagedPoliciesList))
+	require.True(t, len(it.cachedPolicies) >= len(testSingleCustomStagedPoliciesList))
 	policies, _ := testSingleCustomStagedPoliciesList[0].Policies()
 	require.Equal(t, it.cachedPolicies[0], policies)
 }
@@ -71,7 +71,7 @@ func TestUnaggregatedIteratorDecodeSingleCustomPoliciesListNoPoliciesListAlloc(t
 	require.NoError(t, it.Err())
 	_, pl := it.Value()
 	require.Equal(t, testSingleCustomStagedPoliciesList, pl)
-	require.Equal(t, len(it.cachedPolicies), len(testSingleCustomStagedPoliciesList))
+	require.True(t, len(it.cachedPolicies) >= len(testSingleCustomStagedPoliciesList))
 	policies, _ := testSingleCustomStagedPoliciesList[0].Policies()
 	require.Equal(t, it.cachedPolicies[0], policies)
 }
@@ -88,7 +88,7 @@ func TestUnaggregatedIteratorDecodeSingleCustomPoliciesListNoAlloc(t *testing.T)
 	require.NoError(t, it.Err())
 	_, pl := it.Value()
 	require.Equal(t, testSingleCustomStagedPoliciesList, pl)
-	require.Equal(t, len(it.cachedPolicies), len(testSingleCustomStagedPoliciesList))
+	require.True(t, len(it.cachedPolicies) >= len(testSingleCustomStagedPoliciesList))
 	policies, _ := testSingleCustomStagedPoliciesList[0].Policies()
 	require.Equal(t, it.cachedPolicies[0], policies)
 }
@@ -103,7 +103,7 @@ func TestUnaggregatedIteratorDecodeMultiCustomPoliciesListWithAlloc(t *testing.T
 	require.NoError(t, it.Err())
 	_, pl := it.Value()
 	require.Equal(t, input, pl)
-	require.Equal(t, len(it.cachedPolicies), len(input))
+	require.True(t, len(it.cachedPolicies) >= len(input))
 	for i := 0; i < len(input); i++ {
 		policies, _ := input[i].Policies()
 		require.Equal(t, it.cachedPolicies[i], policies)