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 2015/12/02 10:14:59 UTC
[1/6] jena git commit: Add first() and last() variants without a
predicate.
Repository: jena
Updated Branches:
refs/heads/master 69786e18a -> 06ed324aa
Add first() and last() variants without a predicate.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b831ec17
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b831ec17
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b831ec17
Branch: refs/heads/master
Commit: b831ec1720bcec703e595212b53973ef8a37952b
Parents: 69786e1
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Nov 30 15:21:58 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Nov 30 15:21:58 2015 +0000
----------------------------------------------------------------------
.../org/apache/jena/atlas/iterator/Iter.java | 23 +++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b831ec17/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java
index c774623..99c71c3 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java
@@ -644,6 +644,14 @@ public class Iter<T> implements Iterator<T> {
return iter(iter1).append(iter(iter2)) ;
}
+ /** Return the first element of an iterator or null if no such element.
+ * @param iter
+ * @return An item or null.
+ */
+ public static <T> T first(Iterator<T> iter) {
+ return first(iter, (x)-> true ) ;
+ }
+
/** Skip to the first element meeting a condition and return that element. */
public static <T> T first(Iterator<T> iter, Predicate<T> filter) {
while (iter.hasNext()) {
@@ -676,7 +684,12 @@ public class Iter<T> implements Iterator<T> {
return firstIndex(collection.iterator(), filter) ;
}
- /** Return the last element satisfying a predicate. This operation destroys the whole iterator. */
+ /** Return the last element or null, if no elements. This operation consumes the iterator. */
+ public static <T> T last(Iterator<T> iter) {
+ return last(iter, (x)->true) ;
+ }
+
+ /** Return the last element satisfying a predicate. This operation consumes the whole iterator. */
public static <T> T last(Iterator<T> iter, Predicate<T> filter) {
T thing = null ;
while (iter.hasNext()) {
@@ -733,6 +746,14 @@ public class Iter<T> implements Iterator<T> {
sendToSink(iterator, sink) ;
}
+ public T first() {
+ return first(iterator) ;
+ }
+
+ public T last() {
+ return last(iterator) ;
+ }
+
/** Skip to the first element meeting a condition and return that element. */
public T first(Predicate<T> filter) {
return first(iterator, filter) ;
[3/6] jena git commit: Clear state then release lock.
Posted by an...@apache.org.
Clear state then release lock.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/14b1edec
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/14b1edec
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/14b1edec
Branch: refs/heads/master
Commit: 14b1edec82ddf4d7d0023d7a7b855cc8132b9c13
Parents: 5724a5a
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Dec 1 16:57:04 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Dec 1 16:57:04 2015 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/sparql/core/DatasetGraphWithLock.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/14b1edec/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphWithLock.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphWithLock.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphWithLock.java
index 1dbfd80..d74bc87 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphWithLock.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphWithLock.java
@@ -136,8 +136,8 @@ public class DatasetGraphWithLock extends DatasetGraphTrackActive implements Syn
if ( isInTransaction() ) {
if ( dsChanges != null )
dsChanges.finish();
- get().getLock().leaveCriticalSection() ;
clearState() ;
+ get().getLock().leaveCriticalSection() ;
}
}
[4/6] jena git commit: (minor) Avoid string churn when not logging.
Posted by an...@apache.org.
(minor) Avoid string churn when not logging.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0fb6f1ce
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0fb6f1ce
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0fb6f1ce
Branch: refs/heads/master
Commit: 0fb6f1ceba08f1e1cdb1fba1171a66276bebd24b
Parents: 14b1ede
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Dec 1 16:57:59 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Dec 1 16:57:59 2015 +0000
----------------------------------------------------------------------
.../main/java/org/apache/jena/sparql/core/mem/PMapTupleTable.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0fb6f1ce/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/PMapTupleTable.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/PMapTupleTable.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/PMapTupleTable.java
index e5feb49..db7b988 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/PMapTupleTable.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/PMapTupleTable.java
@@ -87,7 +87,8 @@ public abstract class PMapTupleTable<TupleMapType, TupleType> implements TupleTa
* Logs to DEBUG prepending the table name in order to distinguish amongst different indexes
*/
protected void debug(final String msg, final Object... values) {
- log().debug(tableName + ": " + msg, values);
+ if ( log().isDebugEnabled() )
+ log().debug(tableName + ": " + msg, values);
}
@Override
[5/6] jena git commit: Add to help message to indicate --results
takes a value.
Posted by an...@apache.org.
Add to help message to indicate --results takes a value.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/08a15804
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/08a15804
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/08a15804
Branch: refs/heads/master
Commit: 08a15804ac47a941f90ada2f743f79195cff3cbe
Parents: 0fb6f1c
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Dec 1 22:03:50 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Dec 1 22:03:50 2015 +0000
----------------------------------------------------------------------
jena-arq/src/main/java/arq/cmdline/ModResultsOut.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/08a15804/jena-arq/src/main/java/arq/cmdline/ModResultsOut.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModResultsOut.java b/jena-arq/src/main/java/arq/cmdline/ModResultsOut.java
index 0cc3f33..938be5f 100644
--- a/jena-arq/src/main/java/arq/cmdline/ModResultsOut.java
+++ b/jena-arq/src/main/java/arq/cmdline/ModResultsOut.java
@@ -53,7 +53,7 @@ public class ModResultsOut extends ModBase
{
cmdLine.getUsage().startCategory("Results") ;
cmdLine.add(resultsFmtDecl,
- "--results",
+ "--results=",
"Results format (Result set: text, XML, JSON, CSV, TSV; Graph: RDF serialization)") ;
}
[6/6] jena git commit: Enhance javadoc for isSimpleString. Tidy code.
Posted by an...@apache.org.
Enhance javadoc for isSimpleString. Tidy code.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/06ed324a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/06ed324a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/06ed324a
Branch: refs/heads/master
Commit: 06ed324aa7863ad8b55064fc13cd74b1760d6b93
Parents: 08a1580
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Dec 2 09:09:35 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Dec 2 09:14:05 2015 +0000
----------------------------------------------------------------------
.../org/apache/jena/rdf/model/impl/Util.java | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/06ed324a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
index 5e3ec1b..d88b755 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
@@ -17,6 +17,7 @@
*/
package org.apache.jena.rdf.model.impl;
+import java.util.Objects ;
import java.util.regex.Matcher ;
import java.util.regex.Pattern ;
@@ -199,6 +200,7 @@ public class Util extends Object {
* <li>(RDF 1.1) xsd:string
*/
public static boolean isSimpleString(Node n) {
+ Objects.requireNonNull(n) ;
RDFDatatype dt = n.getLiteralDatatype() ;
if ( dt == null )
return !isLangString(n) ;
@@ -212,6 +214,7 @@ public class Util extends Object {
* (RDF 1.0 and RDF 1.1)
*/
public static boolean isLangString(Node n) {
+ Objects.requireNonNull(n) ;
String lang = n.getLiteralLanguage() ;
if ( lang == null )
return false ;
@@ -219,18 +222,23 @@ public class Util extends Object {
}
- /** Return true if the literal should be written as a string, without datatype or lang. (RDF 1.0 and RDF 1.1) */
+ /** Return true if the literal is a simple string.
+ * <p>RDF 1.0 => it is a plain literal, with no language tag
+ * <p>RDF 1.1 => it has datatype xsd:string
+ */
public static boolean isSimpleString(Literal lit) {
- if ( lit.getDatatypeURI() == null ) {
+ Objects.requireNonNull(lit) ;
+ String dtStr = lit.getDatatypeURI() ;
+ if ( dtStr == null )
return ! isLangString(lit) ;
- }
- if ( JenaRuntime.isRDF11 && lit.getDatatypeURI().equals(XSDDatatype.XSDstring.getURI()) )
- return true;
+ if ( JenaRuntime.isRDF11 )
+ return dtStr.equals(XSDDatatype.XSDstring.getURI());
return false ;
}
- /** Return true if the literals shodul be written with a language string. (RDF 1.0 and RDF 1.1) */
+ /** Return true if the literal has a language tag. (RDF 1.0 and RDF 1.1) */
public static boolean isLangString(Literal lit) {
+ Objects.requireNonNull(lit) ;
String lang = lit.getLanguage() ;
if ( lang == null )
return false ;
[2/6] jena git commit: Fix indentation.
Posted by an...@apache.org.
Fix indentation.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5724a5a5
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5724a5a5
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5724a5a5
Branch: refs/heads/master
Commit: 5724a5a5430b0e8cac4296b46fce057fe5cce23c
Parents: b831ec1
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Dec 1 16:56:36 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Dec 1 16:56:36 2015 +0000
----------------------------------------------------------------------
.../apache/jena/sdb/engine/QueryEngineSDB.java | 34 ++++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/5724a5a5/jena-sdb/src/main/java/org/apache/jena/sdb/engine/QueryEngineSDB.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/engine/QueryEngineSDB.java b/jena-sdb/src/main/java/org/apache/jena/sdb/engine/QueryEngineSDB.java
index ea720a4..333e651 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/engine/QueryEngineSDB.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/engine/QueryEngineSDB.java
@@ -131,23 +131,23 @@ public class QueryEngineSDB extends QueryEngineBase
QueryIterator qIter = QC.execute(op, input, execCxt) ; // OpExecutor from main query engine.
qIter = QueryIteratorCheck.check(qIter, execCxt) ;
return qIter ;
- }
- // Direct.
- OpSQL opSQL = (OpSQL)op ;
- QueryIterator qIter ;
- if ( opSQL.getSqlNode() == null )
- {
- // Empty BGP, nothing else.
- // Just return the answer.
- if ( binding != null && binding.size() != 0 )
- qIter = QueryIterSingleton.create(binding, execCxt) ;
- else
- qIter = QueryIterRoot.create(execCxt) ;
- }
- else
- qIter = opSQL.exec(binding, execCxt) ;
- qIter = QueryIteratorCheck.check(qIter, execCxt) ;
- return qIter ;
+ }
+ // Direct.
+ OpSQL opSQL = (OpSQL)op ;
+ QueryIterator qIter ;
+ if ( opSQL.getSqlNode() == null )
+ {
+ // Empty BGP, nothing else.
+ // Just return the answer.
+ if ( binding != null && binding.size() != 0 )
+ qIter = QueryIterSingleton.create(binding, execCxt) ;
+ else
+ qIter = QueryIterRoot.create(execCxt) ;
+ }
+ else
+ qIter = opSQL.exec(binding, execCxt) ;
+ qIter = QueryIteratorCheck.check(qIter, execCxt) ;
+ return qIter ;
}
// -------- Factory