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 2012/02/22 08:46:00 UTC
svn commit: r1292163 - in /incubator/jena/Scratch/PC/tdbloader3/trunk:
.classpath .project README TODO pom.xml src/main/java/cmd/tdbloader3.java
src/main/java/org/apache/jena/tdbloader3/DataStreamFactory.java
src/test/java/cmd/TestTDBLoader3.java
Author: castagna
Date: Wed Feb 22 07:45:59 2012
New Revision: 1292163
URL: http://svn.apache.org/viewvc?rev=1292163&view=rev
Log:
JENA-117
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/tdbloader3.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/DataStreamFactory.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader3.java
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/.classpath?rev=1292163&r1=1292162&r2=1292163&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/.classpath (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/.classpath Wed Feb 22 07:45:59 2012
@@ -7,18 +7,17 @@
<classpathentry kind="output" path="target/classes-eclipse"/>
<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/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3-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/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/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-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-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-tdb/0.9.0-incubating/jena-tdb-0.9.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-tdb/0.9.0-incubating/jena-tdb-0.9.0-incubating-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/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.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/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="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
</classpath>
\ No newline at end of file
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/.project
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/.project?rev=1292163&r1=1292162&r2=1292163&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/.project (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/.project Wed Feb 22 07:45:59 2012
@@ -1,5 +1,5 @@
<projectDescription>
- <name>tdbloader3</name>
+ <name>jena-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>
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/README
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/README?rev=1292163&r1=1292162&r2=1292163&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/README (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/README Wed Feb 22 07:45:59 2012
@@ -1,8 +1,8 @@
tdbloader3
----------
-This is an experimental (pure Java) version of tdbloader2 which uses UNIX
-sort instead. 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:
@@ -13,11 +13,11 @@ If you want to try it, here is how you c
This is how you can run it:
- 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
+ java -cp target/jena-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/tdbloader3-0.1-incubating-SNAPSHOT-jar-with-dependencies.jar cmd.tdbloader3 -h
+ java -cp target/jena-tdbloader3-0.1-incubating-SNAPSHOT-jar-with-dependencies.jar cmd.tdbloader3 -h
cmd.tdbloader3 --loc=DIR FILE ...
General
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/TODO
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/TODO?rev=1292163&r1=1292162&r2=1292163&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/TODO (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/TODO Wed Feb 22 07:45:59 2012
@@ -6,4 +6,4 @@ TODO
- Support N3, TURTLE, RDF/XML, etc... not only N-Triples | N-Quads.
- Use ThresholdPolicyMemory instead of ThresholdPolicyCount (this needs
- to bites estimates).
+ byte estimates).
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/pom.xml?rev=1292163&r1=1292162&r2=1292163&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/pom.xml (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/pom.xml Wed Feb 22 07:45:59 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-top</artifactId>
- <version>1-incubating-SNAPSHOT</version>
+ <version>0-incubating</version>
</parent>
<groupId>org.apache.jena</groupId>
@@ -54,7 +54,7 @@
</scm>
<properties>
- <tdb.version>0.9.0-incubating-SNAPSHOT</tdb.version>
+ <tdb.version>0.9.0-incubating</tdb.version>
<slf4j.version>1.6.1</slf4j.version>
<junit.version>4.8.2</junit.version>
<jdk.version>1.6</jdk.version>
@@ -173,17 +173,18 @@
</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>
-
+ <repository>
+ <id>apache-staging-repo</id>
+ <url>https://repository.apache.org/content/repositories/staging/</url>
+ </repository>
</repositories>
<reporting>
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader3.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader3.java?rev=1292163&r1=1292162&r2=1292163&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader3.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader3.java Wed Feb 22 07:45:59 2012
@@ -77,6 +77,7 @@ import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.graph.Triple;
import com.hp.hpl.jena.sparql.core.Quad;
import com.hp.hpl.jena.sparql.util.Utils;
+import com.hp.hpl.jena.tdb.TDB;
import com.hp.hpl.jena.tdb.base.block.BlockMgr;
import com.hp.hpl.jena.tdb.base.block.BlockMgrFactory;
import com.hp.hpl.jena.tdb.base.file.FileSet;
@@ -124,7 +125,7 @@ public class tdbloader3 extends CmdGener
public static void main(String...argv)
{
CmdTDB.setLogging() ;
- SetupTDB.setOptimizerWarningFlag(false) ;
+ TDB.setOptimizerWarningFlag(false) ;
new tdbloader3(argv).mainRun() ;
}
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/DataStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/DataStreamFactory.java?rev=1292163&r1=1292162&r2=1292163&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/DataStreamFactory.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/DataStreamFactory.java Wed Feb 22 07:45:59 2012
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.jena.tdbloader3;
import java.io.BufferedInputStream;
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader3.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader3.java?rev=1292163&r1=1292162&r2=1292163&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader3.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader3.java Wed Feb 22 07:45:59 2012
@@ -43,7 +43,7 @@ import com.hp.hpl.jena.sparql.core.Datas
import com.hp.hpl.jena.tdb.TDBFactory;
import com.hp.hpl.jena.tdb.TDBLoader;
import com.hp.hpl.jena.tdb.base.file.Location;
-import com.hp.hpl.jena.tdb.store.DatasetGraphTDB;
+import com.hp.hpl.jena.tdb.transaction.DatasetGraphTransaction;
import com.hp.hpl.jena.util.iterator.ExtendedIterator;
@RunWith(Parameterized.class)
@@ -87,8 +87,8 @@ public class TestTDBLoader3 {
}
}
- DatasetGraphTDB dsgMem = (DatasetGraphTDB)TDBFactory.createDatasetGraph();
- TDBLoader.load(dsgMem, urls);
+ DatasetGraphTransaction dsgtMem = (DatasetGraphTransaction)TDBFactory.createDatasetGraph();
+ TDBLoader.load(dsgtMem.getDatasetGraphToQuery(), urls);
String[] args;
File path = new File(input);
@@ -113,7 +113,7 @@ public class TestTDBLoader3 {
Location location = new Location(output);
DatasetGraph dsgDisk = TDBFactory.createDatasetGraph(location);
- assertTrue ( dump(dsgMem, dsgDisk), isomorphic ( dsgMem, dsgDisk ) );
+ assertTrue ( dump(dsgtMem, dsgDisk), isomorphic ( dsgtMem, dsgDisk ) );
}
private boolean isomorphic(DatasetGraph dsgMem, DatasetGraph dsgDisk) {