Merge pull request #147 from ipfs/fix/optimize-naive-query

Stebalien · web-flow · commit d099e8e2c0c1 · 2020-02-14T08:37:25.000-08:00
fix: avoid filtering by prefix unless necessary
diff --git a/query/query_impl.go b/query/query_impl.go
@@ -129,12 +129,10 @@ func NaiveQueryApply(q Query, qr Results) Results {
 			}
 			prefix = path.Clean(prefix)
 		}
-		// If the prefix isn't "/", end it in a "/" so we only find keys
-		// _under_ the prefix.
+		// If the prefix is empty, ignore it.
 		if prefix != "/" {
-			prefix += "/"
+			qr = NaiveFilter(qr, FilterKeyPrefix{prefix + "/"})
 		}
-		qr = NaiveFilter(qr, FilterKeyPrefix{prefix})
 	}
 	for _, f := range q.Filters {
 		qr = NaiveFilter(qr, f)

Original file line number	Diff line number	Diff line change
`@@ -129,12 +129,10 @@ func NaiveQueryApply(q Query, qr Results) Results {`
`129`	`129`	`}`
`130`	`130`	`prefix = path.Clean(prefix)`
`131`	`131`	`}`
`132`		`- // If the prefix isn't "/", end it in a "/" so we only find keys`
`133`		`- // _under_ the prefix.`
	`132`	`+ // If the prefix is empty, ignore it.`
`134`	`133`	`if prefix != "/" {`
`135`		`- prefix += "/"`
	`134`	`+ qr = NaiveFilter(qr, FilterKeyPrefix{prefix + "/"})`
`136`	`135`	`}`
`137`		`- qr = NaiveFilter(qr, FilterKeyPrefix{prefix})`
`138`	`136`	`}`
`139`	`137`	`for _, f := range q.Filters {`
`140`	`138`	`qr = NaiveFilter(qr, f)`