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/09/07 20:34:01 UTC
[1/3] jena git commit: Correct comment.
Repository: jena
Updated Branches:
refs/heads/master 5bf54c37f -> 9cfff3a3e
Correct comment.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/710989fb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/710989fb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/710989fb
Branch: refs/heads/master
Commit: 710989fbe2f32bd71e42c09ab39c32925cb5b6f5
Parents: 5bf54c3
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Sep 7 12:35:35 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Sep 7 12:35:35 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/sparql/core/assembler/DatasetAssembler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/710989fb/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java
index a0aeb0b..b38ab83 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java
@@ -63,7 +63,7 @@ public class DatasetAssembler extends AssemblerBase implements Assembler {
if ( dftGraph != null )
dftModel = a.openModel(dftGraph) ;
else
- // Assembler description did not define one - make a dummy.
+ // Assembler description did not define one.
dftModel = GraphFactory.makeDefaultModel() ;
ds.setDefaultModel(dftModel) ;
[3/3] jena git commit: JENA-1020: Remove status setting it's own
FUSEKI_PID
Posted by an...@apache.org.
JENA-1020: Remove status setting it's own FUSEKI_PID
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9cfff3a3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9cfff3a3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9cfff3a3
Branch: refs/heads/master
Commit: 9cfff3a3edd3c057f78915b4b55faa410ca21804
Parents: 2542f93
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Sep 7 19:33:48 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Sep 7 19:33:48 2015 +0100
----------------------------------------------------------------------
jena-fuseki2/apache-jena-fuseki/fuseki | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9cfff3a3/jena-fuseki2/apache-jena-fuseki/fuseki
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/fuseki b/jena-fuseki2/apache-jena-fuseki/fuseki
index a74c7c9..ad9daa5 100755
--- a/jena-fuseki2/apache-jena-fuseki/fuseki
+++ b/jena-fuseki2/apache-jena-fuseki/fuseki
@@ -40,7 +40,7 @@
#
# FUSEKI_RUN
# Where the fuseki.pid file should be stored. It defaults
-# first available of /var/run, /usr/var/run, and /tmp if not set.
+# first available of /var/run, /usr/var/run, $FUSEKI_HOME and /tmp if not set.
#
# FUSEKI_PID
# The FUSEKI PID file, defaults to $FUSEKI_RUN/fuseki.pid
@@ -476,7 +476,6 @@ case $CMD in
run
;;
status)
- FUSEKI_PID=$(findFile fuseki.pid /var/run /usr/var/run $FUSEKI_HOME /tmp)
if running $FUSEKI_PID
then
PID=`cat "$FUSEKI_PID"`
[2/3] jena git commit: Classification for OpMinus.
Posted by an...@apache.org.
Classification for OpMinus.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2542f936
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2542f936
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2542f936
Branch: refs/heads/master
Commit: 2542f9367d528c05d0c54ee68cebb337756f0115
Parents: 710989f
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Sep 7 19:29:46 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Sep 7 19:29:46 2015 +0100
----------------------------------------------------------------------
.../apache/jena/sparql/engine/main/VarFinder.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2542f936/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
index a1a73fb..e04de77 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
@@ -163,6 +163,17 @@ public class VarFinder
}
@Override
+ public void visit(OpMinus opMinus) {
+ joinAcc(opMinus.getLeft()) ;
+ VarUsageVisitor usage = VarUsageVisitor.apply(opMinus.getRight());
+ // Everything in the right side is really a filter.
+ filterMentions.addAll(usage.defines) ;
+ filterMentions.addAll(usage.optDefines) ;
+ filterMentions.addAll(usage.filterMentions) ;
+ filterMentions.addAll(usage.assignMentions) ;
+ }
+
+ @Override
public void visit(OpConditional opLeftJoin) {
leftJoin(opLeftJoin.getLeft(), opLeftJoin.getRight(), null);
}
@@ -201,6 +212,7 @@ public class VarFinder
optDefines.addAll(leftUsage.optDefines);
filterMentions.addAll(leftUsage.filterMentions);
assignMentions.addAll(leftUsage.assignMentions);
+
defines.addAll(rightUsage.defines);
optDefines.addAll(rightUsage.optDefines);
filterMentions.addAll(rightUsage.filterMentions);
@@ -290,9 +302,6 @@ public class VarFinder
public void visit(OpDiff opDiff) { no(); }
@Override
- public void visit(OpMinus opMinus) { no(); }
-
- @Override
public void visit(OpDisjunction opDisjunction) { no(); }
@Override