Merge branch 'releases/2.1.1'

Signed-off-by: Jeen Broekstra <jeen.broekstra@gmail.com> # Conflicts: # bom/pom.xml # compliance/geosparql/pom.xml # compliance/http/pom.xml # compliance/model/pom.xml # compliance/pom.xml # compliance/queryresultio/pom.xml # compliance/rio/pom.xml # compliance/serql/pom.xml # compliance/sparql/pom.xml # compliance/store/pom.xml # core/assembly/pom.xml # core/config/pom.xml # core/console/pom.xml # core/http/client/pom.xml # core/http/pom.xml # core/http/protocol/pom.xml # core/http/server-spring/pom.xml # core/http/server/pom.xml # core/http/workbench/pom.xml # core/model/pom.xml # core/pom.xml # core/query/pom.xml # core/queryalgebra/evaluation/pom.xml # core/queryalgebra/geosparql/pom.xml # core/queryalgebra/model/pom.xml # core/queryalgebra/pom.xml # core/queryparser/api/pom.xml # core/queryparser/pom.xml # core/queryparser/serql/pom.xml # core/queryparser/sparql/pom.xml # core/queryrender/pom.xml # core/queryresultio/api/pom.xml # core/queryresultio/binary/pom.xml # core/queryresultio/pom.xml # core/queryresultio/sparqljson/pom.xml # core/queryresultio/sparqlxml/pom.xml # core/queryresultio/text/pom.xml # core/repository/api/pom.xml # core/repository/contextaware/pom.xml # core/repository/dataset/pom.xml # core/repository/event/pom.xml # core/repository/http/pom.xml # core/repository/manager/pom.xml # core/repository/pom.xml # core/repository/sail/pom.xml # core/repository/sparql/pom.xml # core/rio/api/pom.xml # core/rio/binary/pom.xml # core/rio/datatypes/pom.xml # core/rio/jsonld/pom.xml # core/rio/languages/pom.xml # core/rio/n3/pom.xml # core/rio/nquads/pom.xml # core/rio/ntriples/pom.xml # core/rio/pom.xml # core/rio/rdfjson/pom.xml # core/rio/rdfxml/pom.xml # core/rio/trig/pom.xml # core/rio/trix/pom.xml # core/rio/turtle/pom.xml # core/runtime-osgi/pom.xml # core/runtime/pom.xml # core/sail/api/pom.xml # core/sail/base/pom.xml # core/sail/federation/pom.xml # core/sail/fts/elasticsearch/pom.xml # core/sail/fts/lucene-api/pom.xml # core/sail/fts/lucene/pom.xml # core/sail/fts/pom.xml # core/sail/fts/solr/pom.xml # core/sail/inferencer/pom.xml # core/sail/memory/pom.xml # core/sail/model/pom.xml # core/sail/nativerdf/pom.xml # core/sail/pom.xml # core/sail/spin/pom.xml # core/spin/pom.xml # core/util/pom.xml # pom.xml # testsuites/geosparql/pom.xml # testsuites/lucene/pom.xml # testsuites/model/pom.xml # testsuites/pom.xml # testsuites/queryresultio/pom.xml # testsuites/rio/pom.xml # testsuites/serql/pom.xml # testsuites/sparql/pom.xml # testsuites/store/pom.xml
eclipse-rdf4j · Oct 24, 2016 · 3fc3a21 · 3fc3a21
2 parents daef7fa + 4c87810
commit 3fc3a21
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 18 deletions.
diff --git a/...pository/api/src/main/resources/org/eclipse/rdf4j/repository/config/memory-customrule.ttl b/...pository/api/src/main/resources/org/eclipse/rdf4j/repository/config/memory-customrule.ttl
@@ -9,6 +9,8 @@
 @prefix cgqi: <http://www.openrdf.org/config/sail/customGraphQueryInferencer#>.
 @prefix ms: <http://www.openrdf.org/config/sail/memory#>.
 @prefix sp: <http://spinrdf.org/sp#>.
+@prefix sb: <http://www.openrdf.org/config/sail/base#>.
+
 
 [] a rep:Repository ;
    rep:repositoryID "{%Repository ID|memory-customrule%}" ;
@@ -30,7 +32,8 @@
             sail:sailType "openrdf:MemoryStore" ;
 	    sail:iterationCacheSyncThreshold "{%Query Iteration Cache sync threshold|10000%}";
             ms:persist {%Persist|true|false%} ;
