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 2017/12/01 19:09:01 UTC
[01/14] jena git commit: added config for using text cache;
added debug log for Lucene docs
Repository: jena
Updated Branches:
refs/heads/master 6064259ad -> 89145b0dd
added config for using text cache; added debug log for Lucene docs
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7b016291
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7b016291
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7b016291
Branch: refs/heads/master
Commit: 7b016291a17cdcabb1cf7222094e1f00344ddf15
Parents: bd58437
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Sun Nov 19 11:48:42 2017 -0600
Committer: Chris Tomlinson <ct...@moonvine.org>
Committed: Sun Nov 19 11:48:42 2017 -0600
----------------------------------------------------------------------
.../jena/query/text/EntityDefinition.java | 10 ++++++
.../apache/jena/query/text/TextIndexLucene.java | 6 ++++
.../org/apache/jena/query/text/TextQueryPF.java | 36 +++++++++++++-------
.../assembler/TextIndexLuceneAssembler.java | 12 +++++++
.../jena/query/text/assembler/TextVocab.java | 3 ++
5 files changed, 54 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/7b016291/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java b/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java
index 69cca8c..39457d8 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java
@@ -45,6 +45,8 @@ public class EntityDefinition {
private String langField ;
private String uidField ;
+ private boolean cacheQueries;
+
/**
* @param entityField
* The entity being indexed (e.g. it's URI).
@@ -189,6 +191,14 @@ public class EntityDefinition {
return null ;
return collection.iterator().next() ;
}
+
+ public boolean areQueriesCached() {
+ return cacheQueries;
+ }
+
+ public void setCacheQueries(boolean cacheQueries) {
+ this.cacheQueries = cacheQueries;
+ }
@Override
public String toString() {
http://git-wip-us.apache.org/repos/asf/jena/blob/7b016291/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
index 54063d8..355e4c7 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
@@ -216,6 +216,8 @@ public class TextIndexLucene implements TextIndex {
Document doc = doc(entity);
Term term = new Term(docDef.getEntityField(), entity.getId());
indexWriter.updateDocument(term, doc);
+ if ( log.isDebugEnabled() )
+ log.debug("updated: "+doc) ;
}
@Override
@@ -233,6 +235,8 @@ public class TextIndexLucene implements TextIndex {
protected void addDocument(Entity entity) throws IOException {
Document doc = doc(entity) ;
indexWriter.addDocument(doc) ;
+ if ( log.isDebugEnabled() )
+ log.debug("added: "+doc) ;
}
@Override
@@ -426,6 +430,8 @@ public class TextIndexLucene implements TextIndex {
for ( ScoreDoc sd : sDocs ) {
Document doc = indexSearcher.doc(sd.doc) ;
+ if ( log.isDebugEnabled() )
+ log.debug("query$ found: "+doc) ;
String[] values = doc.getValues(docDef.getEntityField()) ;
Node literal = null;
http://git-wip-us.apache.org/repos/asf/jena/blob/7b016291/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
index 170337a..20668cd 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
@@ -252,24 +252,34 @@ public class TextQueryPF extends PropertyFunctionBase {
if ( log.isDebugEnabled())
log.debug("Text query: {} <{}> ({})", queryString, graphURI, limit) ;
}
+
+ ListMultimap<String,TextHit> results;
- // Cache-key does not matter if lang or graphURI are null
- String cacheKey = limit + " " + property + " " + queryString + " " + lang + " " + graphURI ;
- @SuppressWarnings("unchecked")
- Cache<String,ListMultimap<String,TextHit>> queryCache =
- (Cache<String,ListMultimap<String,TextHit>>) execCxt.getContext().get(cacheSymbol);
- if (queryCache == null) {
- /* doesn't yet exist, need to create it */
- queryCache = CacheFactory.createCache(CACHE_SIZE);
- execCxt.getContext().put(cacheSymbol, queryCache);
+ if (textIndex.getDocDef().areQueriesCached()) {
+ // Cache-key does not matter if lang or graphURI are null
+ String cacheKey = limit + " " + property + " " + queryString + " " + lang + " " + graphURI ;
+ @SuppressWarnings("unchecked")
+ Cache<String,ListMultimap<String,TextHit>> queryCache =
+ (Cache<String,ListMultimap<String,TextHit>>) execCxt.getContext().get(cacheSymbol);
+ if (queryCache == null) {
+ /* doesn't yet exist, need to create it */
+ queryCache = CacheFactory.createCache(CACHE_SIZE);
+ execCxt.getContext().put(cacheSymbol, queryCache);
+ }
+
+ if ( log.isDebugEnabled())
+ log.debug("Caching Text query: {} with key: >>{}<< in cache: {}", queryString, cacheKey, queryCache) ;
+
+ results = queryCache.getOrFill(cacheKey, ()->performQuery(property, queryString, graphURI, lang, limit));
+ } else {
+ if ( log.isDebugEnabled())
+ log.debug("Executing w/o cache Text query: {}", queryString) ;
+ results = performQuery(property, queryString, graphURI, lang, limit);
}
- ListMultimap<String,TextHit> results = queryCache.getOrFill(cacheKey, ()->performQuery(property, queryString, graphURI, lang, limit));
- // No cache.
- //ListMultimap<String,TextHit> results = performQuery(property, queryString, graphURI, lang, limit);
return results;
}
-
+
private String chooseGraphURI(ExecutionContext execCxt) {
// use the graph information in the text index if possible
String graphURI = null;
http://git-wip-us.apache.org/repos/asf/jena/blob/7b016291/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java
index 14af9bf..f8e6a16 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java
@@ -144,6 +144,17 @@ public class TextIndexLuceneAssembler extends AssemblerBase {
storeValues = svNode.asLiteral().getBoolean();
}
+ // use query cache by default
+ boolean cacheQueries = true;
+ Statement cacheQueriesStatement = root.getProperty(pCacheQueries);
+ if (null != cacheQueriesStatement) {
+ RDFNode cqNode = cacheQueriesStatement.getObject();
+ if (! cqNode.isLiteral()) {
+ throw new TextIndexException("text:cacheQueries property must be a string : " + cqNode);
+ }
+ cacheQueries = cqNode.asLiteral().getBoolean();
+ }
+
Resource r = GraphUtils.getResourceValue(root, pEntityMap) ;
EntityDefinition docDef = (EntityDefinition)a.open(r) ;
TextIndexConfig config = new TextIndexConfig(docDef);
@@ -152,6 +163,7 @@ public class TextIndexLuceneAssembler extends AssemblerBase {
config.setQueryParser(queryParser);
config.setMultilingualSupport(isMultilingualSupport);
config.setValueStored(storeValues);
+ docDef.setCacheQueries(cacheQueries);
return TextDatasetFactory.createLuceneIndex(directory, config) ;
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/jena/blob/7b016291/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java
index 1ce4afa..f41d0cc 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java
@@ -102,5 +102,8 @@ public class TextVocab
public static final Property pDefAnalyzer = Vocab.property(NS, "defineAnalyzer");
public static final Property pAddLang = Vocab.property(NS, "addLang");
public static final Property pUseAnalyzer = Vocab.property(NS, "useAnalyzer");
+
+ // Query Cache
+ public static final Property pCacheQueries = Vocab.property(NS, "cacheQueries");
}
[04/14] jena git commit: Merge remote-tracking branch
'upstream/master' into highlighting
Posted by an...@apache.org.
Merge remote-tracking branch 'upstream/master' into highlighting
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5e95a09e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5e95a09e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5e95a09e
Branch: refs/heads/master
Commit: 5e95a09eccaf7f8fa5ec659bebde83cdf8398163
Parents: e144571 ff92fae
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Sun Nov 26 10:19:11 2017 -0600
Committer: Chris Tomlinson <ct...@moonvine.org>
Committed: Sun Nov 26 10:19:11 2017 -0600
----------------------------------------------------------------------
jena-cmds/src/main/java/tdb2/cmdline/ModTDBDataset.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[10/14] jena git commit: correct exception messages to reflect
required boolean values
Posted by an...@apache.org.
correct exception messages to reflect required boolean values
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/281d65c4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/281d65c4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/281d65c4
Branch: refs/heads/master
Commit: 281d65c431054ee38a4fcae22952a43e360c2a1d
Parents: ed67ef7
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Wed Nov 29 12:07:33 2017 -0600
Committer: Chris Tomlinson <ct...@moonvine.org>
Committed: Wed Nov 29 12:07:33 2017 -0600
----------------------------------------------------------------------
.../jena/query/text/assembler/TextIndexLuceneAssembler.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/281d65c4/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java
index f8e6a16..ebaca4e 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java
@@ -112,7 +112,7 @@ public class TextIndexLuceneAssembler extends AssemblerBase {
if (null != mlSupportStatement) {
RDFNode mlsNode = mlSupportStatement.getObject();
if (! mlsNode.isLiteral()) {
- throw new TextIndexException("text:multilingualSupport property must be a string : " + mlsNode);
+ throw new TextIndexException("text:multilingualSupport property must be a boolean : " + mlsNode);
}
isMultilingualSupport = mlsNode.asLiteral().getBoolean();
}
@@ -139,7 +139,7 @@ public class TextIndexLuceneAssembler extends AssemblerBase {
if (null != storeValuesStatement) {
RDFNode svNode = storeValuesStatement.getObject();
if (! svNode.isLiteral()) {
- throw new TextIndexException("text:storeValues property must be a string : " + svNode);
+ throw new TextIndexException("text:storeValues property must be a boolean : " + svNode);
}
storeValues = svNode.asLiteral().getBoolean();
}
@@ -150,7 +150,7 @@ public class TextIndexLuceneAssembler extends AssemblerBase {
if (null != cacheQueriesStatement) {
RDFNode cqNode = cacheQueriesStatement.getObject();
if (! cqNode.isLiteral()) {
- throw new TextIndexException("text:cacheQueries property must be a string : " + cqNode);
+ throw new TextIndexException("text:cacheQueries property must be a boolean : " + cqNode);
}
cacheQueries = cqNode.asLiteral().getBoolean();
}
[06/14] jena git commit: added tracing exec, etc for development
Posted by an...@apache.org.
added tracing exec, etc for development
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/452b3838
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/452b3838
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/452b3838
Branch: refs/heads/master
Commit: 452b3838aee02da4983e8df8c6b33c504e7c3f5a
Parents: d98b096
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Tue Nov 28 11:57:16 2017 -0600
Committer: Chris Tomlinson <ct...@moonvine.org>
Committed: Tue Nov 28 11:57:16 2017 -0600
----------------------------------------------------------------------
.../org/apache/jena/query/text/TextQueryPF.java | 27 +++++++++++++++++---
1 file changed, 23 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/452b3838/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
index 20668cd..4a68b28 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
@@ -23,6 +23,7 @@ import java.util.Iterator ;
import java.util.List ;
import java.util.function.Function ;
+import org.apache.jena.atlas.io.IndentedLineBuffer;
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.lib.Cache ;
import org.apache.jena.atlas.lib.CacheFactory ;
@@ -147,6 +148,13 @@ public class TextQueryPF extends PropertyFunctionBase {
@Override
public QueryIterator exec(Binding binding, PropFuncArg argSubject, Node predicate, PropFuncArg argObject,
ExecutionContext execCxt) {
+ if (log.isTraceEnabled()) {
+ IndentedLineBuffer subjBuff = new IndentedLineBuffer() ;
+ argSubject.output(subjBuff, null) ;
+ IndentedLineBuffer objBuff = new IndentedLineBuffer() ;
+ argObject.output(objBuff, null) ;
+ log.trace("exec: {} text:query {}", subjBuff, objBuff) ;
+ }
if (textIndex == null) {
if (!warningIssued) {
Log.warn(getClass(), "No text index - no text search performed") ;
@@ -201,6 +209,8 @@ public class TextQueryPF extends PropertyFunctionBase {
}
private QueryIterator resultsToQueryIterator(Binding binding, Node s, Node score, Node literal, Collection<TextHit> results, ExecutionContext execCxt) {
+ if (log.isTraceEnabled())
+ log.trace("resultsToQueryIterator: {}", results) ;
Var sVar = Var.isVar(s) ? Var.alloc(s) : null ;
Var scoreVar = (score==null) ? null : Var.alloc(score) ;
Var literalVar = (literal==null) ? null : Var.alloc(literal) ;
@@ -224,12 +234,16 @@ public class TextQueryPF extends PropertyFunctionBase {
}
private QueryIterator variableSubject(Binding binding, Node s, Node score, Node literal, StrMatch match, ExecutionContext execCxt) {
+ if (log.isTraceEnabled())
+ log.trace("variableSubject: {}", match) ;
ListMultimap<String,TextHit> results = query(match.getProperty(), match.getQueryString(), match.getLang(), match.getLimit(), execCxt) ;
Collection<TextHit> r = results.values();
return resultsToQueryIterator(binding, s, score, literal, r, execCxt);
}
private QueryIterator concreteSubject(Binding binding, Node s, Node score, Node literal, StrMatch match, ExecutionContext execCxt) {
+ if (log.isTraceEnabled())
+ log.trace("concreteSubject: {}", match) ;
ListMultimap<String,TextHit> x = query(match.getProperty(), match.getQueryString(), match.getLang(), -1, execCxt) ;
if ( x == null ) // null return value - empty result
@@ -267,13 +281,13 @@ public class TextQueryPF extends PropertyFunctionBase {
execCxt.getContext().put(cacheSymbol, queryCache);
}
- if ( log.isDebugEnabled())
- log.debug("Caching Text query: {} with key: >>{}<< in cache: {}", queryString, cacheKey, queryCache) ;
+ if (log.isTraceEnabled())
+ log.trace("Caching Text query: {} with key: >>{}<< in cache: {}", queryString, cacheKey, queryCache) ;
results = queryCache.getOrFill(cacheKey, ()->performQuery(property, queryString, graphURI, lang, limit));
} else {
- if ( log.isDebugEnabled())
- log.debug("Executing w/o cache Text query: {}", queryString) ;
+ if (log.isTraceEnabled())
+ log.trace("Executing w/o cache Text query: {}", queryString) ;
results = performQuery(property, queryString, graphURI, lang, limit);
}
@@ -426,5 +440,10 @@ public class TextQueryPF extends PropertyFunctionBase {
public float getScoreLimit() {
return scoreLimit ;
}
+
+ @Override
+ public String toString() {
+ return "( property: " + property + "; query: " + queryString + "; limit: " + limit + "; lang: " + lang + " )";
+ }
}
}
[07/14] jena git commit: Merge branch 'master' of
https://github.com/apache/jena into highlighting
Posted by an...@apache.org.
Merge branch 'master' of https://github.com/apache/jena into highlighting
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/dbbca204
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/dbbca204
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/dbbca204
Branch: refs/heads/master
Commit: dbbca204e5a4f7510bb6f667eac7105c28c2ff3e
Parents: 452b383 155edb7
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Tue Nov 28 16:38:05 2017 -0600
Committer: Chris Tomlinson <ct...@moonvine.org>
Committed: Tue Nov 28 16:38:05 2017 -0600
----------------------------------------------------------------------
.../org/apache/jena/riot/RDFParserBuilder.java | 2 +-
.../jena/riot/system/ErrorHandlerFactory.java | 61 ++++++++++++++++++++
.../src/main/java/arq/cmdline/ModLangParse.java | 10 ++++
.../src/main/java/riotcmd/CmdLangParse.java | 35 ++++++-----
.../arq/querybuilder/AbstractQueryBuilder.java | 4 +-
.../arq/querybuilder/clauses/ValuesClause.java | 4 +-
6 files changed, 99 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
[14/14] jena git commit: JENA-1438: Merge commit 'refs/pull/320/head'
of github.com:apache/jena
Posted by an...@apache.org.
JENA-1438: Merge commit 'refs/pull/320/head' of github.com:apache/jena
This closes #320.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/89145b0d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/89145b0d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/89145b0d
Branch: refs/heads/master
Commit: 89145b0ddb8b37fe9d5df3fd0aec448fba6ddacb
Parents: e427c41 c68d55f
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Dec 1 19:02:36 2017 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Dec 1 19:02:36 2017 +0000
----------------------------------------------------------------------
.../org/apache/jena/query/text/TextQueryPF.java | 27 +++++++++++++-------
1 file changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/89145b0d/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
----------------------------------------------------------------------
[12/14] jena git commit: prefer Strings.emptyToNull(...)
Posted by an...@apache.org.
prefer Strings.emptyToNull(...)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c68d55fb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c68d55fb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c68d55fb
Branch: refs/heads/master
Commit: c68d55fbebdb449ec3e7544b82539ee2c4f4b317
Parents: c39c232
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Thu Nov 30 09:41:44 2017 -0600
Committer: GitHub <no...@github.com>
Committed: Thu Nov 30 09:41:44 2017 -0600
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/query/text/TextQueryPF.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/c68d55fb/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
index ecb781c..bafe2ac 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
@@ -31,6 +31,7 @@ import org.apache.jena.datatypes.RDFDatatype ;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
+import org.apache.jena.ext.com.google.common.base.Strings;
import org.apache.jena.ext.com.google.common.collect.LinkedListMultimap;
import org.apache.jena.ext.com.google.common.collect.ListMultimap;
import org.apache.jena.query.QueryBuildException ;
@@ -317,7 +318,7 @@ public class TextQueryPF extends PropertyFunctionBase {
return null ;
}
}
- lang = lang.isEmpty() ? null : lang;
+ lang = Strings.emptyToNull(lang);
String qs = o.getLiteralLexicalForm() ;
return new StrMatch(null, qs, lang, -1, 0) ;
@@ -358,7 +359,7 @@ public class TextQueryPF extends PropertyFunctionBase {
return null ;
}
}
- lang = lang.isEmpty() ? null : lang;
+ lang = Strings.emptyToNull(lang);
String queryString = x.getLiteralLexicalForm() ;
idx++ ;
[02/14] jena git commit: Merge remote-tracking branch
'upstream/master' into highlighting
Posted by an...@apache.org.
Merge remote-tracking branch 'upstream/master' into highlighting
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e2d6b89e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e2d6b89e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e2d6b89e
Branch: refs/heads/master
Commit: e2d6b89e369530a1c53d4579d500daa135439ab8
Parents: 7b01629 a725e96
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Fri Nov 24 16:09:41 2017 -0600
Committer: Chris Tomlinson <ct...@moonvine.org>
Committed: Fri Nov 24 16:09:41 2017 -0600
----------------------------------------------------------------------
apache-jena-libs/pom.xml | 54 +-
apache-jena-osgi/jena-osgi-test/pom.xml | 13 +-
apache-jena-osgi/pom.xml | 15 +-
apache-jena/pom.xml | 4 +-
jena-arq/pom.xml | 16 +-
jena-base/pom.xml | 7 +-
.../org/apache/jena/atlas/iterator/Iter.java | 16 +
.../apache/jena/atlas/iterator/TestIter.java | 441 +++++----
jena-cmds/pom.xml | 15 +-
jena-core/pom.xml | 4 +-
.../java/org/apache/jena/graph/GraphUtil.java | 225 +++--
.../org/apache/jena/graph/TestGraphUtil.java | 59 ++
.../org/apache/jena/graph/test/TestPackage.java | 4 +
jena-csv/pom.xml | 23 +-
jena-db/pom.xml | 4 +-
jena-elephas/pom.xml | 4 +-
jena-examples/pom.xml | 21 -
.../arq/querybuilder/AbstractQueryBuilder.java | 9 +-
.../jena/arq/querybuilder/AskBuilder.java | 75 +-
.../jena/arq/querybuilder/ConstructBuilder.java | 75 ++
.../jena/arq/querybuilder/DescribeBuilder.java | 71 ++
.../jena/arq/querybuilder/SelectBuilder.java | 74 ++
.../arq/querybuilder/clauses/WhereClause.java | 192 ++++
.../querybuilder/handlers/ValuesHandler.java | 53 +-
.../arq/querybuilder/handlers/WhereHandler.java | 120 ++-
.../querybuilder/AbstractQueryBuilderTest.java | 26 +
.../querybuilder/UpdateBuilderExampleTests.java | 44 +-
.../jena/arq/querybuilder/WhereValidator.java | 19 +-
.../querybuilder/clauses/WhereClauseTest.java | 305 ++++++-
.../handlers/ValuesHandlerTest.java | 89 ++
.../querybuilder/handlers/WhereHandlerTest.java | 259 +++++-
jena-extras/pom.xml | 102 +--
jena-fuseki1/pom.xml | 16 +-
jena-fuseki2/jena-fuseki-core/pom.xml | 11 -
.../apache/jena/fuseki/servlets/ActionBase.java | 7 +
jena-fuseki2/jena-fuseki-server/pom.xml | 11 -
jena-fuseki2/jena-fuseki-war/pom.xml | 12 -
jena-fuseki2/pom.xml | 15 +-
jena-integration-tests/pom.xml | 4 +-
jena-iri/pom.xml | 4 +-
jena-jdbc/pom.xml | 16 +-
jena-maven-tools/pom.xml | 4 +-
jena-permissions/pom.xml | 4 +-
jena-project/DEPENDENCIES | 11 -
jena-project/LICENSE | 202 -----
jena-project/NOTICE | 5 -
jena-project/pom.xml | 872 ------------------
jena-rdfconnection/pom.xml | 4 +-
jena-sdb/pom.xml | 4 +-
jena-shaded-guava/pom.xml | 4 +-
jena-spatial/pom.xml | 4 +-
jena-tdb/pom.xml | 18 +-
jena-text-es/pom.xml | 4 +-
jena-text/pom.xml | 4 +-
pom.xml | 885 ++++++++++++++++++-
55 files changed, 2768 insertions(+), 1791 deletions(-)
----------------------------------------------------------------------
[09/14] jena git commit: JENA-1441 remove unneeded isTraceEnabled()
and isDebugEnabled() calls
Posted by an...@apache.org.
JENA-1441 remove unneeded isTraceEnabled() and isDebugEnabled() calls
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ed67ef7b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ed67ef7b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ed67ef7b
Branch: refs/heads/master
Commit: ed67ef7b76fae551793723d906703ce1f6977657
Parents: dbbca20
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Wed Nov 29 11:28:04 2017 -0600
Committer: Chris Tomlinson <ct...@moonvine.org>
Committed: Wed Nov 29 11:28:04 2017 -0600
----------------------------------------------------------------------
.../apache/jena/query/text/TextIndexLucene.java | 12 ++++-------
.../org/apache/jena/query/text/TextQueryPF.java | 21 +++++++-------------
2 files changed, 11 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ed67ef7b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
index c4571d3..17c9749 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
@@ -219,8 +219,7 @@ public class TextIndexLucene implements TextIndex {
Document doc = doc(entity);
Term term = new Term(docDef.getEntityField(), entity.getId());
indexWriter.updateDocument(term, doc);
- if ( log.isTraceEnabled() )
- log.trace("updated: "+doc) ;
+ log.trace("updated: {}", doc) ;
}
@Override
@@ -241,8 +240,7 @@ public class TextIndexLucene implements TextIndex {
protected void addDocument(Entity entity) throws IOException {
Document doc = doc(entity) ;
indexWriter.addDocument(doc) ;
- if ( log.isTraceEnabled() )
- log.trace("added: "+doc) ;
+ log.trace("added: {}", doc) ;
}
@Override
@@ -426,8 +424,7 @@ public class TextIndexLucene implements TextIndex {
if (graphClause != null)
queryString = "(" + queryString + ") AND " + graphClause ;
- if ( log.isDebugEnabled())
- log.debug("Lucene query: {} ({})", queryString,limit) ;
+ log.debug("Lucene query: {} ({})", queryString, limit) ;
IndexSearcher indexSearcher = new IndexSearcher(indexReader) ;
Query query = parseQuery(queryString, queryAnalyzer) ;
@@ -439,8 +436,7 @@ public class TextIndexLucene implements TextIndex {
for ( ScoreDoc sd : sDocs ) {
Document doc = indexSearcher.doc(sd.doc) ;
- if ( log.isTraceEnabled() )
- log.trace("query$ found: "+doc) ;
+ log.trace("query$ found: {}", doc) ;
String entity = doc.get(docDef.getEntityField()) ;
Node literal = null;
http://git-wip-us.apache.org/repos/asf/jena/blob/ed67ef7b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
index 4a68b28..0313cc0 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
@@ -209,8 +209,7 @@ public class TextQueryPF extends PropertyFunctionBase {
}
private QueryIterator resultsToQueryIterator(Binding binding, Node s, Node score, Node literal, Collection<TextHit> results, ExecutionContext execCxt) {
- if (log.isTraceEnabled())
- log.trace("resultsToQueryIterator: {}", results) ;
+ log.trace("resultsToQueryIterator: {}", results) ;
Var sVar = Var.isVar(s) ? Var.alloc(s) : null ;
Var scoreVar = (score==null) ? null : Var.alloc(score) ;
Var literalVar = (literal==null) ? null : Var.alloc(literal) ;
@@ -234,16 +233,14 @@ public class TextQueryPF extends PropertyFunctionBase {
}
private QueryIterator variableSubject(Binding binding, Node s, Node score, Node literal, StrMatch match, ExecutionContext execCxt) {
- if (log.isTraceEnabled())
- log.trace("variableSubject: {}", match) ;
+ log.trace("variableSubject: {}", match) ;
ListMultimap<String,TextHit> results = query(match.getProperty(), match.getQueryString(), match.getLang(), match.getLimit(), execCxt) ;
Collection<TextHit> r = results.values();
return resultsToQueryIterator(binding, s, score, literal, r, execCxt);
}
private QueryIterator concreteSubject(Binding binding, Node s, Node score, Node literal, StrMatch match, ExecutionContext execCxt) {
- if (log.isTraceEnabled())
- log.trace("concreteSubject: {}", match) ;
+ log.trace("concreteSubject: {}", match) ;
ListMultimap<String,TextHit> x = query(match.getProperty(), match.getQueryString(), match.getLang(), -1, execCxt) ;
if ( x == null ) // null return value - empty result
@@ -259,12 +256,10 @@ public class TextQueryPF extends PropertyFunctionBase {
if ( graphURI == null ) {
Explain.explain(execCxt.getContext(), "Text query: "+queryString) ;
- if ( log.isDebugEnabled())
- log.debug("Text query: {} ({})", queryString,limit) ;
+ log.debug("Text query: {} ({})", queryString, limit) ;
} else {
Explain.explain(execCxt.getContext(), "Text query <"+graphURI+">: "+queryString) ;
- if ( log.isDebugEnabled())
- log.debug("Text query: {} <{}> ({})", queryString, graphURI, limit) ;
+ log.debug("Text query: {} <{}> ({})", queryString, graphURI, limit) ;
}
ListMultimap<String,TextHit> results;
@@ -281,13 +276,11 @@ public class TextQueryPF extends PropertyFunctionBase {
execCxt.getContext().put(cacheSymbol, queryCache);
}
- if (log.isTraceEnabled())
- log.trace("Caching Text query: {} with key: >>{}<< in cache: {}", queryString, cacheKey, queryCache) ;
+ log.trace("Caching Text query: {} with key: >>{}<< in cache: {}", queryString, cacheKey, queryCache) ;
results = queryCache.getOrFill(cacheKey, ()->performQuery(property, queryString, graphURI, lang, limit));
} else {
- if (log.isTraceEnabled())
- log.trace("Executing w/o cache Text query: {}", queryString) ;
+ log.trace("Executing w/o cache Text query: {}", queryString) ;
results = performQuery(property, queryString, graphURI, lang, limit);
}
[08/14] jena git commit: JENA-1438 rdf:langString args
Posted by an...@apache.org.
JENA-1438 rdf:langString args
JENA-1438 allow rdf:langString arguments to text:query
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/eff7e533
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/eff7e533
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/eff7e533
Branch: refs/heads/master
Commit: eff7e533c3ee48a7413bd1f5c248f9dfea09ac78
Parents: 875f8fe
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Wed Nov 29 09:28:05 2017 -0600
Committer: GitHub <no...@github.com>
Committed: Wed Nov 29 09:28:05 2017 -0600
----------------------------------------------------------------------
.../org/apache/jena/query/text/TextQueryPF.java | 34 ++++++++++++++------
1 file changed, 25 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/eff7e533/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
index 170337a..7dbba9f 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
@@ -295,6 +295,14 @@ public class TextQueryPF extends PropertyFunctionBase {
return results;
}
+ private boolean noLang(String lang) {
+ return (lang == null || lang.isEmpty() || " ".equals(lang));
+ }
+
+ private String fixLang(String lang) {
+ return lang.isEmpty() || " ".equals(lang) ? null : lang;
+ }
+
/** Deconstruct the node or list object argument and make a StrMatch
* The 'executionTime' flag indicates whether this is for a build time
* static check, or for runtime execution.
@@ -309,14 +317,18 @@ public class TextQueryPF extends PropertyFunctionBase {
return null ;
}
+ String lang = o.getLiteralLanguage();
RDFDatatype dt = o.getLiteralDatatype() ;
- if (dt != null && dt != XSDDatatype.XSDstring) {
- log.warn("Object to text query is not a string") ;
- return null ;
+ if (noLang(lang)) {
+ if (dt != null && dt != XSDDatatype.XSDstring) {
+ log.warn("Object to text query is not a string") ;
+ return null ;
+ }
}
+ lang = fixLang(lang);
String qs = o.getLiteralLexicalForm() ;
- return new StrMatch(null, qs, null, -1, 0) ;
+ return new StrMatch(null, qs, lang, -1, 0) ;
}
List<Node> list = argObject.getArgList() ;
@@ -347,11 +359,15 @@ public class TextQueryPF extends PropertyFunctionBase {
log.warn("Text query string is not a literal " + list) ;
return null ;
}
-
- if (x.getLiteralDatatype() != null && !x.getLiteralDatatype().equals(XSDDatatype.XSDstring)) {
- log.warn("Text query is not a string " + list) ;
- return null ;
+ String lang = x.getLiteralLanguage();
+ if (noLang(lang)) {
+ if (x.getLiteralDatatype() != null && !x.getLiteralDatatype().equals(XSDDatatype.XSDstring)) {
+ log.warn("Text query is not a string " + list) ;
+ return null ;
+ }
}
+ lang = fixLang(lang);
+
String queryString = x.getLiteralLexicalForm() ;
idx++ ;
@@ -373,7 +389,7 @@ public class TextQueryPF extends PropertyFunctionBase {
}
//extract extra lang arg if present and if is usable.
- String lang = extractArg("lang", list);
+ lang = lang == null ? extractArg("lang", list) : lang;
if (lang != null && textIndex.getDocDef().getLangField() == null)
log.warn("lang argument is ignored if langField not set in the index configuration");
[03/14] jena git commit: use get vs getValues in query$;
log trace for Lucene dev
Posted by an...@apache.org.
use get vs getValues in query$; log trace for Lucene dev
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e1445711
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e1445711
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e1445711
Branch: refs/heads/master
Commit: e14457115e638b33dcd8923f22c2ff3655309ab0
Parents: e2d6b89
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Fri Nov 24 18:22:58 2017 -0600
Committer: Chris Tomlinson <ct...@moonvine.org>
Committed: Fri Nov 24 18:22:58 2017 -0600
----------------------------------------------------------------------
.../java/org/apache/jena/query/text/Entity.java | 4 ++
.../apache/jena/query/text/TextIndexLucene.java | 51 ++++++++++++--------
2 files changed, 34 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e1445711/jena-text/src/main/java/org/apache/jena/query/text/Entity.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/Entity.java b/jena-text/src/main/java/org/apache/jena/query/text/Entity.java
index 83e34c6..4ae2577 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/Entity.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/Entity.java
@@ -72,5 +72,9 @@ public class Entity
public String toString() {
return id+" : "+map ;
}
+
+ public String toStringDetail() {
+ return id+" : "+graph+" : "+language+" : "+datatype+" : "+map ;
+ }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/e1445711/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
index 355e4c7..c4571d3 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
@@ -204,7 +204,10 @@ public class TextIndexLucene implements TextIndex {
@Override public void updateEntity(Entity entity) {
if ( log.isDebugEnabled() )
- log.debug("Update entity: " + entity) ;
+ if (log.isTraceEnabled() && entity != null)
+ log.trace("Update entity: " + entity.toStringDetail()) ;
+ else
+ log.debug("Update entity: " + entity) ;
try {
updateDocument(entity);
} catch (IOException e) {
@@ -216,14 +219,17 @@ public class TextIndexLucene implements TextIndex {
Document doc = doc(entity);
Term term = new Term(docDef.getEntityField(), entity.getId());
indexWriter.updateDocument(term, doc);
- if ( log.isDebugEnabled() )
- log.debug("updated: "+doc) ;
+ if ( log.isTraceEnabled() )
+ log.trace("updated: "+doc) ;
}
@Override
public void addEntity(Entity entity) {
if ( log.isDebugEnabled() )
- log.debug("Add entity: " + entity) ;
+ if (log.isTraceEnabled() && entity != null)
+ log.trace("Add entity: " + entity.toStringDetail()) ;
+ else
+ log.debug("Add entity: " + entity) ;
try {
addDocument(entity);
}
@@ -235,8 +241,8 @@ public class TextIndexLucene implements TextIndex {
protected void addDocument(Entity entity) throws IOException {
Document doc = doc(entity) ;
indexWriter.addDocument(doc) ;
- if ( log.isDebugEnabled() )
- log.debug("added: "+doc) ;
+ if ( log.isTraceEnabled() )
+ log.trace("added: "+doc) ;
}
@Override
@@ -245,7 +251,10 @@ public class TextIndexLucene implements TextIndex {
return;
if ( log.isDebugEnabled() )
- log.debug("Delete entity: "+entity) ;
+ if (log.isTraceEnabled() && entity != null)
+ log.trace("Delete entity: " + entity.toStringDetail()) ;
+ else
+ log.debug("Delete entity: "+entity) ;
try {
Map<String, Object> map = entity.getMap();
String property = map.keySet().iterator().next();
@@ -430,18 +439,20 @@ public class TextIndexLucene implements TextIndex {
for ( ScoreDoc sd : sDocs ) {
Document doc = indexSearcher.doc(sd.doc) ;
- if ( log.isDebugEnabled() )
- log.debug("query$ found: "+doc) ;
- String[] values = doc.getValues(docDef.getEntityField()) ;
+ if ( log.isTraceEnabled() )
+ log.trace("query$ found: "+doc) ;
+ String entity = doc.get(docDef.getEntityField()) ;
Node literal = null;
+ // the following is why no literal is bound when the field is included directly
+ // in the query string rather than explicitly as the property argument, except
+ // when the field is the primaryField. There would need to be an analysis of the
+ // query string in order to extract the field name (if any)
String field = (property != null) ? docDef.getField(property) : docDef.getPrimaryField();
- String[] lexicals = doc.getValues(field) ;
- if (lexicals.length > 0) {
- String lexical = lexicals[0];
- String[] langs = doc.getValues(docDef.getLangField()) ;
- if (langs.length > 0) {
- String doclang = langs[0];
+ String lexical = doc.get(field) ;
+ if (lexical != null) {
+ String doclang = doc.get(docDef.getLangField()) ;
+ if (doclang != null) {
if (doclang.startsWith(DATATYPE_PREFIX)) {
String datatype = doclang.substring(DATATYPE_PREFIX.length());
TypeMapper tmap = TypeMapper.getInstance();
@@ -454,11 +465,9 @@ public class TextIndexLucene implements TextIndex {
}
}
- for ( String v : values ) {
- Node n = TextQueryFuncs.stringToNode(v) ;
- TextHit hit = new TextHit(n, sd.score, literal);
- results.add(hit) ;
- }
+ Node subject = TextQueryFuncs.stringToNode(entity) ;
+ TextHit hit = new TextHit(subject, sd.score, literal);
+ results.add(hit) ;
}
return results ;
}
[05/14] jena git commit: Merge branch 'master' of
https://github.com/apache/jena into highlighting
Posted by an...@apache.org.
Merge branch 'master' of https://github.com/apache/jena into highlighting
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d98b0966
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d98b0966
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d98b0966
Branch: refs/heads/master
Commit: d98b096620ef09d115f745c9ecd1359d0a62c83e
Parents: 5e95a09 924e999
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Tue Nov 28 11:52:50 2017 -0600
Committer: Chris Tomlinson <ct...@moonvine.org>
Committed: Tue Nov 28 11:52:50 2017 -0600
----------------------------------------------------------------------
jena-fuseki2/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[13/14] jena git commit: JENA-1441: Merge commit 'refs/pull/319/head'
of github.com:apache/jena
Posted by an...@apache.org.
JENA-1441: Merge commit 'refs/pull/319/head' of github.com:apache/jena
This closes #319.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e427c417
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e427c417
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e427c417
Branch: refs/heads/master
Commit: e427c417f61051eb4e10ec15ae8b670c5b4b72d1
Parents: 6064259 281d65c
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Dec 1 19:00:43 2017 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Dec 1 19:00:43 2017 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/query/text/Entity.java | 4 ++
.../jena/query/text/EntityDefinition.java | 10 ++++
.../apache/jena/query/text/TextIndexLucene.java | 45 ++++++++++------
.../org/apache/jena/query/text/TextQueryPF.java | 56 ++++++++++++++------
.../assembler/TextIndexLuceneAssembler.java | 16 +++++-
.../jena/query/text/assembler/TextVocab.java | 3 ++
6 files changed, 98 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
[11/14] jena git commit: correct for getLiteralLanguage() never
Posted by an...@apache.org.
correct for getLiteralLanguage() never <SPC>
This corrects the fix for language tag handling to reflect that getLiteralLanguage() in fact does not return <SPC> on no language tag. It does indeed return the an empty string.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c39c232b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c39c232b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c39c232b
Branch: refs/heads/master
Commit: c39c232bf5c65c4f43c41639d85ed194ca9ba96d
Parents: eff7e53
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Thu Nov 30 09:27:31 2017 -0600
Committer: GitHub <no...@github.com>
Committed: Thu Nov 30 09:27:31 2017 -0600
----------------------------------------------------------------------
.../org/apache/jena/query/text/TextQueryPF.java | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/c39c232b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
index 7dbba9f..ecb781c 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
@@ -295,14 +295,6 @@ public class TextQueryPF extends PropertyFunctionBase {
return results;
}
- private boolean noLang(String lang) {
- return (lang == null || lang.isEmpty() || " ".equals(lang));
- }
-
- private String fixLang(String lang) {
- return lang.isEmpty() || " ".equals(lang) ? null : lang;
- }
-
/** Deconstruct the node or list object argument and make a StrMatch
* The 'executionTime' flag indicates whether this is for a build time
* static check, or for runtime execution.
@@ -319,13 +311,13 @@ public class TextQueryPF extends PropertyFunctionBase {
String lang = o.getLiteralLanguage();
RDFDatatype dt = o.getLiteralDatatype() ;
- if (noLang(lang)) {
+ if (lang.isEmpty()) {
if (dt != null && dt != XSDDatatype.XSDstring) {
log.warn("Object to text query is not a string") ;
return null ;
}
}
- lang = fixLang(lang);
+ lang = lang.isEmpty() ? null : lang;
String qs = o.getLiteralLexicalForm() ;
return new StrMatch(null, qs, lang, -1, 0) ;
@@ -360,13 +352,13 @@ public class TextQueryPF extends PropertyFunctionBase {
return null ;
}
String lang = x.getLiteralLanguage();
- if (noLang(lang)) {
+ if (lang.isEmpty()) {
if (x.getLiteralDatatype() != null && !x.getLiteralDatatype().equals(XSDDatatype.XSDstring)) {
log.warn("Text query is not a string " + list) ;
return null ;
}
}
- lang = fixLang(lang);
+ lang = lang.isEmpty() ? null : lang;
String queryString = x.getLiteralLexicalForm() ;
idx++ ;