You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by ca...@apache.org on 2011/12/15 20:43:23 UTC
svn commit: r1214929 - in /incubator/jena/Scratch/PC/tdbloader3/trunk: ./
src/main/java/cmd/ src/main/java/org/apache/jena/tdbloader2/
src/test/java/cmd/
Author: castagna
Date: Thu Dec 15 19:43:23 2011
New Revision: 1214929
URL: http://svn.apache.org/viewvc?rev=1214929&view=rev
Log:
JENA-117
Renaming tdbloader2 to tdbloader3.
Now using jena-tdb 0.9.0-incubating-SNAPSHOT.
Modified:
incubator/jena/Scratch/PC/tdbloader3/trunk/.classpath
incubator/jena/Scratch/PC/tdbloader3/trunk/.project
incubator/jena/Scratch/PC/tdbloader3/trunk/README
incubator/jena/Scratch/PC/tdbloader3/trunk/TODO
incubator/jena/Scratch/PC/tdbloader3/trunk/pom.xml
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader2.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/MultiThreadedSortedDataBag.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/NodeTableBuilder2.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader2.java
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/.classpath?rev=1214929&r1=1214928&r2=1214929&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/.classpath (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/.classpath Thu Dec 15 19:43:23 2011
@@ -5,24 +5,19 @@
<classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
<classpathentry kind="src" path="target/maven-shared-archive-resources" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes-eclipse"/>
- <classpathentry kind="var" path="M2_REPO/com/hp/hpl/jena/arq/2.8.9-SNAPSHOT/arq-2.8.9-SNAPSHOT.jar" sourcepath="M2_REPO/com/hp/hpl/jena/arq/2.8.9-SNAPSHOT/arq-2.8.9-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-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/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2-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/com/hp/hpl/jena/iri/0.8/iri-0.8.jar" sourcepath="M2_REPO/com/hp/hpl/jena/iri/0.8/iri-0.8-sources.jar">
- <attributes>
- <attribute value="jar:file:/home/castagna/.m2/repository/com/hp/hpl/jena/iri/0.8/iri-0.8-javadoc.jar!/" name="javadoc_location"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="M2_REPO/com/hp/hpl/jena/jena/2.6.4/jena-2.6.4.jar" sourcepath="M2_REPO/com/hp/hpl/jena/jena/2.6.4/jena-2.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-tdb/0.9.0-incubating-SNAPSHOT/jena-tdb-0.9.0-incubating-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-tdb/0.9.0-incubating-SNAPSHOT/jena-tdb-0.9.0-incubating-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.8.2/junit-4.8.2.jar" sourcepath="M2_REPO/junit/junit/4.8.2/junit-4.8.2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.3.1/lucene-core-2.3.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/2.3.1/lucene-core-2.3.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/hp/hpl/jena/tdb/0.8.11-SNAPSHOT/tdb-0.8.11-SNAPSHOT.jar" sourcepath="M2_REPO/com/hp/hpl/jena/tdb/0.8.11-SNAPSHOT/tdb-0.8.11-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9.jar" sourcepath="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/.project
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/.project?rev=1214929&r1=1214928&r2=1214929&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/.project (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/.project Thu Dec 15 19:43:23 2011
@@ -1,6 +1,6 @@
<projectDescription>
- <name>tdbloader2</name>
- <comment>tdbloader2 - this is an experimental (pure Java) implementation. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+ <name>tdbloader3</name>
+ <comment>tdbloader3 - this is an experimental (pure Java) implementation of tdbloader2 which uses UNIX sort instead. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects/>
<buildSpec>
<buildCommand>
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/README
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/README?rev=1214929&r1=1214928&r2=1214929&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/README (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/README Thu Dec 15 19:43:23 2011
@@ -1,25 +1,25 @@
-tdbloader2
+tdbloader3
----------
-This is an experimental (pure Java) version of tdbloader2.
-See also: https://issues.apache.org/jira/browse/JENA-117
+This is an experimental (pure Java) version of tdbloader2 which uses UNIX
+sort instead. See also: https://issues.apache.org/jira/browse/JENA-117
If you want to try it, here is how you can checkout and compile it:
cd /tmp
- svn co https://svn.apache.org/repos/asf/incubator/jena/Scratch/PC/tdbloader2/trunk/ tdbloader2
- cd /tmp/tdbloader2
+ svn co https://svn.apache.org/repos/asf/incubator/jena/Scratch/PC/tdbloader3/trunk/ tdbloader3
+ cd /tmp/tdbloader3
mvn package
This is how you can run it:
- java -cp target/tdbloader2-0.1-incubating-SNAPSHOT-jar-with-dependencies.jar -server -d64 -Xmx6144M cmd.tdbloader2 --no-stats --compression --spill-size 1500000 --loc /tmp/tdb /opt/datasets/raw/openlibrary-2011-06-02.nt.gz
+ java -cp target/tdbloader3-0.1-incubating-SNAPSHOT-jar-with-dependencies.jar -server -d64 -Xmx6144M cmd.tdbloader3 --no-stats --compression --spill-size 1500000 --loc /tmp/tdb /opt/datasets/raw/openlibrary-2011-06-02.nt.gz
For a list of the options:
- java -cp target/tdbloader2-0.1-incubating-SNAPSHOT-jar-with-dependencies.jar cmd.tdbloader2 -h
+ java -cp target/tdbloader3-0.1-incubating-SNAPSHOT-jar-with-dependencies.jar cmd.tdbloader3 -h
- cmd.tdbloader2 --loc=DIR FILE ...
+ cmd.tdbloader3 --loc=DIR FILE ...
General
-v --verbose Verbose
-q --quiet Run with minimal output
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/TODO
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/TODO?rev=1214929&r1=1214928&r2=1214929&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/TODO (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/TODO Thu Dec 15 19:43:23 2011
@@ -1,6 +1,8 @@
TODO
----
+ - Benchmark: tdbloader, tdbloader2 and tdbloader3 with a ~ 500 M dataset.
+
- Support N3, TURTLE, RDF/XML, etc... not only N-Triples | N-Quads.
- Use ThresholdPolicyMemory instead of ThresholdPolicyCount (this needs
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/pom.xml?rev=1214929&r1=1214928&r2=1214929&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/pom.xml (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/pom.xml Thu Dec 15 19:43:23 2011
@@ -26,12 +26,12 @@
</parent>
<groupId>org.apache.jena</groupId>
- <artifactId>tdbloader2</artifactId>
+ <artifactId>tdbloader3</artifactId>
<packaging>jar</packaging>
- <name>tdbloader2</name>
+ <name>tdbloader3</name>
<version>0.1-incubating-SNAPSHOT</version>
- <description>tdbloader2 - this is an experimental (pure Java) implementation</description>
+ <description>tdbloader3 - this is an experimental (pure Java) implementation of tdbloader2 which uses UNIX sort instead.</description>
<url>https://svn.apache.org/repos/asf/incubator/jena/Scratch/PC/tdbloader2/</url>
<licenses>
@@ -48,13 +48,13 @@
</organization>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/jena/Scratch/PC/tdbloader2/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/jena/Scratch/PC/tdbloader2/trunk</developerConnection>
- <url>https://svn.apache.org/repos/asf/incubator/jena/Scratch/PC/tdbloader2/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/jena/Scratch/PC/tdbloader3/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/jena/Scratch/PC/tdbloader3/trunk</developerConnection>
+ <url>https://svn.apache.org/repos/asf/incubator/jena/Scratch/PC/tdbloader3/</url>
</scm>
<properties>
- <tdb.version>0.8.11-SNAPSHOT</tdb.version>
+ <tdb.version>0.9.0-incubating-SNAPSHOT</tdb.version>
<slf4j.version>1.6.1</slf4j.version>
<junit.version>4.8.2</junit.version>
<jdk.version>1.6</jdk.version>
@@ -65,8 +65,8 @@
<dependencies>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>tdb</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-tdb</artifactId>
<version>${tdb.version}</version>
</dependency>
@@ -166,22 +166,26 @@
</plugins>
</build>
-
- <repositories>
- <repository>
- <id>repo-jena-dev</id>
- <url>http://openjena.org/repo-dev</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
<issueManagement>
<system>JIRA</system>
<url>http://issues.apache.org/jira/browse/JENA</url>
</issueManagement>
+ <repositories>
+
+ <repository>
+ <id>apache-snapshots-repo</id>
+ <url>https://repository.apache.org/content/repositories/snapshots/</url>
+ </repository>
+
+ <repository>
+ <id>apache-releases-repo</id>
+ <url>https://repository.apache.org/content/repositories/releases/</url>
+ </repository>
+
+ </repositories>
+
<reporting>
<plugins>
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader2.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader2.java?rev=1214929&r1=1214928&r2=1214929&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader2.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader2.java Thu Dec 15 19:43:23 2011
@@ -308,8 +308,8 @@ public class tdbloader2 extends CmdGener
int writeCacheSize = 100 ;
FileSet destination = new FileSet(location, indexName) ;
- BlockMgr blkMgrNodes = BlockMgrFactory.create(destination, Names.bptExt1, SystemTDB.BlockSize, readCacheSize, writeCacheSize) ;
- BlockMgr blkMgrRecords = BlockMgrFactory.create(destination, Names.bptExt2, SystemTDB.BlockSize, readCacheSize, writeCacheSize) ;
+ BlockMgr blkMgrNodes = BlockMgrFactory.create(destination, Names.bptExtTree, SystemTDB.BlockSize, readCacheSize, writeCacheSize) ;
+ BlockMgr blkMgrRecords = BlockMgrFactory.create(destination, Names.bptExtRecords, SystemTDB.BlockSize, readCacheSize, writeCacheSize) ;
cmdLog.info("Index: creating " + indexName + " index...") ;
final ProgressLogger monitor = new ProgressLogger(cmdLog, "records to " + indexName, BulkLoader.DataTickPoint,BulkLoader.superTick) ;
@@ -389,8 +389,8 @@ public class tdbloader2 extends CmdGener
}
private void deleteExistingBPlusTreeIndex(String indexName) {
- FileOps.delete(location.absolute(indexName, Names.bptExt1)) ;
- FileOps.delete(location.absolute(indexName, Names.bptExt2)) ;
+ FileOps.delete(location.absolute(indexName, Names.bptExtTree)) ;
+ FileOps.delete(location.absolute(indexName, Names.bptExtRecords)) ;
}
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/MultiThreadedSortedDataBag.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/MultiThreadedSortedDataBag.java?rev=1214929&r1=1214928&r2=1214929&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/MultiThreadedSortedDataBag.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/MultiThreadedSortedDataBag.java Thu Dec 15 19:43:23 2011
@@ -89,9 +89,9 @@ public class MultiThreadedSortedDataBag<
{
return false;
}
-
+
protected List<File> getSpillFiles() {
- return spillFiles ;
+ return super.getSpillFiles() ;
}
public void add(E item)
@@ -120,7 +120,7 @@ public class MultiThreadedSortedDataBag<
OutputStream out;
try
{
- out = getSpillFile();
+ out = getSpillStream();
}
catch (IOException e)
{
@@ -195,7 +195,7 @@ public class MultiThreadedSortedDataBag<
{
preMerge();
- return iterator(spillFiles.size());
+ return iterator(getSpillFiles().size());
}
@SuppressWarnings({ "unchecked" })
@@ -236,7 +236,7 @@ public class MultiThreadedSortedDataBag<
for ( int i = 0; i < size; i++ )
{
- File spillFile = spillFiles.get(i);
+ File spillFile = getSpillFiles().get(i);
try
{
InputStream in = new BufferedInputStream(new FileInputStream(spillFile));
@@ -276,11 +276,11 @@ public class MultiThreadedSortedDataBag<
}
private void preMerge() {
- if (spillFiles == null || spillFiles.size() <= MAX_SPILL_FILES) { return; }
+ if (getSpillFiles() == null || getSpillFiles().size() <= MAX_SPILL_FILES) { return; }
try {
- while ( spillFiles.size() > MAX_SPILL_FILES ) {
- Sink<E> sink = serializationFactory.createSerializer(getSpillFile()) ;
+ while ( getSpillFiles().size() > MAX_SPILL_FILES ) {
+ Sink<E> sink = serializationFactory.createSerializer(getSpillStream()) ;
Iterator<E> ssi = iterator(MAX_SPILL_FILES) ;
try {
while ( ssi.hasNext() ) {
@@ -293,12 +293,12 @@ public class MultiThreadedSortedDataBag<
List<File> toRemove = new ArrayList<File>(MAX_SPILL_FILES) ;
for ( int i = 0; i < MAX_SPILL_FILES; i++ ) {
- File file = spillFiles.get(i) ;
+ File file = getSpillFiles().get(i) ;
file.delete() ;
toRemove.add(file) ;
}
- spillFiles.removeAll(toRemove) ;
+ getSpillFiles().removeAll(toRemove) ;
memory = new ArrayList<E>() ;
}
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/NodeTableBuilder2.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/NodeTableBuilder2.java?rev=1214929&r1=1214928&r2=1214929&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/NodeTableBuilder2.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/NodeTableBuilder2.java Thu Dec 15 19:43:23 2011
@@ -290,8 +290,8 @@ public class NodeTableBuilder2 implement
int readCacheSize = 10 ;
int writeCacheSize = 100 ;
FileSet destination = new FileSet(dsg.getLocation(), Names.indexNode2Id) ;
- BlockMgr blkMgrNodes = BlockMgrFactory.create(destination, Names.bptExt1, SystemTDB.BlockSize, readCacheSize, writeCacheSize) ;
- BlockMgr blkMgrRecords = BlockMgrFactory.create(destination, Names.bptExt2, SystemTDB.BlockSize, readCacheSize, writeCacheSize) ;
+ BlockMgr blkMgrNodes = BlockMgrFactory.create(destination, Names.bptExtTree, SystemTDB.BlockSize, readCacheSize, writeCacheSize) ;
+ BlockMgr blkMgrRecords = BlockMgrFactory.create(destination, Names.bptExtRecords, SystemTDB.BlockSize, readCacheSize, writeCacheSize) ;
Iterator<Record> iter2 = Iter.iter(sdb03.iterator()).map(transformPair2Record) ;
BPlusTree bpt2 = BPlusTreeRewriter.packIntoBPlusTree(iter2, bptParams, recordFactory, blkMgrNodes, blkMgrRecords) ;
bpt2.sync() ;
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader2.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader2.java?rev=1214929&r1=1214928&r2=1214929&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader2.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader2.java Thu Dec 15 19:43:23 2011
@@ -39,6 +39,7 @@ import org.openjena.atlas.lib.FileOps;
import com.hp.hpl.jena.graph.Graph;
import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.graph.Triple;
+import com.hp.hpl.jena.sparql.core.DatasetGraph;
import com.hp.hpl.jena.tdb.TDBFactory;
import com.hp.hpl.jena.tdb.TDBLoader;
import com.hp.hpl.jena.tdb.base.file.Location;
@@ -86,7 +87,7 @@ public class TestTDBLoader2 {
}
}
- DatasetGraphTDB dsgMem = TDBFactory.createDatasetGraph();
+ DatasetGraphTDB dsgMem = (DatasetGraphTDB)TDBFactory.createDatasetGraph();
TDBLoader.load(dsgMem, urls);
String[] args;
@@ -110,13 +111,13 @@ public class TestTDBLoader2 {
tdbloader2.main(args);
Location location = new Location(output);
- DatasetGraphTDB dsgDisk = TDBFactory.createDatasetGraph(location);
+ DatasetGraph dsgDisk = TDBFactory.createDatasetGraph(location);
assertTrue ( dump(dsgMem, dsgDisk), isomorphic ( dsgMem, dsgDisk ) );
}
- private boolean isomorphic(DatasetGraphTDB dsgMem, DatasetGraphTDB dsgDisk) {
- if (!dsgMem.getDefaultGraphTDB().isIsomorphicWith(dsgDisk.getDefaultGraphTDB()))
+ private boolean isomorphic(DatasetGraph dsgMem, DatasetGraph dsgDisk) {
+ if (!dsgMem.getDefaultGraph().isIsomorphicWith(dsgDisk.getDefaultGraph()))
return false;
Iterator<Node> graphsMem = dsgMem.listGraphNodes();
Iterator<Node> graphsDisk = dsgDisk.listGraphNodes();
@@ -125,32 +126,32 @@ public class TestTDBLoader2 {
while (graphsMem.hasNext()) {
Node graphNode = graphsMem.next();
- if (dsgDisk.getGraphTDB(graphNode) == null) return false;
- if (!dsgMem.getGraphTDB(graphNode).isIsomorphicWith(dsgDisk.getGraphTDB(graphNode))) return false;
+ if (dsgDisk.getGraph(graphNode) == null) return false;
+ if (!dsgMem.getGraph(graphNode).isIsomorphicWith(dsgDisk.getGraph(graphNode))) return false;
seen.add(graphNode);
}
while (graphsDisk.hasNext()) {
Node graphNode = graphsDisk.next();
if (!seen.contains(graphNode)) {
- if (dsgMem.getGraphTDB(graphNode) == null) return false;
- if (!dsgMem.getGraphTDB(graphNode).isIsomorphicWith(dsgDisk.getGraphTDB(graphNode))) return false;
+ if (dsgMem.getGraph(graphNode) == null) return false;
+ if (!dsgMem.getGraph(graphNode).isIsomorphicWith(dsgDisk.getGraph(graphNode))) return false;
}
}
return true;
}
- private String dump(DatasetGraphTDB dsgMem, DatasetGraphTDB dsgDisk) {
+ private String dump(DatasetGraph dsgMem, DatasetGraph dsgDisk) {
StringBuffer sb = new StringBuffer();
sb.append("\n");
- if (!dsgMem.getDefaultGraphTDB().isIsomorphicWith(dsgDisk.getDefaultGraphTDB())) {
+ if (!dsgMem.getDefaultGraph().isIsomorphicWith(dsgDisk.getDefaultGraph())) {
sb.append("Default graphs are not isomorphic [FAIL]\n");
sb.append(" First:\n");
- dump(sb, dsgMem.getDefaultGraphTDB());
+ dump(sb, dsgMem.getDefaultGraph());
sb.append(" Second:\n");
- dump(sb, dsgDisk.getDefaultGraphTDB());
+ dump(sb, dsgDisk.getDefaultGraph());
} else {
sb.append("Default graphs are isomorphic [OK]\n");
}