From 93cbf7bfc42e58587871e7b3b9a4a64596d873a4 Mon Sep 17 00:00:00 2001
From: Issac Trotts <issactrotts@google.com>
Date: Tue, 31 Jul 2018 19:41:33 -0700
Subject: [PATCH 1/2] cmd/go: uniq test log lines in computeTestInputsID

Before this change, the same hashes were being computed multiple times
in some cases.

This gets the case reported in issue #26726 down from over 30s to .8s.
---
 src/cmd/go/internal/test/test.go | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/cmd/go/internal/test/test.go b/src/cmd/go/internal/test/test.go
index d6fcc2a47420f4..f1927d7848113d 100644
--- a/src/cmd/go/internal/test/test.go
+++ b/src/cmd/go/internal/test/test.go
@@ -1391,20 +1391,32 @@ func computeTestInputsID(a *work.Action, testlog []byte) (cache.ActionID, error)
 	testlog = bytes.TrimPrefix(testlog, testlogMagic)
 	h := cache.NewHash("testInputs")
 	pwd := a.Package.Dir
+
+	// Get the unique lines from the test log to save time by not computing
+	// the same hash more than once.
+	lineSet := make(map[string]bool)
 	for _, line := range bytes.Split(testlog, []byte("\n")) {
 		if len(line) == 0 {
 			continue
 		}
-		s := string(line)
-		i := strings.Index(s, " ")
+		lineSet[string(line)] = true
+	}
+	var lines []string
+	for l := range lineSet {
+		lines = append(lines, l)
+	}
+	sort.Strings(lines)
+
+	for _, line := range lines {
+		i := strings.Index(line, " ")
 		if i < 0 {
 			if cache.DebugTest {
 				fmt.Fprintf(os.Stderr, "testcache: %s: input list malformed (%q)\n", a.Package.ImportPath, line)
 			}
 			return cache.ActionID{}, errBadTestInputs
 		}
-		op := s[:i]
-		name := s[i+1:]
+		op := line[:i]
+		name := line[i+1:]
 		switch op {
 		default:
 			if cache.DebugTest {

From e2feba204c981c7ab9c8c8d14aee1e31017549cb Mon Sep 17 00:00:00 2001
From: Issac Trotts <issactrotts@google.com>
Date: Wed, 1 Aug 2018 08:30:43 -0700
Subject: [PATCH 2/2] Add comment saying why test log lines are sorted

---
 src/cmd/go/internal/test/test.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/cmd/go/internal/test/test.go b/src/cmd/go/internal/test/test.go
index f1927d7848113d..308e03ef3dea8f 100644
--- a/src/cmd/go/internal/test/test.go
+++ b/src/cmd/go/internal/test/test.go
@@ -1405,6 +1405,9 @@ func computeTestInputsID(a *work.Action, testlog []byte) (cache.ActionID, error)
 	for l := range lineSet {
 		lines = append(lines, l)
 	}
+	// Iterating over the map means the unique lines are in random order.
+	// Sorting puts them in a deterministic order so the hashing below will
+	// get the same result if the set of log lines is the same.
 	sort.Strings(lines)
 
 	for _, line := range lines {