-            ms:syncDelay {%Sync delay|0%}
+            ms:syncDelay {%Sync delay|0%};
+            sb:evaluationStrategyFactory "{%EvaluationStrategyFactory|org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategyFactory%}"
          ]
       ]
    ].
diff --git a/.../repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/memory-rdfs-dt.ttl b/.../repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/memory-rdfs-dt.ttl
@@ -7,6 +7,8 @@
 @prefix sr: <http://www.openrdf.org/config/repository/sail#>.
 @prefix sail: <http://www.openrdf.org/config/sail#>.
 @prefix ms: <http://www.openrdf.org/config/sail/memory#>.
+@prefix sb: <http://www.openrdf.org/config/sail/base#>.
+
 
 [] a rep:Repository ;
    rep:repositoryID "{%Repository ID|memory-rdfs-dt%}" ;
@@ -21,7 +23,8 @@
                sail:sailType "openrdf:MemoryStore" ;
 	       sail:iterationCacheSyncThreshold "{%Query Iteration Cache size|10000%}";
                ms:persist {%Persist|true|false%} ;
-               ms:syncDelay {%Sync delay|0%}
+               ms:syncDelay {%Sync delay|0%};
+               sb:evaluationStrategyFactory "{%EvaluationStrategyFactory|org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategyFactory%}"
             ]
          ]
       ]

diff --git a/core/repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/memory-rdfs.ttl b/core/repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/memory-rdfs.ttl
@@ -7,6 +7,8 @@
 @prefix sr: <http://www.openrdf.org/config/repository/sail#>.
 @prefix sail: <http://www.openrdf.org/config/sail#>.
 @prefix ms: <http://www.openrdf.org/config/sail/memory#>.
+@prefix sb: <http://www.openrdf.org/config/sail/base#>.
+
 
 [] a rep:Repository ;
    rep:repositoryID "{%Repository ID|memory-rdfs%}" ;
@@ -19,7 +21,8 @@
             sail:sailType "openrdf:MemoryStore" ;
 	    sail:iterationCacheSyncThreshold "{%Query Iteration Cache size|10000%}";
             ms:persist {%Persist|true|false%} ;
-            ms:syncDelay {%Sync delay|0%}
+            ms:syncDelay {%Sync delay|0%};
+            sb:evaluationStrategyFactory "{%EvaluationStrategyFactory|org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategyFactory%}"
          ]
       ]
    ].
diff --git a/...epository/api/src/main/resources/org/eclipse/rdf4j/repository/config/memory-spin-rdfs.ttl b/...epository/api/src/main/resources/org/eclipse/rdf4j/repository/config/memory-spin-rdfs.ttl
@@ -6,6 +6,8 @@
 @prefix spin: <http://www.openrdf.org/config/sail/spin#>.
 @prefix ms: <http://www.openrdf.org/config/sail/memory#>.
 @prefix sp: <http://spinrdf.org/sp#>.
+@prefix sb: <http://www.openrdf.org/config/sail/base#>.
+
 
 [] a rep:Repository ;
    rep:repositoryID "{%Repository ID|memory-spin-rdfs%}" ;
@@ -23,7 +25,8 @@
 					sail:sailType "openrdf:MemoryStore" ;
 					sail:iterationCacheSyncThreshold "{%Query Iteration Cache sync threshold|10000%}";
 					ms:persist {%Persist|true|false%} ;
-					ms:syncDelay {%Sync delay|0%}
+					ms:syncDelay {%Sync delay|0%};
+					sb:evaluationStrategyFactory "{%EvaluationStrategyFactory|org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategyFactory%}"
 				 ]
 		 	]
       	]

diff --git a/core/repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/memory-spin.ttl b/core/repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/memory-spin.ttl
@@ -10,6 +10,7 @@
 @prefix cgqi: <http://www.openrdf.org/config/sail/customGraphQueryInferencer#>.
 @prefix ms: <http://www.openrdf.org/config/sail/memory#>.
 @prefix sp: <http://spinrdf.org/sp#>.
+@prefix sb: <http://www.openrdf.org/config/sail/base#>.
 
 [] a rep:Repository ;
    rep:repositoryID "{%Repository ID|memory-spin%}" ;
@@ -23,7 +24,8 @@
             sail:sailType "openrdf:MemoryStore" ;
 	    sail:iterationCacheSyncThreshold "{%Query Iteration Cache sync threshold|10000%}";
             ms:persist {%Persist|true|false%} ;
