gps: create trie only when wildcard is found

* Create trie only when wildcard is found
* Rename 'recursive' to 'wildcard' ignore

Author: darkowlzz

internal/gps/pkgtree/pkgtree.go

@@ -20,8 +20,8 @@ import (
 	radix "github.com/armon/go-radix"
 )
 
-// recursive ignore suffix
-const recIgnoreSuffix = "/*"
+// wildcard ignore suffix
+const wcIgnoreSuffix = "*"
 
 // Package represents a Go package. It contains a subset of the information
 // go/build.Package does.
@@ -450,11 +450,16 @@ func (t PackageTree) ToReachMap(main, tests, backprop bool, ignore map[string]bo
 		ignore = make(map[string]bool)
 	}
 
-	// Create a radix tree for ignore prefixes
-	xt := radix.New()
+	// Declare a radix tree for ignore prefixes
+	var xt *radix.Tree
+
 	for i := range ignore {
-		if strings.HasSuffix(i, recIgnoreSuffix) {
-			i = strings.TrimSuffix(i, recIgnoreSuffix)
+		if strings.HasSuffix(i, wcIgnoreSuffix) {
+			// Create trie if it doesn't exists
+			if xt == nil {
+				xt = radix.New()
+			}
+			i = strings.TrimSuffix(i, wcIgnoreSuffix)
 			xt.Insert(i, true)
 		}
 	}

internal/gps/solver.go

@@ -17,8 +17,8 @@ import (
 	"github.com/golang/dep/internal/gps/pkgtree"
 )
 
-// recursive ignore suffix
-const recIgnoreSuffix = "/*"
+// wildcard ignore suffix
+const wcIgnoreSuffix = "*"
 
 var rootRev = Revision("")
 
@@ -1345,13 +1345,17 @@ func pa2lp(pa atom, pkgs map[string]struct{}) LockedProject {
 }
 
 func createIgnorePrefixTree(ig map[string]bool) *radix.Tree {
-	xt := radix.New()
+	var xt *radix.Tree
 
 	for i := range ig {
 		// Check if it's a recursive ignore
-		if strings.HasSuffix(i, recIgnoreSuffix) {
+		if strings.HasSuffix(i, wcIgnoreSuffix) {
+			// Create trie if it doesn't exists
+			if xt == nil {
+				xt = radix.New()
+			}
 			// Create the ignore prefix and insert in the radix tree
-			i = strings.TrimSuffix(i, recIgnoreSuffix)
+			i = strings.TrimSuffix(i, wcIgnoreSuffix)
 			xt.Insert(i, true)
 		}
 	}