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 2018/11/17 17:20:50 UTC
[24/34] jena git commit: JENA-1629: Print CONSTRUCT Quads executions.
JENA-1629: Print CONSTRUCT Quads executions.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0a1f986d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0a1f986d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0a1f986d
Branch: refs/heads/master
Commit: 0a1f986d3cc9871691c488dafdd2113391229fed
Parents: 2f1fefb
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Nov 13 22:00:03 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Nov 13 22:00:03 2018 +0000
----------------------------------------------------------------------
.../apache/jena/sparql/util/QueryExecUtils.java | 25 +++++++++++---------
1 file changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0a1f986d/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
index 5c12c2e..e4ddf99 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
@@ -70,7 +70,6 @@ public class QueryExecUtils {
}
public static void executeQuery(Prologue prologue, QueryExecution queryExecution, ResultsFormat outputFormat) {
-
Query query = queryExecution.getQuery() ;
if ( prologue == null )
prologue = query.getPrologue() ;
@@ -80,10 +79,11 @@ public class QueryExecUtils {
doSelectQuery(prologue, queryExecution, outputFormat) ;
else if ( query.isDescribeType() )
doDescribeQuery(prologue, queryExecution, outputFormat) ;
- else if ( query.isConstructType() )
- doConstructQuery(prologue, queryExecution, outputFormat) ;
else if ( query.isConstructQuad() )
+ // Before isConstructType.
doConstructQuadsQuery(prologue, queryExecution, outputFormat) ;
+ else if ( query.isConstructType() )
+ doConstructQuery(prologue, queryExecution, outputFormat) ;
else if ( query.isAskType() )
doAskQuery(prologue, queryExecution, outputFormat) ;
else if ( query.isJsonType() )
@@ -212,13 +212,23 @@ public class QueryExecUtils {
}
private static void doConstructQuery(Prologue prologue, QueryExecution qe, ResultsFormat outputFormat) {
+ if ( qe.getQuery().isConstructQuad() ) {
+ doConstructQuadsQuery(prologue, qe, outputFormat);
+ return;
+ }
if ( outputFormat == null || outputFormat == ResultsFormat.FMT_UNKNOWN )
outputFormat = ResultsFormat.FMT_RDF_TTL ;
-
Model r = qe.execConstruct() ;
writeModel(prologue, r, outputFormat) ;
}
+ private static void doConstructQuadsQuery(Prologue prologue, QueryExecution qe, ResultsFormat outputFormat) {
+ if ( outputFormat == null || outputFormat == ResultsFormat.FMT_UNKNOWN )
+ outputFormat = ResultsFormat.FMT_RDF_TRIG;
+ Dataset ds = qe.execConstructDataset();
+ writeDataset(prologue, ds, outputFormat) ;
+ }
+
private static void writeModel(Prologue prologue, Model model, ResultsFormat outputFormat) {
if ( outputFormat == null || outputFormat == ResultsFormat.FMT_UNKNOWN )
outputFormat = ResultsFormat.FMT_TEXT ;
@@ -266,13 +276,6 @@ public class QueryExecUtils {
System.err.println("Unknown format: " + outputFormat) ;
}
- private static void doConstructQuadsQuery(Prologue prologue, QueryExecution qe, ResultsFormat outputFormat) {
- if ( outputFormat == null || outputFormat == ResultsFormat.FMT_UNKNOWN )
- outputFormat = ResultsFormat.FMT_RDF_TRIG;
- Dataset ds = qe.execConstructDataset();
- writeDataset(prologue, ds, outputFormat) ;
- }
-
private static void writeDataset(Prologue prologue, Dataset dataset, ResultsFormat outputFormat) {
if ( outputFormat == null || outputFormat == ResultsFormat.FMT_UNKNOWN )
outputFormat = ResultsFormat.FMT_TEXT ;