clean up TranslogOpToEngineOpConverter

Author: ywelsch

core/src/main/java/org/elasticsearch/index/shard/IndexShard.java

@@ -258,7 +258,7 @@ public IndexShard(ShardRouting shardRouting, IndexSettings indexSettings, ShardP
 
         this.checkIndexOnStartup = indexSettings.getValue(IndexSettings.INDEX_CHECK_ON_STARTUP);
         this.translogConfig = new TranslogConfig(shardId, shardPath().resolveTranslog(), indexSettings, bigArrays);
-        this.translogOpToEngineOpConverter = new TranslogOpToEngineOpConverter(shardId, mapperService, logger);
+        this.translogOpToEngineOpConverter = new TranslogOpToEngineOpConverter(shardId, mapperService);
         // the query cache is a node-level thing, however we want the most popular filters
         // to be computed on a per-shard basis
         if (IndexModule.INDEX_QUERY_CACHE_EVERYTHING_SETTING.get(settings)) {

core/src/main/java/org/elasticsearch/index/shard/TranslogOpToEngineOpConverter.java

@@ -18,7 +18,6 @@
  */
 package org.elasticsearch.index.shard;
 
-import org.apache.logging.log4j.Logger;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.mapper.DocumentMapperForType;
@@ -33,13 +32,11 @@
  */
 public class TranslogOpToEngineOpConverter {
     private final MapperService mapperService;
-    private final Logger logger;
     private final ShardId shardId;
 
-    protected TranslogOpToEngineOpConverter(ShardId shardId, MapperService mapperService, Logger logger) {
+    protected TranslogOpToEngineOpConverter(ShardId shardId, MapperService mapperService) {
         this.shardId = shardId;
         this.mapperService = mapperService;
-        this.logger = logger;
     }
 
     protected DocumentMapperForType docMapper(String type) {
@@ -49,28 +46,25 @@ protected DocumentMapperForType docMapper(String type) {
     public Engine.Operation convertToEngineOp(Translog.Operation operation, Engine.Operation.Origin origin) {
         switch (operation.opType()) {
             case INDEX:
-                Translog.Index index = (Translog.Index) operation;
+                final Translog.Index index = (Translog.Index) operation;
                 // we set canHaveDuplicates to true all the time such that we de-optimze the translog case and ensure that all
                 // autoGeneratedID docs that are coming from the primary are updated correctly.
-                Engine.Index engineIndex = IndexShard.prepareIndex(docMapper(index.type()),
+                final Engine.Index engineIndex = IndexShard.prepareIndex(docMapper(index.type()),
                     source(shardId.getIndexName(), index.type(), index.id(), index.source(), XContentFactory.xContentType(index.source()))
                         .routing(index.routing()).parent(index.parent()), index.seqNo(), index.primaryTerm(),
                     index.version(), index.versionType().versionTypeForReplicationAndRecovery(), origin,
                     index.getAutoGeneratedIdTimestamp(), true);
                 return engineIndex;
             case DELETE:
-                Translog.Delete delete = (Translog.Delete) operation;
+                final Translog.Delete delete = (Translog.Delete) operation;
                 final Engine.Delete engineDelete = new Engine.Delete(delete.type(), delete.id(), delete.uid(), delete.seqNo(),
                     delete.primaryTerm(), delete.version(), delete.versionType().versionTypeForReplicationAndRecovery(),
                     origin, System.nanoTime());
                 return engineDelete;
             case NO_OP:
                 final Translog.NoOp noOp = (Translog.NoOp) operation;
-                final long seqNo = noOp.seqNo();
-                final long primaryTerm = noOp.primaryTerm();
-                final String reason = noOp.reason();
                 final Engine.NoOp engineNoOp =
-                    new Engine.NoOp(seqNo, primaryTerm, origin, System.nanoTime(), reason);
+                    new Engine.NoOp(noOp.seqNo(), noOp.primaryTerm(), origin, System.nanoTime(), noOp.reason());
                 return engineNoOp;
             default:
                 throw new IllegalStateException("No operation defined for [" + operation + "]");

core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java

@@ -431,7 +431,7 @@ public void onFailedEngine(String reason, @Nullable Exception e) {
             }
         };
         TranslogHandler handler = new TranslogHandler(xContentRegistry(), IndexSettingsModule.newIndexSettings(shardId.getIndexName(),
-            indexSettings.getSettings()), logger);
+            indexSettings.getSettings()));
         EngineConfig config = new EngineConfig(openMode, shardId, threadPool, indexSettings, null, store,
                 mergePolicy, iwc.getAnalyzer(), iwc.getSimilarity(), new CodecService(null, logger), listener,
                 IndexSearcher.getDefaultQueryCache(), IndexSearcher.getDefaultQueryCachingPolicy(), translogConfig,
@@ -2679,8 +2679,8 @@ public static class TranslogHandler extends TranslogOpToEngineOpConverter
         private final Map<String, Mapping> recoveredTypes = new HashMap<>();
         private final AtomicLong appliedOperations = new AtomicLong();
 
-        public TranslogHandler(NamedXContentRegistry xContentRegistry, IndexSettings indexSettings, Logger logger) {
-            super(new ShardId("test", "_na_", 0), null, logger);
+        public TranslogHandler(NamedXContentRegistry xContentRegistry, IndexSettings indexSettings) {
+            super(new ShardId("test", "_na_", 0), null);
             NamedAnalyzer defaultAnalyzer = new NamedAnalyzer("default", AnalyzerScope.INDEX, new StandardAnalyzer());
             IndexAnalyzers indexAnalyzers = new IndexAnalyzers(indexSettings, defaultAnalyzer, defaultAnalyzer, defaultAnalyzer, Collections.emptyMap(), Collections.emptyMap());
             SimilarityService similarityService = new SimilarityService(indexSettings, Collections.emptyMap());