You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/05/30 18:25:43 UTC
svn commit: r1598660 - in /jena/trunk/jena-arq/src:
main/java/com/hp/hpl/jena/query/ARQ.java
main/java/com/hp/hpl/jena/sparql/SystemARQ.java
main/java/com/hp/hpl/jena/sparql/graph/GraphFactory.java
test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java
Author: andy
Date: Fri May 30 16:25:42 2014
New Revision: 1598660
URL: http://svn.apache.org/r1598660
Log:
Bug - was using a plain/simple graph at all times
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphFactory.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java?rev=1598660&r1=1598659&r2=1598660&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java Fri May 30 16:25:42 2014
@@ -405,16 +405,6 @@ public class ARQ
*/
public static final Symbol propertyFunctions = ARQConstants.allocSymbol("propertyFunctions") ;
-
-
- /**
- * Use a simple (and non-scalable) graph implementation that does no
- * value testing. Needed for DAWG tests where matching is exact
- * and results compared by graph-equivalence.
- */
- public static final Symbol strictGraph =
- ARQConstants.allocSymbol("strictGraph") ;
-
/**
* Expression evaluation without extension types (e.g. xsd:date, language tags)
*/
@@ -443,7 +433,6 @@ public class ARQ
context.set(optimization, false) ;
context.set(hideNonDistiguishedVariables, true) ;
- context.set(strictGraph, true) ;
context.set(strictSPARQL, true) ;
context.set(enablePropertyFunctions, false) ;
@@ -473,7 +462,6 @@ public class ARQ
{
context.set(optimization, true) ;
context.set(hideNonDistiguishedVariables, false) ;
- context.set(strictGraph, false) ;
context.set(strictSPARQL, false) ;
context.set(enablePropertyFunctions, true) ;
@@ -557,7 +545,6 @@ public class ARQ
context.set(strictSPARQL, false) ;
context.set(constantBNodeLabels, true) ;
context.set(enablePropertyFunctions, true) ;
- context.set(strictGraph, false) ;
context.set(regexImpl, javaRegex) ;
return context ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java?rev=1598660&r1=1598659&r2=1598660&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java Fri May 30 16:25:42 2014
@@ -38,7 +38,7 @@ import com.hp.hpl.jena.sparql.mgt.System
public class SystemARQ
{
- // Various system wide settings, "constants" that might chnage e,g test setups
+ // Various system wide settings, "constants" that might change e.g. test setups
// NodeValues work without the context so somethings only have global settings.
@@ -66,9 +66,9 @@ public class SystemARQ
public static boolean EnableRomanNumerals = true ;
/**
- * Use a plain graph (sameValeuAs is term equality)
+ * Use a plain graph (sameValueAs is term equality)
*/
- public static boolean UsePlainGraph = true ;
+ public static boolean UsePlainGraph = false ;
/**
* Whether to use StAX or SAX XML parsing for result sets (StAX preferred).
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphFactory.java?rev=1598660&r1=1598659&r2=1598660&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphFactory.java Fri May 30 16:25:42 2014
@@ -42,6 +42,7 @@ public class GraphFactory
/** Create a graph - ARQ-wide default type */
public static Graph createDefaultGraph()
{
+ // Normal usage is SystemARQ.UsePlainGraph = false and use createJenaDefaultGraph
return SystemARQ.UsePlainGraph ? createPlainGraph() : createJenaDefaultGraph() ;
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java?rev=1598660&r1=1598659&r2=1598660&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java Fri May 30 16:25:42 2014
@@ -31,6 +31,7 @@ import com.hp.hpl.jena.graph.NodeFactory
import com.hp.hpl.jena.query.* ;
import com.hp.hpl.jena.rdf.model.* ;
import com.hp.hpl.jena.shared.JenaException ;
+import com.hp.hpl.jena.sparql.SystemARQ ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.engine.QueryIterator ;
import com.hp.hpl.jena.sparql.engine.ResultSetStream ;
@@ -52,7 +53,6 @@ public class QueryTest extends EarlTestC
private static int testCounter = 1 ;
private int testNumber = testCounter++ ;
private TestItem testItem ;
- private boolean resetNeeded = false ;
private SPARQLResult results = null ; // Maybe null if no testing of results
@@ -65,14 +65,15 @@ public class QueryTest extends EarlTestC
testItem = t ;
}
private boolean oldWarningFlag ;
+ private boolean oldPlainGraphFlag ;
@Override
public void setUpTest() throws Exception
{
super.setUpTest() ;
// SPARQL and ARQ tests are done with no value matching (for query execution and results testing)
- resetNeeded = true ;
- ARQ.setTrue(ARQ.strictGraph) ;
+ oldPlainGraphFlag = SystemARQ.UsePlainGraph ;
+ SystemARQ.UsePlainGraph = true ;
// Turn parser warnings off for the test data.
oldWarningFlag = CheckerLiterals.WarnOnBadLiterals ;
CheckerLiterals.WarnOnBadLiterals = false ;
@@ -84,8 +85,7 @@ public class QueryTest extends EarlTestC
@Override
public void tearDownTest() throws Exception
{
- if ( resetNeeded )
- ARQ.setFalse(ARQ.strictGraph) ;
+ SystemARQ.UsePlainGraph = oldPlainGraphFlag ;
CheckerLiterals.WarnOnBadLiterals = oldWarningFlag ;
super.tearDownTest() ;
}