Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[7565] branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src
|
From: <jer...@us...> - 2013-11-19 23:54:35
|
Revision: 7565
http://bigdata.svn.sourceforge.net/bigdata/?rev=7565&view=rev
Author: jeremy_carroll
Date: 2013-11-19 23:54:27 +0000 (Tue, 19 Nov 2013)
Log Message:
-----------
Running AST eval tests also in HTree mode ?\226?\128?\166 (omitting trac748 tests that fail for reasons articulated in trac 776)
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpContext.java
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestAll.java
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestTickets.java
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/service/TestServiceRegistry.java
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpContext.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpContext.java 2013-11-19 22:25:59 UTC (rev 7564)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpContext.java 2013-11-19 23:54:27 UTC (rev 7565)
@@ -53,6 +53,11 @@
* FIXME Rolling back r7319 which broke UNION processing.
*/
public class AST2BOpContext implements IdFactory, IEvaluationContext {
+
+ /**
+ * This field is public non-final so that we can change its value during testing.
+ */
+ public static boolean DEFAULT_NATIVE_HASH_JOINS = true; // QueryHints.DEFAULT_NATIVE_HASH_JOINS;
/**
* The {@link ASTContainer}
@@ -148,7 +153,7 @@
*
* @see QueryHints#NATIVE_HASH_JOINS
*/
- public boolean nativeHashJoins = QueryHints.DEFAULT_NATIVE_HASH_JOINS;
+ public boolean nativeHashJoins = DEFAULT_NATIVE_HASH_JOINS;
/**
* When <code>true</code>, a merge-join pattern will be recognized if it
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestAll.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestAll.java 2013-11-19 22:25:59 UTC (rev 7564)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestAll.java 2013-11-19 23:54:27 UTC (rev 7565)
@@ -26,6 +26,7 @@
import com.bigdata.rdf.sparql.ast.QueryHints;
import com.bigdata.rdf.sparql.ast.eval.reif.TestReificationDoneRightEval;
+import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -55,7 +56,7 @@
* Returns a test that will run each of the implementation specific test
* suites in turn.
*/
- public static Test suite()
+ private static TestSuite coreSuite()
{
final TestSuite suite = new TestSuite("AST Evaluation");
@@ -181,4 +182,31 @@
}
+
+ /**
+ * Returns a test that will run each of the implementation specific test
+ * suites in turn.
+ */
+ public static Test suite()
+ {
+
+ final TestSuite suite = new TestSuite("AST Evaluation (all)");
+ final TestSuite tHash = coreSuite();
+ tHash.setName("AST Evaluation (tHash)");
+ suite.addTest(new TestSetup(tHash) {
+
+ protected void setUp() throws Exception {
+ AST2BOpContext.DEFAULT_NATIVE_HASH_JOINS = true;
+ }
+ protected void tearDown() throws Exception {
+ AST2BOpContext.DEFAULT_NATIVE_HASH_JOINS = false;
+ }
+
+ });
+ final TestSuite jvmHash = coreSuite();
+ jvmHash.setName("AST Evaluation (jvmHash)");
+ suite.addTest(jvmHash);
+ return suite;
+ }
+
}
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestTickets.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestTickets.java 2013-11-19 22:25:59 UTC (rev 7564)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestTickets.java 2013-11-19 23:54:27 UTC (rev 7565)
@@ -27,6 +27,8 @@
package com.bigdata.rdf.sparql.ast.eval;
+import com.bigdata.BigdataStatics;
+
/**
* Test suite for tickets at <href a="http://sourceforge.net/apps/trac/bigdata">
* trac </a>.
@@ -178,6 +180,11 @@
}
public void test_ticket_748() throws Exception {
+ // Concerning omitting the test with hash joins, see Trac776 and
+ // com.bigdata.rdf.internal.encoder.AbstractBindingSetEncoderTestCase.test_solutionWithOneMockIV()
+
+ if(AST2BOpContext.DEFAULT_NATIVE_HASH_JOINS && !BigdataStatics.runKnownBadTests)
+ return;
new TestHelper("ticket748-subselect",// testURI,
"ticket748-subselect.rq",// queryFileURL
@@ -190,6 +197,9 @@
public void test_ticket_748a() throws Exception {
+ if(AST2BOpContext.DEFAULT_NATIVE_HASH_JOINS && !BigdataStatics.runKnownBadTests)
+ return;
+
new TestHelper("ticket748A-subselect",// testURI,
"ticket748A-subselect.rq",// queryFileURL
"ticket748-subselect.ttl",// dataFileURL
@@ -200,6 +210,9 @@
public void test_ticket_two_subselects_748() throws Exception {
+ if(AST2BOpContext.DEFAULT_NATIVE_HASH_JOINS && !BigdataStatics.runKnownBadTests)
+ return;
+
new TestHelper("ticket748-two-subselects",// testURI,
"ticket748-two-subselects.rq",// queryFileURL
"ticket748-two-subselects.ttl",// dataFileURL
@@ -211,6 +224,9 @@
public void test_ticket_two_subselects_748a() throws Exception {
+ if(AST2BOpContext.DEFAULT_NATIVE_HASH_JOINS && !BigdataStatics.runKnownBadTests)
+ return;
+
new TestHelper("ticket748A-two-subselects",// testURI,
"ticket748A-two-subselects.rq",// queryFileURL
"ticket748-two-subselects.ttl",// dataFileURL
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/service/TestServiceRegistry.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/service/TestServiceRegistry.java 2013-11-19 22:25:59 UTC (rev 7564)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/service/TestServiceRegistry.java 2013-11-19 23:54:27 UTC (rev 7565)
@@ -300,6 +300,7 @@
// De-register alias
ServiceRegistry.getInstance().remove(serviceURI1);
+ ServiceRegistry.getInstance().remove(serviceURI2);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
