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/11 19:05:47 UTC
[1/4] jena git commit: Detect and stop re-registering a dataset.
Repository: jena
Updated Branches:
refs/heads/master ab8f32ab1 -> 087b9480a
Detect and stop re-registering a dataset.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0f097d57
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0f097d57
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0f097d57
Branch: refs/heads/master
Commit: 0f097d57f486df01bd7f2b8b2fea6ca32e4717f3
Parents: ab8f32a
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Sep 10 08:44:17 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Sep 10 08:44:17 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0f097d57/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
----------------------------------------------------------------------
diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
index fe71cbf..155f09f 100644
--- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
+++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
@@ -305,6 +305,9 @@ public class SPARQLServer {
dsDesc.init() ;
+ if ( DatasetRegistry.get().isRegistered(datasetPath) )
+ throw new FusekiException("Already registered: "+datasetPath) ;
+
DatasetRegistry.get().put(datasetPath, dsDesc) ;
serverLog.info(format("Dataset path = %s", datasetPath)) ;
[2/4] jena git commit: Remove methods that only call super.
Posted by an...@apache.org.
Remove methods that only call super.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b064a3b8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b064a3b8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b064a3b8
Branch: refs/heads/master
Commit: b064a3b8395d36826730d420aee15b10904459de
Parents: 0f097d5
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Sep 10 10:19:29 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Sep 10 10:19:29 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/tdb/solver/OpExecutorTDB1.java | 16 ----------------
1 file changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b064a3b8/jena-tdb/src/main/java/org/apache/jena/tdb/solver/OpExecutorTDB1.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/solver/OpExecutorTDB1.java b/jena-tdb/src/main/java/org/apache/jena/tdb/solver/OpExecutorTDB1.java
index 77cfbfa..eeff69c 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/solver/OpExecutorTDB1.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/solver/OpExecutorTDB1.java
@@ -87,22 +87,6 @@ public class OpExecutorTDB1 extends OpExecutor
return super.exec(op, input) ;
}
- // Retrieving nodes isn't so bad because they will be needed anyway.
- // And if their duplicates, likely to be cached.
- // Need to work with SolverLib which wraps the NodeId bindgins with a converter.
-
- @Override
- protected QueryIterator execute(OpDistinct opDistinct, QueryIterator input)
- {
- return super.execute(opDistinct, input) ;
- }
-
- @Override
- protected QueryIterator execute(OpReduced opReduced, QueryIterator input)
- {
- return super.execute(opReduced, input) ;
- }
-
@Override
protected QueryIterator execute(OpFilter opFilter, QueryIterator input)
{
[3/4] jena git commit: Replace compatibility code with direct call.
Posted by an...@apache.org.
Replace compatibility code with direct call.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0b97e774
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0b97e774
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0b97e774
Branch: refs/heads/master
Commit: 0b97e774570bd33b5f3e44fc54b1dd5d00281c61
Parents: b064a3b
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Sep 11 09:34:21 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Sep 11 09:34:21 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/fuseki/FusekiCmd.java | 23 +-------------------
1 file changed, 1 insertion(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0b97e774/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiCmd.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
index 5746394..f3ed119 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
@@ -18,32 +18,11 @@
package org.apache.jena.fuseki;
-import java.lang.reflect.Method ;
-
public class FusekiCmd {
public static void main(String[] args) {
// Must NOT use any logging. The command processor sets that up.
System.err.println("Deprecated: Use org.apache.jena.fuseki.cmd.FusekiCmd") ;
- try {
- // A
- callByRefection("org.apache.jena.fuseki.cmd.FusekiCmd", "main", args) ;
- } catch (ClassNotFoundException | NoSuchMethodException ex) {
- System.err.println("Failed to find the command processor: "+ ex.getMessage()) ;
- } catch (Exception ex) {
- System.err.println("Failed to invoke the command processor: "+ ex.getMessage()) ;
- ex.printStackTrace(System.err) ;
- }
- }
-
- // Call a static of no arguments by reflection.
- private static void callByRefection(String className, String staticMethod, String[] args)
- throws Exception
- {
- Class<? > cls = Class.forName(className) ;
- // Pass up : ClassNotFoundException
-
- Method m = cls.getMethod(staticMethod, String[].class) ;
- m.invoke(null, (Object)args) ;
+ org.apache.jena.fuseki.cmd.FusekiCmd.main(args);
}
}
[4/4] jena git commit: Remove redundant wrapper.
Posted by an...@apache.org.
Remove redundant wrapper.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/087b9480
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/087b9480
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/087b9480
Branch: refs/heads/master
Commit: 087b9480a977514d3b8d84760b94c6fa5ea46807
Parents: 0b97e77
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Sep 11 18:05:18 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Sep 11 18:05:18 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/sparql/engine/join/TestHashJoin.java | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/087b9480/jena-arq/src/test/java/org/apache/jena/sparql/engine/join/TestHashJoin.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/join/TestHashJoin.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/join/TestHashJoin.java
index 6aa9eaa..e5989f6 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/join/TestHashJoin.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/join/TestHashJoin.java
@@ -18,22 +18,13 @@
package org.apache.jena.sparql.engine.join;
-import java.util.Iterator ;
-
import org.apache.jena.sparql.algebra.Table ;
import org.apache.jena.sparql.engine.QueryIterator ;
-import org.apache.jena.sparql.engine.binding.Binding ;
-import org.apache.jena.sparql.engine.iterator.QueryIterPlainWrapper ;
-import org.apache.jena.sparql.engine.join.Join ;
-import org.apache.jena.sparql.engine.join.JoinKey ;
import org.apache.jena.sparql.expr.ExprList ;
public class TestHashJoin extends AbstractTestInnerJoin {
-
@Override
public QueryIterator join(JoinKey joinKey, Table left, Table right, ExprList conditions) {
- Iterator<Binding> data = Join.hashJoin(joinKey, left.iterator(null), right.iterator(null), null) ;
- QueryIterator qIter = new QueryIterPlainWrapper(data) ;
- return qIter ;
+ return Join.hashJoin(joinKey, left.iterator(null), right.iterator(null), null) ;
}
}