Skip to content

Commit

Permalink
HSEARCH-3892 Remove an unused parameter in StubMappingIndexManager#cr…
Browse files Browse the repository at this point in the history 
…eateIndexer()

This was an oversight in HSEARCH-3822
  • Loading branch information
@yrodiere
yrodiere committed Apr 15, 2020
1 parent 4c1be89 commit 6ff7f03
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 22 deletions.
3 changes: 1 addition & 2 deletions ...rch/integrationtest/backend/elasticsearch/work/ElasticsearchZeroDowntimeReindexingIT.java
View file
Expand Up @@ -18,7 +18,6 @@
import org.hibernate.search.engine.backend.common.DocumentReference;
import org.hibernate.search.engine.backend.document.IndexFieldReference;
import org.hibernate.search.engine.backend.document.model.dsl.IndexSchemaElement;
import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexer;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkspace;
import org.hibernate.search.engine.search.query.SearchQuery;
Expand Down Expand Up @@ -64,7 +63,7 @@ public void setup() {
@Test
public void test() {
IndexWorkspace workspace = indexManager.createWorkspace();
IndexIndexer indexer = indexManager.createIndexer( DocumentCommitStrategy.NONE );
IndexIndexer indexer = indexManager.createIndexer();

indexer.add( referenceProvider( "1" ), document -> {
document.addValue( indexMapping.text, "text1" );
Expand Down
3 changes: 1 addition & 2 deletions ...java/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryBaseIT.java
View file
Expand Up @@ -18,7 +18,6 @@

import org.hibernate.search.engine.backend.document.IndexFieldReference;
import org.hibernate.search.engine.backend.document.model.dsl.IndexSchemaElement;
import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexer;
import org.hibernate.search.engine.backend.types.Sortable;
import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
Expand Down Expand Up @@ -138,7 +137,7 @@ public void context_extension() {

private void initData(int documentCount) {
IndexIndexer executor =
indexManager.createIndexer( DocumentCommitStrategy.NONE );
indexManager.createIndexer();
List<CompletableFuture<?>> futures = new ArrayList<>();
for ( int i = 0; i < documentCount; i++ ) {
int intValue = i;
Expand Down
3 changes: 1 addition & 2 deletions ...ava/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryFetchIT.java
View file
Expand Up @@ -19,7 +19,6 @@

import org.hibernate.search.engine.backend.document.IndexFieldReference;
import org.hibernate.search.engine.backend.document.model.dsl.IndexSchemaElement;
import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexer;
import org.hibernate.search.engine.backend.types.Sortable;
import org.hibernate.search.engine.backend.common.DocumentReference;
Expand Down Expand Up @@ -286,7 +285,7 @@ public void maxResults_zero() {

private void initData() {
IndexIndexer executor =
indexManager.createIndexer( DocumentCommitStrategy.NONE );
indexManager.createIndexer();
List<CompletableFuture<?>> futures = new ArrayList<>();
for ( int i = 0; i < DOCUMENT_COUNT; i++ ) {
int intValue = i;
Expand Down
3 changes: 1 addition & 2 deletions ...in/java/org/hibernate/search/integrationtest/backend/tck/sharding/AbstractShardingIT.java
View file
Expand Up @@ -16,7 +16,6 @@
import java.util.stream.Stream;

import org.hibernate.search.engine.backend.document.IndexFieldReference;
import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexer;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkspace;
import org.hibernate.search.engine.mapper.mapping.building.spi.IndexedEntityBindingContext;
Expand Down Expand Up @@ -56,7 +55,7 @@ protected static DocumentReference[] docRefs(Stream<String> docIds) {

protected final void initData(Map<String, List<String>> docIdByRoutingKey) {
IndexIndexer indexer =
indexManager.createIndexer( DocumentCommitStrategy.NONE );
indexManager.createIndexer();
List<CompletableFuture<?>> tasks = new ArrayList<>();

for ( Map.Entry<String, List<String>> entry : docIdByRoutingKey.entrySet() ) {
Expand Down
3 changes: 1 addition & 2 deletions ...nate/search/integrationtest/backend/tck/work/AbstractIndexWorkspaceSimpleOperationIT.java
View file
Expand Up @@ -14,7 +14,6 @@

import org.hibernate.search.engine.backend.document.IndexFieldReference;
import org.hibernate.search.engine.backend.document.model.dsl.IndexSchemaElement;
import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexer;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkspace;
import org.hibernate.search.integrationtest.backend.tck.testsupport.util.rule.SearchSetupHelper;
Expand Down Expand Up @@ -121,7 +120,7 @@ private void setup() {
beforeInitData( indexManager );

IndexIndexer indexer =
indexManager.createIndexer( DocumentCommitStrategy.NONE );
indexManager.createIndexer();
CompletableFuture<?>[] tasks = new CompletableFuture<?>[DOCUMENT_COUNT];
for ( int i = 0; i < DOCUMENT_COUNT; i++ ) {
final String id = String.valueOf( i );
Expand Down
5 changes: 2 additions & 3 deletions ...k/src/main/java/org/hibernate/search/integrationtest/backend/tck/work/IndexIndexerIT.java
View file
Expand Up @@ -15,7 +15,6 @@
import org.hibernate.search.engine.backend.common.DocumentReference;
import org.hibernate.search.engine.backend.document.IndexFieldReference;
import org.hibernate.search.engine.backend.document.model.dsl.IndexSchemaElement;
import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexer;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkspace;
import org.hibernate.search.engine.search.query.SearchQuery;
Expand Down Expand Up @@ -60,7 +59,7 @@ public void success() {
setup();

IndexIndexer indexer =
indexManager.createIndexer( DocumentCommitStrategy.NONE );
indexManager.createIndexer();
CompletableFuture<?>[] tasks = new CompletableFuture<?>[NUMBER_OF_BOOKS];
IndexWorkspace workspace = indexManager.createWorkspace();

Expand Down Expand Up @@ -90,7 +89,7 @@ public void failure() {
setup();

IndexIndexer indexer =
indexManager.createIndexer( DocumentCommitStrategy.NONE );
indexManager.createIndexer();

// Trigger failures in the next operations
setupHelper.getBackendAccessor().ensureIndexOperationsFail( INDEX_NAME );
Expand Down
3 changes: 1 addition & 2 deletions ...src/main/java/org/hibernate/search/integrationtest/backend/tck/work/IndexWorkspaceIT.java
View file
Expand Up @@ -13,7 +13,6 @@

import org.hibernate.search.engine.backend.document.IndexFieldReference;
import org.hibernate.search.engine.backend.document.model.dsl.IndexSchemaElement;
import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexer;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkspace;
import org.hibernate.search.engine.backend.common.DocumentReference;
Expand Down Expand Up @@ -118,7 +117,7 @@ public void runMergeSegmentsPurgeAndFlushAndRefreshWithMultiTenancy() {

private void createBookIndexes(StubBackendSessionContext sessionContext) {
IndexIndexer indexer =
indexManager.createIndexer( sessionContext, DocumentCommitStrategy.NONE );
indexManager.createIndexer( sessionContext );
CompletableFuture<?>[] tasks = new CompletableFuture<?>[NUMBER_OF_BOOKS];

for ( int i = 0; i < NUMBER_OF_BOOKS; i++ ) {
Expand Down
2 changes: 1 addition & 1 deletion ...rnate/search/integrationtest/performance/backend/base/AbstractMassIndexingBenchmarks.java
View file
Expand Up @@ -57,7 +57,7 @@ public abstract class AbstractMassIndexingBenchmarks extends AbstractBackendBenc
public void prepareIteration(DatasetHolder datasetHolder) {
index = getIndexPartition().getIndex();
StubBackendSessionContext sessionContext = new StubBackendSessionContext();
indexer = index.createIndexer( sessionContext, commitStrategy );
indexer = index.createIndexer( sessionContext );
dataset = datasetHolder.getDataset();
}

Expand Down
3 changes: 1 addition & 2 deletions ...e/search/integrationtest/performance/backend/base/testsupport/index/IndexInitializer.java
View file
Expand Up @@ -15,7 +15,6 @@
import java.util.stream.LongStream;

import org.hibernate.search.engine.backend.session.spi.DetachedBackendSessionContext;
import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexer;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkspace;
import org.hibernate.search.integrationtest.performance.backend.base.testsupport.dataset.Dataset;
Expand Down Expand Up @@ -71,7 +70,7 @@ public void addToIndex(MappedIndex index, LongStream idStream) {

IndexWorkspace workspace = index.createWorkspace( DetachedBackendSessionContext.of( sessionContext ) );

IndexIndexer indexer = index.createIndexer( new StubBackendSessionContext(), DocumentCommitStrategy.NONE );
IndexIndexer indexer = index.createIndexer( new StubBackendSessionContext() );
List<CompletableFuture<?>> futures = new ArrayList<>();
idStream.forEach( id -> {
CompletableFuture<?> future = indexer.add(
Expand Down
7 changes: 3 additions & 4 deletions ...a/org/hibernate/search/util/impl/integrationtest/mapper/stub/StubMappingIndexManager.java
View file
Expand Up @@ -54,12 +54,11 @@ public IndexIndexingPlan<StubEntityReference> createIndexingPlan(StubBackendSess
commitStrategy, refreshStrategy );
}

public IndexIndexer createIndexer(DocumentCommitStrategy commitStrategy) {
return createIndexer( new StubBackendSessionContext(), commitStrategy );
public IndexIndexer createIndexer() {
return createIndexer( new StubBackendSessionContext() );
}

public IndexIndexer createIndexer(
StubBackendSessionContext sessionContext, DocumentCommitStrategy commitStrategy) {
public IndexIndexer createIndexer(StubBackendSessionContext sessionContext) {
return delegate().createIndexer( sessionContext, StubEntityReference.FACTORY );
}

Expand Down

0 comments on commit 6ff7f03

Please sign in to comment.