-            ms:syncDelay {%Sync delay|0%}
+            ms:syncDelay {%Sync delay|0%};
+            sb:evaluationStrategyFactory "{%EvaluationStrategyFactory|org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategyFactory%}"
          ]
       ]
    ].
diff --git a/core/repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/memory.ttl b/core/repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/memory.ttl
@@ -18,6 +18,6 @@
 	 sail:iterationCacheSyncThreshold "{%Query Iteration Cache sync threshold|10000%}";
          ms:persist {%Persist|true|false%} ;
          ms:syncDelay {%Sync delay|0%} ;
-         sb:evaluationStrategyFactory "{%EvaluationStrategyFactory|org.eclipse.rdf4j.query.algebra.evaluation.impl.SimpleEvaluationStrategyFactory%}"
+         sb:evaluationStrategyFactory "{%EvaluationStrategyFactory|org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategyFactory%}"
       ]
    ].
diff --git a/...pository/api/src/main/resources/org/eclipse/rdf4j/repository/config/native-customrule.ttl b/...pository/api/src/main/resources/org/eclipse/rdf4j/repository/config/native-customrule.ttl
@@ -9,6 +9,8 @@
 @prefix ns: <http://www.openrdf.org/config/sail/native#>.
 @prefix cgqi: <http://www.openrdf.org/config/sail/customGraphQueryInferencer#>.
 @prefix sp: <http://spinrdf.org/sp#>.
+@prefix sb: <http://www.openrdf.org/config/sail/base#>.
+
 
 [] a rep:Repository ;
    rep:repositoryID "{%Repository ID|native-customrule%}" ;
@@ -29,7 +31,8 @@
          sail:delegate [
             sail:sailType "openrdf:NativeStore" ;
 	    sail:iterationCacheSyncThreshold "{%Query Iteration Cache sync threshold|10000%}";
-            ns:tripleIndexes "{%Triple indexes|spoc,posc%}"
+            ns:tripleIndexes "{%Triple indexes|spoc,posc%}";
+            sb:evaluationStrategyFactory "{%EvaluationStrategyFactory|org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategyFactory%}"
          ]
       ]
    ].
diff --git a/.../repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/native-rdfs-dt.ttl b/.../repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/native-rdfs-dt.ttl
@@ -7,6 +7,8 @@
 @prefix sr: <http://www.openrdf.org/config/repository/sail#>.
 @prefix sail: <http://www.openrdf.org/config/sail#>.
 @prefix ns: <http://www.openrdf.org/config/sail/native#>.
+@prefix sb: <http://www.openrdf.org/config/sail/base#>.
+
 
 [] a rep:Repository ;
    rep:repositoryID "{%Repository ID|native-rdfs-dt%}" ;
@@ -20,7 +22,8 @@
             sail:delegate [
                sail:sailType "openrdf:NativeStore" ;
 	       sail:iterationCacheSyncThreshold "{%Query Iteration Cache size|10000%}";
-               ns:tripleIndexes "{%Triple indexes|spoc,posc%}"
+               ns:tripleIndexes "{%Triple indexes|spoc,posc%}";
+               sb:evaluationStrategyFactory "{%EvaluationStrategyFactory|org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategyFactory%}"
             ]
          ]
       ]

diff --git a/core/repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/native-rdfs.ttl b/core/repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/native-rdfs.ttl
@@ -7,6 +7,8 @@
 @prefix sr: <http://www.openrdf.org/config/repository/sail#>.
 @prefix sail: <http://www.openrdf.org/config/sail#>.
 @prefix ns: <http://www.openrdf.org/config/sail/native#>.
+@prefix sb: <http://www.openrdf.org/config/sail/base#>.
+
 
 [] a rep:Repository ;
    rep:repositoryID "{%Repository ID|native-rdfs%}" ;
@@ -18,7 +20,8 @@
          sail:delegate [
             sail:sailType "openrdf:NativeStore" ;
 	    sail:iterationCacheSyncThreshold "{%Query Iteration Cache size|10000%}";
-            ns:tripleIndexes "{%Triple indexes|spoc,posc%}"
+            ns:tripleIndexes "{%Triple indexes|spoc,posc%}";
+            sb:evaluationStrategyFactory "{%EvaluationStrategyFactory|org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategyFactory%}"
          ]
       ]
    ].
