From fab27f1bb032f573b16b53ef4d5bf062314d0ebe Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Thu, 11 Jun 2015 17:32:29 +0200
Subject: [PATCH] Create ShardSuggestService/Metrics manually outside of guice

This ShardSuggestService is a simple metrics counter and doesn't need
to be injected. It just makes IndexShard ctor bigger for no reason.
---
 .../action/suggest/TransportSuggestAction.java    |  8 ++++----
 .../org/elasticsearch/index/shard/IndexShard.java | 15 +++++++--------
 .../index/shard/IndexShardModule.java             |  2 --
 .../index/shard/ShadowIndexShard.java             |  5 ++---
 ...uggestService.java => ShardSuggestMetric.java} |  9 +--------
 5 files changed, 14 insertions(+), 25 deletions(-)
 rename core/src/main/java/org/elasticsearch/index/suggest/stats/{ShardSuggestService.java => ShardSuggestMetric.java} (89%)

diff --git a/core/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java b/core/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java
index ac046e6552d..27caf314b0d 100644
--- a/core/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java
+++ b/core/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java
@@ -39,7 +39,7 @@ import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.shard.IndexShard;
-import org.elasticsearch.index.suggest.stats.ShardSuggestService;
+import org.elasticsearch.index.suggest.stats.ShardSuggestMetric;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.search.suggest.Suggest;
 import org.elasticsearch.search.suggest.SuggestPhase;
@@ -130,8 +130,8 @@ public class TransportSuggestAction extends TransportBroadcastAction<SuggestRequ
     protected ShardSuggestResponse shardOperation(ShardSuggestRequest request) {
         IndexService indexService = indicesService.indexServiceSafe(request.shardId().getIndex());
         IndexShard indexShard = indexService.shardSafe(request.shardId().id());
-        ShardSuggestService shardSuggestService = indexShard.shardSuggestService();
-        shardSuggestService.preSuggest();
+        ShardSuggestMetric suggestMetric = indexShard.getSuggestMetric();
+        suggestMetric.preSuggest();
         long startTime = System.nanoTime();
         XContentParser parser = null;
         try (Engine.Searcher searcher = indexShard.acquireSearcher("suggest")) {
@@ -153,7 +153,7 @@ public class TransportSuggestAction extends TransportBroadcastAction<SuggestRequ
             if (parser != null) {
                 parser.close();
             }
-            shardSuggestService.postSuggest(System.nanoTime() - startTime);
+            suggestMetric.postSuggest(System.nanoTime() - startTime);
         }
     }
 }
diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java
index d3142e0d253..3dde442dbcf 100644
--- a/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java
+++ b/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java
@@ -22,7 +22,7 @@ package org.elasticsearch.index.shard;
 import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import org.apache.lucene.codecs.PostingsFormat;
-import org.apache.lucene.index.*;
+import org.apache.lucene.index.CheckIndex;
 import org.apache.lucene.store.AlreadyClosedException;
 import org.apache.lucene.util.IOUtils;
 import org.apache.lucene.util.ThreadInterruptedException;
@@ -88,7 +88,7 @@ import org.elasticsearch.index.store.Store;
 import org.elasticsearch.index.store.Store.MetadataSnapshot;
 import org.elasticsearch.index.store.StoreFileMetaData;
 import org.elasticsearch.index.store.StoreStats;
-import org.elasticsearch.index.suggest.stats.ShardSuggestService;
+import org.elasticsearch.index.suggest.stats.ShardSuggestMetric;
 import org.elasticsearch.index.suggest.stats.SuggestStats;
 import org.elasticsearch.index.termvectors.ShardTermVectorsService;
 import org.elasticsearch.index.translog.Translog;
