From 2ac191ae8efe873e2b9a2bfad421debf3c9bb2e7 Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Thu, 9 Jan 2014 15:57:08 +0100 Subject: [PATCH] Rename RobinEngine and friends to InternalEngine Closes #4633 --- docs/reference/indices/refresh.asciidoc | 2 +- .../admin/indices/refresh/RefreshRequest.java | 2 +- .../refresh/RefreshRequestBuilder.java | 2 +- .../SnapshotDeletionPolicy.java | 2 +- .../index/engine/IndexEngineModule.java | 8 +-- .../InternalEngine.java} | 70 +++++++++---------- .../InternalEngineModule.java} | 6 +- .../InternalIndexEngine.java} | 8 +-- .../InternalIndexEngineModule.java} | 6 +- .../settings/IndexDynamicSettingsModule.java | 12 ++-- .../index/snapshots/IndexShardRepository.java | 2 +- .../search/internal/ContextIndexSearcher.java | 2 +- .../HistogramAggregationSearchBenchmark.java | 2 +- .../ChildSearchAndIndexingBenchmark.java | 2 +- .../search/child/ChildSearchBenchmark.java | 2 +- .../ChildSearchShortCircuitBenchmark.java | 2 +- .../search/nested/NestedSearchBenchMark.java | 2 +- .../benchmark/stress/NodesStressTest.java | 2 +- .../InternalEngineIntegrationTest.java} | 22 +++--- .../InternalEngineTests.java} | 14 ++-- .../RandomExceptionCircuitBreakerTests.java | 4 +- .../indices/settings/UpdateSettingsTests.java | 2 +- .../SearchWithRandomExceptionsTests.java | 8 +-- .../test/ElasticsearchTestCase.java | 10 +-- .../test/engine/MockEngineModule.java | 2 +- ...binEngine.java => MockInternalEngine.java} | 16 ++--- 26 files changed, 106 insertions(+), 106 deletions(-) rename src/main/java/org/elasticsearch/index/engine/{robin/RobinEngine.java => internal/InternalEngine.java} (96%) rename src/main/java/org/elasticsearch/index/engine/{robin/RobinEngineModule.java => internal/InternalEngineModule.java} (84%) rename src/main/java/org/elasticsearch/index/engine/{robin/RobinIndexEngine.java => internal/InternalIndexEngine.java} (83%) rename src/main/java/org/elasticsearch/index/engine/{robin/RobinIndexEngineModule.java => internal/InternalIndexEngineModule.java} (83%) rename src/test/java/org/elasticsearch/index/engine/{robin/RobinEngineIntegrationTest.java => internal/InternalEngineIntegrationTest.java} (92%) rename src/test/java/org/elasticsearch/index/engine/{robin/RobinEngineTests.java => internal/InternalEngineTests.java} (98%) rename src/test/java/org/elasticsearch/test/engine/{MockRobinEngine.java => MockInternalEngine.java} (91%) diff --git a/docs/reference/indices/refresh.asciidoc b/docs/reference/indices/refresh.asciidoc index 1b0fb5daf48d3..bbc1f20f40976 100644 --- a/docs/reference/indices/refresh.asciidoc +++ b/docs/reference/indices/refresh.asciidoc @@ -4,7 +4,7 @@ The refresh API allows to explicitly refresh one or more index, making all operations performed since the last refresh available for search. The (near) real-time capabilities depend on the index engine used. For -example, the robin one requires refresh to be called, but by default a +example, the internal one requires refresh to be called, but by default a refresh is scheduled periodically. [source,js] diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java index 50b1be9cbe7c8..58532e05fa578 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java @@ -27,7 +27,7 @@ /** * A refresh request making all operations performed since the last refresh available for search. The (near) real-time - * capabilities depends on the index engine used. For example, the robin one requires refresh to be called, but by + * capabilities depends on the index engine used. For example, the internal one requires refresh to be called, but by * default a refresh is scheduled periodically. * * @see org.elasticsearch.client.Requests#refreshRequest(String...) diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java index f9806553d18bd..7bf15c4df59db 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java @@ -26,7 +26,7 @@ /** * A refresh request making all operations performed since the last refresh available for search. The (near) real-time - * capabilities depends on the index engine used. For example, the robin one requires refresh to be called, but by + * capabilities depends on the index engine used. For example, the internal one requires refresh to be called, but by * default a refresh is scheduled periodically. */ public class RefreshRequestBuilder extends BroadcastOperationRequestBuilder { diff --git a/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicy.java b/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicy.java index 682fd25c9d892..5a5d95edb7dd4 100644 --- a/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicy.java +++ b/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicy.java @@ -136,7 +136,7 @@ public SnapshotIndexCommit snapshot() throws IOException { @Override public IndexDeletionPolicy clone() { // Lucene IW makes a clone internally but since we hold on to this instance - // the clone will just be the identity. See RobinEngine recovery why we need this. + // the clone will just be the identity. See InternalEngine recovery why we need this. return this; } diff --git a/src/main/java/org/elasticsearch/index/engine/IndexEngineModule.java b/src/main/java/org/elasticsearch/index/engine/IndexEngineModule.java index 281a922c2ee6c..3ceaf8e780b65 100644 --- a/src/main/java/org/elasticsearch/index/engine/IndexEngineModule.java +++ b/src/main/java/org/elasticsearch/index/engine/IndexEngineModule.java @@ -24,8 +24,8 @@ import org.elasticsearch.common.inject.Module; import org.elasticsearch.common.inject.SpawnModules; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.index.engine.robin.RobinEngineModule; -import org.elasticsearch.index.engine.robin.RobinIndexEngineModule; +import org.elasticsearch.index.engine.internal.InternalEngineModule; +import org.elasticsearch.index.engine.internal.InternalIndexEngineModule; import static org.elasticsearch.common.inject.Modules.createModule; @@ -37,8 +37,8 @@ public class IndexEngineModule extends AbstractModule implements SpawnModules { public static final class EngineSettings { public static final String ENGINE_TYPE = "index.engine.type"; public static final String INDEX_ENGINE_TYPE = "index.index_engine.type"; - public static final Class DEFAULT_INDEX_ENGINE = RobinIndexEngineModule.class; - public static final Class DEFAULT_ENGINE = RobinEngineModule.class; + public static final Class DEFAULT_INDEX_ENGINE = InternalIndexEngineModule.class; + public static final Class DEFAULT_ENGINE = InternalEngineModule.class; } private final Settings settings; diff --git a/src/main/java/org/elasticsearch/index/engine/robin/RobinEngine.java b/src/main/java/org/elasticsearch/index/engine/internal/InternalEngine.java similarity index 96% rename from src/main/java/org/elasticsearch/index/engine/robin/RobinEngine.java rename to src/main/java/org/elasticsearch/index/engine/internal/InternalEngine.java index 5c4edbbfb15b3..6dcbc4f2c0903 100644 --- a/src/main/java/org/elasticsearch/index/engine/robin/RobinEngine.java +++ b/src/main/java/org/elasticsearch/index/engine/internal/InternalEngine.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.engine.robin; +package org.elasticsearch.index.engine.internal; import com.google.common.collect.Lists; import org.apache.lucene.index.*; @@ -89,7 +89,7 @@ /** * */ -public class RobinEngine extends AbstractIndexShardComponent implements Engine { +public class InternalEngine extends AbstractIndexShardComponent implements Engine { private volatile ByteSizeValue indexingBufferSize; private volatile int indexConcurrency; @@ -119,7 +119,7 @@ public class RobinEngine extends AbstractIndexShardComponent implements Engine { private volatile IndexWriter indexWriter; - private final SearcherFactory searcherFactory = new RobinSearchFactory(); + private final SearcherFactory searcherFactory = new SearchFactory(); private volatile SearcherManager searcherManager; private volatile boolean closed = false; @@ -159,11 +159,11 @@ public class RobinEngine extends AbstractIndexShardComponent implements Engine { private SegmentInfos lastCommittedSegmentInfos; @Inject - public RobinEngine(ShardId shardId, @IndexSettings Settings indexSettings, ThreadPool threadPool, - IndexSettingsService indexSettingsService, ShardIndexingService indexingService, @Nullable IndicesWarmer warmer, - Store store, SnapshotDeletionPolicy deletionPolicy, Translog translog, - MergePolicyProvider mergePolicyProvider, MergeSchedulerProvider mergeScheduler, - AnalysisService analysisService, SimilarityService similarityService, CodecService codecService) throws EngineException { + public InternalEngine(ShardId shardId, @IndexSettings Settings indexSettings, ThreadPool threadPool, + IndexSettingsService indexSettingsService, ShardIndexingService indexingService, @Nullable IndicesWarmer warmer, + Store store, SnapshotDeletionPolicy deletionPolicy, Translog translog, + MergePolicyProvider mergePolicyProvider, MergeSchedulerProvider mergeScheduler, + AnalysisService analysisService, SimilarityService similarityService, CodecService codecService) throws EngineException { super(shardId, indexSettings); Preconditions.checkNotNull(store, "Store must be provided to the engine"); Preconditions.checkNotNull(deletionPolicy, "Snapshot deletion policy must be provided to the engine"); @@ -694,7 +694,7 @@ public final Searcher acquireSearcher(String source) throws EngineException { } protected Searcher newSearcher(String source, IndexSearcher searcher, SearcherManager manager) { - return new RobinSearcher(source, searcher, manager); + return new EngineSearcher(source, searcher, manager); } @Override @@ -1409,45 +1409,45 @@ class ApplySettings implements IndexSettingsService.Listener { @Override public void onRefreshSettings(Settings settings) { - long gcDeletesInMillis = settings.getAsTime(INDEX_GC_DELETES, TimeValue.timeValueMillis(RobinEngine.this.gcDeletesInMillis)).millis(); - if (gcDeletesInMillis != RobinEngine.this.gcDeletesInMillis) { - logger.info("updating index.gc_deletes from [{}] to [{}]", TimeValue.timeValueMillis(RobinEngine.this.gcDeletesInMillis), TimeValue.timeValueMillis(gcDeletesInMillis)); - RobinEngine.this.gcDeletesInMillis = gcDeletesInMillis; + long gcDeletesInMillis = settings.getAsTime(INDEX_GC_DELETES, TimeValue.timeValueMillis(InternalEngine.this.gcDeletesInMillis)).millis(); + if (gcDeletesInMillis != InternalEngine.this.gcDeletesInMillis) { + logger.info("updating index.gc_deletes from [{}] to [{}]", TimeValue.timeValueMillis(InternalEngine.this.gcDeletesInMillis), TimeValue.timeValueMillis(gcDeletesInMillis)); + InternalEngine.this.gcDeletesInMillis = gcDeletesInMillis; } - final boolean compoundOnFlush = settings.getAsBoolean(INDEX_COMPOUND_ON_FLUSH, RobinEngine.this.compoundOnFlush); - if (compoundOnFlush != RobinEngine.this.compoundOnFlush) { - logger.info("updating {} from [{}] to [{}]", RobinEngine.INDEX_COMPOUND_ON_FLUSH, RobinEngine.this.compoundOnFlush, compoundOnFlush); - RobinEngine.this.compoundOnFlush = compoundOnFlush; + final boolean compoundOnFlush = settings.getAsBoolean(INDEX_COMPOUND_ON_FLUSH, InternalEngine.this.compoundOnFlush); + if (compoundOnFlush != InternalEngine.this.compoundOnFlush) { + logger.info("updating {} from [{}] to [{}]", InternalEngine.INDEX_COMPOUND_ON_FLUSH, InternalEngine.this.compoundOnFlush, compoundOnFlush); + InternalEngine.this.compoundOnFlush = compoundOnFlush; indexWriter.getConfig().setUseCompoundFile(compoundOnFlush); } - int indexConcurrency = settings.getAsInt(INDEX_INDEX_CONCURRENCY, RobinEngine.this.indexConcurrency); - boolean failOnMergeFailure = settings.getAsBoolean(INDEX_FAIL_ON_MERGE_FAILURE, RobinEngine.this.failOnMergeFailure); - String codecName = settings.get(INDEX_CODEC, RobinEngine.this.codecName); + int indexConcurrency = settings.getAsInt(INDEX_INDEX_CONCURRENCY, InternalEngine.this.indexConcurrency); + boolean failOnMergeFailure = settings.getAsBoolean(INDEX_FAIL_ON_MERGE_FAILURE, InternalEngine.this.failOnMergeFailure); + String codecName = settings.get(INDEX_CODEC, InternalEngine.this.codecName); final boolean codecBloomLoad = settings.getAsBoolean(CodecService.INDEX_CODEC_BLOOM_LOAD, codecService.isLoadBloomFilter()); boolean requiresFlushing = false; - if (indexConcurrency != RobinEngine.this.indexConcurrency || - !codecName.equals(RobinEngine.this.codecName) || - failOnMergeFailure != RobinEngine.this.failOnMergeFailure || + if (indexConcurrency != InternalEngine.this.indexConcurrency || + !codecName.equals(InternalEngine.this.codecName) || + failOnMergeFailure != InternalEngine.this.failOnMergeFailure || codecBloomLoad != codecService.isLoadBloomFilter()) { rwl.readLock().lock(); try { - if (indexConcurrency != RobinEngine.this.indexConcurrency) { - logger.info("updating index.index_concurrency from [{}] to [{}]", RobinEngine.this.indexConcurrency, indexConcurrency); - RobinEngine.this.indexConcurrency = indexConcurrency; + if (indexConcurrency != InternalEngine.this.indexConcurrency) { + logger.info("updating index.index_concurrency from [{}] to [{}]", InternalEngine.this.indexConcurrency, indexConcurrency); + InternalEngine.this.indexConcurrency = indexConcurrency; // we have to flush in this case, since it only applies on a new index writer requiresFlushing = true; } - if (!codecName.equals(RobinEngine.this.codecName)) { - logger.info("updating index.codec from [{}] to [{}]", RobinEngine.this.codecName, codecName); - RobinEngine.this.codecName = codecName; + if (!codecName.equals(InternalEngine.this.codecName)) { + logger.info("updating index.codec from [{}] to [{}]", InternalEngine.this.codecName, codecName); + InternalEngine.this.codecName = codecName; // we want to flush in this case, so the new codec will be reflected right away... requiresFlushing = true; } - if (failOnMergeFailure != RobinEngine.this.failOnMergeFailure) { - logger.info("updating {} from [{}] to [{}]", RobinEngine.INDEX_FAIL_ON_MERGE_FAILURE, RobinEngine.this.failOnMergeFailure, failOnMergeFailure); - RobinEngine.this.failOnMergeFailure = failOnMergeFailure; + if (failOnMergeFailure != InternalEngine.this.failOnMergeFailure) { + logger.info("updating {} from [{}] to [{}]", InternalEngine.INDEX_FAIL_ON_MERGE_FAILURE, InternalEngine.this.failOnMergeFailure, failOnMergeFailure); + InternalEngine.this.failOnMergeFailure = failOnMergeFailure; } if (codecBloomLoad != codecService.isLoadBloomFilter()) { logger.info("updating {} from [{}] to [{}]", CodecService.INDEX_CODEC_BLOOM_LOAD, codecService.isLoadBloomFilter(), codecBloomLoad); @@ -1469,13 +1469,13 @@ private SearcherManager buildSearchManager(IndexWriter indexWriter) throws IOExc return new SearcherManager(indexWriter, true, searcherFactory); } - static class RobinSearcher implements Searcher { + static class EngineSearcher implements Searcher { private final String source; private final IndexSearcher searcher; private final SearcherManager manager; - private RobinSearcher(String source, IndexSearcher searcher, SearcherManager manager) { + private EngineSearcher(String source, IndexSearcher searcher, SearcherManager manager) { this.source = source; this.searcher = searcher; this.manager = manager; @@ -1542,7 +1542,7 @@ public Translog.Location translogLocation() { } } - class RobinSearchFactory extends SearcherFactory { + class SearchFactory extends SearcherFactory { @Override public IndexSearcher newSearcher(IndexReader reader) throws IOException { diff --git a/src/main/java/org/elasticsearch/index/engine/robin/RobinEngineModule.java b/src/main/java/org/elasticsearch/index/engine/internal/InternalEngineModule.java similarity index 84% rename from src/main/java/org/elasticsearch/index/engine/robin/RobinEngineModule.java rename to src/main/java/org/elasticsearch/index/engine/internal/InternalEngineModule.java index 4f8bf1ae0691c..667e13c4e8d17 100644 --- a/src/main/java/org/elasticsearch/index/engine/robin/RobinEngineModule.java +++ b/src/main/java/org/elasticsearch/index/engine/internal/InternalEngineModule.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.engine.robin; +package org.elasticsearch.index.engine.internal; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.index.engine.Engine; @@ -25,10 +25,10 @@ /** * */ -public class RobinEngineModule extends AbstractModule { +public class InternalEngineModule extends AbstractModule { @Override protected void configure() { - bind(Engine.class).to(RobinEngine.class).asEagerSingleton(); + bind(Engine.class).to(InternalEngine.class).asEagerSingleton(); } } diff --git a/src/main/java/org/elasticsearch/index/engine/robin/RobinIndexEngine.java b/src/main/java/org/elasticsearch/index/engine/internal/InternalIndexEngine.java similarity index 83% rename from src/main/java/org/elasticsearch/index/engine/robin/RobinIndexEngine.java rename to src/main/java/org/elasticsearch/index/engine/internal/InternalIndexEngine.java index a3b0631616771..5a82e176f128e 100644 --- a/src/main/java/org/elasticsearch/index/engine/robin/RobinIndexEngine.java +++ b/src/main/java/org/elasticsearch/index/engine/internal/InternalIndexEngine.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.engine.robin; +package org.elasticsearch.index.engine.internal; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; @@ -31,14 +31,14 @@ /** * */ -public class RobinIndexEngine extends AbstractIndexComponent implements IndexEngine { +public class InternalIndexEngine extends AbstractIndexComponent implements IndexEngine { - public RobinIndexEngine(Index index) { + public InternalIndexEngine(Index index) { this(index, EMPTY_SETTINGS); } @Inject - public RobinIndexEngine(Index index, @IndexSettings Settings indexSettings) { + public InternalIndexEngine(Index index, @IndexSettings Settings indexSettings) { super(index, indexSettings); } diff --git a/src/main/java/org/elasticsearch/index/engine/robin/RobinIndexEngineModule.java b/src/main/java/org/elasticsearch/index/engine/internal/InternalIndexEngineModule.java similarity index 83% rename from src/main/java/org/elasticsearch/index/engine/robin/RobinIndexEngineModule.java rename to src/main/java/org/elasticsearch/index/engine/internal/InternalIndexEngineModule.java index 15470633ecc8e..d3f596d45fefc 100644 --- a/src/main/java/org/elasticsearch/index/engine/robin/RobinIndexEngineModule.java +++ b/src/main/java/org/elasticsearch/index/engine/internal/InternalIndexEngineModule.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.engine.robin; +package org.elasticsearch.index.engine.internal; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.index.engine.IndexEngine; @@ -25,10 +25,10 @@ /** * */ -public class RobinIndexEngineModule extends AbstractModule { +public class InternalIndexEngineModule extends AbstractModule { @Override protected void configure() { - bind(IndexEngine.class).to(RobinIndexEngine.class).asEagerSingleton(); + bind(IndexEngine.class).to(InternalIndexEngine.class).asEagerSingleton(); } } diff --git a/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettingsModule.java b/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettingsModule.java index 340ecf92c744f..39248adbcc8f7 100644 --- a/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettingsModule.java +++ b/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettingsModule.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.gateway.local.LocalGatewayAllocator; import org.elasticsearch.index.codec.CodecService; -import org.elasticsearch.index.engine.robin.RobinEngine; +import org.elasticsearch.index.engine.internal.InternalEngine; import org.elasticsearch.index.gateway.IndexShardGatewayService; import org.elasticsearch.index.indexing.slowlog.ShardSlowLogIndexingService; import org.elasticsearch.index.merge.policy.LogByteSizeMergePolicyProvider; @@ -80,12 +80,12 @@ public IndexDynamicSettingsModule() { indexDynamicSettings.addDynamicSetting(LogDocMergePolicyProvider.INDEX_MERGE_POLICY_MAX_MERGE_DOCS, Validator.POSITIVE_INTEGER); indexDynamicSettings.addDynamicSetting(LogDocMergePolicyProvider.INDEX_MERGE_POLICY_MERGE_FACTOR, Validator.INTEGER_GTE_2); indexDynamicSettings.addDynamicSetting(LogDocMergePolicyProvider.INDEX_COMPOUND_FORMAT); - indexDynamicSettings.addDynamicSetting(RobinEngine.INDEX_INDEX_CONCURRENCY, Validator.NON_NEGATIVE_INTEGER); - indexDynamicSettings.addDynamicSetting(RobinEngine.INDEX_COMPOUND_ON_FLUSH, Validator.BOOLEAN); + indexDynamicSettings.addDynamicSetting(InternalEngine.INDEX_INDEX_CONCURRENCY, Validator.NON_NEGATIVE_INTEGER); + indexDynamicSettings.addDynamicSetting(InternalEngine.INDEX_COMPOUND_ON_FLUSH, Validator.BOOLEAN); indexDynamicSettings.addDynamicSetting(CodecService.INDEX_CODEC_BLOOM_LOAD, Validator.BOOLEAN); - indexDynamicSettings.addDynamicSetting(RobinEngine.INDEX_GC_DELETES, Validator.TIME); - indexDynamicSettings.addDynamicSetting(RobinEngine.INDEX_CODEC); - indexDynamicSettings.addDynamicSetting(RobinEngine.INDEX_FAIL_ON_MERGE_FAILURE); + indexDynamicSettings.addDynamicSetting(InternalEngine.INDEX_GC_DELETES, Validator.TIME); + indexDynamicSettings.addDynamicSetting(InternalEngine.INDEX_CODEC); + indexDynamicSettings.addDynamicSetting(InternalEngine.INDEX_FAIL_ON_MERGE_FAILURE); indexDynamicSettings.addDynamicSetting(ShardSlowLogIndexingService.INDEX_INDEXING_SLOWLOG_THRESHOLD_INDEX_WARN, Validator.TIME); indexDynamicSettings.addDynamicSetting(ShardSlowLogIndexingService.INDEX_INDEXING_SLOWLOG_THRESHOLD_INDEX_INFO, Validator.TIME); indexDynamicSettings.addDynamicSetting(ShardSlowLogIndexingService.INDEX_INDEXING_SLOWLOG_THRESHOLD_INDEX_DEBUG, Validator.TIME); diff --git a/src/main/java/org/elasticsearch/index/snapshots/IndexShardRepository.java b/src/main/java/org/elasticsearch/index/snapshots/IndexShardRepository.java index c4b729e23d8b1..760a39753e332 100644 --- a/src/main/java/org/elasticsearch/index/snapshots/IndexShardRepository.java +++ b/src/main/java/org/elasticsearch/index/snapshots/IndexShardRepository.java @@ -35,7 +35,7 @@ public interface IndexShardRepository { /** * Creates a snapshot of the shard based on the index commit point. *

