Merge pull request weaveworks#3095 from weaveworks/blank-latestmap-in…

…sert Blank out value on LatestMap decode insert
sandeep3119 · Feb 26, 2018 · 306a744 · 306a744
2 parents adc46e8 + f176406
commit 306a744
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/extras/generate_latest_map b/extras/generate_latest_map
@@ -143,6 +143,7 @@ function generate_latest_map() {
         if i == len(*m) || (*m)[i].key != key {
             *m = append(*m, ${entry_type}{})
             copy((*m)[i+1:], (*m)[i:])
+            (*m)[i] = ${entry_type}{}
         }
         return i
     }

diff --git a/report/latest_map_generated.go b/report/latest_map_generated.go
@@ -111,6 +111,7 @@ func (m *StringLatestMap) locate(key string) int {
 	if i == len(*m) || (*m)[i].key != key {
 		*m = append(*m, stringLatestEntry{})
 		copy((*m)[i+1:], (*m)[i:])
+		(*m)[i] = stringLatestEntry{}
 	}
 	return i
 }
@@ -332,6 +333,7 @@ func (m *NodeControlDataLatestMap) locate(key string) int {
 	if i == len(*m) || (*m)[i].key != key {
 		*m = append(*m, nodeControlDataLatestEntry{})
 		copy((*m)[i+1:], (*m)[i:])
+		(*m)[i] = nodeControlDataLatestEntry{}
 	}
 	return i
 }

diff --git a/report/latest_map_internal_test.go b/report/latest_map_internal_test.go
@@ -168,6 +168,36 @@ func BenchmarkLatestMapDecode(b *testing.B) {
 	}
 }
 
+func TestLatestMapDecoding(t *testing.T) {
+	ts, _ := time.Parse(time.RFC3339Nano, "2018-02-26T09:50:43Z")
+	want := MakeStringLatestMap().
+		Set("foo", ts, "bar").
+		Set("bar", ts, "baz").
+		Set("emptyval", ts, "")
+	// The following string is carefully constructed to have 'emptyval' not in alphabetical order
+	data := `
+{
+  "bar": {
+    "timestamp": "2018-02-26T09:50:43Z",
+    "value": "baz"
+  },
+  "foo": {
+    "timestamp": "2018-02-26T09:50:43Z",
+    "value": "bar"
+  },
+  "emptyval": {
+    "timestamp": "2018-02-26T09:50:43Z"
+  }
+}`
+	h := &codec.JsonHandle{}
+	decoder := codec.NewDecoder(bytes.NewBufferString(data), h)
+	have := MakeStringLatestMap()
+	have.CodecDecodeSelf(decoder)
+	if !reflect.DeepEqual(want, have) {
+		t.Error(test.Diff(want, have))
+	}
+}
+
 func TestLatestMapEncoding(t *testing.T) {
 	now := time.Now()
 	want := MakeStringLatestMap().
@@ -188,7 +218,6 @@ func TestLatestMapEncoding(t *testing.T) {
 			t.Error(test.Diff(want, have))
 		}
 	}
-
 }
 
 func TestLatestMapEncodingNil(t *testing.T) {