Merge pull request #295 from LiUSemWeb/InVocabularyMappingContext_App…

…lyUnaryJoinWhenPossible Fix a small issue in function 'checkUnaryOpApplicableToUnionPlan'
LiUSemWeb · May 2, 2023 · 4217005 · 4217005
2 parents f65cdf5 + aabb289
commit 4217005
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/se/liu/ida/hefquin/engine/queryplan/utils/PhysicalPlanFactory.java b/src/main/java/se/liu/ida/hefquin/engine/queryplan/utils/PhysicalPlanFactory.java
@@ -746,18 +746,20 @@ public static boolean checkUnaryOpApplicableToUnionPlan( final PhysicalPlan unio
 			}
 
 			if ( subRootOp instanceof PhysicalOpLocalToGlobal ){
-				if ( !( subPlan.getSubPlan(0) instanceof PhysicalOpRequest || subPlan.getSubPlan(0) instanceof PhysicalOpFilter) ){
+				final PhysicalPlan subSubPlan = subPlan.getSubPlan(0);
+				final PhysicalOperator subSubRootOp = subSubPlan.getRootOperator();
+				if ( !( subSubRootOp instanceof PhysicalOpRequest || subSubRootOp instanceof PhysicalOpFilter) ){
 					return false;
 				}
-				if ( subPlan.getSubPlan(0) instanceof PhysicalOpFilter ){
-					if ( !( subPlan.getSubPlan(0).getSubPlan(0) instanceof PhysicalOpRequest) ){
+				if ( subSubRootOp instanceof PhysicalOpFilter ){
+					if ( !( subSubPlan.getSubPlan(0).getRootOperator() instanceof PhysicalOpRequest) ){
 						return false;
 					}
 				}
 			}
 
 			if ( subRootOp instanceof PhysicalOpFilter ){
-				if ( !( subPlan.getSubPlan(0) instanceof PhysicalOpRequest) ){
+				if ( !( subPlan.getSubPlan(0).getRootOperator() instanceof PhysicalOpRequest) ){
 					return false;
 				}
 			}