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 2012/03/23 22:34:16 UTC
svn commit: r1304613 - in /incubator/jena/Jena2/TDB/trunk: .classpath
pom.xml src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java
src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTransaction.java
Author: andy
Date: Fri Mar 23 21:34:16 2012
New Revision: 1304613
URL: http://svn.apache.org/viewvc?rev=1304613&view=rev
Log:
Update to ARQ 2.7.1-SNAPSHOT
Switch to binary-safe UTF8 encoder/decoder. JENA-225.
Modified:
incubator/jena/Jena2/TDB/trunk/.classpath
incubator/jena/Jena2/TDB/trunk/pom.xml
incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java
incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTransaction.java
Modified: incubator/jena/Jena2/TDB/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/.classpath?rev=1304613&r1=1304612&r2=1304613&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/.classpath (original)
+++ incubator/jena/Jena2/TDB/trunk/.classpath Fri Mar 23 21:34:16 2012
@@ -7,11 +7,22 @@
<classpathentry excluding="**/*.java|**/.svn/" kind="src" path="src/main/resources"/>
<classpathentry excluding="**/*.java|**/.svn/" kind="src" path="src/test/resources"/>
<classpathentry excluding="**/*.java|**/.svn/" kind="src" path="resources2"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating.jar" sourcepath="/M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating-tests.jar" sourcepath="/M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating-test-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating-tests.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating-test-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating-sources.jar"/>
+
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.9.1-incubating-SNAPSHOT/jena-arq-2.9.1-incubating-SNAPSHOT.jar"
+ sourcepath="/M2_REPO/org/apache/jena/jena-arq/2.9.1-incubating-SNAPSHOT/jena-arq-2.9.1-incubating-SNAPSHOT-sources.jar"/>
+
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.9.1-incubating-SNAPSHOT/jena-arq-2.9.1-incubating-SNAPSHOT-tests.jar"
+ sourcepath="/M2_REPO/org/apache/jena/jena-arq/2.9.1-incubating-SNAPSHOT/jena-arq-2.9.1-incubating-SNAPSHOT-test-sources.jar"/>
+
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.1-incubating-SNAPSHOT/jena-iri-0.9.1-incubating-SNAPSHOT.jar"
+ sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.1-incubating-SNAPSHOT/jena-iri-0.9.1-incubating-SNAPSHOT-sources.jar"/>
+
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT-tests.jar"
+ sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT-test-sources.jar"/>
+
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT.jar"
+ sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT-sources.jar"/>
+
<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.5/commons-codec-1.5.jar" sourcepath="/M2_REPO/commons-codec/commons-codec/1.5/commons-codec-1.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar" sourcepath="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.9-sources.jar"/>
Modified: incubator/jena/Jena2/TDB/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/pom.xml?rev=1304613&r1=1304612&r2=1304613&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/pom.xml (original)
+++ incubator/jena/Jena2/TDB/trunk/pom.xml Fri Mar 23 21:34:16 2012
@@ -42,8 +42,8 @@
<this.root>${project.artifactId}-${project.version}</this.root>
<assembly.root.name>apache-${project.artifactId}-${project.version}</assembly.root.name>
- <ver.jena>2.7.0-incubating</ver.jena>
- <ver.arq>2.9.0-incubating</ver.arq>
+ <ver.jena>2.7.1-incubating-SNAPSHOT</ver.jena>
+ <ver.arq>2.9.1-incubating-SNAPSHOT</ver.arq>
</properties>
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java?rev=1304613&r1=1304612&r2=1304613&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java Fri Mar 23 21:34:16 2012
@@ -20,7 +20,7 @@ package com.hp.hpl.jena.tdb.nodetable;
import java.nio.ByteBuffer ;
-import org.openjena.atlas.lib.Bytes ;
+import org.openjena.atlas.io.BlockUTF8 ;
import org.openjena.atlas.lib.StrUtils ;
import org.openjena.riot.RiotException ;
import org.openjena.riot.tokens.Token ;
@@ -64,11 +64,14 @@ public class NodecSSE implements Nodec
// Node->String
String str = NodeFmtLib.serialize(node) ;
- // String -> bytes
- int x = Bytes.toByteBuffer(str, bb) ;
- bb.position(0) ; // Around the space used
- bb.limit(x) ; // The space we have used.
- return x ;
+ // String -> bytes ;
+ BlockUTF8.fromChars(str, bb) ;
+ bb.flip() ;
+ return bb.limit() ;
+// int x = Bytes.toByteBuffer(str, bb) ;
+// bb.position(0) ; // Around the space used
+// bb.limit(x) ; // The space we have used.
+// return x ;
}
@Override
@@ -78,7 +81,9 @@ public class NodecSSE implements Nodec
// But currently we go bytes -> string -> node
// Byte -> String
- String str = Bytes.fromByteBuffer(bb) ;
+ String str = BlockUTF8.toString(bb) ;
+ //OLD
+ //String str = Bytes.fromByteBuffer(bb) ;
// String -> Node
// Easy cases.
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTransaction.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTransaction.java?rev=1304613&r1=1304612&r2=1304613&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTransaction.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTransaction.java Fri Mar 23 21:34:16 2012
@@ -117,6 +117,14 @@ public class DatasetGraphTransaction ext
{
dsgTxn.end() ;
}
+
+ @Override
+ public String toString()
+ {
+ // Risky ...
+ return get().toString() ;
+ }
+
@Override
protected void _close()