- * The index commit point can be obtained by using {@link org.elasticsearch.index.engine.robin.RobinEngine#snapshotIndex()} method. + * The index commit point can be obtained by using {@link org.elasticsearch.index.engine.internal.InternalEngine#snapshotIndex()} method. * IndexShardRepository implementations shouldn't release the snapshot index commit point. It is done by the method caller. *

* As snapshot process progresses, implementation of this method should update {@link IndexShardSnapshotStatus} object and check diff --git a/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java b/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java index d89cac6a11918..231d6d5997be7 100644 --- a/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java +++ b/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java @@ -44,7 +44,7 @@ public static enum Stage { } /** The wrapped {@link IndexSearcher}. The reason why we sometimes prefer delegating to this searcher instead of super is that - * this instance may have more assertions, for example if it comes from MockRobinEngine which wraps the IndexSearcher into an + * this instance may have more assertions, for example if it comes from MockInternalEngine which wraps the IndexSearcher into an * AssertingIndexSearcher. */ private final IndexSearcher in; diff --git a/src/test/java/org/elasticsearch/benchmark/search/aggregations/HistogramAggregationSearchBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/aggregations/HistogramAggregationSearchBenchmark.java index d09e188445805..66e1a4faaf214 100644 --- a/src/test/java/org/elasticsearch/benchmark/search/aggregations/HistogramAggregationSearchBenchmark.java +++ b/src/test/java/org/elasticsearch/benchmark/search/aggregations/HistogramAggregationSearchBenchmark.java @@ -56,7 +56,7 @@ public class HistogramAggregationSearchBenchmark { public static void main(String[] args) throws Exception { Settings settings = settingsBuilder() - .put("index.engine.robin.refreshInterval", "-1") + .put("refresh_interval", "-1") .put("gateway.type", "local") .put(SETTING_NUMBER_OF_SHARDS, 2) .put(SETTING_NUMBER_OF_REPLICAS, 1) diff --git a/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchAndIndexingBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchAndIndexingBenchmark.java index cc8b96ae6af71..ed75ddb020bbd 100644 --- a/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchAndIndexingBenchmark.java +++ b/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchAndIndexingBenchmark.java @@ -59,7 +59,7 @@ public class ChildSearchAndIndexingBenchmark { public static void main(String[] args) throws Exception { Settings settings = settingsBuilder() - .put("index.engine.robin.refreshInterval", "-1") + .put("refresh_interval", "-1") .put("gateway.type", "local") .put(SETTING_NUMBER_OF_SHARDS, 1) .put(SETTING_NUMBER_OF_REPLICAS, 0) diff --git a/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java index c1309b16f3bcd..b7432bf2f628d 100644 --- a/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java +++ b/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java @@ -51,7 +51,7 @@ public class ChildSearchBenchmark { public static void main(String[] args) throws Exception { Settings settings = settingsBuilder() - .put("index.engine.robin.refreshInterval", "-1") + .put("index.refresh_interval", "-1") .put("gateway.type", "local") .put(SETTING_NUMBER_OF_SHARDS, 1) .put(SETTING_NUMBER_OF_REPLICAS, 0) diff --git a/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchShortCircuitBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchShortCircuitBenchmark.java index 106f7ed6c33e2..398c9a934963e 100644 --- a/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchShortCircuitBenchmark.java +++ b/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchShortCircuitBenchmark.java @@ -51,7 +51,7 @@ public class ChildSearchShortCircuitBenchmark { public static void main(String[] args) throws Exception { Settings settings = settingsBuilder() - .put("index.engine.robin.refreshInterval", "-1") + .put("index.refresh_interval", "-1") .put("gateway.type", "local") .put(SETTING_NUMBER_OF_SHARDS, 1) .put(SETTING_NUMBER_OF_REPLICAS, 0) diff --git a/src/test/java/org/elasticsearch/benchmark/search/nested/NestedSearchBenchMark.java b/src/test/java/org/elasticsearch/benchmark/search/nested/NestedSearchBenchMark.java index d505e1a771add..d084261dc8a76 100644 --- a/src/test/java/org/elasticsearch/benchmark/search/nested/NestedSearchBenchMark.java +++ b/src/test/java/org/elasticsearch/benchmark/search/nested/NestedSearchBenchMark.java @@ -47,7 +47,7 @@ public class NestedSearchBenchMark { public static void main(String[] args) throws Exception { Settings settings = settingsBuilder() - .put("index.engine.robin.refreshInterval", "-1") + .put("index.refresh_interval", "-1") .put("gateway.type", "local") .put(SETTING_NUMBER_OF_SHARDS, 1) .put(SETTING_NUMBER_OF_REPLICAS, 0) diff --git a/src/test/java/org/elasticsearch/benchmark/stress/NodesStressTest.java b/src/test/java/org/elasticsearch/benchmark/stress/NodesStressTest.java index 7bf2c5ce3e97c..fab0166e4b883 100644 --- a/src/test/java/org/elasticsearch/benchmark/stress/NodesStressTest.java +++ b/src/test/java/org/elasticsearch/benchmark/stress/NodesStressTest.java @@ -117,7 +117,7 @@ public NodesStressTest sleepBeforeClose(TimeValue time) { public NodesStressTest build(Settings settings) throws Exception { settings = settingsBuilder() -// .put("index.engine.robin.refreshInterval", 1, TimeUnit.SECONDS) +// .put("index.refresh_interval", 1, TimeUnit.SECONDS) .put(SETTING_NUMBER_OF_SHARDS, 5) .put(SETTING_NUMBER_OF_REPLICAS, 1) .put(settings) diff --git a/src/test/java/org/elasticsearch/index/engine/robin/RobinEngineIntegrationTest.java b/src/test/java/org/elasticsearch/index/engine/internal/InternalEngineIntegrationTest.java similarity index 92% rename from src/test/java/org/elasticsearch/index/engine/robin/RobinEngineIntegrationTest.java rename to src/test/java/org/elasticsearch/index/engine/internal/InternalEngineIntegrationTest.java index 6222da3b1cc63..a50b580b8a3d9 100644 --- a/src/test/java/org/elasticsearch/index/engine/robin/RobinEngineIntegrationTest.java +++ b/src/test/java/org/elasticsearch/index/engine/internal/InternalEngineIntegrationTest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.engine.robin; +package org.elasticsearch.index.engine.internal; import com.google.common.base.Predicate; import org.apache.lucene.util.LuceneTestCase.Slow; @@ -45,14 +45,14 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -public class RobinEngineIntegrationTest extends ElasticsearchIntegrationTest { +public class InternalEngineIntegrationTest extends ElasticsearchIntegrationTest { @Test @Slow public void testSettingLoadBloomFilterDefaultTrue() throws Exception { - Field allowRamBytesUsed = RobinEngine.class.getDeclaredField("allowRamBytesUsed"); + Field allowRamBytesUsed = InternalEngine.class.getDeclaredField("allowRamBytesUsed"); allowRamBytesUsed.setAccessible(true); - allowRamBytesUsed.set(RobinEngine.class, Boolean.TRUE); + allowRamBytesUsed.set(InternalEngine.class, Boolean.TRUE); try { client().admin().indices().prepareCreate("test").setSettings(ImmutableSettings.builder().put("number_of_replicas", 0).put("number_of_shards", 1)).get(); @@ -87,16 +87,16 @@ public boolean apply(Object o) { } }); } finally { - allowRamBytesUsed.set(RobinEngine.class, Boolean.FALSE); + allowRamBytesUsed.set(InternalEngine.class, Boolean.FALSE); } } @Test @Slow public void testSettingLoadBloomFilterDefaultFalse() throws Exception { - Field allowRamBytesUsed = RobinEngine.class.getDeclaredField("allowRamBytesUsed"); + Field allowRamBytesUsed = InternalEngine.class.getDeclaredField("allowRamBytesUsed"); allowRamBytesUsed.setAccessible(true); - allowRamBytesUsed.set(RobinEngine.class, Boolean.TRUE); + allowRamBytesUsed.set(InternalEngine.class, Boolean.TRUE); try { client().admin().indices().prepareCreate("test").setSettings(ImmutableSettings.builder().put("number_of_replicas", 0).put("number_of_shards", 1).put(CodecService.INDEX_CODEC_BLOOM_LOAD, false)).get(); client().prepareIndex("test", "foo").setSource("field", "foo").get(); @@ -131,7 +131,7 @@ public boolean apply(Object o) { } }); } finally { - allowRamBytesUsed.set(RobinEngine.class, Boolean.FALSE); + allowRamBytesUsed.set(InternalEngine.class, Boolean.FALSE); } } @@ -143,13 +143,13 @@ public void testSetIndexCompoundOnFlush() { refresh(); assertTotalCompoundSegments(1, 1, "test"); client().admin().indices().prepareUpdateSettings("test") - .setSettings(ImmutableSettings.builder().put(RobinEngine.INDEX_COMPOUND_ON_FLUSH, false)).get(); + .setSettings(ImmutableSettings.builder().put(InternalEngine.INDEX_COMPOUND_ON_FLUSH, false)).get(); client().prepareIndex("test", "foo").setSource("field", "foo").get(); refresh(); assertTotalCompoundSegments(1, 2, "test"); client().admin().indices().prepareUpdateSettings("test") - .setSettings(ImmutableSettings.builder().put(RobinEngine.INDEX_COMPOUND_ON_FLUSH, true)).get(); + .setSettings(ImmutableSettings.builder().put(InternalEngine.INDEX_COMPOUND_ON_FLUSH, true)).get(); client().prepareIndex("test", "foo").setSource("field", "foo").get(); refresh(); assertTotalCompoundSegments(2, 3, "test"); @@ -186,7 +186,7 @@ public void test4093() { .put("index.number_of_shards", "1") .put("index.number_of_replicas", "0") .put("gateway.type", "none") - .put(RobinEngine.INDEX_COMPOUND_ON_FLUSH, randomBoolean()) + .put(InternalEngine.INDEX_COMPOUND_ON_FLUSH, randomBoolean()) .put("index.warmer.enabled", false) .build()).get()); NodesInfoResponse nodeInfos = client().admin().cluster().prepareNodesInfo().setJvm(true).get(); diff --git a/src/test/java/org/elasticsearch/index/engine/robin/RobinEngineTests.java b/src/test/java/org/elasticsearch/index/engine/internal/InternalEngineTests.java similarity index 98% rename from src/test/java/org/elasticsearch/index/engine/robin/RobinEngineTests.java rename to src/test/java/org/elasticsearch/index/engine/internal/InternalEngineTests.java index 0d223410924a0..10878affd4866 100644 --- a/src/test/java/org/elasticsearch/index/engine/robin/RobinEngineTests.java +++ b/src/test/java/org/elasticsearch/index/engine/internal/InternalEngineTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.engine.robin; +package org.elasticsearch.index.engine.internal; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Field; @@ -84,7 +84,7 @@ /** * */ -public class RobinEngineTests extends ElasticsearchTestCase { +public class InternalEngineTests extends ElasticsearchTestCase { protected final ShardId shardId = new ShardId(new Index("index"), 1); @@ -107,7 +107,7 @@ public class RobinEngineTests extends ElasticsearchTestCase { public void setUp() throws Exception { super.setUp(); defaultSettings = ImmutableSettings.builder() - .put(RobinEngine.INDEX_COMPOUND_ON_FLUSH, getRandom().nextBoolean()) + .put(InternalEngine.INDEX_COMPOUND_ON_FLUSH, getRandom().nextBoolean()) .build(); // TODO randomize more settings threadPool = new ThreadPool(); store = createStore(); @@ -194,7 +194,7 @@ protected Engine createEngine(IndexSettingsService indexSettingsService, Store s } protected Engine createEngine(IndexSettingsService indexSettingsService, Store store, Translog translog, MergeSchedulerProvider mergeSchedulerProvider) { - return new RobinEngine(shardId, defaultSettings, threadPool, indexSettingsService, new ShardIndexingService(shardId, EMPTY_SETTINGS, new ShardSlowLogIndexingService(shardId, EMPTY_SETTINGS, indexSettingsService)), null, store, createSnapshotDeletionPolicy(), translog, createMergePolicy(), mergeSchedulerProvider, + return new InternalEngine(shardId, defaultSettings, threadPool, indexSettingsService, new ShardIndexingService(shardId, EMPTY_SETTINGS, new ShardSlowLogIndexingService(shardId, EMPTY_SETTINGS, indexSettingsService)), null, store, createSnapshotDeletionPolicy(), translog, createMergePolicy(), mergeSchedulerProvider, new AnalysisService(shardId.index()), new SimilarityService(shardId.index()), new CodecService(shardId.index())); } @@ -207,7 +207,7 @@ public void testSegments() throws Exception { List segments = engine.segments(); assertThat(segments.isEmpty(), equalTo(true)); assertThat(engine.segmentsStats().getCount(), equalTo(0l)); - final boolean defaultCompound = defaultSettings.getAsBoolean(RobinEngine.INDEX_COMPOUND_ON_FLUSH, true); + final boolean defaultCompound = defaultSettings.getAsBoolean(InternalEngine.INDEX_COMPOUND_ON_FLUSH, true); // create a doc and refresh ParsedDocument doc = testParsedDocument("1", "1", "test", null, -1, -1, testDocumentWithTextField(), Lucene.STANDARD_ANALYZER, B_1, false); @@ -237,7 +237,7 @@ public void testSegments() throws Exception { assertThat(segments.get(0).getDeletedDocs(), equalTo(0)); assertThat(segments.get(0).isCompound(), equalTo(defaultCompound)); - engineSettingsService.refreshSettings(ImmutableSettings.builder().put(RobinEngine.INDEX_COMPOUND_ON_FLUSH, false).build()); + engineSettingsService.refreshSettings(ImmutableSettings.builder().put(InternalEngine.INDEX_COMPOUND_ON_FLUSH, false).build()); ParsedDocument doc3 = testParsedDocument("3", "3", "test", null, -1, -1, testDocumentWithTextField(), Lucene.STANDARD_ANALYZER, B_3, false); engine.create(new Engine.Create(null, newUid("3"), doc3)); @@ -280,7 +280,7 @@ public void testSegments() throws Exception { assertThat(segments.get(1).getDeletedDocs(), equalTo(0)); assertThat(segments.get(1).isCompound(), equalTo(false)); - engineSettingsService.refreshSettings(ImmutableSettings.builder().put(RobinEngine.INDEX_COMPOUND_ON_FLUSH, true).build()); + engineSettingsService.refreshSettings(ImmutableSettings.builder().put(InternalEngine.INDEX_COMPOUND_ON_FLUSH, true).build()); ParsedDocument doc4 = testParsedDocument("4", "4", "test", null, -1, -1, testDocumentWithTextField(), Lucene.STANDARD_ANALYZER, B_3, false); engine.create(new Engine.Create(null, newUid("4"), doc4)); engine.refresh(new Engine.Refresh("test").force(false)); diff --git a/src/test/java/org/elasticsearch/indices/fielddata/breaker/RandomExceptionCircuitBreakerTests.java b/src/test/java/org/elasticsearch/indices/fielddata/breaker/RandomExceptionCircuitBreakerTests.java index b9e5ddfa67389..511f16ba361b0 100644 --- a/src/test/java/org/elasticsearch/indices/fielddata/breaker/RandomExceptionCircuitBreakerTests.java +++ b/src/test/java/org/elasticsearch/indices/fielddata/breaker/RandomExceptionCircuitBreakerTests.java @@ -35,7 +35,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.engine.MockRobinEngine; +import org.elasticsearch.test.engine.MockInternalEngine; import org.elasticsearch.test.engine.ThrowingAtomicReaderWrapper; import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.test.store.MockDirectoryHelper; @@ -167,7 +167,7 @@ public void testBreakerWithRandomExceptions() throws IOException, InterruptedExc public static final String EXCEPTION_LOW_LEVEL_RATIO_KEY = "index.engine.exception.ratio.low"; // TODO: Generalize this class and add it as a utility - public static class RandomExceptionDirectoryReaderWrapper extends MockRobinEngine.DirectoryReaderWrapper { + public static class RandomExceptionDirectoryReaderWrapper extends MockInternalEngine.DirectoryReaderWrapper { private final Settings settings; static class ThrowingSubReaderWrapper extends SubReaderWrapper implements ThrowingAtomicReaderWrapper.Thrower { private final Random random; diff --git a/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java index 5e8d25e92dfdd..64afcc4782e33 100644 --- a/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java +++ b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java @@ -97,7 +97,7 @@ public void testOpenCloseUpdateSettings() throws Exception { } @Test - public void testRobinEngineGCDeletesSetting() throws InterruptedException { + public void testEngineGCDeletesSetting() throws InterruptedException { createIndex("test"); client().prepareIndex("test", "type", "1").setSource("f", 1).get(); // set version to 1 client().prepareDelete("test", "type", "1").get(); // sets version to 2 diff --git a/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java b/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java index dd4b88ee41655..02aa05914328a 100644 --- a/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java +++ b/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java @@ -35,7 +35,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.engine.MockRobinEngine; +import org.elasticsearch.test.engine.MockInternalEngine; import org.elasticsearch.test.engine.ThrowingAtomicReaderWrapper; import org.elasticsearch.test.store.MockDirectoryHelper; import org.hamcrest.Matchers; @@ -186,10 +186,10 @@ public void testRandomExceptions() throws IOException, InterruptedException, Exe Builder settings = settingsBuilder() .put("index.number_of_shards", numShards) .put("index.number_of_replicas", randomIntBetween(0, 1)) - .put(MockRobinEngine.READER_WRAPPER_TYPE, RandomExceptionDirectoryReaderWrapper.class.getName()) + .put(MockInternalEngine.READER_WRAPPER_TYPE, RandomExceptionDirectoryReaderWrapper.class.getName()) .put(EXCEPTION_TOP_LEVEL_RATIO_KEY, topLevelRate) .put(EXCEPTION_LOW_LEVEL_RATIO_KEY, lowLevelRate) - .put(MockRobinEngine.WRAP_READER_RATIO, 1.0d); + .put(MockInternalEngine.WRAP_READER_RATIO, 1.0d); logger.info("creating index: [test] using settings: [{}]", settings.build().getAsMap()); client().admin().indices().prepareCreate("test") .setSettings(settings) @@ -243,7 +243,7 @@ public void testRandomExceptions() throws IOException, InterruptedException, Exe public static final String EXCEPTION_LOW_LEVEL_RATIO_KEY = "index.engine.exception.ratio.low"; - public static class RandomExceptionDirectoryReaderWrapper extends MockRobinEngine.DirectoryReaderWrapper { + public static class RandomExceptionDirectoryReaderWrapper extends MockInternalEngine.DirectoryReaderWrapper { private final Settings settings; static class ThrowingSubReaderWrapper extends SubReaderWrapper implements ThrowingAtomicReaderWrapper.Thrower { private final Random random; diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java b/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java index c90c834b4b753..3f5a4fce76871 100644 --- a/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java +++ b/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java @@ -34,7 +34,7 @@ import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.util.concurrent.EsAbortPolicy; import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; -import org.elasticsearch.test.engine.MockRobinEngine; +import org.elasticsearch.test.engine.MockInternalEngine; import org.elasticsearch.test.junit.listeners.LoggingListener; import org.elasticsearch.test.store.MockDirectoryHelper; import org.junit.AfterClass; @@ -131,27 +131,27 @@ public static void ensureAllSearchersClosed() { try { if (awaitBusy(new Predicate() { public boolean apply(Object o) { - return MockRobinEngine.INFLIGHT_ENGINE_SEARCHERS.isEmpty(); + return MockInternalEngine.INFLIGHT_ENGINE_SEARCHERS.isEmpty(); } }, 5, TimeUnit.SECONDS)) { return; } } catch (InterruptedException ex) { - if (MockRobinEngine.INFLIGHT_ENGINE_SEARCHERS.isEmpty()) { + if (MockInternalEngine.INFLIGHT_ENGINE_SEARCHERS.isEmpty()) { return; } } try { RuntimeException ex = null; StringBuilder builder = new StringBuilder("Unclosed Searchers instance for shards: ["); - for (Entry entry : MockRobinEngine.INFLIGHT_ENGINE_SEARCHERS.entrySet()) { + for (Entry entry : MockInternalEngine.INFLIGHT_ENGINE_SEARCHERS.entrySet()) { ex = entry.getValue(); builder.append(entry.getKey().shardId()).append(","); } builder.append("]"); throw new RuntimeException(builder.toString(), ex); } finally { - MockRobinEngine.INFLIGHT_ENGINE_SEARCHERS.clear(); + MockInternalEngine.INFLIGHT_ENGINE_SEARCHERS.clear(); } } diff --git a/src/test/java/org/elasticsearch/test/engine/MockEngineModule.java b/src/test/java/org/elasticsearch/test/engine/MockEngineModule.java index 4e14272e7cbd2..d8f4c4a9a578a 100644 --- a/src/test/java/org/elasticsearch/test/engine/MockEngineModule.java +++ b/src/test/java/org/elasticsearch/test/engine/MockEngineModule.java @@ -26,6 +26,6 @@ public class MockEngineModule extends AbstractModule { @Override protected void configure() { - bind(Engine.class).to(MockRobinEngine.class).asEagerSingleton(); + bind(Engine.class).to(MockInternalEngine.class).asEagerSingleton(); } } diff --git a/src/test/java/org/elasticsearch/test/engine/MockRobinEngine.java b/src/test/java/org/elasticsearch/test/engine/MockInternalEngine.java similarity index 91% rename from src/test/java/org/elasticsearch/test/engine/MockRobinEngine.java rename to src/test/java/org/elasticsearch/test/engine/MockInternalEngine.java index 20b843f1ba1b5..f8add70d86e10 100644 --- a/src/test/java/org/elasticsearch/test/engine/MockRobinEngine.java +++ b/src/test/java/org/elasticsearch/test/engine/MockInternalEngine.java @@ -32,7 +32,7 @@ import org.elasticsearch.index.deletionpolicy.SnapshotDeletionPolicy; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.engine.EngineException; -import org.elasticsearch.index.engine.robin.RobinEngine; +import org.elasticsearch.index.engine.internal.InternalEngine; import org.elasticsearch.index.indexing.ShardIndexingService; import org.elasticsearch.index.merge.policy.MergePolicyProvider; import org.elasticsearch.index.merge.scheduler.MergeSchedulerProvider; @@ -52,7 +52,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -public final class MockRobinEngine extends RobinEngine implements Engine { +public final class MockInternalEngine extends InternalEngine implements Engine { public static final ConcurrentMap INFLIGHT_ENGINE_SEARCHERS = new ConcurrentHashMap(); public static final String WRAP_READER_RATIO = "index.engine.mock.random.wrap_reader_ratio"; public static final String READER_WRAPPER_TYPE = "index.engine.mock.random.wrapper"; @@ -62,11 +62,11 @@ public final class MockRobinEngine extends RobinEngine implements Engine { private final Class wrapper; @Inject - public MockRobinEngine(ShardId shardId, @IndexSettings Settings indexSettings, ThreadPool threadPool, - IndexSettingsService indexSettingsService, ShardIndexingService indexingService, @Nullable IndicesWarmer warmer, Store store, - SnapshotDeletionPolicy deletionPolicy, Translog translog, MergePolicyProvider mergePolicyProvider, - MergeSchedulerProvider mergeScheduler, AnalysisService analysisService, SimilarityService similarityService, - CodecService codecService) throws EngineException { + public MockInternalEngine(ShardId shardId, @IndexSettings Settings indexSettings, ThreadPool threadPool, + IndexSettingsService indexSettingsService, ShardIndexingService indexingService, @Nullable IndicesWarmer warmer, Store store, + SnapshotDeletionPolicy deletionPolicy, Translog translog, MergePolicyProvider mergePolicyProvider, + MergeSchedulerProvider mergeScheduler, AnalysisService analysisService, SimilarityService similarityService, + CodecService codecService) throws EngineException { super(shardId, indexSettings, threadPool, indexSettingsService, indexingService, warmer, store, deletionPolicy, translog, mergePolicyProvider, mergeScheduler, analysisService, similarityService, codecService); final long seed = indexSettings.getAsLong(ElasticsearchIntegrationTest.INDEX_SEED_SETTING, 0l); @@ -86,7 +86,7 @@ public void close() throws ElasticsearchException { } finally { if (logger.isTraceEnabled()) { // log debug if we have pending searchers - for (Entry entry : MockRobinEngine.INFLIGHT_ENGINE_SEARCHERS.entrySet()) { + for (Entry entry : MockInternalEngine.INFLIGHT_ENGINE_SEARCHERS.entrySet()) { logger.trace("Unreleased Searchers instance for shard [{}]", entry.getValue(), entry.getKey().shardId); } }