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 2013/06/24 13:20:30 UTC
svn commit: r1495993 - in /jena/trunk/jena-text/src:
main/java/org/apache/jena/query/text/
main/java/org/apache/jena/query/text/assembler/
test/java/org/apache/jena/query/text/assembler/
Author: andy
Date: Mon Jun 24 11:20:30 2013
New Revision: 1495993
URL: http://svn.apache.org/r1495993
Log:
Remove requirement for a default predicate declaration because it is not needed.
Modified:
jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java
jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java
jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/QueryPF.java
jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/assembler/EntityMapAssembler.java
jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestEntityMapAssembler.java
Modified: jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java?rev=1495993&r1=1495992&r2=1495993&view=diff
==============================================================================
--- jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java (original)
+++ jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java Mon Jun 24 11:20:30 2013
@@ -62,22 +62,28 @@ public class DatasetGraphText extends Da
{
return textIndex;
}
-
+
+ /** Search the text index on the default text field */
public Iterator<Node> search(String queryString)
{
return search(queryString, null) ;
}
+ /** Search the text index on the text field associated with the predicate */
public Iterator<Node> search(String queryString, Node predicate)
{
return search(queryString, predicate, -1) ;
}
+
+ /** Search the text index on the default text field */
+ public Iterator<Node> search(String queryString, int limit) {
+ return search(queryString, null, limit) ;
+ }
+ /** Search the text index on the text field associated with the predicate */
public Iterator<Node> search(String queryString, Node predicate, int limit)
{
queryString = QueryParser.escape(queryString) ;
- if ( predicate == null )
- predicate = textIndex.getDocDef().getPrimaryPredicate() ;
if ( predicate != null )
{
String f = textIndex.getDocDef().getField(predicate) ;
Modified: jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java?rev=1495993&r1=1495992&r2=1495993&view=diff
==============================================================================
--- jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java (original)
+++ jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java Mon Jun 24 11:20:30 2013
@@ -18,10 +18,7 @@
package org.apache.jena.query.text ;
-import java.util.Collection ;
-import java.util.Collections ;
-import java.util.HashMap ;
-import java.util.Map ;
+import java.util.* ;
import org.apache.jena.atlas.lib.MultiMap ;
@@ -38,7 +35,18 @@ public class EntityDefinition {
// Collections.unmodifiableCollection(fieldToPredicate.keySet()) ;
private final String entityField ;
private final String primaryField ;
- private final Node primaryPredicate ;
+ //private final Node primaryPredicate ;
+
+ /**
+ * @param entityField
+ * The entity being indexed (e.g. it's URI).
+ * @param primaryField
+ * The primary/default field to search
+ */
+ public EntityDefinition(String entityField, String primaryField) {
+ this.entityField = entityField ;
+ this.primaryField = primaryField ;
+ }
/**
* @param entityField
@@ -49,15 +57,8 @@ public class EntityDefinition {
* The property associated with the primary/default field
*/
public EntityDefinition(String entityField, String primaryField, Node primaryPredicate) {
- this.entityField = entityField ;
- this.primaryField = primaryField ;
- this.primaryPredicate = primaryPredicate ;
- if (primaryField == null && primaryPredicate != null)
- throw new IllegalArgumentException("primaryField null but primaryPredicate not null") ;
- if (primaryField != null && primaryPredicate == null)
- throw new IllegalArgumentException("primaryField not null but primaryPredicate null") ;
- if (primaryField != null && primaryPredicate != null)
- set(primaryField, primaryPredicate) ;
+ this(entityField, primaryField) ;
+ set(primaryField, primaryPredicate) ;
}
public String getEntityField() {
@@ -80,15 +81,22 @@ public class EntityDefinition {
return predicateToField.get(predicate) ;
}
- public Node getPrimaryPredicate() {
- return primaryPredicate ;
- }
-
public String getPrimaryField() {
return primaryField ;
}
+ public Node getPrimaryPredicate() {
+ Collection<Node> c = fieldToPredicate.get(getPrimaryField()) ;
+ return getOne(c) ;
+ }
+
public Collection<String> fields() {
return fields ;
}
+
+ private static <T> T getOne(Collection<T> collection) {
+ if ( collection.size() != 1 )
+ return null ;
+ return collection.iterator().next() ;
+ }
}
Modified: jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/QueryPF.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/QueryPF.java?rev=1495993&r1=1495992&r2=1495993&view=diff
==============================================================================
--- jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/QueryPF.java (original)
+++ jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/QueryPF.java Mon Jun 24 11:20:30 2013
@@ -197,27 +197,27 @@ public class QueryPF extends PropertyFun
}
String qs = o.getLiteralLexicalForm() ;
- return new StrMatch(docDef.getPrimaryPredicate(), qs, -1, 0) ;
+ return new StrMatch(null, qs, -1, 0) ;
}
List<Node> list = argObject.getArgList() ;
if (list.size() == 0 || list.size() > 3)
throw new TextIndexException("Change in object list size") ;
- Node p = docDef.getPrimaryPredicate() ;
+ Node predicate = null ;
String field = docDef.getPrimaryField() ;
int idx = 0 ;
Node x = list.get(0) ;
// Property?
if (x.isURI()) {
- p = x ;
+ predicate = x ;
idx++ ;
if (idx >= list.size())
throw new TextIndexException("Property specificied but no query string : " + list) ;
x = list.get(idx) ;
- field = docDef.getField(p) ;
+ field = docDef.getField(predicate) ;
if (field == null) {
- log.warn("Predicate not indexed: " + p) ;
+ log.warn("Predicate not indexed: " + predicate) ;
return null ;
}
}
@@ -249,7 +249,7 @@ public class QueryPF extends PropertyFun
if (field != null)
qs = field + ":" + qs ;
- return new StrMatch(p, qs, limit, score) ;
+ return new StrMatch(predicate, qs, limit, score) ;
}
class StrMatch {
Modified: jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/assembler/EntityMapAssembler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/assembler/EntityMapAssembler.java?rev=1495993&r1=1495992&r2=1495993&view=diff
==============================================================================
--- jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/assembler/EntityMapAssembler.java (original)
+++ jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/assembler/EntityMapAssembler.java Mon Jun 24 11:20:30 2013
@@ -25,6 +25,7 @@ import java.util.List ;
import org.apache.jena.atlas.lib.MultiMap ;
import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.query.text.EntityDefinition ;
import org.apache.jena.query.text.TextIndexException ;
@@ -56,25 +57,13 @@ public class EntityMapAssembler extends
{
String prologue = "PREFIX : <"+NS+"> PREFIX list: <http://jena.hpl.hp.com/ARQ/list#> " ;
Model model = root.getModel() ;
-
-
- // ParameterizedSparqlString
-// String qs1 = StrUtils.strjoinNL("SELECT * {",
-// " <"+root.getURI()+"> :entityField ?entityField ;",
-// " :defaultField ?dftField
-// " :map ?map ;",
-// " OPTIONAL { <"+root.getURI()+"> :defaultField ?dftField } ",
-// "}") ;
-
+
String qs1 = StrUtils.strjoinNL(prologue,
"SELECT * {" ,
" ?eMap :entityField ?entityField ;" ,
- " :map ?map" ,
- " OPTIONAL {" ,
- " ?eMap :defaultField ?dftField" ,
- " OPTIONAL { ?eMap :defaultPredicate ?dftPredicate } " ,
- " }",
- "}") ;
+ " :map ?map ;",
+ " :defaultField ?dftField" ,
+ "}") ;
ParameterizedSparqlString pss = new ParameterizedSparqlString(qs1) ;
pss.setIri("eMap", root.getURI()) ;
@@ -82,33 +71,26 @@ public class EntityMapAssembler extends
QueryExecution qexec1 = QueryExecutionFactory.create(query1, model) ;
ResultSet rs1 = qexec1.execSelect() ;
List<QuerySolution> results = ResultSetFormatter.toList(rs1) ;
- if ( results.size() !=1 )
- throw new IllegalStateException() ;
+ if ( results.size() == 0 ) {
+ //Log.warn(this, "Failed to find a valid EntityMap for : "+root) ;
+ throw new TextIndexException("Failed to find a valid EntityMap for : "+root) ;
+ }
+
+ if ( results.size() !=1 ) {
+ Log.warn(this, "Multiple matches for EntityMap for : "+root) ;
+ throw new TextIndexException("Multiple matches for EntityMap for : "+root) ;
+ }
QuerySolution qsol1 = results.get(0) ;
String entityField = qsol1.getLiteral("entityField").getLexicalForm() ;
String defaultField = qsol1.contains("dftField") ? qsol1.getLiteral("dftField").getLexicalForm() : null ;
- Node defaultPredicate = qsol1.contains("dftPredicate") ? qsol1.get("dftPredicate").asNode() : null ;
- String qs2 = StrUtils.strjoinNL("SELECT * {",
- " ?map list:member [ :field ?field ; :predicate ?predicate ]" ,
- "}") ;
+ String qs2 = StrUtils.strjoinNL("SELECT * { ?map list:member [ :field ?field ; :predicate ?predicate ] }") ;
Query query2 = QueryFactory.create(prologue+" "+qs2) ;
QueryExecution qexec2 = QueryExecutionFactory.create(query2, model, qsol1) ;
ResultSet rs2 = qexec2.execSelect() ;
List<QuerySolution> mapEntries = ResultSetFormatter.toList(rs2) ;
- // Find primary entity property.
- Node primaryProperty = null ;
- for ( QuerySolution qsol : mapEntries )
- {
- String field = qsol.getLiteral("field").getLexicalForm() ;
- if ( defaultField.equals(field) )
- {
- primaryProperty = qsol.getResource("predicate").asNode() ;
- break ;
- }
- }
MultiMap<String, Node> mapDefs = MultiMap.createMapList() ;
for ( QuerySolution qsol : mapEntries ) {
@@ -122,19 +104,10 @@ public class EntityMapAssembler extends
Collection<Node> c = mapDefs.get(defaultField) ;
if ( c == null )
throw new TextIndexException("No definition of primary field '"+defaultField+"'") ;
- if ( defaultPredicate == null ) {
- if ( c.size() != 1 )
- throw new TextIndexException("No single definition of primary predicate for primary field '"+defaultField+"'") ;
- // Set default predicate
- defaultPredicate = c.iterator().next() ;
- } else {
- if ( ! c.contains(defaultPredicate) )
- throw new TextIndexException("Primary field '"+defaultField+"' not asscoiated with property <"+defaultPredicate.getURI()+">" ) ;
- }
}
- EntityDefinition docDef = new EntityDefinition(entityField, defaultField, defaultPredicate) ;
+ EntityDefinition docDef = new EntityDefinition(entityField, defaultField) ;
for ( String f : mapDefs.keys() ) {
for ( Node p : mapDefs.get(f))
docDef.set(f, p) ;
Modified: jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestEntityMapAssembler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestEntityMapAssembler.java?rev=1495993&r1=1495992&r2=1495993&view=diff
==============================================================================
--- jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestEntityMapAssembler.java (original)
+++ jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestEntityMapAssembler.java Mon Jun 24 11:20:30 2013
@@ -20,7 +20,6 @@ package org.apache.jena.query.text.assem
import static org.junit.Assert.assertEquals ;
import static org.junit.Assert.assertTrue ;
-import static org.junit.Assert.fail ;
import java.util.Collection ;
@@ -80,37 +79,28 @@ public class TestEntityMapAssembler {
assertEquals(SPEC2_PREDICATE2.asNode(), getOne(entityDef, SPEC2_FIELD2));
}
- @Test public void errorOnNoEntityField() {
+ @Test(expected=TextIndexException.class) public void errorOnNoEntityField() {
EntityMapAssembler emAssembler = new EntityMapAssembler();
- try {
- emAssembler.open(null, specNoEntityField, null);
- fail("should throw exception if there is no entity field");
- } catch (IllegalStateException e) {}
+ emAssembler.open(null, specNoEntityField, null);
}
- @Test public void errorOnNoDefaultField() {
+ @Test(expected=TextIndexException.class) public void errorOnNoDefaultField() {
EntityMapAssembler emAssembler = new EntityMapAssembler();
- try {
- emAssembler.open(null, specNoDefaultField, null);
- fail("should throw exception if there is no default field");
- } catch (IllegalStateException e) {}
+ emAssembler.open(null, specNoDefaultField, null);
}
- @Test public void errorOnNoMapProperty() {
+ @Test(expected=TextIndexException.class) public void errorOnNoMapProperty() {
EntityMapAssembler emAssembler = new EntityMapAssembler();
- try {
- emAssembler.open(null, specNoMapProperty, null);
- fail("should throw exception if there is no map property");
- } catch (IllegalStateException e) {}
+ emAssembler.open(null, specNoMapProperty, null);
}
- @Test public void errorOnNoPrimaryFieldDef() {
+ @Test(expected=TextIndexException.class) public void errorOnNoPrimaryFieldDef() {
EntityMapAssembler emAssembler = new EntityMapAssembler();
try {
emAssembler.open(null, specNoPrimaryFieldDef, null);
- fail("should throw exception if there is no map property");
} catch (TextIndexException e) {
assertTrue(e.getMessage().contains(SPEC1_DEFAULT_FIELD));
+ throw e ;
}
}