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/08/20 14:06:16 UTC
[1/6] jena git commit: Reset resultsVarsSet if
setQueryresultStar(true) called.
Repository: jena
Updated Branches:
refs/heads/JENA-491-construct-quads 444a6c9cb -> d5a3f8b55
Reset resultsVarsSet if setQueryresultStar(true) called.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1a49a2f0
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1a49a2f0
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1a49a2f0
Branch: refs/heads/JENA-491-construct-quads
Commit: 1a49a2f0560f81e34aed7b0b02bb789debdf24bd
Parents: 43efe52
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Aug 16 21:05:42 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Aug 16 21:05:42 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/query/Query.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/1a49a2f0/jena-arq/src/main/java/org/apache/jena/query/Query.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/query/Query.java b/jena-arq/src/main/java/org/apache/jena/query/Query.java
index 914e626..5c9c8ce 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/Query.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/Query.java
@@ -245,17 +245,14 @@ public class Query extends Prologue implements Cloneable, Printable
public boolean isQueryResultStar() { return queryResultStar ; }
/** Set whether the query had SELECT/DESCRIBE *
- * Strictly, this just means whether the projection is
*
* @param isQueryStar
*/
public void setQueryResultStar(boolean isQueryStar)
{
-// if ( isConstructType() )
-// throw new IllegalArgumentException("Query is a CONSTRUCT query") ;
-// if ( isAskType() )
-// throw new IllegalArgumentException("Query is an ASK query") ;
queryResultStar = isQueryStar ;
+ if ( isQueryStar )
+ resultVarsSet = false ;
}
public void setQueryPattern(Element elt)
[6/6] jena git commit: Merge branch 'master' into
JENA-491-construct-quads
Posted by an...@apache.org.
Merge branch 'master' into JENA-491-construct-quads
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d5a3f8b5
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d5a3f8b5
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d5a3f8b5
Branch: refs/heads/JENA-491-construct-quads
Commit: d5a3f8b55d4f2315b31bc9b3e59ef04625498453
Parents: a8d40b1 b54af5d
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 20 13:06:05 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 20 13:06:05 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/6] jena git commit: Make close a no-op.
Posted by an...@apache.org.
Make close a no-op.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f1446c8c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f1446c8c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f1446c8c
Branch: refs/heads/JENA-491-construct-quads
Commit: f1446c8c8d8f3aafb8fc8300b35a03274de0ec8c
Parents: 1a49a2f
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Aug 19 14:19:59 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Aug 19 14:19:59 2015 +0100
----------------------------------------------------------------------
jena-tdb/src/main/java/org/apache/jena/tdb/store/GraphTDB.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f1446c8c/jena-tdb/src/main/java/org/apache/jena/tdb/store/GraphTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/GraphTDB.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/GraphTDB.java
index 93fbf69..be2d8b8 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/GraphTDB.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/GraphTDB.java
@@ -92,7 +92,9 @@ public class GraphTDB extends GraphView implements Closeable, Sync {
@Override
final public void close() {
sync() ;
- super.close() ;
+ // Ignore - graphs are projectsion of the overlying database.
+ // "Close graph" is messy in this projection world.
+ //super.close() ;
}
protected static ExtendedIterator<Triple> graphBaseFindDft(DatasetGraphTDB dataset, Triple triple) {
[3/6] jena git commit: JENA-1011 : Use non-deprecated parer method;
call "start()".
Posted by an...@apache.org.
JENA-1011 : Use non-deprecated parer method; call "start()".
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/03ae45e2
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/03ae45e2
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/03ae45e2
Branch: refs/heads/JENA-491-construct-quads
Commit: 03ae45e29586a1d1ee56fc786474c8fe7465cfa6
Parents: f1446c8
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 20 13:00:46 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 20 13:00:46 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/03ae45e2/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
index 67b9384..1159058 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
@@ -114,8 +114,7 @@ public class RiotReader
*/
public static void parse(InputStream in, Lang lang, String baseIRI, StreamRDF dest)
{
- LangRIOT parser = RiotReader.createParser(in, lang, baseIRI, dest) ;
- parser.parse() ;
+ RDFDataMgr.parse(dest, in, baseIRI, lang);
}
// -------- Parsers
@@ -284,7 +283,9 @@ public class RiotReader
@Override
public void run()
{
+ out.start();
parse(input, lang, baseIRI, out);
+ out.finish() ;
}
});
t.start();
@@ -318,7 +319,9 @@ public class RiotReader
@Override
public void run()
{
+ out.start();
parse(input, lang, baseIRI, out);
+ //out.finish() ;
}
});
t.start();
[5/6] jena git commit: Merge from master
Posted by an...@apache.org.
Merge from master
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a8d40b17
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a8d40b17
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a8d40b17
Branch: refs/heads/JENA-491-construct-quads
Commit: a8d40b1749480612a209360fe217f304cd856ec8
Parents: 444a6c9 03ae45e
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 20 13:05:35 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 20 13:05:35 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/query/Query.java | 7 ++-----
jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java | 6 +++++-
.../src/main/java/org/apache/jena/tdb/store/GraphTDB.java | 4 +++-
3 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a8d40b17/jena-arq/src/main/java/org/apache/jena/query/Query.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a8d40b17/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
----------------------------------------------------------------------
diff --cc jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
index 05892bb,1159058..4b7faa1
--- a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
@@@ -283,7 -283,9 +283,9 @@@ public class RiotReade
@Override
public void run()
{
+ out.start();
parse(input, lang, baseIRI, out);
- out.finish() ;
++ // Unsafe: out.finish() ;
}
});
t.start();
@@@ -317,7 -319,9 +319,9 @@@
@Override
public void run()
{
+ out.start();
parse(input, lang, baseIRI, out);
- //out.finish() ;
++ // Unsafe: out.finish() ;
}
});
t.start();
[4/6] jena git commit: Don't call out.finish in either path.
Posted by an...@apache.org.
Don't call out.finish in either path.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b54af5d9
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b54af5d9
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b54af5d9
Branch: refs/heads/JENA-491-construct-quads
Commit: b54af5d99ad5ae7c92b0c6f49bdd35d31aa9b78f
Parents: 03ae45e
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 20 13:03:42 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 20 13:03:42 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b54af5d9/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
index 1159058..4b7faa1 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
@@ -285,7 +285,7 @@ public class RiotReader
{
out.start();
parse(input, lang, baseIRI, out);
- out.finish() ;
+ // Unsafe: out.finish() ;
}
});
t.start();
@@ -321,7 +321,7 @@ public class RiotReader
{
out.start();
parse(input, lang, baseIRI, out);
- //out.finish() ;
+ // Unsafe: out.finish() ;
}
});
t.start();