Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[4677] branches/QUADS_QUERY_BRANCH
|
From: <mrp...@us...> - 2011-06-09 20:25:11
|
Revision: 4677
http://bigdata.svn.sourceforge.net/bigdata/?rev=4677&view=rev
Author: mrpersonick
Date: 2011-06-09 20:25:05 +0000 (Thu, 09 Jun 2011)
Log Message:
-----------
working through unit test failures
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangBOp.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangMatchesBOp.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEmbeddedFederationWithQuads.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuads.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithSids.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithoutSids.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestLexJoinOps.java
Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangBOp.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangBOp.java 2011-06-09 20:05:26 UTC (rev 4676)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangBOp.java 2011-06-09 20:25:05 UTC (rev 4677)
@@ -113,6 +113,10 @@
if (val == null)
throw new NotMaterializedException();
+ if (log.isDebugEnabled()) {
+ log.debug(val);
+ }
+
if (val instanceof BigdataLiteral) {
final BigdataLiteral literal = (BigdataLiteral) val;
Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangMatchesBOp.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangMatchesBOp.java 2011-06-09 20:05:26 UTC (rev 4676)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangMatchesBOp.java 2011-06-09 20:25:05 UTC (rev 4677)
@@ -60,6 +60,11 @@
this(new BOp[] { tag, range }, null/*annocations*/);
+ if (log.isDebugEnabled()) {
+ log.info(tag);
+ log.info(range);
+ }
+
}
/**
@@ -96,8 +101,13 @@
throw new SparqlTypeErrorException();
final BigdataValue tagVal = tag.getValue();
- final BigdataValue rangeVal = tag.getValue();
+ final BigdataValue rangeVal = range.getValue();
+ if (log.isDebugEnabled()) {
+ log.debug(tagVal);
+ log.debug(rangeVal);
+ }
+
// not yet materialized
if (tagVal == null || rangeVal == null)
throw new NotMaterializedException();
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEmbeddedFederationWithQuads.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEmbeddedFederationWithQuads.java 2011-06-09 20:05:26 UTC (rev 4676)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEmbeddedFederationWithQuads.java 2011-06-09 20:25:05 UTC (rev 4677)
@@ -122,6 +122,8 @@
suite.addTestSuite(com.bigdata.rdf.sail.DavidsTestBOps.class);
+ suite.addTestSuite(com.bigdata.rdf.sail.TestLexJoinOps.class);
+
// The Sesame TCK, including the SPARQL test suite.
{
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuads.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuads.java 2011-06-09 20:05:26 UTC (rev 4676)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuads.java 2011-06-09 20:25:05 UTC (rev 4677)
@@ -121,6 +121,8 @@
suite.addTestSuite(com.bigdata.rdf.sail.DavidsTestBOps.class);
+ suite.addTestSuite(com.bigdata.rdf.sail.TestLexJoinOps.class);
+
// The Sesame TCK, including the SPARQL test suite.
{
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithSids.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithSids.java 2011-06-09 20:05:26 UTC (rev 4676)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithSids.java 2011-06-09 20:25:05 UTC (rev 4677)
@@ -101,6 +101,8 @@
suite.addTestSuite(com.bigdata.rdf.sail.TestTicket275.class);
suite.addTestSuite(com.bigdata.rdf.sail.TestTicket276.class);
+ suite.addTestSuite(com.bigdata.rdf.sail.TestLexJoinOps.class);
+
return suite;
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithoutSids.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithoutSids.java 2011-06-09 20:05:26 UTC (rev 4676)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithoutSids.java 2011-06-09 20:25:05 UTC (rev 4677)
@@ -95,6 +95,8 @@
suite.addTestSuite(com.bigdata.rdf.sail.TestTicket275.class);
suite.addTestSuite(com.bigdata.rdf.sail.TestTicket276.class);
+ suite.addTestSuite(com.bigdata.rdf.sail.TestLexJoinOps.class);
+
return suite;
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestLexJoinOps.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestLexJoinOps.java 2011-06-09 20:05:26 UTC (rev 4676)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestLexJoinOps.java 2011-06-09 20:25:05 UTC (rev 4677)
@@ -23,6 +23,8 @@
package com.bigdata.rdf.sail;
+import java.util.Collection;
+import java.util.LinkedList;
import java.util.Properties;
import org.apache.log4j.Logger;
@@ -31,14 +33,12 @@
import org.openrdf.model.ValueFactory;
import org.openrdf.model.vocabulary.RDF;
import org.openrdf.model.vocabulary.RDFS;
+import org.openrdf.query.BindingSet;
import org.openrdf.query.QueryLanguage;
import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.Repository;
+import org.openrdf.query.impl.BindingImpl;
import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.sail.SailRepository;
import org.openrdf.repository.sail.SailTupleQuery;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.memory.MemoryStore;
import com.bigdata.rdf.axioms.NoAxioms;
import com.bigdata.rdf.internal.XSD;
@@ -114,7 +114,7 @@
* Create some statements.
*/
cxn.add(X, RDF.TYPE, RDFS.RESOURCE);
-// cxn.add(X, RDFS.LABEL, _1);
+ cxn.add(X, RDFS.LABEL, _1);
cxn.add(X, RDFS.LABEL, _2);
cxn.add(X, RDFS.LABEL, _3);
cxn.add(X, RDFS.LABEL, _4);
@@ -140,15 +140,11 @@
"prefix rdf: <"+RDF.NAMESPACE+"> " +
"prefix rdfs: <"+RDFS.NAMESPACE+"> " +
- "select ?p ?o " +
+ "select ?o " +
"where { " +
" ?s rdf:type rdfs:Resource . " +
-// " ?s ?p \"foo\" . " +
" ?s ?p ?o . " +
-// " filter(str(?o) = \"foo\" && regex(str(?o),\"foo\",\"i\")) " +
-// " filter(?o = \"foo\") " +
" filter(str(?o) = \"foo\") " +
- " filter(str(?p) = \""+RDFS.LABEL+"\") " +
"}";
final SailTupleQuery tupleQuery = (SailTupleQuery)
@@ -159,17 +155,6 @@
log.info(query);
-// final BigdataSailTupleQuery bdTupleQuery =
-// (BigdataSailTupleQuery) tupleQuery;
-// final QueryRoot root = (QueryRoot) bdTupleQuery.getTupleExpr();
-// final Projection p = (Projection) root.getArg();
-// final TupleExpr tupleExpr = p.getArg();
-// final SOpTreeBuilder stb = new SOpTreeBuilder();
-// final SOpTree tree = stb.collectSOps(tupleExpr);
-
-// log.info(tree);
-// log.info(query);
-
final TupleQueryResult result = tupleQuery.evaluate();
while (result.hasNext()) {
log.info(result.next());
@@ -177,19 +162,23 @@
}
-// final Collection<BindingSet> answer = new LinkedList<BindingSet>();
-// answer.add(createBindingSet(
-// new BindingImpl("a", paul),
-// new BindingImpl("b", mary)
-// ));
-// answer.add(createBindingSet(
-// new BindingImpl("a", brad),
-// new BindingImpl("b", john)
-// ));
-//
-// final TupleQueryResult result = tupleQuery.evaluate();
-// compare(result, answer);
+ final Collection<BindingSet> answer = new LinkedList<BindingSet>();
+ answer.add(createBindingSet(
+ new BindingImpl("o", _1)
+ ));
+ answer.add(createBindingSet(
+ new BindingImpl("o", _2)
+ ));
+ answer.add(createBindingSet(
+ new BindingImpl("o", _3)
+ ));
+ answer.add(createBindingSet(
+ new BindingImpl("o", _4)
+ ));
+ final TupleQueryResult result = tupleQuery.evaluate();
+ compare(result, answer);
+
}
} finally {
@@ -237,7 +226,7 @@
* Create some statements.
*/
cxn.add(X, RDF.TYPE, RDFS.RESOURCE);
-// cxn.add(X, RDFS.LABEL, _1);
+ cxn.add(X, RDFS.LABEL, _1);
cxn.add(X, RDFS.LABEL, _2);
cxn.add(X, RDFS.LABEL, _3);
cxn.add(X, RDFS.LABEL, _4);
@@ -279,17 +268,6 @@
log.info(query);
-// final BigdataSailTupleQuery bdTupleQuery =
-// (BigdataSailTupleQuery) tupleQuery;
-// final QueryRoot root = (QueryRoot) bdTupleQuery.getTupleExpr();
-// final Projection p = (Projection) root.getArg();
-// final TupleExpr tupleExpr = p.getArg();
-// final SOpTreeBuilder stb = new SOpTreeBuilder();
-// final SOpTree tree = stb.collectSOps(tupleExpr);
-
-// log.info(tree);
-// log.info(query);
-
final TupleQueryResult result = tupleQuery.evaluate();
while (result.hasNext()) {
log.info(result.next());
@@ -297,19 +275,23 @@
}
-// final Collection<BindingSet> answer = new LinkedList<BindingSet>();
-// answer.add(createBindingSet(
-// new BindingImpl("a", paul),
-// new BindingImpl("b", mary)
-// ));
-// answer.add(createBindingSet(
-// new BindingImpl("a", brad),
-// new BindingImpl("b", john)
-// ));
-//
-// final TupleQueryResult result = tupleQuery.evaluate();
-// compare(result, answer);
+ final Collection<BindingSet> answer = new LinkedList<BindingSet>();
+ answer.add(createBindingSet(
+ new BindingImpl("o", _1)
+ ));
+ answer.add(createBindingSet(
+ new BindingImpl("o", _2)
+ ));
+ answer.add(createBindingSet(
+ new BindingImpl("o", _3)
+ ));
+ answer.add(createBindingSet(
+ new BindingImpl("o", _4)
+ ));
+ final TupleQueryResult result = tupleQuery.evaluate();
+ compare(result, answer);
+
}
} finally {
@@ -367,7 +349,7 @@
* Create some statements.
*/
cxn.add(X, RDF.TYPE, RDFS.RESOURCE);
-// cxn.add(X, RDFS.LABEL, _1);
+ cxn.add(X, RDFS.LABEL, _1);
cxn.add(X, RDFS.LABEL, _2);
cxn.add(X, RDFS.LABEL, _3);
cxn.add(X, RDFS.LABEL, _4);
@@ -409,17 +391,6 @@
log.info(query);
-// final BigdataSailTupleQuery bdTupleQuery =
-// (BigdataSailTupleQuery) tupleQuery;
-// final QueryRoot root = (QueryRoot) bdTupleQuery.getTupleExpr();
-// final Projection p = (Projection) root.getArg();
-// final TupleExpr tupleExpr = p.getArg();
-// final SOpTreeBuilder stb = new SOpTreeBuilder();
-// final SOpTree tree = stb.collectSOps(tupleExpr);
-
-// log.info(tree);
-// log.info(query);
-
final TupleQueryResult result = tupleQuery.evaluate();
while (result.hasNext()) {
log.info(result.next());
@@ -427,19 +398,17 @@
}
-// final Collection<BindingSet> answer = new LinkedList<BindingSet>();
-// answer.add(createBindingSet(
-// new BindingImpl("a", paul),
-// new BindingImpl("b", mary)
-// ));
-// answer.add(createBindingSet(
-// new BindingImpl("a", brad),
-// new BindingImpl("b", john)
-// ));
-//
-// final TupleQueryResult result = tupleQuery.evaluate();
-// compare(result, answer);
+ final Collection<BindingSet> answer = new LinkedList<BindingSet>();
+ answer.add(createBindingSet(
+ new BindingImpl("o", _5)
+ ));
+ answer.add(createBindingSet(
+ new BindingImpl("o", _6)
+ ));
+ final TupleQueryResult result = tupleQuery.evaluate();
+ compare(result, answer);
+
}
} finally {
@@ -524,17 +493,6 @@
log.info(query);
-// final BigdataSailTupleQuery bdTupleQuery =
-// (BigdataSailTupleQuery) tupleQuery;
-// final QueryRoot root = (QueryRoot) bdTupleQuery.getTupleExpr();
-// final Projection p = (Projection) root.getArg();
-// final TupleExpr tupleExpr = p.getArg();
-// final SOpTreeBuilder stb = new SOpTreeBuilder();
-// final SOpTree tree = stb.collectSOps(tupleExpr);
-
-// log.info(tree);
-// log.info(query);
-
final TupleQueryResult result = tupleQuery.evaluate();
while (result.hasNext()) {
log.info(result.next());
@@ -542,19 +500,17 @@
}
-// final Collection<BindingSet> answer = new LinkedList<BindingSet>();
-// answer.add(createBindingSet(
-// new BindingImpl("a", paul),
-// new BindingImpl("b", mary)
-// ));
-// answer.add(createBindingSet(
-// new BindingImpl("a", brad),
-// new BindingImpl("b", john)
-// ));
-//
-// final TupleQueryResult result = tupleQuery.evaluate();
-// compare(result, answer);
+ final Collection<BindingSet> answer = new LinkedList<BindingSet>();
+ answer.add(createBindingSet(
+ new BindingImpl("title", _2)
+ ));
+ answer.add(createBindingSet(
+ new BindingImpl("title", _3)
+ ));
+ final TupleQueryResult result = tupleQuery.evaluate();
+ compare(result, answer);
+
}
} finally {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
