some code cleanup in the bind join algos

LiUSemWeb · Nov 21, 2024 · a928d12 · a928d12
1 parent 02cb699
commit a928d12
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 71 deletions.
diff --git a/...ida/hefquin/engine/queryplan/executable/impl/ops/BaseForExecOpBindJoinWithRequestOps.java b/...ida/hefquin/engine/queryplan/executable/impl/ops/BaseForExecOpBindJoinWithRequestOps.java
@@ -27,7 +27,7 @@
  *
  * The implementation is generic in the sense that it works with any type of
  * request operator. Each concrete implementation that extends this base class
- * needs to implement the {@link #createExecutableRequestOperator(Iterable)}
+ * needs to implement the {@link #createExecutableReqOp(Iterable)}
  * function to create the request operators with the types of requests that
  * are specific to that concrete implementation.
  *
@@ -159,7 +159,7 @@ protected void _processWithoutSplittingInputFirst( final List<SolutionMapping> j
 	                                                   final IntermediateResultElementSink sink,
 	                                                   final ExecutionContext execCxt ) throws ExecOpExecutionException
 	{
-		final NullaryExecutableOp reqOp = createExecutableRequestOperator(joinableInputSMs);
+		final NullaryExecutableOp reqOp = createExecutableReqOp(joinableInputSMs);
 
 		if ( reqOp != null ) {
 			numberOfRequestOpsUsed++;
@@ -214,10 +214,14 @@ protected boolean reduceRequestBlockSize() {
 	}
 
 	/**
-	 * The returned operator should be created such that it throws exceptions
-	 * instead of collecting them.
+	 * Implementations of this function should create an executable operator
+	 * that can perform a bind join request in which the query of this bind
+	 * join operator is combined with the given solution mappings.
+	 *
+	 * The operator created by this function should throws exceptions instead
+	 * of collecting them.
 	 */
-	protected abstract NullaryExecutableOp createExecutableRequestOperator( Iterable<SolutionMapping> solMaps );
+	protected abstract NullaryExecutableOp createExecutableReqOp( Iterable<SolutionMapping> solMaps );
 
 	/**
 	 * Splits the given collection of solution mappings into two such that the

diff --git a/...ain/java/se/liu/ida/hefquin/engine/queryplan/executable/impl/ops/ExecOpBindJoinBRTPF.java b/...ain/java/se/liu/ida/hefquin/engine/queryplan/executable/impl/ops/ExecOpBindJoinBRTPF.java
@@ -47,7 +47,7 @@ public ExecOpBindJoinBRTPF( final TriplePattern tp,
 	}
 
 	@Override
-	protected NullaryExecutableOp createExecutableRequestOperator( final Iterable<SolutionMapping> inputSolMaps ) {
+	protected NullaryExecutableOp createExecutableReqOp( final Iterable<SolutionMapping> inputSolMaps ) {
 		final Set<SolutionMapping> restrictedSMs = restrictSolMaps(inputSolMaps, varsInPatternForFM);
 
 		if ( restrictedSMs == null ) {

diff --git a/.../liu/ida/hefquin/engine/queryplan/executable/impl/ops/ExecOpBindJoinSPARQLwithFILTER.java b/.../liu/ida/hefquin/engine/queryplan/executable/impl/ops/ExecOpBindJoinSPARQLwithFILTER.java
@@ -16,9 +16,7 @@
 
 import se.liu.ida.hefquin.base.data.SolutionMapping;
 import se.liu.ida.hefquin.base.data.utils.SolutionMappingUtils;
-import se.liu.ida.hefquin.base.query.BGP;
 import se.liu.ida.hefquin.base.query.SPARQLGraphPattern;
-import se.liu.ida.hefquin.base.query.TriplePattern;
 import se.liu.ida.hefquin.base.query.impl.GenericSPARQLGraphPatternImpl2;
 import se.liu.ida.hefquin.base.query.impl.QueryPatternUtils;
 import se.liu.ida.hefquin.engine.federation.SPARQLEndpoint;
@@ -48,20 +46,6 @@
  */
 public class ExecOpBindJoinSPARQLwithFILTER extends BaseForExecOpBindJoinSPARQL
 {
-	public ExecOpBindJoinSPARQLwithFILTER( final TriplePattern query,
-	                                       final SPARQLEndpoint fm,
-	                                       final boolean useOuterJoinSemantics,
-	                                       final boolean collectExceptions ) {
-		super(query, fm, useOuterJoinSemantics, collectExceptions);
-	}
-
-	public ExecOpBindJoinSPARQLwithFILTER( final BGP query,
-	                                       final SPARQLEndpoint fm,
-	                                       final boolean useOuterJoinSemantics,
-	                                       final boolean collectExceptions ) {
-		super(query, fm, useOuterJoinSemantics, collectExceptions);
-	}
-
 	public ExecOpBindJoinSPARQLwithFILTER( final SPARQLGraphPattern query,
 	                                       final SPARQLEndpoint fm,
 	                                       final boolean useOuterJoinSemantics,
@@ -70,7 +54,7 @@ public ExecOpBindJoinSPARQLwithFILTER( final SPARQLGraphPattern query,
 	}
 
 	@Override
-	protected NullaryExecutableOp createExecutableRequestOperator( final Iterable<SolutionMapping> solMaps ) {
+	protected NullaryExecutableOp createExecutableReqOp( final Iterable<SolutionMapping> solMaps ) {
 		final Op op = createFilter(solMaps);
 		if ( op == null ) {
 			return null;

diff --git a/...e/liu/ida/hefquin/engine/queryplan/executable/impl/ops/ExecOpBindJoinSPARQLwithUNION.java b/...e/liu/ida/hefquin/engine/queryplan/executable/impl/ops/ExecOpBindJoinSPARQLwithUNION.java
@@ -16,9 +16,7 @@
 
 import se.liu.ida.hefquin.base.data.SolutionMapping;
 import se.liu.ida.hefquin.base.data.utils.SolutionMappingUtils;
-import se.liu.ida.hefquin.base.query.BGP;
 import se.liu.ida.hefquin.base.query.SPARQLGraphPattern;
-import se.liu.ida.hefquin.base.query.TriplePattern;
 import se.liu.ida.hefquin.base.query.impl.GenericSPARQLGraphPatternImpl2;
 import se.liu.ida.hefquin.base.query.impl.QueryPatternUtils;
 import se.liu.ida.hefquin.engine.federation.SPARQLEndpoint;
@@ -27,27 +25,22 @@
 import se.liu.ida.hefquin.engine.queryplan.executable.NullaryExecutableOp;
 
 /**
- * Implementation of (a batching version of) the bind join algorithm that uses UNION.
+ * Implementation of (a batching version of) the bind join algorithm
+ * that uses UNION clauses with FILTERs inside.
  *
  * The current algorithm should to be changed.
  * See: https://github.com/LiUSemWeb/HeFQUIN/issues/344
  */
 public class ExecOpBindJoinSPARQLwithUNION extends BaseForExecOpBindJoinSPARQL
 {
-	public ExecOpBindJoinSPARQLwithUNION( final TriplePattern query, final SPARQLEndpoint fm, final boolean collectExceptions ) {
-		super(query, fm, false, collectExceptions);
-	}
-
-	public ExecOpBindJoinSPARQLwithUNION( final BGP query, final SPARQLEndpoint fm, final boolean collectExceptions ) {
-		super(query, fm, false, collectExceptions);
-	}
-
-	public ExecOpBindJoinSPARQLwithUNION( final SPARQLGraphPattern query, final SPARQLEndpoint fm, final boolean collectExceptions ) {
+	public ExecOpBindJoinSPARQLwithUNION( final SPARQLGraphPattern query,
+	                                      final SPARQLEndpoint fm,
+	                                      final boolean collectExceptions ) {
 		super(query, fm, false, collectExceptions);
 	}
 
 	@Override
-	protected NullaryExecutableOp createExecutableRequestOperator( final Iterable<SolutionMapping> solMaps ) {
+	protected NullaryExecutableOp createExecutableReqOp( final Iterable<SolutionMapping> solMaps ) {
 		final Op op = createUnion(solMaps);
 		if ( op == null ) {
 			return null;

diff --git a/.../liu/ida/hefquin/engine/queryplan/executable/impl/ops/ExecOpBindJoinSPARQLwithVALUES.java b/.../liu/ida/hefquin/engine/queryplan/executable/impl/ops/ExecOpBindJoinSPARQLwithVALUES.java
@@ -15,9 +15,7 @@
 
 import se.liu.ida.hefquin.base.data.SolutionMapping;
 import se.liu.ida.hefquin.base.data.utils.SolutionMappingUtils;
-import se.liu.ida.hefquin.base.query.BGP;
 import se.liu.ida.hefquin.base.query.SPARQLGraphPattern;
-import se.liu.ida.hefquin.base.query.TriplePattern;
 import se.liu.ida.hefquin.base.query.impl.GenericSPARQLGraphPatternImpl2;
 import se.liu.ida.hefquin.base.query.impl.QueryPatternUtils;
 import se.liu.ida.hefquin.engine.federation.SPARQLEndpoint;
@@ -47,20 +45,6 @@
  */
 public class ExecOpBindJoinSPARQLwithVALUES extends BaseForExecOpBindJoinSPARQL
 {
-	public ExecOpBindJoinSPARQLwithVALUES( final TriplePattern query,
-	                                       final SPARQLEndpoint fm,
-	                                       final boolean useOuterJoinSemantics,
-	                                       final boolean collectExceptions ) {
-		super(query, fm, useOuterJoinSemantics, collectExceptions);
-	}
-
-	public ExecOpBindJoinSPARQLwithVALUES( final BGP query,
-	                                       final SPARQLEndpoint fm,
-	                                       final boolean useOuterJoinSemantics,
-	                                       final boolean collectExceptions ) {
-		super(query, fm, useOuterJoinSemantics, collectExceptions);
-	}
-
 	public ExecOpBindJoinSPARQLwithVALUES( final SPARQLGraphPattern query,
 	                                       final SPARQLEndpoint fm,
 	                                       final boolean useOuterJoinSemantics,
@@ -69,7 +53,7 @@ public ExecOpBindJoinSPARQLwithVALUES( final SPARQLGraphPattern query,
 	}
 
 	@Override
-	protected NullaryExecutableOp createExecutableRequestOperator( final Iterable<SolutionMapping> solMaps ) {
+	protected NullaryExecutableOp createExecutableReqOp( final Iterable<SolutionMapping> solMaps ) {
 		final Set<Binding> bindings = new HashSet<>();
 		final Set<Var> joinVars = new HashSet<>();
 

diff --git a/.../hefquin/engine/queryplan/executable/impl/ops/ExecOpBindJoinSPARQLwithVALUESorFILTER.java b/.../hefquin/engine/queryplan/executable/impl/ops/ExecOpBindJoinSPARQLwithVALUESorFILTER.java
@@ -2,9 +2,7 @@
 
 import java.util.Collections;
 import java.util.List;
-import se.liu.ida.hefquin.base.query.BGP;
 import se.liu.ida.hefquin.base.query.SPARQLGraphPattern;
-import se.liu.ida.hefquin.base.query.TriplePattern;
 import se.liu.ida.hefquin.engine.federation.SPARQLEndpoint;
 import se.liu.ida.hefquin.engine.queryplan.executable.ExecOpExecutionException;
 import se.liu.ida.hefquin.engine.queryplan.executable.IntermediateResultBlock;
@@ -28,22 +26,6 @@ public class ExecOpBindJoinSPARQLwithVALUESorFILTER extends BaseForExecOpBindJoi
 	// will be initialized when processing the first input block of solution mappings
 	protected BaseForExecOpBindJoinSPARQL currentInstance = null;
 
-	public ExecOpBindJoinSPARQLwithVALUESorFILTER( final TriplePattern query, 
-	                                               final SPARQLEndpoint fm,
-	                                               final boolean useOuterJoinSemantics,
-	                                               final boolean collectExceptions ) {
-		super(query, fm, collectExceptions);
-		this.useOuterJoinSemantics = useOuterJoinSemantics;
-	}
-
-	public ExecOpBindJoinSPARQLwithVALUESorFILTER( final BGP query,
-	                                               final SPARQLEndpoint fm,
-	                                               final boolean useOuterJoinSemantics,
-	                                               final boolean collectExceptions ) {
-		super(query, fm, collectExceptions);
-		this.useOuterJoinSemantics = useOuterJoinSemantics;
-	}
-
 	public ExecOpBindJoinSPARQLwithVALUESorFILTER( final SPARQLGraphPattern query,
 	                                               final SPARQLEndpoint fm,
 	                                               final boolean useOuterJoinSemantics,