Skip to content

Commit 685737e

Browse files
aschwarte10aschwarte10
committed
GH-5718: rename FederationEvalStrategy to FederationEvaluationStrategy
1 parent 92e89e3 commit 685737e

27 files changed

Lines changed: 97 additions & 104 deletions

‎tools/federation/src/main/java/org/eclipse/rdf4j/federated/FedXConnection.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.eclipse.rdf4j.common.transaction.TransactionSetting;
2323
import org.eclipse.rdf4j.federated.algebra.PassThroughTupleExpr;
2424
import org.eclipse.rdf4j.federated.endpoint.Endpoint;
25-
import org.eclipse.rdf4j.federated.evaluation.FederationEvalStrategy;
2625
import org.eclipse.rdf4j.federated.evaluation.FederationEvaluationStatistics;
26+
import org.eclipse.rdf4j.federated.evaluation.FederationEvaluationStrategy;
2727
import org.eclipse.rdf4j.federated.evaluation.concurrent.ParallelExecutor;
2828
import org.eclipse.rdf4j.federated.evaluation.concurrent.ParallelTask;
2929
import org.eclipse.rdf4j.federated.evaluation.iterator.StopRemainingExecutionsOnCloseIteration;
@@ -61,8 +61,8 @@
6161
import org.slf4j.LoggerFactory;
6262

