updated filter

dgraph-io · Nov 11, 2024 · 176bb00 · 176bb00
1 parent 39f175d
commit 176bb00
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/posting/stats.go b/posting/stats.go
@@ -84,7 +84,7 @@ func (sh *StatsHolder) InsertRecord(pred string, key []byte, count uint64) {
 	val.InsertRecord(key, count)
 }
 
-func (sh *StatsHolder) ProcessPredicate(pred string, key []byte) uint64 {
+func (sh *StatsHolder) ProcessEqPredicate(pred string, key []byte) uint64 {
 	sh.RLock()
 	val, ok := sh.predStats[pred]
 	sh.RUnlock()

diff --git a/worker/task.go b/worker/task.go
@@ -1812,10 +1812,16 @@ func planForEqFilter(fc *functionContext, pred string, uidlist []uint64) {
 		return true
 	}
 
+	if uint64(len(uidlist)) < Config.TypeFilterUidLimit && checkUidEmpty(uidlist) {
+		fc.tokens = fc.tokens[:0]
+		fc.n = len(uidlist)
+		return
+	}
+
 	estimatedCount := uint64(0)
 	gotEstimate := false
 	for _, eqToken := range fc.tokens {
-		count := posting.GlobalStatsHolder.ProcessPredicate(pred, []byte(eqToken))
+		count := posting.GlobalStatsHolder.ProcessEqPredicate(pred, []byte(eqToken))
 		if count != math.MaxUint64 {
 			estimatedCount += count
 			gotEstimate = true
@@ -1828,12 +1834,14 @@ func planForEqFilter(fc *functionContext, pred string, uidlist []uint64) {
 		gotEstimate = false
 	}
 
+	// TODO make a different config
 	if gotEstimate && uint64(len(uidlist)) < estimatedCount/Config.TypeFilterUidLimit && checkUidEmpty(uidlist) {
 		fc.tokens = fc.tokens[:0]
 		fc.n = len(uidlist)
-	} else {
-		fc.n = len(fc.tokens)
+		return
 	}
+
+	fc.n = len(fc.tokens)
 }
 
 func parseSrcFn(ctx context.Context, q *pb.Query) (*functionContext, error) {