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/12/11 19:10:32 UTC
[1/4] jena git commit: JENA-1265: Setting for GraphView Capabilities.
Repository: jena
Updated Branches:
refs/heads/master ab9580d6a -> 098206dbf
JENA-1265: Setting for GraphView Capabilities.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ca3502f8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ca3502f8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ca3502f8
Branch: refs/heads/master
Commit: ca3502f8f256b71eb8beb170eb9e69379f97d365
Parents: ab9580d
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Dec 11 12:19:10 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Dec 11 12:19:10 2016 +0000
----------------------------------------------------------------------
.../org/apache/jena/sparql/core/GraphView.java | 56 ++++++++++++++++++++
1 file changed, 56 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ca3502f8/jena-arq/src/main/java/org/apache/jena/sparql/core/GraphView.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/GraphView.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/GraphView.java
index 1e9d150..4c639d0 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/GraphView.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/GraphView.java
@@ -22,6 +22,7 @@ import java.util.Iterator ;
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.lib.Sync ;
+import org.apache.jena.graph.Capabilities;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.graph.impl.GraphBase ;
@@ -163,4 +164,59 @@ public class GraphView extends GraphBase implements Sync
public void sync() {
SystemARQ.sync(dsg);
}
+
+ @Override
+ public Capabilities getCapabilities() {
+ if (capabilities == null)
+ capabilities = new GraphViewCapabilities();
+ return capabilities;
+ }
+
+ protected static class GraphViewCapabilities implements Capabilities {
+ @Override
+ public boolean sizeAccurate() {
+ return true;
+ }
+
+ @Override
+ public boolean addAllowed() {
+ return addAllowed(false);
+ }
+
+ @Override
+ public boolean addAllowed(boolean every) {
+ return true;
+ }
+
+ @Override
+ public boolean deleteAllowed() {
+ return deleteAllowed(false);
+ }
+
+ @Override
+ public boolean deleteAllowed(boolean every) {
+ return true;
+ }
+
+ @Override
+ public boolean canBeEmpty() {
+ return true;
+ }
+
+ @Override
+ public boolean iteratorRemoveAllowed() {
+ //Default for GraphViews is that iterators do not provide remove.
+ return false;
+ }
+
+ @Override
+ public boolean findContractSafe() {
+ return true;
+ }
+
+ @Override
+ public boolean handlesLiteralTyping() {
+ return false;
+ }
+ }
}
[4/4] jena git commit: Merge commit 'refs/pull/196/head' of
github.com:apache/jena
Posted by an...@apache.org.
Merge commit 'refs/pull/196/head' of github.com:apache/jena
This closes #196.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/098206db
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/098206db
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/098206db
Branch: refs/heads/master
Commit: 098206dbff12c27976af72442e41c6eca6e23ece
Parents: 86274aa ecbeec7
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Dec 11 19:02:50 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Dec 11 19:02:50 2016 +0000
----------------------------------------------------------------------
.../org/apache/jena/sparql/core/GraphView.java | 56 ++++++++++++++++++++
.../org/apache/jena/tdb/store/GraphTDB.java | 12 -----
2 files changed, 56 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[2/4] jena git commit: JENA-1265: GraphTDB can use the Capabilities
from GraphView.
Posted by an...@apache.org.
JENA-1265: GraphTDB can use the Capabilities from GraphView.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ecbeec79
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ecbeec79
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ecbeec79
Branch: refs/heads/master
Commit: ecbeec79968ba7f5c9b7d0a161848acd30d87600
Parents: ca3502f
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Dec 11 12:32:14 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Dec 11 12:32:14 2016 +0000
----------------------------------------------------------------------
.../main/java/org/apache/jena/tdb/store/GraphTDB.java | 12 ------------
1 file changed, 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ecbeec79/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 a60357b..95dcd2f 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
@@ -26,11 +26,9 @@ import org.apache.jena.atlas.lib.Closeable ;
import org.apache.jena.atlas.lib.Sync ;
import org.apache.jena.atlas.lib.tuple.Tuple ;
import org.apache.jena.atlas.lib.tuple.TupleFactory ;
-import org.apache.jena.graph.Capabilities ;
import org.apache.jena.graph.GraphEvents ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
-import org.apache.jena.graph.impl.AllCapabilities ;
import org.apache.jena.riot.other.GLib ;
import org.apache.jena.shared.PrefixMapping ;
import org.apache.jena.sparql.core.DatasetGraph ;
@@ -134,16 +132,6 @@ public abstract class GraphTDB extends GraphView implements Closeable, Sync {
};
@Override
- public Capabilities getCapabilities() {
- if ( capabilities == null )
- capabilities = new AllCapabilities() {
- @Override public boolean iteratorRemoveAllowed() { return false ; }
- @Override public boolean handlesLiteralTyping() { return false ; }
- } ;
- return super.getCapabilities() ;
- }
-
- @Override
public void clear() {
getDatasetGraphTDB().deleteAny(getGraphName(), Node.ANY, Node.ANY, Node.ANY) ;
getEventManager().notifyEvent(this, GraphEvents.removeAll) ;
[3/4] jena git commit: Fix comment.
Posted by an...@apache.org.
Fix comment.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/86274aa7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/86274aa7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/86274aa7
Branch: refs/heads/master
Commit: 86274aa735b64155d30908f72d3800e60f9573c6
Parents: ab9580d
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Dec 11 12:10:12 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Dec 11 19:02:19 2016 +0000
----------------------------------------------------------------------
jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/86274aa7/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
index ac4b4ac..3059aed 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
@@ -274,7 +274,7 @@ public class LogCtl {
private static String defaultProperties = StrUtils.strjoinNL
("handlers=org.apache.jena.atlas.logging.java.ConsoleHandlerStream"
// These are the defaults.
- //,"org.apache.atlas.jena.logging.java.ConsoleHandlerStream.level=INFO"
+ //,"org.apache.jena.atlas.logging.java.ConsoleHandlerStream.level=INFO"
//,"org.apache.jena.atlas.logging.java.ConsoleHandlerStream.formatter=org.apache.jena.atlas.logging.java.TextFormatter"
//,"org.apache.jena.atlas.logging.java.TextFormatter.format=%5$tT %3$-5s %2$-20s :: %6$s"
) ;