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 2013/06/19 12:56:53 UTC
svn commit: r1494544 - in /jena/trunk/jena-arq/src:
main/java/org/apache/jena/riot/lang/LabelToNode.java
main/java/org/apache/jena/riot/system/SyntaxLabels.java
test/java/org/apache/jena/riot/lang/TestLabelToNode.java
Author: andy
Date: Wed Jun 19 10:56:53 2013
New Revision: 1494544
URL: http://svn.apache.org/r1494544
Log:
Add output-input policy operations to SyntaxLabels.
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LabelToNode.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/SyntaxLabels.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLabelToNode.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LabelToNode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LabelToNode.java?rev=1494544&r1=1494543&r2=1494544&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LabelToNode.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LabelToNode.java Wed Jun 19 10:56:53 2013
@@ -41,7 +41,8 @@ public class LabelToNode extends MapWith
*/
public static LabelToNode createScopeByDocumentHash()
{ return new LabelToNode(new AllocScopePolicy(), nodeAllocatorHash()) ; }
-
+
+ /** The policy upto jena 2.10.0 - problems at very large scale */
public static LabelToNode createScopeByDocumentOld()
{ return new LabelToNode(new SingleScopePolicy(), nodeAllocatorTraditional()) ; }
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/SyntaxLabels.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/SyntaxLabels.java?rev=1494544&r1=1494543&r2=1494544&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/SyntaxLabels.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/SyntaxLabels.java Wed Jun 19 10:56:53 2013
@@ -32,4 +32,8 @@ public class SyntaxLabels
/** Default setup - scope by document, relabel BNodes ids to short forms */
static public NodeToLabel createNodeToLabel() { return NodeToLabel.createScopeByDocument() ; }
static public LabelToNode createLabelToNode() { return LabelToNode.createScopeByDocumentHash() ; }
+
+ /** Round-trip setup */
+ static public NodeToLabel createNodeToLabelRT() { return NodeToLabel.createBNodeByLabelEncoded() ; }
+ static public LabelToNode createLabelToNodeRT() { return LabelToNode.createUseLabelEncoded() ; }
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLabelToNode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLabelToNode.java?rev=1494544&r1=1494543&r2=1494544&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLabelToNode.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLabelToNode.java Wed Jun 19 10:56:53 2013
@@ -51,7 +51,7 @@ public class TestLabelToNode extends Bas
@Override public String toString() { return "ScopeByDocumentHash" ; }
} ;
- LabelToNodeFactory fScopeByDocument = new LabelToNodeFactory() {
+ LabelToNodeFactory fScopeByDocumentOld = new LabelToNodeFactory() {
@Override public LabelToNode create() { return LabelToNode.createScopeByDocumentOld() ; }
@Override public String toString() { return "ScopeByDocumentOld" ; }
} ;
@@ -73,13 +73,13 @@ public class TestLabelToNode extends Bas
} ;
// (1) Factory, whether DocScoped, (2) whether unique in a document (or graph) (3) whether unique per run
- x.add(new Object[]{fSyntaxLabels, true, true}) ;
- x.add(new Object[]{fScopeDocumentHash, true, true}) ;
- x.add(new Object[]{fScopeByDocument, true, true}) ;
+ x.add(new Object[]{fSyntaxLabels, true, true}) ;
+ x.add(new Object[]{fScopeDocumentHash, true, true}) ;
+ x.add(new Object[]{fScopeByDocumentOld, true, true}) ;
x.add(new Object[]{fScopeByGraph, false, true}) ;
- x.add(new Object[]{fUseLabelAsGiven, true, false}) ;
- x.add(new Object[]{fUseLabelEncoded, true, false}) ;
- x.add(new Object[]{fIncremental, true, false}) ;
+ x.add(new Object[]{fUseLabelAsGiven, true, false}) ;
+ x.add(new Object[]{fUseLabelEncoded, true, false}) ;
+ x.add(new Object[]{fIncremental, true, false}) ;
return x ;
}