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 2016/02/09 12:43:50 UTC
[1/2] jena git commit: Rename
Repository: jena
Updated Branches:
refs/heads/master cb449523c -> 5a46b5041
Rename
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/525f9614
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/525f9614
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/525f9614
Branch: refs/heads/master
Commit: 525f9614bf65dec5734d6a5631a7c3900fbccf7f
Parents: cb44952
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Feb 9 11:39:44 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Feb 9 11:39:44 2016 +0000
----------------------------------------------------------------------
.../jena/sparql/core/DatasetGraphQuad.java | 54 --------------------
.../jena/sparql/core/DatasetGraphQuads.java | 54 ++++++++++++++++++++
2 files changed, 54 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/525f9614/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphQuad.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphQuad.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphQuad.java
deleted file mode 100644
index d685a71..0000000
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphQuad.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.sparql.core;
-
-import java.util.Iterator ;
-import org.apache.jena.atlas.iterator.Iter ;
-import org.apache.jena.graph.Node ;
-
-
-/** A DatasetGraph base class for pure quad-centric storage.
- */
-public abstract class DatasetGraphQuad extends DatasetGraphBase
-{
- @Override
- public Iterator<Node> listGraphNodes()
- {
- Iter<Quad> iter = Iter.iter(find(Node.ANY, Node.ANY, Node.ANY, Node.ANY)) ;
- return iter.map(Quad::getGraph).distinct() ;
- }
-
- @Override
- public void removeGraph(Node graphName)
- {
- deleteAny(graphName, Node.ANY, Node.ANY, Node.ANY) ;
- }
-
- @Override
- public abstract Iterator<Quad> find(Node g, Node s, Node p, Node o) ;
-
- @Override
- public abstract Iterator<Quad> findNG(Node g, Node s, Node p, Node o) ;
-
- @Override
- public abstract void add(Quad quad) ;
-
- @Override
- public abstract void delete(Quad quad) ;
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/525f9614/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphQuads.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphQuads.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphQuads.java
new file mode 100644
index 0000000..e96e2fd
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphQuads.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.core;
+
+import java.util.Iterator ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.graph.Node ;
+
+
+/** A DatasetGraph base class for pure quad-centric storage.
+ */
+public abstract class DatasetGraphQuads extends DatasetGraphBase
+{
+ @Override
+ public Iterator<Node> listGraphNodes()
+ {
+ Iter<Quad> iter = Iter.iter(find(Node.ANY, Node.ANY, Node.ANY, Node.ANY)) ;
+ return iter.map(Quad::getGraph).distinct() ;
+ }
+
+ @Override
+ public void removeGraph(Node graphName)
+ {
+ deleteAny(graphName, Node.ANY, Node.ANY, Node.ANY) ;
+ }
+
+ @Override
+ public abstract Iterator<Quad> find(Node g, Node s, Node p, Node o) ;
+
+ @Override
+ public abstract Iterator<Quad> findNG(Node g, Node s, Node p, Node o) ;
+
+ @Override
+ public abstract void add(Quad quad) ;
+
+ @Override
+ public abstract void delete(Quad quad) ;
+}
[2/2] jena git commit: Tidy and update some javadoc.
Posted by an...@apache.org.
Tidy and update some javadoc.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5a46b504
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5a46b504
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5a46b504
Branch: refs/heads/master
Commit: 5a46b50415aa46b6b998de3fe36e6a410b60d609
Parents: 525f961
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Feb 9 11:43:37 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Feb 9 11:43:37 2016 +0000
----------------------------------------------------------------------
.../jena/sparql/core/DatasetGraphBase.java | 10 +-
.../sparql/core/DatasetGraphTrackActive.java | 155 ++++---------------
.../jena/sparql/core/DatasetGraphWrapper.java | 3 +-
3 files changed, 35 insertions(+), 133 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/5a46b504/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphBase.java
index 7cdcf56..e5214eb 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphBase.java
@@ -25,6 +25,7 @@ import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
import org.apache.jena.shared.Lock ;
import org.apache.jena.shared.LockMRSW ;
+import org.apache.jena.sparql.core.mem.DatasetGraphInMemory ;
import org.apache.jena.sparql.sse.writers.WriterGraph ;
import org.apache.jena.sparql.util.Context ;
@@ -32,11 +33,14 @@ import org.apache.jena.sparql.util.Context ;
* <p>DatasetGraph framework : readonly dataset need only provide find(g,s,p,o), getGraph() and getDefaultGraph()
* although it may wish to override other operations and do better.</p>
*
- * <p>Other implementations include:</p>
+ * <p>Implementations include:</p>
* <ul>
* <li>{@link DatasetGraphBase} that adds an implementation of find based on default / named graphs.</li>
- * <li>{@link DatasetGraphCollection} that adds mutating quad operations mapped to a collection of graphs.</li>
- * <li>{@link DatasetGraphQuad} that maps graph operations to a quad view.
+ * <li>{@link DatasetGraphInMemory} provides full transactions for an in-memory {@code DatasetGraph}.</li>
+ * <li>{@link DatasetGraphTriplesQuads} that adds mutating quad operations.</li>
+ * <li>{@link DatasetGraphMap} provides for operations working over a collection of in-memory graphs.</li>
+ * <li>{@link DatasetGraphMapLink} provides for operations working over a collection of graphs provived by the application.</li>
+ * <li>{@link DatasetGraphCollection} that provides for operations working over a collection of graphs.</li>
* </ul>
*/
abstract public class DatasetGraphBase implements DatasetGraph
http://git-wip-us.apache.org/repos/asf/jena/blob/5a46b504/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphTrackActive.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphTrackActive.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphTrackActive.java
index 5d35d25..b345a08 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphTrackActive.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphTrackActive.java
@@ -18,50 +18,44 @@
package org.apache.jena.sparql.core;
-import java.util.Iterator ;
-
-import org.apache.jena.graph.Graph ;
-import org.apache.jena.graph.Node ;
import org.apache.jena.query.ReadWrite ;
-import org.apache.jena.shared.Lock ;
-/** Track the transactional state of a DatasetGraph */
-public abstract class DatasetGraphTrackActive implements DatasetGraph //,Transactional
+/** Check the transactional state of a DatasetGraph */
+public abstract class DatasetGraphTrackActive extends DatasetGraphWrapper
{
+ @Override
protected abstract DatasetGraph get() ;
- protected DatasetGraphTrackActive() { }
+ protected DatasetGraphTrackActive() { super(null) ; }
+ /** Check the transaction state from the point of view of the caller
+ * (usuually, for the current thread).
+ */
protected abstract void checkActive() ;
protected abstract void checkNotActive() ;
@Override
- public final void begin(ReadWrite readWrite)
- {
- checkNotActive() ;
- _begin(readWrite) ;
+ public final void begin(ReadWrite readWrite) {
+ checkNotActive();
+ _begin(readWrite);
}
-
+
@Override
- public final void commit()
- {
- checkActive() ;
- _commit() ;
+ public final void commit() {
+ checkActive();
+ _commit();
}
@Override
- public final void abort()
- {
- checkActive() ;
- // Set before calling _abort, which might throw an exception.
- _abort() ;
+ public final void abort() {
+ checkActive();
+ _abort();
}
-
+
@Override
- public final void end()
- {
- // Don't check if active. We may have committed or aborted already.
- _end() ;
+ public final void end() {
+ // Don't check if active. We may have committed or aborted already.
+ _end();
}
@Override
@@ -72,108 +66,13 @@ public abstract class DatasetGraphTrackActive implements DatasetGraph //,Transac
protected abstract void _end() ;
@Override
- public void close()
- {
+ public void close() {
if ( isInTransaction() )
- abort() ;
- // Don't close really - let the implementation decide.
- _close() ;
+ abort();
+ // Don't close really - let the implementation decide.
+ _close();
}
-
- protected abstract void _close() ;
-
- @Override
- public boolean containsGraph(Node graphNode)
- { return get().containsGraph(graphNode) ; }
-
- @Override
- public Graph getDefaultGraph()
- { return get().getDefaultGraph(); }
-
- @Override
- public Graph getGraph(Node graphNode)
- { return get().getGraph(graphNode) ; }
-
- @Override
- public void addGraph(Node graphName, Graph graph)
- { get().addGraph(graphName, graph) ; }
-
- @Override
- public void removeGraph(Node graphName)
- { get().removeGraph(graphName) ; }
-
- @Override
- public void setDefaultGraph(Graph g)
- { get().setDefaultGraph(g) ; }
-
- @Override
- public Lock getLock()
- { return get().getLock() ; }
-
- @Override
- public Iterator<Node> listGraphNodes()
- { return get().listGraphNodes() ; }
-
- @Override
- public void add(Quad quad)
- { get().add(quad) ; }
-
- @Override
- public void delete(Quad quad)
- { get().delete(quad) ; }
-
- @Override
- public void add(Node g, Node s, Node p, Node o)
- { get().add(g, s, p, o) ; }
-
- @Override
- public void delete(Node g, Node s, Node p, Node o)
- { get().delete(g, s, p, o) ; }
-
- @Override
- public void deleteAny(Node g, Node s, Node p, Node o)
- { get().deleteAny(g, s, p, o) ; }
- @Override
- public void clear()
- { get().clear() ; }
-
- @Override
- public boolean isEmpty()
- { return get().isEmpty() ; }
-
- @Override
- public Iterator<Quad> find()
- { return get().find() ; }
-
- @Override
- public Iterator<Quad> find(Quad quad)
- { return get().find(quad) ; }
-
- @Override
- public Iterator<Quad> find(Node g, Node s, Node p, Node o)
- { return get().find(g, s, p, o) ; }
-
- @Override
- public Iterator<Quad> findNG(Node g, Node s, Node p, Node o)
- { return get().findNG(g, s, p, o) ; }
-
- @Override
- public boolean contains(Quad quad)
- { return get().contains(quad) ; }
-
- @Override
- public boolean contains(Node g, Node s, Node p, Node o)
- { return get().contains(g, s, p, o) ; }
-
- // This mixes get() (which may do checking such as in/out transaction)
- // with configuration, which is not transaction related.
-
-// @Override
-// public Context getContext()
-// { return get().getContext() ; }
-
- @Override
- public long size()
- { return get().size() ; }
+ /** close() has been called. Subcklasses can make this a no-op. */
+ protected abstract void _close() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/5a46b504/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphWrapper.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphWrapper.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphWrapper.java
index 6b7bae9..ef731df 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphWrapper.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphWrapper.java
@@ -30,8 +30,7 @@ import org.apache.jena.sparql.util.Context ;
public class DatasetGraphWrapper implements DatasetGraph, Sync
{
- // Associated query engine factory - QueryEngineFactoryWrapper
- // which executes on the unwraped DSG.
+ // The wrapped DatasetGraph but all calls go via get() so this can be null.
private final DatasetGraph dsg ;
/** Return the DatasetGraph being wrapped. */