diff --git a/...epository/api/src/main/resources/org/eclipse/rdf4j/repository/config/native-spin-rdfs.ttl b/...epository/api/src/main/resources/org/eclipse/rdf4j/repository/config/native-spin-rdfs.ttl
@@ -10,6 +10,8 @@
 @prefix cgqi: <http://www.openrdf.org/config/sail/customGraphQueryInferencer#>.
 @prefix ns: <http://www.openrdf.org/config/sail/native#>.
 @prefix sp: <http://spinrdf.org/sp#>.
+@prefix sb: <http://www.openrdf.org/config/sail/base#>.
+
 
 [] a rep:Repository ;
    rep:repositoryID "{%Repository ID|native-spin-rdfs%}" ;
@@ -26,7 +28,8 @@
 				 sail:delegate [
 					sail:sailType "openrdf:NativeStore" ;
 					sail:iterationCacheSyncThreshold "{%Query Iteration Cache sync threshold|10000%}";
-         			ns:tripleIndexes "{%Triple indexes|spoc,posc%}"
+         			ns:tripleIndexes "{%Triple indexes|spoc,posc%}";
+         			sb:evaluationStrategyFactory "{%EvaluationStrategyFactory|org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategyFactory%}"
 				 ]
 		 ]
       ]

diff --git a/core/repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/native-spin.ttl b/core/repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/native-spin.ttl
@@ -9,6 +9,8 @@
 @prefix cgqi: <http://www.openrdf.org/config/sail/customGraphQueryInferencer#>.
 @prefix ns: <http://www.openrdf.org/config/sail/native#>.
 @prefix sp: <http://spinrdf.org/sp#>.
+@prefix sb: <http://www.openrdf.org/config/sail/base#>.
+
 
 [] a rep:Repository ;
    rep:repositoryID "{%Repository ID|native-spin%}" ;
@@ -21,7 +23,8 @@
          sail:delegate [
 				sail:sailType "openrdf:NativeStore" ;
 				sail:iterationCacheSyncThreshold "{%Query Iteration Cache sync threshold|10000%}";
-				ns:tripleIndexes "{%Triple indexes|spoc,posc%}"
+				ns:tripleIndexes "{%Triple indexes|spoc,posc%}";
+				sb:evaluationStrategyFactory "{%EvaluationStrategyFactory|org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategyFactory%}"
 			 ]
 		 ]
       ] .
diff --git a/core/repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/native.ttl b/core/repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/native.ttl
@@ -17,6 +17,6 @@
          sail:sailType "openrdf:NativeStore" ;
 	 sail:iterationCacheSyncThreshold "{%Query Iteration Cache size|10000%}";
          ns:tripleIndexes "{%Triple indexes|spoc,posc%}" ;
-         sb:evaluationStrategyFactory "{%EvaluationStrategyFactory|org.eclipse.rdf4j.query.algebra.evaluation.impl.SimpleEvaluationStrategyFactory%}"
+         sb:evaluationStrategyFactory "{%EvaluationStrategyFactory|org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategyFactory%}"
       ]
    ].
diff --git a/core/sail/memory/src/main/java/org/eclipse/rdf4j/sail/memory/MemoryStoreConnection.java b/core/sail/memory/src/main/java/org/eclipse/rdf4j/sail/memory/MemoryStoreConnection.java
@@ -63,8 +63,8 @@ protected void commitInternal()
 	{
 		super.commitInternal();
 
-		sail.scheduleSyncTask();
 		sail.notifySailChanged(sailChangedEvent);
+		sail.scheduleSyncTask();
 
 		// create a fresh event object.
 		sailChangedEvent = new DefaultSailChangedEvent(sail);

diff --git a/core/sail/nativerdf/src/main/java/org/eclipse/rdf4j/sail/nativerdf/MemoryOverflowModel.java b/core/sail/nativerdf/src/main/java/org/eclipse/rdf4j/sail/nativerdf/MemoryOverflowModel.java
@@ -261,11 +261,9 @@ protected void finalize()
 			disk.addAll(memory);
 			memory = new TreeModel(memory.getNamespaces());
 		}
-		catch (IOException e) {
-			logger.error(e.toString(), e);
-		}
-		catch (SailException e) {
-			logger.error(e.toString(), e);
+		catch (IOException | SailException e) {
+			String path = dataDir != null? dataDir.getAbsolutePath() : "(unknown)";
+			logger.error("Error while writing to overflow directory " + path, e);
 		}
 	}