From 20a55c05df14f88c9d4daf9a0e1a064a3a3a19fb Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date: Wed, 2 Jul 2014 22:36:02 +0200
Subject: [PATCH] Percolator: improve logging and cleanup try-catch statement
 for percolator query loading.

---
 .../percolator/PercolatorQueriesRegistry.java | 42 +++++++++----------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java b/src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java
index a9107e438da..c7bc04db70f 100644
--- a/src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java
+++ b/src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java
@@ -245,9 +245,9 @@ public class PercolatorQueriesRegistry extends AbstractIndexShardComponent {
             if (hasPercolatorType(indexShard)) {
                 // percolator index has started, fetch what we can from it and initialize the indices
                 // we have
-                logger.debug("loading percolator queries for index [{}] and shard[{}]...", shardId.index(), shardId.id());
-                loadQueries(indexShard);
-                logger.trace("done loading percolator queries for index [{}] and shard[{}]", shardId.index(), shardId.id());
+                logger.trace("loading percolator queries for [{}]...", shardId);
+                int loadedQueries = loadQueries(indexShard);
+                logger.debug("done loading [{}] percolator queries for [{}]", loadedQueries, shardId);
             }
         }
 
@@ -256,27 +256,23 @@ public class PercolatorQueriesRegistry extends AbstractIndexShardComponent {
             return shardId.equals(otherShardId) && mapperService.hasMapping(PercolatorService.TYPE_NAME);
         }
 
-        private void loadQueries(IndexShard shard) {
-            try {
-                shard.refresh(new Engine.Refresh("percolator_load_queries").force(true));
-                // Maybe add a mode load? This isn't really a write. We need write b/c state=post_recovery
-                Engine.Searcher searcher = shard.acquireSearcher("percolator_load_queries", IndexShard.Mode.WRITE);
-                try {
-                    Query query = new XConstantScoreQuery(
-                            indexCache.filter().cache(
-                                    new TermFilter(new Term(TypeFieldMapper.NAME, PercolatorService.TYPE_NAME))
-                            )
-                    );
-                    QueriesLoaderCollector queryCollector = new QueriesLoaderCollector(PercolatorQueriesRegistry.this, logger, mapperService, indexFieldDataService);
-                    searcher.searcher().search(query, queryCollector);
-                    Map<BytesRef, Query> queries = queryCollector.queries();
-                    for (Map.Entry<BytesRef, Query> entry : queries.entrySet()) {
-                        Query previousQuery = percolateQueries.put(entry.getKey(), entry.getValue());
-                        shardPercolateService.addedQuery(entry.getKey(), previousQuery, entry.getValue());
-                    }
-                } finally {
-                    searcher.close();
+        private int loadQueries(IndexShard shard) {
+            shard.refresh(new Engine.Refresh("percolator_load_queries").force(true));
+            // Maybe add a mode load? This isn't really a write. We need write b/c state=post_recovery
+            try (Engine.Searcher searcher = shard.acquireSearcher("percolator_load_queries", IndexShard.Mode.WRITE)) {
+                Query query = new XConstantScoreQuery(
+                        indexCache.filter().cache(
+                                new TermFilter(new Term(TypeFieldMapper.NAME, PercolatorService.TYPE_NAME))
+                        )
+                );
+                QueriesLoaderCollector queryCollector = new QueriesLoaderCollector(PercolatorQueriesRegistry.this, logger, mapperService, indexFieldDataService);
+                searcher.searcher().search(query, queryCollector);
+                Map<BytesRef, Query> queries = queryCollector.queries();
+                for (Map.Entry<BytesRef, Query> entry : queries.entrySet()) {
+                    Query previousQuery = percolateQueries.put(entry.getKey(), entry.getValue());
+                    shardPercolateService.addedQuery(entry.getKey(), previousQuery, entry.getValue());
                 }
+                return queries.size();
             } catch (Exception e) {
                 throw new PercolatorException(shardId.index(), "failed to load queries from percolator index", e);
             }