@@ -142,7 +142,7 @@ public class IndexShard extends AbstractIndexShardComponent {
     private final ShardTermVectorsService termVectorsService;
     private final IndexFieldDataService indexFieldDataService;
     private final IndexService indexService;
-    private final ShardSuggestService shardSuggestService;
+    private final ShardSuggestMetric shardSuggestMetric = new ShardSuggestMetric();
     private final ShardBitsetFilterCache shardBitsetFilterCache;
     private final DiscoveryNode localNode;
 
@@ -194,7 +194,7 @@ public class IndexShard extends AbstractIndexShardComponent {
     public IndexShard(ShardId shardId, IndexSettingsService indexSettingsService, IndicesLifecycle indicesLifecycle, Store store,
                       ThreadPool threadPool, MapperService mapperService, IndexQueryParserService queryParserService, IndexCache indexCache, IndexAliasesService indexAliasesService, ShardIndexingService indexingService, ShardGetService getService, ShardSearchService searchService, ShardIndexWarmerService shardWarmerService,
                       ShardFilterCache shardFilterCache, ShardFieldData shardFieldData, PercolatorQueriesRegistry percolatorQueriesRegistry, ShardPercolateService shardPercolateService, CodecService codecService,
-                      ShardTermVectorsService termVectorsService, IndexFieldDataService indexFieldDataService, IndexService indexService, ShardSuggestService shardSuggestService,
+                      ShardTermVectorsService termVectorsService, IndexFieldDataService indexFieldDataService, IndexService indexService,
                       ShardQueryCache shardQueryCache, ShardBitsetFilterCache shardBitsetFilterCache,
                       @Nullable IndicesWarmer warmer, SnapshotDeletionPolicy deletionPolicy, SimilarityService similarityService, EngineFactory factory,
                       ClusterService clusterService, NodeEnvironment nodeEnv, ShardPath path, BigArrays bigArrays) {
@@ -227,7 +227,6 @@ public class IndexShard extends AbstractIndexShardComponent {
         this.shardPercolateService = shardPercolateService;
         this.indexFieldDataService = indexFieldDataService;
         this.indexService = indexService;
-        this.shardSuggestService = shardSuggestService;
         this.shardBitsetFilterCache = shardBitsetFilterCache;
         assert clusterService.localNode() != null : "Local node is null lifecycle state is: " + clusterService.lifecycleState();
         this.localNode = clusterService.localNode();
@@ -273,8 +272,8 @@ public class IndexShard extends AbstractIndexShardComponent {
         return termVectorsService;
     }
 
-    public ShardSuggestService shardSuggestService() {
-        return shardSuggestService;
+    public ShardSuggestMetric getSuggestMetric() {
+        return shardSuggestMetric;
     }
 
     public ShardBitsetFilterCache shardBitsetFilterCache() {
@@ -646,7 +645,7 @@ public class IndexShard extends AbstractIndexShardComponent {
     }
 
     public SuggestStats suggestStats() {
-        return shardSuggestService.stats();
+        return shardSuggestMetric.stats();
     }
 
     public CompletionStats completionStats(String... fields) {
diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java
index f5fd555b989..11e1e853356 100644
--- a/core/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java
+++ b/core/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java
@@ -38,7 +38,6 @@ import org.elasticsearch.index.percolator.stats.ShardPercolateService;
 import org.elasticsearch.index.search.slowlog.ShardSlowLogSearchService;
 import org.elasticsearch.index.search.stats.ShardSearchService;
 import org.elasticsearch.index.snapshots.IndexShardSnapshotAndRestoreService;
-import org.elasticsearch.index.suggest.stats.ShardSuggestService;
 import org.elasticsearch.index.termvectors.ShardTermVectorsService;
 import org.elasticsearch.index.translog.TranslogService;
 import org.elasticsearch.index.warmer.ShardIndexWarmerService;
@@ -103,7 +102,6 @@ public class IndexShardModule extends AbstractModule {
         bind(ShardPercolateService.class).asEagerSingleton();
         bind(ShardTermVectorsService.class).asEagerSingleton();
         bind(IndexShardSnapshotAndRestoreService.class).asEagerSingleton();
-        bind(ShardSuggestService.class).asEagerSingleton();
     }
 
 
diff --git a/core/src/main/java/org/elasticsearch/index/shard/ShadowIndexShard.java b/core/src/main/java/org/elasticsearch/index/shard/ShadowIndexShard.java
index 6e1af76f94c..76211df9627 100644
--- a/core/src/main/java/org/elasticsearch/index/shard/ShadowIndexShard.java
+++ b/core/src/main/java/org/elasticsearch/index/shard/ShadowIndexShard.java
@@ -48,7 +48,6 @@ import org.elasticsearch.index.search.stats.ShardSearchService;
 import org.elasticsearch.index.settings.IndexSettingsService;
 import org.elasticsearch.index.similarity.SimilarityService;
 import org.elasticsearch.index.store.Store;
-import org.elasticsearch.index.suggest.stats.ShardSuggestService;
 import org.elasticsearch.index.termvectors.ShardTermVectorsService;
 import org.elasticsearch.index.warmer.ShardIndexWarmerService;
 import org.elasticsearch.indices.IndicesLifecycle;
@@ -76,7 +75,7 @@ public final class ShadowIndexShard extends IndexShard {
                             ShardFieldData shardFieldData, PercolatorQueriesRegistry percolatorQueriesRegistry,
                             ShardPercolateService shardPercolateService, CodecService codecService,
                             ShardTermVectorsService termVectorsService, IndexFieldDataService indexFieldDataService,
-                            IndexService indexService, ShardSuggestService shardSuggestService, ShardQueryCache shardQueryCache,
+                            IndexService indexService, ShardQueryCache shardQueryCache,
                             ShardBitsetFilterCache shardBitsetFilterCache, @Nullable IndicesWarmer warmer,
                             SnapshotDeletionPolicy deletionPolicy, SimilarityService similarityService,
                             EngineFactory factory, ClusterService clusterService,
@@ -85,7 +84,7 @@ public final class ShadowIndexShard extends IndexShard {
                 threadPool, mapperService, queryParserService, indexCache, indexAliasesService,
                 indexingService, getService, searchService, shardWarmerService, shardFilterCache,
                 shardFieldData, percolatorQueriesRegistry, shardPercolateService, codecService,
-                termVectorsService, indexFieldDataService, indexService, shardSuggestService,
+                termVectorsService, indexFieldDataService, indexService,
                 shardQueryCache, shardBitsetFilterCache, warmer, deletionPolicy, similarityService,
                 factory, clusterService, nodeEnv, path, bigArrays);
     }
diff --git a/core/src/main/java/org/elasticsearch/index/suggest/stats/ShardSuggestService.java b/core/src/main/java/org/elasticsearch/index/suggest/stats/ShardSuggestMetric.java
similarity index 89%
rename from core/src/main/java/org/elasticsearch/index/suggest/stats/ShardSuggestService.java
rename to core/src/main/java/org/elasticsearch/index/suggest/stats/ShardSuggestMetric.java
index c12c5acef60..2ced4a8a058 100644
--- a/core/src/main/java/org/elasticsearch/index/suggest/stats/ShardSuggestService.java
+++ b/core/src/main/java/org/elasticsearch/index/suggest/stats/ShardSuggestMetric.java
@@ -32,16 +32,10 @@ import java.util.concurrent.TimeUnit;
 /**
  *
  */
-public class ShardSuggestService extends AbstractIndexShardComponent {
-
+public final class ShardSuggestMetric {
     private final MeanMetric suggestMetric = new MeanMetric();
     private final CounterMetric currentMetric = new CounterMetric();
 
-    @Inject
-    public ShardSuggestService(ShardId shardId, @IndexSettings Settings indexSettings) {
-        super(shardId, indexSettings);
-    }
-
     /**
      * Called before suggest
      */
@@ -64,5 +58,4 @@ public class ShardSuggestService extends AbstractIndexShardComponent {
     public SuggestStats stats() {
         return new SuggestStats(suggestMetric.count(), TimeUnit.NANOSECONDS.toMillis(suggestMetric.sum()), currentMetric.count());
     }
-
 }