Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
import org.hibernate.search.engine.backend.index.IndexManager;
import org.hibernate.search.engine.backend.index.spi.IndexManagerStartContext;
import org.hibernate.search.engine.backend.work.execution.DocumentRefreshStrategy;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkExecutor;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkspace;
import org.hibernate.search.engine.backend.index.spi.IndexManagerImplementor;
import org.hibernate.search.engine.backend.scope.spi.IndexScopeBuilder;
import org.hibernate.search.engine.backend.work.execution.spi.IndexDocumentWorkExecutor;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkPlan;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexer;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexingPlan;
import org.hibernate.search.engine.cfg.spi.ConfigurationPropertySource;
import org.hibernate.search.engine.cfg.spi.ConfigurationProperty;
import org.hibernate.search.engine.backend.session.spi.DetachedBackendSessionContext;
Expand Down Expand Up @@ -141,10 +141,10 @@ public ElasticsearchIndexModel getModel() {
}

@Override
public IndexWorkPlan<ElasticsearchDocumentObjectBuilder> createWorkPlan(BackendSessionContext sessionContext,
public IndexIndexingPlan<ElasticsearchDocumentObjectBuilder> createIndexingPlan(BackendSessionContext sessionContext,
DocumentCommitStrategy commitStrategy, DocumentRefreshStrategy refreshStrategy) {
// The commit strategy is ignored, because Elasticsearch always commits changes to its transaction log.
return backendContext.createWorkPlan(
return backendContext.createIndexingPlan(
serialOrchestrator,
elasticsearchIndexName,
refreshStrategy,
Expand All @@ -153,17 +153,17 @@ public IndexWorkPlan<ElasticsearchDocumentObjectBuilder> createWorkPlan(BackendS
}

@Override
public IndexDocumentWorkExecutor<ElasticsearchDocumentObjectBuilder> createDocumentWorkExecutor(
public IndexIndexer<ElasticsearchDocumentObjectBuilder> createIndexer(
BackendSessionContext sessionContext, DocumentCommitStrategy commitStrategy) {
// The commit strategy is ignored, because Elasticsearch always commits changes to its transaction log.
return backendContext.createDocumentWorkExecutor(
return backendContext.createIndexer(
parallelOrchestrator, elasticsearchIndexName, sessionContext
);
}

@Override
public IndexWorkExecutor createWorkExecutor(DetachedBackendSessionContext sessionContext) {
return backendContext.createWorkExecutor(
public IndexWorkspace createWorkspace(DetachedBackendSessionContext sessionContext) {
return backendContext.createWorkspace(
parallelOrchestrator, elasticsearchIndexName, sessionContext
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
import org.hibernate.search.backend.elasticsearch.multitenancy.impl.MultiTenancyStrategy;
import org.hibernate.search.backend.elasticsearch.orchestration.impl.ElasticsearchWorkOrchestrator;
import org.hibernate.search.backend.elasticsearch.orchestration.impl.ElasticsearchWorkOrchestratorProvider;
import org.hibernate.search.backend.elasticsearch.work.execution.impl.ElasticsearchIndexDocumentWorkExecutor;
import org.hibernate.search.backend.elasticsearch.work.execution.impl.ElasticsearchIndexWorkExecutor;
import org.hibernate.search.backend.elasticsearch.work.execution.impl.ElasticsearchIndexWorkPlan;
import org.hibernate.search.backend.elasticsearch.work.execution.impl.ElasticsearchIndexIndexer;
import org.hibernate.search.backend.elasticsearch.work.execution.impl.ElasticsearchIndexWorkspace;
import org.hibernate.search.backend.elasticsearch.work.execution.impl.ElasticsearchIndexIndexingPlan;
import org.hibernate.search.backend.elasticsearch.work.execution.impl.WorkExecutionBackendContext;
import org.hibernate.search.engine.backend.work.execution.spi.IndexDocumentWorkExecutor;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexer;
import org.hibernate.search.engine.backend.work.execution.DocumentRefreshStrategy;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkExecutor;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkPlan;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkspace;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexingPlan;
import org.hibernate.search.engine.backend.mapping.spi.BackendMappingContext;
import org.hibernate.search.engine.backend.session.spi.DetachedBackendSessionContext;
import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
Expand Down Expand Up @@ -79,14 +79,14 @@ public String toString() {
}

@Override
public IndexWorkPlan<ElasticsearchDocumentObjectBuilder> createWorkPlan(
public IndexIndexingPlan<ElasticsearchDocumentObjectBuilder> createIndexingPlan(
ElasticsearchWorkOrchestrator orchestrator,
URLEncodedString indexName,
DocumentRefreshStrategy refreshStrategy,
BackendSessionContext sessionContext) {
multiTenancyStrategy.checkTenantId( sessionContext.getTenantIdentifier(), eventContext );

return new ElasticsearchIndexWorkPlan(
return new ElasticsearchIndexIndexingPlan(
link.getWorkBuilderFactory(), multiTenancyStrategy, orchestrator,
indexName,
refreshStrategy,
Expand All @@ -95,22 +95,22 @@ public IndexWorkPlan<ElasticsearchDocumentObjectBuilder> createWorkPlan(
}

@Override
public IndexDocumentWorkExecutor<ElasticsearchDocumentObjectBuilder> createDocumentWorkExecutor(
public IndexIndexer<ElasticsearchDocumentObjectBuilder> createIndexer(
ElasticsearchWorkOrchestrator orchestrator,
URLEncodedString indexName,
BackendSessionContext sessionContext) {
multiTenancyStrategy.checkTenantId( sessionContext.getTenantIdentifier(), eventContext );

return new ElasticsearchIndexDocumentWorkExecutor( link.getWorkBuilderFactory(), multiTenancyStrategy, orchestrator,
return new ElasticsearchIndexIndexer( link.getWorkBuilderFactory(), multiTenancyStrategy, orchestrator,
indexName, sessionContext );
}

@Override
public IndexWorkExecutor createWorkExecutor(ElasticsearchWorkOrchestrator orchestrator, URLEncodedString indexName,
public IndexWorkspace createWorkspace(ElasticsearchWorkOrchestrator orchestrator, URLEncodedString indexName,
DetachedBackendSessionContext sessionContext) {
multiTenancyStrategy.checkTenantId( sessionContext.getTenantIdentifier(), eventContext );

return new ElasticsearchIndexWorkExecutor(
return new ElasticsearchIndexWorkspace(
link.getWorkBuilderFactory(), multiTenancyStrategy, orchestrator, indexName,
sessionContext
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@
import org.hibernate.search.backend.elasticsearch.work.builder.factory.impl.ElasticsearchWorkBuilderFactory;
import org.hibernate.search.engine.backend.work.execution.spi.DocumentContributor;
import org.hibernate.search.engine.backend.work.execution.spi.DocumentReferenceProvider;
import org.hibernate.search.engine.backend.work.execution.spi.IndexDocumentWorkExecutor;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexer;
import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;

import com.google.gson.JsonObject;

public class ElasticsearchIndexDocumentWorkExecutor implements IndexDocumentWorkExecutor<ElasticsearchDocumentObjectBuilder> {
public class ElasticsearchIndexIndexer implements IndexIndexer<ElasticsearchDocumentObjectBuilder> {

private final ElasticsearchWorkBuilderFactory factory;
private final MultiTenancyStrategy multiTenancyStrategy;
private final ElasticsearchWorkOrchestrator orchestrator;
private final URLEncodedString indexName;
private final String tenantId;

public ElasticsearchIndexDocumentWorkExecutor(ElasticsearchWorkBuilderFactory factory, MultiTenancyStrategy multiTenancyStrategy,
public ElasticsearchIndexIndexer(ElasticsearchWorkBuilderFactory factory, MultiTenancyStrategy multiTenancyStrategy,
ElasticsearchWorkOrchestrator orchestrator,
URLEncodedString indexName,
BackendSessionContext sessionContext) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import org.hibernate.search.backend.elasticsearch.work.builder.factory.impl.ElasticsearchWorkBuilderFactory;
import org.hibernate.search.backend.elasticsearch.work.impl.ElasticsearchWork;
import org.hibernate.search.engine.backend.work.execution.DocumentRefreshStrategy;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkPlan;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexingPlan;
import org.hibernate.search.engine.backend.work.execution.spi.DocumentContributor;
import org.hibernate.search.engine.backend.work.execution.spi.DocumentReferenceProvider;
import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
Expand All @@ -26,7 +26,7 @@



public class ElasticsearchIndexWorkPlan implements IndexWorkPlan<ElasticsearchDocumentObjectBuilder> {
public class ElasticsearchIndexIndexingPlan implements IndexIndexingPlan<ElasticsearchDocumentObjectBuilder> {

private final ElasticsearchWorkBuilderFactory builderFactory;
private final MultiTenancyStrategy multiTenancyStrategy;
Expand All @@ -37,7 +37,7 @@ public class ElasticsearchIndexWorkPlan implements IndexWorkPlan<ElasticsearchDo

private final List<ElasticsearchWork<?>> works = new ArrayList<>();

public ElasticsearchIndexWorkPlan(ElasticsearchWorkBuilderFactory builderFactory,
public ElasticsearchIndexIndexingPlan(ElasticsearchWorkBuilderFactory builderFactory,
MultiTenancyStrategy multiTenancyStrategy,
ElasticsearchWorkOrchestrator orchestrator,
URLEncodedString indexName,
Expand Down Expand Up @@ -78,7 +78,7 @@ public void delete(DocumentReferenceProvider referenceProvider) {
}

@Override
public void prepare() {
public void process() {
/*
* Nothing to do: we can't execute anything more
* without sending a request to the cluster.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@
import org.hibernate.search.backend.elasticsearch.orchestration.impl.ElasticsearchWorkOrchestrator;
import org.hibernate.search.backend.elasticsearch.util.spi.URLEncodedString;
import org.hibernate.search.backend.elasticsearch.work.builder.factory.impl.ElasticsearchWorkBuilderFactory;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkExecutor;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkspace;
import org.hibernate.search.engine.backend.session.spi.DetachedBackendSessionContext;

import com.google.gson.JsonObject;

public class ElasticsearchIndexWorkExecutor implements IndexWorkExecutor {
public class ElasticsearchIndexWorkspace implements IndexWorkspace {

private final ElasticsearchWorkBuilderFactory builderFactory;
private final MultiTenancyStrategy multiTenancyStrategy;
private final ElasticsearchWorkOrchestrator orchestrator;
private final URLEncodedString indexName;
private final DetachedBackendSessionContext sessionContext;

public ElasticsearchIndexWorkExecutor(ElasticsearchWorkBuilderFactory builderFactory,
public ElasticsearchIndexWorkspace(ElasticsearchWorkBuilderFactory builderFactory,
MultiTenancyStrategy multiTenancyStrategy, ElasticsearchWorkOrchestrator orchestrator,
URLEncodedString indexName,
DetachedBackendSessionContext sessionContext) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
import org.hibernate.search.backend.elasticsearch.orchestration.impl.ElasticsearchWorkOrchestrator;
import org.hibernate.search.backend.elasticsearch.util.spi.URLEncodedString;
import org.hibernate.search.engine.backend.work.execution.DocumentRefreshStrategy;
import org.hibernate.search.engine.backend.work.execution.spi.IndexDocumentWorkExecutor;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkExecutor;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkPlan;
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.work.execution.spi.IndexIndexingPlan;
import org.hibernate.search.engine.backend.session.spi.DetachedBackendSessionContext;
import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;

Expand All @@ -29,18 +29,18 @@
*/
public interface WorkExecutionBackendContext {

IndexWorkPlan<ElasticsearchDocumentObjectBuilder> createWorkPlan(
IndexIndexingPlan<ElasticsearchDocumentObjectBuilder> createIndexingPlan(
ElasticsearchWorkOrchestrator orchestrator,
URLEncodedString indexName,
DocumentRefreshStrategy refreshStrategy,
BackendSessionContext sessionContext);

IndexDocumentWorkExecutor<ElasticsearchDocumentObjectBuilder> createDocumentWorkExecutor(
IndexIndexer<ElasticsearchDocumentObjectBuilder> createIndexer(
ElasticsearchWorkOrchestrator orchestrator,
URLEncodedString indexName,
BackendSessionContext sessionContext);

IndexWorkExecutor createWorkExecutor(ElasticsearchWorkOrchestrator orchestrator, URLEncodedString indexName,
IndexWorkspace createWorkspace(ElasticsearchWorkOrchestrator orchestrator, URLEncodedString indexName,
DetachedBackendSessionContext sessionContext);

}
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@
import org.hibernate.search.backend.lucene.search.projection.impl.LuceneSearchProjection;
import org.hibernate.search.backend.lucene.search.query.impl.LuceneSearchQueryBuilder;
import org.hibernate.search.backend.lucene.search.query.impl.SearchBackendContext;
import org.hibernate.search.backend.lucene.work.execution.impl.LuceneIndexDocumentWorkExecutor;
import org.hibernate.search.backend.lucene.work.execution.impl.LuceneIndexWorkExecutor;
import org.hibernate.search.backend.lucene.work.execution.impl.LuceneIndexWorkPlan;
import org.hibernate.search.backend.lucene.work.execution.impl.LuceneIndexIndexer;
import org.hibernate.search.backend.lucene.work.execution.impl.LuceneIndexWorkspace;
import org.hibernate.search.backend.lucene.work.execution.impl.LuceneIndexIndexingPlan;
import org.hibernate.search.backend.lucene.work.execution.impl.WorkExecutionBackendContext;
import org.hibernate.search.backend.lucene.work.execution.impl.WorkExecutionIndexManagerContext;
import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy;
import org.hibernate.search.engine.backend.work.execution.DocumentRefreshStrategy;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkExecutor;
import org.hibernate.search.engine.backend.work.execution.spi.IndexDocumentWorkExecutor;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkPlan;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkspace;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexer;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexingPlan;
import org.hibernate.search.backend.lucene.document.impl.LuceneRootDocumentBuilder;
import org.hibernate.search.backend.lucene.multitenancy.impl.MultiTenancyStrategy;
import org.hibernate.search.backend.lucene.work.impl.LuceneWorkFactory;
Expand Down Expand Up @@ -90,14 +90,14 @@ public String toString() {
}

@Override
public IndexWorkPlan<LuceneRootDocumentBuilder> createWorkPlan(
public IndexIndexingPlan<LuceneRootDocumentBuilder> createIndexingPlan(
WorkExecutionIndexManagerContext indexManagerContext,
LuceneIndexEntryFactory indexEntryFactory,
BackendSessionContext sessionContext,
DocumentCommitStrategy commitStrategy, DocumentRefreshStrategy refreshStrategy) {
multiTenancyStrategy.checkTenantId( sessionContext.getTenantIdentifier(), eventContext );

return new LuceneIndexWorkPlan(
return new LuceneIndexIndexingPlan(
workFactory,
indexManagerContext,
indexEntryFactory,
Expand All @@ -122,14 +122,14 @@ public LuceneWriteWorkOrchestratorImplementor createOrchestrator(String indexNam
}

@Override
public IndexDocumentWorkExecutor<LuceneRootDocumentBuilder> createDocumentWorkExecutor(
public IndexIndexer<LuceneRootDocumentBuilder> createIndexer(
WorkExecutionIndexManagerContext indexManagerContext,
LuceneIndexEntryFactory indexEntryFactory,
BackendSessionContext sessionContext,
DocumentCommitStrategy commitStrategy) {
multiTenancyStrategy.checkTenantId( sessionContext.getTenantIdentifier(), eventContext );

return new LuceneIndexDocumentWorkExecutor(
return new LuceneIndexIndexer(
workFactory,
indexEntryFactory,
indexManagerContext,
Expand All @@ -139,11 +139,11 @@ public IndexDocumentWorkExecutor<LuceneRootDocumentBuilder> createDocumentWorkEx
}

@Override
public IndexWorkExecutor createWorkExecutor(WorkExecutionIndexManagerContext indexManagerContext,
public IndexWorkspace createWorkspace(WorkExecutionIndexManagerContext indexManagerContext,
DetachedBackendSessionContext sessionContext) {
multiTenancyStrategy.checkTenantId( sessionContext.getTenantIdentifier(), eventContext );

return new LuceneIndexWorkExecutor( workFactory, indexManagerContext, sessionContext );
return new LuceneIndexWorkspace( workFactory, indexManagerContext, sessionContext );
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
import org.hibernate.search.engine.backend.index.IndexManager;
import org.hibernate.search.engine.backend.index.spi.IndexManagerStartContext;
import org.hibernate.search.engine.backend.scope.spi.IndexScopeBuilder;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkExecutor;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkspace;
import org.hibernate.search.engine.backend.index.spi.IndexManagerImplementor;
import org.hibernate.search.engine.backend.work.execution.spi.IndexDocumentWorkExecutor;
import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkPlan;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexer;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexingPlan;
import org.hibernate.search.backend.lucene.document.impl.LuceneRootDocumentBuilder;
import org.hibernate.search.backend.lucene.document.model.impl.LuceneIndexModel;
import org.hibernate.search.backend.lucene.logging.impl.Log;
Expand Down Expand Up @@ -87,26 +87,26 @@ public void close() {
}

@Override
public IndexWorkPlan<LuceneRootDocumentBuilder> createWorkPlan(BackendSessionContext sessionContext,
public IndexIndexingPlan<LuceneRootDocumentBuilder> createIndexingPlan(BackendSessionContext sessionContext,
DocumentCommitStrategy commitStrategy, DocumentRefreshStrategy refreshStrategy) {
return backendContext.createWorkPlan(
return backendContext.createIndexingPlan(
shardHolder, indexEntryFactory,
sessionContext, commitStrategy, refreshStrategy
);
}

@Override
public IndexDocumentWorkExecutor<LuceneRootDocumentBuilder> createDocumentWorkExecutor(
public IndexIndexer<LuceneRootDocumentBuilder> createIndexer(
BackendSessionContext sessionContext, DocumentCommitStrategy commitStrategy) {
return backendContext.createDocumentWorkExecutor(
return backendContext.createIndexer(
shardHolder, indexEntryFactory,
sessionContext, commitStrategy
);
}

@Override
public IndexWorkExecutor createWorkExecutor(DetachedBackendSessionContext sessionContext) {
return backendContext.createWorkExecutor( shardHolder, sessionContext );
public IndexWorkspace createWorkspace(DetachedBackendSessionContext sessionContext) {
return backendContext.createWorkspace( shardHolder, sessionContext );
}

@Override
Expand Down
Loading