[Bigdata-commit] SF.net SVN: bigdata:[8531] branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/ test/com/bigdata/rdf/sparql/ast/optimizers/ TestASTExistsAndJoinOrderByTypeOptimizers.java

[<tho...@us...>]

Revision: 8531
          http://sourceforge.net/p/bigdata/code/8531
Author:   thompsonbry
Date:     2014-07-10 00:00:48 +0000 (Thu, 10 Jul 2014)
Log Message:
-----------
Updated some unit tests of the expected behavior of an optimizer that were broken by #988.

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTExistsAndJoinOrderByTypeOptimizers.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTExistsAndJoinOrderByTypeOptimizers.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTExistsAndJoinOrderByTypeOptimizers.java	2014-07-09 19:03:07 UTC (rev 8530)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTExistsAndJoinOrderByTypeOptimizers.java	2014-07-10 00:00:48 UTC (rev 8531)
@@ -28,6 +28,8 @@
 package com.bigdata.rdf.sparql.ast.optimizers;
 
 import com.bigdata.rdf.sparql.ast.ArbitraryLengthPathNode;
+import com.bigdata.rdf.sparql.ast.QueryHints;
+import com.bigdata.rdf.sparql.ast.SubqueryRoot;
 
 /**
  * Test suite for {@link ASTUnionFiltersOptimizer}.
@@ -64,9 +66,10 @@
 							    )
 							) ) );
 			
+			final SubqueryRoot askQuery;
 			expected = select( varNode(w), 
 					where (joinGroupNode(
-								ask(varNode(y),
+								askQuery=ask(varNode(y),
 										joinGroupNode(
 											statementPatternNode(constantNode(a),constantNode(b),varNode(w))
 											 ) ),
@@ -74,7 +77,7 @@
 						    			statementPatternNode(constantNode(a),constantNode(b),varNode(w))))
 						    ) )
 							) );
-			
+			askQuery.setFilterExistsMode(QueryHints.DEFAULT_FILTER_EXISTS);
 		}}.test();
 		
 	}
@@ -91,13 +94,14 @@
 							    )
 							) ) );
 			
+			final SubqueryRoot askQuery1, askQuery2;
 			expected = select( varNode(w), 
 					where (joinGroupNode(
-								ask(varNode(y),
+								askQuery1=ask(varNode(y),
 										joinGroupNode(
 											statementPatternNode(constantNode(a),constantNode(b),varNode(w))
 											 ) ),
-								ask(varNode(z),
+								askQuery2=ask(varNode(z),
 										joinGroupNode(
 											statementPatternNode(constantNode(a),constantNode(c),varNode(w))
 											) ),
@@ -110,7 +114,8 @@
 								    )
 						    ) )
 							);
-			
+            askQuery1.setFilterExistsMode(QueryHints.DEFAULT_FILTER_EXISTS);
+            askQuery2.setFilterExistsMode(QueryHints.DEFAULT_FILTER_EXISTS);
 		}}.test();
 		
 	}
@@ -136,13 +141,14 @@
     		varCount = 0;
 			final ArbitraryLengthPathNode alpp2 = arbitartyLengthPropertyPath(varNode(w), constantNode(b), HelperFlag.ONE_OR_MORE,
 					joinGroupNode( statementPatternNode(leftVar(), constantNode(b),  rightVar()) ) );
+            final SubqueryRoot askQuery1, askQuery2;
 			expected = select( varNode(w), 
 					where (joinGroupNode(
-								ask(varNode(y),
+					            askQuery1=ask(varNode(y),
 										joinGroupNode(
 							    			alpp1
 											 ) ),
-								ask(varNode(z),
+								askQuery2=ask(varNode(z),
 										joinGroupNode(
 											statementPatternNode(constantNode(a),constantNode(c),varNode(w))
 											) ),
@@ -157,7 +163,9 @@
 								    )
 						    ) )
 							);
-			
+            askQuery1.setFilterExistsMode(QueryHints.DEFAULT_FILTER_EXISTS);
+            askQuery2.setFilterExistsMode(QueryHints.DEFAULT_FILTER_EXISTS);
+
 		}}.test();
 	}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.