6363
/**
64-
* An implementation of RepositoryConnection that uses {@link FederationEvalStrategy} to evaluate provided queries.
65-
* Prior to evaluation various optimizations are performed, see
64+
* An implementation of RepositoryConnection that uses {@link FederationEvaluationStrategy} to evaluate provided
65+
* queries. Prior to evaluation various optimizations are performed, see
6666
* {@link org.eclipse.rdf4j.federated.optimizer.FedXOptimizer} for further details.
6767
* <p>
6868
* <p>
@@ -73,7 +73,7 @@
7373
* Implementation notes: - not all methods are implemented as of now
7474
*
7575
* @author Andreas Schwarte
76-
* @see FederationEvalStrategy
76+
* @see FederationEvaluationStrategy
7777
* @see WriteStrategy
7878
*/
7979
public class FedXConnection extends AbstractSailConnection {
@@ -105,7 +105,7 @@ protected CloseableIteration<? extends BindingSet> evaluateInternal(TupleExpr qu
105105

106106
final TupleExpr originalQuery = query;
107107

108-
FederationEvalStrategy strategy = federationContext.createStrategy(dataset);
108+
FederationEvaluationStrategy strategy = federationContext.createStrategy(dataset);
109109

110110
long start = 0;
111111
String queryString = getOriginalQueryString(bindings);
@@ -236,7 +236,7 @@ protected void commitInternal() throws SailException {
236236
@Override
237237
protected CloseableIteration<? extends Resource> getContextIDsInternal() throws SailException {
238238

239-
FederationEvalStrategy strategy = federationContext.createStrategy(new SimpleDataset());
239+
FederationEvaluationStrategy strategy = federationContext.createStrategy(new SimpleDataset());
240240
WorkerUnionBase<Resource> union = new SynchronousWorkerUnion<>(new QueryInfo("getContextIDsInternal", null,
241241
QueryType.UNKNOWN, 0, federationContext.getConfig().getIncludeInferredDefault(), federationContext,
242242
strategy, new SimpleDataset()));
@@ -307,7 +307,7 @@ protected CloseableIteration<? extends Statement> getStatementsInternal(Resource
307307

308308
try {
309309
Dataset dataset = new SimpleDataset();
310-
FederationEvalStrategy strategy = federationContext.createStrategy(dataset);
310+
FederationEvaluationStrategy strategy = federationContext.createStrategy(dataset);
311311
QueryInfo queryInfo = new QueryInfo(subj, pred, obj, 0, includeInferred, federationContext, strategy,
312312
dataset);
313313
federationContext.getMonitoringService().monitorQuery(queryInfo);
@@ -342,7 +342,7 @@ protected boolean hasStatementInternal(Resource subj, IRI pred, Value obj, boole
342342
Resource[] contexts) {
343343
try {
344344
Dataset dataset = new SimpleDataset();
345-
FederationEvalStrategy strategy = federationContext.createStrategy(dataset);
345+
FederationEvaluationStrategy strategy = federationContext.createStrategy(dataset);
346346
QueryInfo queryInfo = new QueryInfo(subj, pred, obj, 0, includeInferred, federationContext, strategy,
347347
dataset);
348348
federationContext.getMonitoringService().monitorQuery(queryInfo);

‎tools/federation/src/main/java/org/eclipse/rdf4j/federated/FederationContext.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.eclipse.rdf4j.federated.cache.SourceSelectionCache;
1414
import org.eclipse.rdf4j.federated.cache.SourceSelectionMemoryCache;
1515
import org.eclipse.rdf4j.federated.evaluation.DelegateFederatedServiceResolver;
16-
import org.eclipse.rdf4j.federated.evaluation.FederationEvalStrategy;
16+
import org.eclipse.rdf4j.federated.evaluation.FederationEvaluationStrategy;
1717
import org.eclipse.rdf4j.federated.monitoring.Monitoring;
1818
import org.eclipse.rdf4j.query.Dataset;
1919
import org.eclipse.rdf4j.query.algebra.evaluation.TripleSource;
@@ -87,9 +87,9 @@ public SourceSelectionCache getSourceSelectionCache() {
8787
}
8888

8989
/**
90-
* Create a fresh {@link FederationEvalStrategy} using information from this federation context.
90+
* Create a fresh {@link FederationEvaluationStrategy} using information from this federation context.
9191
*/
92-
public FederationEvalStrategy createStrategy(Dataset dataset) {
92+
public FederationEvaluationStrategy createStrategy(Dataset dataset) {
9393
TripleSource tripleSource = null;
9494
EvaluationStatistics evaluationStatistics = null;
9595
return manager.getFederationEvaluationStrategyFactory()

‎tools/federation/src/main/java/org/eclipse/rdf4j/federated/QueryManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import java.util.regex.MatchResult;
2626
import java.util.regex.Pattern;
2727

28-
import org.eclipse.rdf4j.federated.evaluation.FederationEvalStrategy;
2928
import org.eclipse.rdf4j.federated.evaluation.FederationEvaluationStatistics;
29+
import org.eclipse.rdf4j.federated.evaluation.FederationEvaluationStrategy;
3030
import org.eclipse.rdf4j.federated.exception.FedXException;
3131
import org.eclipse.rdf4j.federated.exception.FedXRuntimeException;
3232
import org.eclipse.rdf4j.federated.repository.FedXRepository;
@@ -307,7 +307,7 @@ public String getQueryPlan(String queryString) throws MalformedQueryException, F
307307
throw new MalformedQueryException("Not a ParsedQuery: " + query.getClass());
308308
}
309309
Dataset dataset = ((ParsedQuery) query).getDataset();
310-
FederationEvalStrategy strategy = federationContext.createStrategy(dataset);
310+
FederationEvaluationStrategy strategy = federationContext.createStrategy(dataset);
311311
// we use a dummy query info object here
312312
QueryInfo qInfo = new QueryInfo(queryString, null, QueryType.SELECT,
313313
federationContext.getConfig().getEnforceMaxQueryTime(),

‎tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvaluationStatistics.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/**
1818
* Stateful {@link EvaluationStatistics} providing information for evaluating a given query in
19-
* {@link FederationEvalStrategy#optimize(org.eclipse.rdf4j.query.algebra.TupleExpr, EvaluationStatistics, org.eclipse.rdf4j.query.BindingSet)}
19+
* {@link FederationEvaluationStrategy#optimize(org.eclipse.rdf4j.query.algebra.TupleExpr, EvaluationStatistics, org.eclipse.rdf4j.query.BindingSet)}
2020
* <p>
2121
* The statistics are instantiated per query.
2222
* </p>

tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvalStrategy.java renamed to tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvaluationStrategy.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@
149149
* @author Andreas Schwarte
150150
*
151151
*/
152-
public class FederationEvalStrategy extends StrictEvaluationStrategy {
152+
public class FederationEvaluationStrategy extends StrictEvaluationStrategy {
153153

154-
private static final Logger log = LoggerFactory.getLogger(FederationEvalStrategy.class);
154+
private static final Logger log = LoggerFactory.getLogger(FederationEvaluationStrategy.class);
155155

156156
protected Executor executor;
157157
protected SourceSelectionCache cache;
@@ -166,7 +166,7 @@ public class FederationEvalStrategy extends StrictEvaluationStrategy {
166166
StandardQueryOptimizerPipeline.BINDING_SET_ASSIGNMENT_INLINER,
167167
StandardQueryOptimizerPipeline.DISJUNCTIVE_CONSTRAINT_OPTIMIZER);
168168

169-
public FederationEvalStrategy(FederationContext federationContext) {
169+
public FederationEvaluationStrategy(FederationContext federationContext) {
170170
super(new org.eclipse.rdf4j.query.algebra.evaluation.TripleSource() {
171171

172172
@Override
@@ -660,8 +660,8 @@ public boolean hasStatements(QueryInfo queryInfo, Resource subj,
660660
/**
661661
* Returns the accessible federation members in the context of the query. By default this is all federation members.
662662
* <p>
663-
* Specialized implementations of the {@link FederationEvalStrategy} may override and define custom behavior (e.g.,
664-
* to support resilience).
663+
* Specialized implementations of the {@link FederationEvaluationStrategy} may override and define custom behavior
664+
* (e.g., to support resilience).
665665
* </p>
666666
*
667667
*
@@ -737,7 +737,8 @@ protected CloseableIteration<BindingSet> evaluateArbitrayLengthPath(
737737

738738
protected QueryEvaluationStep prepare(FedXArbitraryLengthPath alp, QueryEvaluationContext context)
739739
throws QueryEvaluationException {
740-
return (bindings) -> new FedXPathIteration(FederationEvalStrategy.this, alp.getScope(), alp.getSubjectVar(),
740+
return (bindings) -> new FedXPathIteration(FederationEvaluationStrategy.this, alp.getScope(),
741+
alp.getSubjectVar(),
741742
alp.getPathExpression(), alp.getObjectVar(), alp.getContextVar(), alp.getMinLength(), bindings,
742743
alp.getQueryInfo());
743744
}
@@ -831,7 +832,7 @@ public CloseableIteration<BindingSet> evaluate(BindingSet bindings) {
831832
joinCondition,
832833
problemVars);
833834
return new BadlyDesignedLeftJoinIterator(
834-
FederationEvalStrategy.this,
835+
FederationEvaluationStrategy.this,
835836
leftJoin,
836837
bindings,
837838
problemVarsClone,
@@ -904,7 +905,7 @@ public QueryEvaluationStep prepareNaryUnion(NUnion union, QueryEvaluationContext
904905
* For endpoint federation use controlled worker bound join, for local federation use controlled worker join. The
905906
* other operators are there for completeness.
906907
*
907-
* Use {@link FederationEvalStrategy#executor} to execute the join (it is a runnable).
908+
* Use {@link FederationEvaluationStrategy#executor} to execute the join (it is a runnable).
908909
*
909910
* @param joinScheduler
910911
* @param leftIter

‎tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvaluationStrategyFactory.java‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,7 @@
1919
import org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategyFactory;
2020

2121
/**
22-
* Factory class for retrieving the {@link FederationEvalStrategy} to be used.
23-
*
24-
* <p>
25-
* Default strategies:
26-
* </p>
27-
*
28-
* <ul>
29-
* <li>local federation: {@link SailFederationEvalStrategy}</li>
30-
* <li>endpoint federation: {@link SparqlFederationEvalStrategy}</li>
31-
* <li>hybrid federation: {@link SparqlFederationEvalStrategy}</li>
32-
* </ul>
22+
* Factory class for retrieving the {@link FederationEvaluationStrategy} to be used.
3323
*
3424
* <p>
3525
* Customized strategies can be supplied to the federation using
@@ -59,17 +49,17 @@ public void setFederationContext(FederationContext federationContext) {
5949
}
6050

6151
/**
62-
* Create the {@link FederationEvalStrategy} to be used.
52+
* Create the {@link FederationEvaluationStrategy} to be used.
6353
*
6454
* Note: all parameters may be <code>null</code>
6555
*/
6656
@Override
67-
public FederationEvalStrategy createEvaluationStrategy(Dataset dataset, TripleSource tripleSource,
57+
public FederationEvaluationStrategy createEvaluationStrategy(Dataset dataset, TripleSource tripleSource,
6858
EvaluationStatistics evaluationStatistics) {
6959

7060
// Note: currently dataset, triplesource and statistics are explicitly ignored
7161
// in the federation
7262

73-
return new FederationEvalStrategy(federationContext);
63+
return new FederationEvaluationStrategy(federationContext);
7464
}
7565
}

‎tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/concurrent/ParallelExecutorBase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.eclipse.rdf4j.common.iteration.CloseableIteration;
1616
import org.eclipse.rdf4j.common.iteration.EmptyIteration;
1717
import org.eclipse.rdf4j.common.iteration.LookAheadIteration;
18-
import org.eclipse.rdf4j.federated.evaluation.FederationEvalStrategy;
18+
import org.eclipse.rdf4j.federated.evaluation.FederationEvaluationStrategy;
1919
import org.eclipse.rdf4j.federated.evaluation.join.JoinExecutorBase;
2020
import org.eclipse.rdf4j.federated.evaluation.union.UnionExecutorBase;
2121
import org.eclipse.rdf4j.federated.exception.ExceptionUtil;
@@ -41,7 +41,7 @@ public abstract class ParallelExecutorBase<T> extends LookAheadIteration<T>
4141
protected static final AtomicLong NEXT_EXECUTOR_ID = new AtomicLong(0L);
4242

4343
/* Constants */
44-
protected final FederationEvalStrategy strategy; // the evaluation strategy
44+
protected final FederationEvaluationStrategy strategy; // the evaluation strategy
4545
protected final long executorId; // the executor id
4646
protected final QueryInfo queryInfo;
4747

‎tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/concurrent/ParallelServiceExecutor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.eclipse.rdf4j.common.iteration.LookAheadIteration;
1919
import org.eclipse.rdf4j.federated.FederationContext;
2020
import org.eclipse.rdf4j.federated.algebra.FedXService;
21-
import org.eclipse.rdf4j.federated.evaluation.FederationEvalStrategy;
21+
import org.eclipse.rdf4j.federated.evaluation.FederationEvaluationStrategy;
2222
import org.eclipse.rdf4j.federated.structures.QueryInfo;
2323
import org.eclipse.rdf4j.query.BindingSet;
2424
import org.eclipse.rdf4j.query.QueryEvaluationException;
@@ -48,7 +48,7 @@ public class ParallelServiceExecutor extends LookAheadIteration<BindingSet>
4848
protected static final Logger log = LoggerFactory.getLogger(ParallelServiceExecutor.class);
4949

5050
protected final FedXService service;
51-
protected final FederationEvalStrategy strategy;
51+
protected final FederationEvaluationStrategy strategy;
5252
protected final BindingSet bindings;
5353
protected final FederationContext federationContext;
5454

@@ -65,7 +65,7 @@ public class ParallelServiceExecutor extends LookAheadIteration<BindingSet>
6565
* @param federationContext
6666
*/
6767
public ParallelServiceExecutor(FedXService service,
68-
FederationEvalStrategy strategy, BindingSet bindings, FederationContext federationContext) {
68+
FederationEvaluationStrategy strategy, BindingSet bindings, FederationContext federationContext) {
6969
super();
7070
this.service = service;
7171
this.strategy = strategy;

‎tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/iterator/BoundJoinVALUESConversionIteration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import org.eclipse.rdf4j.common.iteration.CloseableIteration;
1616
import org.eclipse.rdf4j.common.iteration.ConvertingIteration;
17-
import org.eclipse.rdf4j.federated.evaluation.FederationEvalStrategy;
17+
import org.eclipse.rdf4j.federated.evaluation.FederationEvaluationStrategy;
1818
import org.eclipse.rdf4j.federated.util.QueryStringUtil;
1919
import org.eclipse.rdf4j.model.Literal;
2020
import org.eclipse.rdf4j.query.Binding;
@@ -30,7 +30,7 @@
3030
* </p>
3131
*
3232
* @author Andreas Schwarte
33-
* @see FederationEvalStrategy
33+
* @see FederationEvaluationStrategy
3434
* @since 3.0
3535
*/
3636
public class BoundJoinVALUESConversionIteration

‎tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/iterator/FederatedDescribeIteration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.eclipse.rdf4j.federated.algebra.StatementSource.StatementSourceType;
2121
import org.eclipse.rdf4j.federated.algebra.StatementSourcePattern;
2222
import org.eclipse.rdf4j.federated.endpoint.Endpoint;
23-
import org.eclipse.rdf4j.federated.evaluation.FederationEvalStrategy;
23+
import org.eclipse.rdf4j.federated.evaluation.FederationEvaluationStrategy;
2424
import org.eclipse.rdf4j.federated.structures.QueryInfo;
2525
import org.eclipse.rdf4j.model.Value;
2626
import org.eclipse.rdf4j.query.BindingSet;
@@ -45,7 +45,7 @@ public class FederatedDescribeIteration extends DescribeIteration {
4545
private final List<StatementSource> allSources;
4646

4747
public FederatedDescribeIteration(CloseableIteration<BindingSet> sourceIter,
48-
FederationEvalStrategy strategy, Set<String> describeExprNames, BindingSet parentBindings,
48+
FederationEvaluationStrategy strategy, Set<String> describeExprNames, BindingSet parentBindings,
4949
QueryInfo queryInfo) {
5050
super(sourceIter, strategy, describeExprNames, parentBindings);
5151
this.queryInfo = queryInfo;

0 commit comments

Comments
 (0)