Skip to content

Commit 867566f

Browse files
committed
GH-5718: remove deprecated FedX constructs and classes
Remove the deprecated FedX constructs that were scheduled for removal earlier. The functional code has been replaced with optimized variants earlier, some testing constructs can be simply removed without replacements.
1 parent d874f67 commit 867566f

28 files changed

Lines changed: 0 additions & 2154 deletions

tools/federation/src/main/java/org/eclipse/rdf4j/federated/FedXConfig.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -496,20 +496,4 @@ public FedXConfig withConsumingIterationMax(int max) {
496496
public int getConsumingIterationMax() {
497497
return consumingIterationMax;
498498
}
499-
500-
/**
501-
* Set the CollectionFactory to be used by the federation
502-
*
503-
* <p>
504-
* Can only be set before federation initialization.
505-
* </p>
506-
*
507-
* @param cf
508-
* @return the current config
509-
* @deprecated unusedO
510-
*/
511-
@Deprecated(forRemoval = true)
512-
public FedXConfig withCollectionFactory(CollectionFactory cf) {
513-
return this;
514-
}
515499
}

tools/federation/src/main/java/org/eclipse/rdf4j/federated/api/FedXApi.java

Lines changed: 0 additions & 47 deletions
This file was deleted.

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -996,21 +996,6 @@ protected QueryEvaluationStep prepareExclusiveTupleExpr(
996996
public abstract CloseableIteration<BindingSet> evaluateBoundJoinStatementPattern(
997997
StatementTupleExpr stmt, final List<BindingSet> bindings) throws QueryEvaluationException;
998998

999-
/**
1000-
* Perform a grouped check at the relevant endpoints, i.e. for a group of bindings keep only those for which at
1001-
* least one endpoint provides a result to the bound statement.
1002-
*
1003-
* @param stmt
1004-
* @param bindings
1005-
* @return the result iteration
1006-
* @throws QueryEvaluationException
1007-
* @deprecated with VALUES implementation, control flow goes via
1008-
* {@link #evaluateBoundJoinStatementPattern(StatementTupleExpr, List)}
1009-
*/
1010-
@Deprecated(forRemoval = true)
1011-
public abstract CloseableIteration<BindingSet> evaluateGroupedCheck(
1012-
CheckStatementPattern stmt, final List<BindingSet> bindings) throws QueryEvaluationException;
1013-
1014999
/**
10151000
* Evaluate the left bind join for the given {@link StatementTupleExpr} and bindings at the relevant endpoints.
10161001
*

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -91,22 +91,6 @@ public CloseableIteration<BindingSet> evaluateBoundJoinStatementPattern(
9191
return result;
9292
}
9393

94-
@Override
95-
public CloseableIteration<BindingSet> evaluateGroupedCheck(
96-
CheckStatementPattern stmt, List<BindingSet> bindings)
97-
throws QueryEvaluationException {
98-
99-
if (bindings.size() == 1) {
100-
return stmt.evaluate(bindings.get(0));
101-
}
102-
103-
TupleExpr preparedQuery = QueryAlgebraUtil.selectQueryStringBoundCheck(stmt.getStatementPattern(), bindings);
104-
105-
CloseableIteration<BindingSet> result = evaluateAtStatementSources(preparedQuery,
106-
stmt.getStatementSources(), stmt.getQueryInfo());
107-
108-
return new GroupedCheckConversionIteration(result, bindings);
109-
}
11094

11195
@Override
11296
public CloseableIteration<BindingSet> executeJoin(

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

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -116,64 +116,6 @@ public CloseableIteration<BindingSet> evaluateBoundJoinStatementPattern(
116116
}
117117
}
118118

119-
/**
120-
* Alternative evaluation implementation using UNION. Nowadays we use a VALUES clause based implementation
121-
*
122-
* @deprecated no longer used
123-
*/
124-
@Deprecated(forRemoval = true)
125-
protected CloseableIteration<BindingSet> evaluateBoundJoinStatementPattern_UNION(
126-
StatementTupleExpr stmt, List<BindingSet> bindings)
127-
throws QueryEvaluationException {
128-
129-
// we can omit the bound join handling
130-
if (bindings.size() == 1) {
131-
return evaluate(stmt, bindings.get(0));
132-
}
133-
134-
FilterValueExpr filterExpr = null;
135-
if (stmt instanceof FilterTuple) {
136-
filterExpr = ((FilterTuple) stmt).getFilterExpr();
137-
}
138-
139-
Boolean isEvaluated = false;
140-
String preparedQuery = QueryStringUtil.selectQueryStringBoundUnion((StatementPattern) stmt, bindings,
141-
filterExpr, isEvaluated, stmt.getQueryInfo().getDataset());
142-
143-
CloseableIteration<BindingSet> result = evaluateAtStatementSources(preparedQuery,
144-
stmt.getStatementSources(), stmt.getQueryInfo());
145-
146-
// apply filter and/or convert to original bindings
147-
if (filterExpr != null && !isEvaluated) {
148-
result = new BoundJoinConversionIteration(result, bindings); // apply conversion
149-
result = new FilteringIteration(filterExpr, result, this); // apply filter
150-
if (!result.hasNext()) {
151-
return new EmptyIteration<>();
152-
}
153-
} else {
154-
result = new BoundJoinConversionIteration(result, bindings);
155-
}
156-
157-
return result;
158-
}
159-
160-
@Override
161-
public CloseableIteration<BindingSet> evaluateGroupedCheck(
162-
CheckStatementPattern stmt, List<BindingSet> bindings)
163-
throws QueryEvaluationException {
164-
165-
if (bindings.size() == 1) {
166-
return stmt.evaluate(bindings.get(0));
167-
}
168-
169-
String preparedQuery = QueryStringUtil.selectQueryStringBoundCheck(stmt.getStatementPattern(), bindings,
170-
stmt.getQueryInfo().getDataset());
171-
172-
CloseableIteration<BindingSet> result = evaluateAtStatementSources(preparedQuery,
173-
stmt.getStatementSources(), stmt.getQueryInfo());
174-
175-
return new GroupedCheckConversionIteration(result, bindings);
176-
}
177119

178120
@Override
179121
public CloseableIteration<BindingSet> executeJoin(

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@ public int getTotalNumberOfWorkers() {
117117
return nWorkers;
118118
}
119119

120-
@Deprecated(forRemoval = true, since = "5.1") // currently unused and this class is internal
121-
public int getNumberOfTasks() {
122-
return _taskQueue.size();
123-
}
124120

125121
/**
126122
* Create the {@link BlockingQueue} used for the thread pool. The default implementation creates a

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

Lines changed: 0 additions & 104 deletions
This file was deleted.

0 commit comments

Comments
 (0)