Revert "在goroutine worker里不要用return"

This reverts commit e1b46af.
huichen · Dec 3, 2015 · 06d71d0 · 06d71d0
1 parent e1b46af
commit 06d71d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/core/indexer.go b/core/indexer.go
@@ -176,9 +176,6 @@ func (indexer *Indexer) Lookup(
 	for ; indexPointers[0] >= 0; indexPointers[0]-- {
 		// 以第一个搜索键出现的文档作为基准，并遍历其他搜索键搜索同一文档
 		baseDocId := indexer.getDocId(table[0], indexPointers[0])
-		if _, ok := indexer.tableLock.docs[baseDocId]; !ok {
-			continue
-		}
 
 		if docIds != nil {
 			_, found := docIds[baseDocId]
@@ -211,7 +208,8 @@ func (indexer *Indexer) Lookup(
 			}
 		}
 
-		if found {
+		_, ok := indexer.tableLock.docs[baseDocId]
+		if found && ok {
 			indexedDoc := types.IndexedDocument{}
 
 			// 当为LocationsIndex时计算关键词紧邻距离
@@ -420,6 +418,5 @@ func (indexer *Indexer) RemoveDoc(docId uint64) {
 
 	indexer.tableLock.Lock()
 	delete(indexer.tableLock.docs, docId)
-	indexer.numDocuments--
 	indexer.tableLock.Unlock()
 }
diff --git a/engine/indexer_worker.go b/engine/indexer_worker.go
@@ -47,7 +47,7 @@ func (engine *Engine) indexerLookupWorker(shard int) {
 
 		if request.countDocsOnly {
 			request.rankerReturnChannel <- rankerReturnRequest{numDocs: numDocs}
-			continue
+			return
 		}
 
 		if len(docs) == 0 {