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/01/08 20:07:29 UTC
svn commit: r1430447 [9/10] - in /jena/branches/streaming-update: ./
apache-jena/ apache-jena/bat/ apache-jena/bin/ jena-arq/
jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/ jena-core/
jena-core/src/main/java/com/hp/hpl/jena/assembler/ jena-core/s...
Modified: jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java (original)
+++ jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java Tue Jan 8 19:07:23 2013
@@ -31,21 +31,22 @@ import org.apache.commons.fileupload.Fil
import org.apache.commons.fileupload.FileItemStream ;
import org.apache.commons.fileupload.servlet.ServletFileUpload ;
import org.apache.commons.fileupload.util.Streams ;
-import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.HttpNames ;
import org.apache.jena.fuseki.http.HttpSC ;
import org.apache.jena.fuseki.server.DatasetRef ;
import org.apache.jena.iri.IRI ;
-import org.openjena.riot.* ;
-import org.openjena.riot.lang.LangRIOT ;
-import org.openjena.riot.lang.SinkTriplesToGraph ;
-import org.openjena.riot.system.IRIResolver ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.RiotReader ;
+import org.apache.jena.riot.lang.LangRIOT ;
+import org.apache.jena.riot.system.* ;
import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.GraphUtil ;
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
public class SPARQL_Upload extends SPARQL_ServletBase
@@ -101,13 +102,15 @@ public class SPARQL_Upload extends SPARQ
log.info(format("[%d] Upload: Graph: %s (%d triple(s))",
action.id, graphName, tripleCount)) ;
+ Graph target ;
if ( graphName.equals(HttpNames.valueDefault) )
- action.getActiveDSG().getDefaultGraph().getBulkUpdateHandler().add(graphTmp) ;
+ target = action.getActiveDSG().getDefaultGraph() ;
else
{
Node gn = Node.createURI(graphName) ;
- action.getActiveDSG().getGraph(gn).getBulkUpdateHandler().add(graphTmp) ;
+ target = action.getActiveDSG().getGraph(gn) ;
}
+ GraphUtil.addInto(target, graphTmp) ;
tripleCount = graphTmp.size();
action.commit() ;
} catch (RuntimeException ex)
@@ -194,23 +197,20 @@ public class SPARQL_Upload extends SPARQ
lang = FusekiLib.langFromContentType(ct.getContentType()) ;
if ( lang == null )
- lang = Lang.guess(name) ;
+ lang = RDFLanguages.filenameToLang(name) ;
if ( lang == null )
// Desperate.
- lang = Lang.RDFXML ;
+ lang = RDFLanguages.RDFXML ;
// We read into a in-memory graph, then (if successful) update the dataset.
// This isolates errors.
- Sink<Triple> sink = new SinkTriplesToGraph(graphDst) ;
- LangRIOT parser = RiotReader.createParserTriples(stream, lang, base, sink) ;
+ StreamRDF dest = StreamRDFLib.graph(graphDst) ;
+ LangRIOT parser = RiotReader.createParser(stream, lang, base, dest) ;
parser.getProfile().setHandler(errorHandler) ;
log.info(format("[%d] Upload: Filename: %s, Content-Type=%s, Charset=%s => %s",
action.id, name, ct.getContentType(), ct.getCharset(), lang.getName())) ;
- try {
- parser.parse() ;
- }
+ try { parser.parse() ; }
catch (RiotException ex) { errorBadRequest("Parse error: "+ex.getMessage()) ; }
- finally { sink.close() ; }
}
}
Modified: jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SimpleVelocityServlet.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SimpleVelocityServlet.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SimpleVelocityServlet.java (original)
+++ jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SimpleVelocityServlet.java Tue Jan 8 19:07:23 2013
@@ -26,12 +26,7 @@ import javax.servlet.http.HttpServlet ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
-import org.apache.velocity.Template ;
-import org.apache.velocity.VelocityContext ;
import org.apache.velocity.app.VelocityEngine ;
-import org.apache.velocity.exception.MethodInvocationException ;
-import org.apache.velocity.exception.ParseErrorException ;
-import org.apache.velocity.exception.ResourceNotFoundException ;
import org.apache.velocity.runtime.RuntimeConstants ;
import org.apache.velocity.runtime.RuntimeServices ;
import org.apache.velocity.runtime.log.LogChute ;
@@ -89,22 +84,16 @@ public class SimpleVelocityServlet exten
private void process(HttpServletRequest req, HttpServletResponse resp)
{
- VelocityContext context = new VelocityContext(datamodel) ;
+ try {
+ resp.setContentType("text/html") ;
+ resp.setCharacterEncoding("UTF-8") ;
+ Writer out = resp.getWriter() ;
String path = path(req) ;
- try
+ SimpleVelocity.process(docbase, path, out, datamodel) ;
+ } catch (IOException ex)
{
- Template temp = velocity.getTemplate(path) ; // ResourceNotFoundException, ParseErrorException
- context.put("request", req) ;
- resp.setContentType("text/html") ;
- resp.setCharacterEncoding("UTF-8") ;
- Writer out = resp.getWriter() ;
- temp.merge(context, out); // ResourceNotFoundException, ParseErrorException, MethodInvocationException
- out.flush();
+ vlog.warn("IOException", ex) ;
}
- catch (ResourceNotFoundException ex) { vlog.error("Resource not found: "+ex.getMessage()) ; }
- catch (ParseErrorException ex) { vlog.error("Parse error ("+path+") : "+ex.getMessage()) ; }
- catch (MethodInvocationException ex) { vlog.error("Method invocation exception ("+path+") : "+ex.getMessage()) ; }
- catch (IOException ex) { vlog.warn ("IOException", ex) ; }
}
private String path(HttpServletRequest request)
@@ -119,7 +108,7 @@ public class SimpleVelocityServlet exten
@Override
public String getServletInfo()
{
- return "Lightweight FreeMarker Servlet";
+ return "Lightweight Velocity Servlet";
}
/** Velocity logger to SLF4J */
Modified: jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java (original)
+++ jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java Tue Jan 8 19:07:23 2013
@@ -18,7 +18,7 @@
package org.apache.jena.fuseki.validation;
-import static org.openjena.riot.SysRIOT.fmtMessage ;
+import static org.apache.jena.riot.SysRIOT.fmtMessage ;
import java.io.IOException ;
import java.io.PrintStream ;
@@ -31,16 +31,18 @@ import javax.servlet.http.HttpServletRes
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.Sink ;
-import org.apache.jena.atlas.lib.SinkWrapper ;
import org.apache.jena.fuseki.FusekiLib ;
-import org.openjena.riot.ErrorHandler ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.RiotException ;
-import org.openjena.riot.RiotReader ;
-import org.openjena.riot.lang.LangRIOT ;
-import org.openjena.riot.system.RiotLib ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.RiotReader ;
+import org.apache.jena.riot.lang.LangRIOT ;
+import org.apache.jena.riot.system.ErrorHandler ;
+import org.apache.jena.riot.system.RiotLib ;
+import org.apache.jena.riot.system.StreamRDF ;
+import org.apache.jena.riot.system.StreamRDFLib ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.core.Quad ;
@@ -72,9 +74,9 @@ public class DataValidator extends Valid
String syntax = FusekiLib.safeParameter(httpRequest, paramSyntax) ;
if ( syntax == null || syntax.equals("") )
- syntax = Lang.NQUADS.getName() ;
+ syntax = RDFLanguages.NQUADS.getName() ;
- Lang language = Lang.get(syntax) ;
+ Lang language = RDFLanguages.shortnameToLang(syntax) ;
if ( language == null )
{
httpResponse.sendError(HttpServletResponse.SC_BAD_REQUEST, "Unknown syntax: "+syntax) ;
@@ -163,22 +165,9 @@ public class DataValidator extends Valid
public void flush() {}
String formatNode(Node n) { return FmtUtils.stringForNode(n, sCxt) ; }
} ;
-
- Sink<Quad> sink2 = new SinkWrapper<Quad>(sink){
- long count = 0 ;
- @Override public void close() {}
- @Override public void flush() {}
- @Override
- public void send(Quad quad)
- {
- super.send(quad) ;
- count++ ;
- if ( count > LIMIT )
- throw new RiotException("Limit exceeded") ;
- }
- } ;
- // Language?
- LangRIOT parser = RiotReader.createParserQuads(tokenizer, language, null, sink) ;
+
+ StreamRDF dest = StreamRDFLib.sinkQuads(sink) ;
+ LangRIOT parser = RiotReader.createParser(tokenizer, language, null, dest) ;
// Don't resolve IRIs. Do checking.
parser.setProfile(RiotLib.profile(null, false, true, errorHandler)) ;
return parser ;
@@ -220,22 +209,6 @@ public class DataValidator extends Valid
private Tokenizer createTokenizer(HttpServletRequest httpRequest, HttpServletResponse httpResponse) throws Exception
{
Reader reader = null ;
-// String[] args = httpRequest.getParameterValues(paramIndirection) ;
-//
-// if ( args == null || args.length == 0 )
-// {
-// reader = httpRequest.getReader() ;
-// }
-// else if ( args.length > 1 )
-// {
-// httpResponse.sendError(HttpServletResponse.SC_BAD_REQUEST, "Too many parameters for '"+paramIndirection+"='") ;
-// return null ;
-// }
-//// else
-//// {
-//// reader = // get from afar.
-//// }
-
String[] args = httpRequest.getParameterValues(paramData) ;
if ( args == null || args.length == 0 )
{
Modified: jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/IRIValidator.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/IRIValidator.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/IRIValidator.java (original)
+++ jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/IRIValidator.java Tue Jan 8 19:07:23 2013
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.jena.iri.IRI ;
import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.iri.Violation ;
-import org.openjena.riot.system.IRIResolver ;
+import org.apache.jena.riot.system.IRIResolver ;
public class IRIValidator extends ValidatorBase
{
Modified: jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/ValidatorBase.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/ValidatorBase.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/ValidatorBase.java (original)
+++ jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/ValidatorBase.java Tue Jan 8 19:07:23 2013
@@ -64,7 +64,7 @@ public abstract class ValidatorBase exte
{
httpResponse.setCharacterEncoding("UTF-8") ;
httpResponse.setContentType("text/html") ;
- httpResponse.setHeader(respService, "Fuseki/ARQ SPARQL Query Validator: http://openjena.org/ARQ") ;
+ httpResponse.setHeader(respService, "Fuseki/ARQ SPARQL Query Validator: http://jena.apache.org/") ;
}
protected static String htmlQuote(String str)
Modified: jena/branches/streaming-update/jena-fuseki/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-fuseki/src/main/resources/META-INF/NOTICE?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-fuseki/src/main/resources/META-INF/NOTICE (original)
+++ jena/branches/streaming-update/jena-fuseki/src/main/resources/META-INF/NOTICE Tue Jan 8 19:07:23 2013
@@ -1,5 +1,5 @@
Apache Jena - module Fuseki
-Copyright 2011, 2012 The Apache Software Foundation
+Copyright 2011-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: jena/branches/streaming-update/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorBase.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorBase.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorBase.java (original)
+++ jena/branches/streaming-update/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorBase.java Tue Jan 8 19:07:23 2013
@@ -23,6 +23,7 @@ import org.apache.jena.fuseki.http.Datas
import org.junit.Test ;
import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.GraphUtil ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
public abstract class TestDatasetGraphAccessorBase extends BaseServerTest
@@ -83,8 +84,8 @@ public abstract class TestDatasetGraphAc
Graph graph = updater.httpGet() ;
Graph graph3 = GraphFactory.createDefaultGraph() ;
- graph3.getBulkUpdateHandler().add(graph1) ;
- graph3.getBulkUpdateHandler().add(graph2) ;
+ GraphUtil.addInto(graph3, graph1) ;
+ GraphUtil.addInto(graph3, graph2) ;
assertTrue(graph.isIsomorphicWith(graph3)) ;
assertFalse(graph.isIsomorphicWith(graph1)) ;
assertFalse(graph.isIsomorphicWith(graph2)) ;
@@ -97,8 +98,8 @@ public abstract class TestDatasetGraphAc
updater.httpPost(n1, graph2) ;
Graph graph = updater.httpGet(n1) ;
Graph graph3 = GraphFactory.createDefaultGraph() ;
- graph3.getBulkUpdateHandler().add(graph1) ;
- graph3.getBulkUpdateHandler().add(graph2) ;
+ GraphUtil.addInto(graph3, graph1) ;
+ GraphUtil.addInto(graph3, graph2) ;
assertTrue(graph.isIsomorphicWith(graph3)) ;
assertFalse(graph.isIsomorphicWith(graph1)) ;
assertFalse(graph.isIsomorphicWith(graph2)) ;
Modified: jena/branches/streaming-update/jena-iri/NOTICE
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-iri/NOTICE?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-iri/NOTICE (original)
+++ jena/branches/streaming-update/jena-iri/NOTICE Tue Jan 8 19:07:23 2013
@@ -1,5 +1,5 @@
Apache Jena - IRI module
-Copyright 2011, 2012 The Apache Software Foundation
+Copyright 2011-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: jena/branches/streaming-update/jena-iri/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-iri/src/main/resources/META-INF/NOTICE?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-iri/src/main/resources/META-INF/NOTICE (original)
+++ jena/branches/streaming-update/jena-iri/src/main/resources/META-INF/NOTICE Tue Jan 8 19:07:23 2013
@@ -1,5 +1,5 @@
Apache Jena - IRI module
-Copyright 2011, 2012 The Apache Software Foundation
+Copyright 2011-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Propchange: jena/branches/streaming-update/jena-larq/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jan 8 19:07:23 2013
@@ -1,5 +1,6 @@
.classpath
.project
+.settings
target
classes
release.properties
Modified: jena/branches/streaming-update/jena-larq/NOTICE
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/NOTICE?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/NOTICE (original)
+++ jena/branches/streaming-update/jena-larq/NOTICE Tue Jan 8 19:07:23 2013
@@ -1,5 +1,5 @@
Apache Jena - module jena-larq
-Copyright 2011, 2012 The Apache Software Foundation
+Copyright 2011-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: jena/branches/streaming-update/jena-larq/log4j.properties
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/log4j.properties?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/log4j.properties (original)
+++ jena/branches/streaming-update/jena-larq/log4j.properties Tue Jan 8 19:07:23 2013
@@ -8,5 +8,5 @@ log4j.appender.stdlog.layout.ConversionP
# Everything else in Jena
log4j.logger.com.hp.hpl.jena=WARN
log4j.logger.org.openjena=WARN
-log4j.logger.org.openjena.riot=INFO
+log4j.logger.org.apache.jena.riot=INFO
Modified: jena/branches/streaming-update/jena-larq/pom.xml
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/pom.xml?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/pom.xml (original)
+++ jena/branches/streaming-update/jena-larq/pom.xml Tue Jan 8 19:07:23 2013
@@ -55,8 +55,8 @@
<properties>
<ver.lucene>3.6.1</ver.lucene>
- <ver.arq>2.9.4</ver.arq>
- <ver.tdb>0.9.4</ver.tdb>
+ <ver.arq>2.10.0-SNAPSHOT</ver.arq>
+ <ver.tdb>0.10.0-SNAPSHOT</ver.tdb>
</properties>
<dependencies>
Modified: jena/branches/streaming-update/jena-larq/src/main/java/larq/cmdline/ModLARQindex.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/src/main/java/larq/cmdline/ModLARQindex.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/src/main/java/larq/cmdline/ModLARQindex.java (original)
+++ jena/branches/streaming-update/jena-larq/src/main/java/larq/cmdline/ModLARQindex.java Tue Jan 8 19:07:23 2013
@@ -39,13 +39,14 @@ public class ModLARQindex implements Arg
ArgDecl argIndex = new ArgDecl(ArgDecl.HasValue, "larq", "lucene", "index") ;
File luceneDir ;
-
+ @Override
public void registerWith(CmdGeneral cmdLine)
{
cmdLine.getUsage().startCategory("LARQ") ;
cmdLine.add(argIndex, "--larq=DIR", "Index directory") ;
}
+ @Override
public void processArgs(CmdArgModule cmdLine)
{
if ( ! cmdLine.contains(argIndex) )
Modified: jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/HitConverter.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/HitConverter.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/HitConverter.java (original)
+++ jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/HitConverter.java Tue Jan 8 19:07:23 2013
@@ -41,6 +41,7 @@ class HitConverter implements Map1<HitLA
this.score = score ;
}
+ @Override
public Binding map1(HitLARQ hit)
{
BindingMap b = BindingFactory.create(binding) ;
Modified: jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/IndexBuilderBase.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/IndexBuilderBase.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/IndexBuilderBase.java (original)
+++ jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/IndexBuilderBase.java Tue Jan 8 19:07:23 2013
@@ -113,6 +113,7 @@ public class IndexBuilderBase implements
/** Close the writing index permanently. Optimizes the index. */
+ @Override
public void closeWriter() { closeWriter(true) ; }
/** Close the writing index permanently.
@@ -130,6 +131,8 @@ public class IndexBuilderBase implements
indexWriter = null ;
}
+ @Override
+ @SuppressWarnings("deprecation")
public void flushWriter()
{
try { if ( indexWriter != null ) indexWriter.optimize(); }
@@ -138,6 +141,7 @@ public class IndexBuilderBase implements
/** Get a search index used by LARQ */
+ @Override
public IndexLARQ getIndex()
{
//ARQ 2.2 : no longer close the index. closeForWriting() ;
Modified: jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/IndexLARQ.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/IndexLARQ.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/IndexLARQ.java (original)
+++ jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/IndexLARQ.java Tue Jan 8 19:07:23 2013
@@ -33,7 +33,7 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TopDocs;
-import org.openjena.atlas.iterator.IteratorTruncate;
+import org.apache.jena.atlas.iterator.IteratorTruncate;
import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.rdf.model.Model;
@@ -132,6 +132,7 @@ public class IndexLARQ
public NodeIterator searchModelByIndex(final Model model, String queryString, final float scoreLimit)
{
Map1<HitLARQ, RDFNode> converter = new Map1<HitLARQ, RDFNode>(){
+ @Override
public RDFNode map1(HitLARQ x)
{
return ModelUtils.convertGraphNodeToRDFNode(x.getNode(), model) ;
@@ -168,6 +169,7 @@ public class IndexLARQ
TopDocs topDocs = searcher.search(query, (Filter)null, LARQ.NUM_RESULTS ) ;
Map1<ScoreDoc,HitLARQ> converter = new Map1<ScoreDoc,HitLARQ>(){
+ @Override
public HitLARQ map1(ScoreDoc object)
{
return new HitLARQ(searcher, object) ;
Modified: jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/LuceneSearch.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/LuceneSearch.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/LuceneSearch.java (original)
+++ jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/LuceneSearch.java Tue Jan 8 19:07:23 2013
@@ -20,8 +20,8 @@ package org.apache.jena.larq;
import java.util.Iterator;
-import org.openjena.atlas.iterator.IteratorTruncate;
-import org.openjena.atlas.logging.Log;
+import org.apache.jena.atlas.iterator.IteratorTruncate;
+import org.apache.jena.atlas.logging.Log;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
import com.hp.hpl.jena.graph.Node;
@@ -235,6 +235,7 @@ public abstract class LuceneSearch exten
this.score = score ;
}
+ @Override
public Binding map1(HitLARQ hit)
{
BindingMap b = BindingFactory.create(binding) ;
Modified: jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/ScoreTest.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/ScoreTest.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/ScoreTest.java (original)
+++ jena/branches/streaming-update/jena-larq/src/main/java/org/apache/jena/larq/ScoreTest.java Tue Jan 8 19:07:23 2013
@@ -18,7 +18,7 @@
package org.apache.jena.larq;
-import org.openjena.atlas.iterator.IteratorTruncate;
+import org.apache.jena.atlas.iterator.IteratorTruncate;
/** Class to provide the truncation limit based on hit score */
@@ -26,6 +26,7 @@ class ScoreTest implements IteratorTrunc
{
private float scoreLimit ;
ScoreTest(float scoreLimit) { this.scoreLimit = scoreLimit ; }
+ @Override
public boolean accept(Object object)
{
HitLARQ hit = (HitLARQ)object ;
Modified: jena/branches/streaming-update/jena-larq/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/src/main/resources/META-INF/NOTICE?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/src/main/resources/META-INF/NOTICE (original)
+++ jena/branches/streaming-update/jena-larq/src/main/resources/META-INF/NOTICE Tue Jan 8 19:07:23 2013
@@ -1,5 +1,5 @@
Apache Jena - module jena-larq
-Copyright 2011, 2012 The Apache Software Foundation
+Copyright 2011-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: jena/branches/streaming-update/jena-larq/src/test/java/dev/Report_LARQ_Concurrent.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/src/test/java/dev/Report_LARQ_Concurrent.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/src/test/java/dev/Report_LARQ_Concurrent.java (original)
+++ jena/branches/streaming-update/jena-larq/src/test/java/dev/Report_LARQ_Concurrent.java Tue Jan 8 19:07:23 2013
@@ -18,27 +18,18 @@
package dev ;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.jena.larq.IndexBuilderString;
-import org.apache.jena.larq.IndexLARQ;
-import org.apache.jena.larq.LARQ;
-import org.apache.log4j.Logger;
-import org.apache.lucene.queryParser.ParseException;
-import org.junit.Test;
-
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.shared.Lock;
+import java.util.concurrent.* ;
+
+import org.apache.jena.larq.IndexBuilderString ;
+import org.apache.jena.larq.IndexLARQ ;
+import org.apache.jena.larq.LARQ ;
+import org.apache.log4j.Logger ;
+import org.junit.Test ;
+
+import com.hp.hpl.jena.query.* ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.shared.Lock ;
public class Report_LARQ_Concurrent {
@@ -49,7 +40,7 @@ public class Report_LARQ_Concurrent {
Model model;
@Test
- public void test_concurrent_larq_query() throws ParseException, InterruptedException, ExecutionException {
+ public void test_concurrent_larq_query() throws InterruptedException, ExecutionException {
endTime = startTime + duration * 1000;
model = ModelFactory.createDefaultModel();
@@ -88,7 +79,7 @@ public class Report_LARQ_Concurrent {
" ?doc ?p ?lit\n" +
"}\n";
- //@Override
+ @Override
public void run() {
while (System.currentTimeMillis() < endTime) {
model.enterCriticalSection(Lock.READ);
Modified: jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/TestAssemblerLARQ.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/TestAssemblerLARQ.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/TestAssemblerLARQ.java (original)
+++ jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/TestAssemblerLARQ.java Tue Jan 8 19:07:23 2013
@@ -37,8 +37,8 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.openjena.atlas.lib.FileOps;
-import org.openjena.atlas.logging.Log;
+import org.apache.jena.atlas.lib.FileOps;
+import org.apache.jena.atlas.logging.Log;
import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.rdf.model.ResourceFactory;
Modified: jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/TestLARQUtils.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/TestLARQUtils.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/TestLARQUtils.java (original)
+++ jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/TestLARQUtils.java Tue Jan 8 19:07:23 2013
@@ -25,7 +25,7 @@ import org.apache.jena.larq.IndexBuilder
import org.apache.jena.larq.IndexLARQ;
import org.apache.jena.larq.LARQ;
import org.apache.lucene.index.IndexReader;
-import org.openjena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.lib.StrUtils ;
import com.hp.hpl.jena.query.Query ;
import com.hp.hpl.jena.query.QueryExecution ;
Modified: jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/TestLARQ_Code.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/TestLARQ_Code.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/TestLARQ_Code.java (original)
+++ jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/TestLARQ_Code.java Tue Jan 8 19:07:23 2013
@@ -18,31 +18,22 @@
package org.apache.jena.larq;
-import java.io.IOException;
-import java.io.StringReader;
+import java.io.StringReader ;
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestCase;
-
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
-import org.junit.Test;
-
-import com.hp.hpl.jena.query.ARQ;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.NodeIterator;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.util.FileManager;
-import com.hp.hpl.jena.vocabulary.DC;
-import com.hp.hpl.jena.vocabulary.RDFS;
+import junit.framework.JUnit4TestAdapter ;
+import junit.framework.TestCase ;
+import org.apache.lucene.index.IndexWriter ;
+import org.apache.lucene.store.Directory ;
+import org.apache.lucene.store.RAMDirectory ;
+import org.junit.Test ;
+
+import com.hp.hpl.jena.query.ARQ ;
+import com.hp.hpl.jena.query.QueryExecution ;
+import com.hp.hpl.jena.query.ResultSet ;
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.util.FileManager ;
+import com.hp.hpl.jena.vocabulary.DC ;
+import com.hp.hpl.jena.vocabulary.RDFS ;
public class TestLARQ_Code extends TestCase
{
@@ -370,7 +361,7 @@ public class TestLARQ_Code extends TestC
assertFalse(index.searchModelByIndex("keyword").hasNext()) ;
}
- @Test public void test_remove_3() throws IOException
+ @Test public void test_remove_3() //throws IOException
{
IndexBuilderNode b = new IndexBuilderNode() ;
Resource r = ResourceFactory.createResource("http://example/r") ;
Modified: jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/TestLuceneNRT.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/TestLuceneNRT.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/TestLuceneNRT.java (original)
+++ jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/TestLuceneNRT.java Tue Jan 8 19:07:23 2013
@@ -165,7 +165,7 @@ public class TestLuceneNRT {
reader = TestLARQUtils.openIfChanged(reader);
assertEquals(0, count(reader, term));
- writer.expungeDeletes();
+ writer.forceMergeDeletes();
assertEquals(1, writer.maxDoc());
assertEquals(0, count(reader, term));
}
@@ -281,7 +281,7 @@ public class TestLuceneNRT {
reader = TestLARQUtils.openIfChanged(reader);
assertEquals(0, count(reader, term));
- writer.expungeDeletes();
+ writer.forceMergeDeletes();
assertEquals(1, writer.maxDoc());
assertEquals(0, count(reader, term));
}
Modified: jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene1.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene1.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene1.java (original)
+++ jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene1.java Tue Jan 8 19:07:23 2013
@@ -22,7 +22,7 @@ package org.apache.jena.larq.examples;
import org.apache.jena.larq.IndexBuilderString;
import org.apache.jena.larq.IndexLARQ;
import org.apache.jena.larq.LARQ;
-import org.openjena.atlas.lib.StrUtils;
+import org.apache.jena.atlas.lib.StrUtils;
import com.hp.hpl.jena.query.ARQ;
import com.hp.hpl.jena.query.Query;
Modified: jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene2.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene2.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene2.java (original)
+++ jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene2.java Tue Jan 8 19:07:23 2013
@@ -20,7 +20,7 @@ package org.apache.jena.larq.examples;
import org.apache.jena.larq.IndexLARQ;
-import org.openjena.atlas.lib.StrUtils;
+import org.apache.jena.atlas.lib.StrUtils;
import com.hp.hpl.jena.query.ARQ;
import com.hp.hpl.jena.rdf.model.Model;
Modified: jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene3.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene3.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene3.java (original)
+++ jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene3.java Tue Jan 8 19:07:23 2013
@@ -21,7 +21,7 @@ package org.apache.jena.larq.examples;
import org.apache.jena.larq.IndexBuilderString;
import org.apache.jena.larq.IndexLARQ;
-import org.openjena.atlas.lib.StrUtils;
+import org.apache.jena.atlas.lib.StrUtils;
import com.hp.hpl.jena.query.ARQ;
import com.hp.hpl.jena.rdf.model.Model;
Modified: jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene4.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene4.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene4.java (original)
+++ jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene4.java Tue Jan 8 19:07:23 2013
@@ -21,7 +21,7 @@ package org.apache.jena.larq.examples;
import org.apache.jena.larq.IndexBuilderSubject;
import org.apache.jena.larq.IndexLARQ;
-import org.openjena.atlas.lib.StrUtils;
+import org.apache.jena.atlas.lib.StrUtils;
import com.hp.hpl.jena.query.ARQ;
import com.hp.hpl.jena.rdf.model.Model;
Modified: jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene5.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene5.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene5.java (original)
+++ jena/branches/streaming-update/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene5.java Tue Jan 8 19:07:23 2013
@@ -22,7 +22,7 @@ import java.io.StringReader;
import org.apache.jena.larq.IndexBuilderNode;
import org.apache.jena.larq.IndexLARQ;
-import org.openjena.atlas.lib.StrUtils;
+import org.apache.jena.atlas.lib.StrUtils;
import com.hp.hpl.jena.query.ARQ;
import com.hp.hpl.jena.rdf.model.Literal;
Modified: jena/branches/streaming-update/jena-parent/NOTICE
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-parent/NOTICE?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-parent/NOTICE (original)
+++ jena/branches/streaming-update/jena-parent/NOTICE Tue Jan 8 19:07:23 2013
@@ -1,5 +1,5 @@
Apache Jena
-Copyright 2011, 2012 The Apache Software Foundation
+Copyright 2011-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: jena/branches/streaming-update/jena-sdb/NOTICE
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-sdb/NOTICE?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-sdb/NOTICE (original)
+++ jena/branches/streaming-update/jena-sdb/NOTICE Tue Jan 8 19:07:23 2013
@@ -1,5 +1,5 @@
Apache Jena - module SDB
-Copyright 2011, 2012 The Apache Software Foundation
+Copyright 2011-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: jena/branches/streaming-update/jena-sdb/bin/make_classpath
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-sdb/bin/make_classpath?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-sdb/bin/make_classpath (original)
+++ jena/branches/streaming-update/jena-sdb/bin/make_classpath Tue Jan 8 19:07:23 2013
@@ -31,11 +31,6 @@ then
DIRROOT=${DIRROOT%/}
LIBDIR="$DIRROOT/lib"
-# List
-CPDIR1="$DIRROOT/classes"
-CPDIR2="$DIRROOT/target/classes"
-CPDIR3="$DIRROOT/target/classes-eclipse"
-ETCDIR="$DIRROOT/etc"
# Cygwin - on Windows, the Java separator is ;
# Alternative: Form in UNIX style, turn into windows form at the end.
@@ -76,17 +71,6 @@ for jar in "$LIBDIR"/*.jar
##
done
-# Prepend any classes/ directory
-# As it's "prepend", we need to do it in reverse.
-for dir in "$CPDIR3" "$CPDIR2" "$CPDIR1"
-do
- if [ -e "$dir" ]
- then
- [ "$CP" != "" ] && CP="${SEP}${CP}"
- CP="${dir}$CP"
- fi
-done
-
# Add DIRROOT
#CP="${CP}${SEP}${DIRROOT}"
Modified: jena/branches/streaming-update/jena-sdb/bin/make_classpath_mvn
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-sdb/bin/make_classpath_mvn?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-sdb/bin/make_classpath_mvn (original)
+++ jena/branches/streaming-update/jena-sdb/bin/make_classpath_mvn Tue Jan 8 19:07:23 2013
@@ -33,7 +33,18 @@ do
CP="${CP}$M2_REPO$x"
done
+# Add development systems
+
[ -e "$DIRROOT/classes" ] && CP="$DIRROOT/classes:$CP"
[ -e "$DIRROOT/target/classes" ] && CP="$DIRROOT/target/classes:$CP"
+for P in jena-core jena-arq
+do
+ [ -e "$DIRROOT/../$P/classes" ] && CP="$DIRROOT/../$P/classes:$CP"
+ [ -e "$DIRROOT/../$P/target/classes" ] && CP="$DIRROOT/../$P/target/classes:$CP"
+done
+
+
+
+
echo "$CP"
Modified: jena/branches/streaming-update/jena-sdb/dist/NOTICE-dist
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-sdb/dist/NOTICE-dist?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-sdb/dist/NOTICE-dist (original)
+++ jena/branches/streaming-update/jena-sdb/dist/NOTICE-dist Tue Jan 8 19:07:23 2013
@@ -1,5 +1,5 @@
Apache Jena - module SDB
-Copyright 2011, 2012 The Apache Software Foundation
+Copyright 2011-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -20,7 +20,7 @@ Copyright (c) 2005 Brian Goetz and Tim P
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
Apache Xerces Java
- Copyright 1999-2011, 2012 The Apache Software Foundation
+ Copyright 1999-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: jena/branches/streaming-update/jena-sdb/pom.xml
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-sdb/pom.xml?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-sdb/pom.xml (original)
+++ jena/branches/streaming-update/jena-sdb/pom.xml Tue Jan 8 19:07:23 2013
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-parent</artifactId>
- <version>4</version>
+ <version>5-SNAPSHOT</version>
<relativePath>../jena-parent</relativePath>
</parent>
@@ -43,8 +43,8 @@
<properties>
<this.root>${project.artifactId}-${project.version}</this.root>
- <ver.jena>2.7.5-SNAPSHOT</ver.jena>
- <ver.arq>2.9.5-SNAPSHOT</ver.arq>
+ <ver.jena>2.10.0-SNAPSHOT</ver.jena>
+ <ver.arq>2.10.0-SNAPSHOT</ver.arq>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
<build.time.xsd>${maven.build.timestamp}</build.time.xsd>
</properties>
Modified: jena/branches/streaming-update/jena-sdb/src-dev/dev/TestStores2Connections1.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-sdb/src-dev/dev/TestStores2Connections1.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-sdb/src-dev/dev/TestStores2Connections1.java (original)
+++ jena/branches/streaming-update/jena-sdb/src-dev/dev/TestStores2Connections1.java Tue Jan 8 19:07:23 2013
@@ -57,7 +57,7 @@ public class TestStores2Connections1
store1.getConnection().getTransactionHandler().begin() ;
Graph graph1 = SDBFactory.connectDefaultGraph(store1) ;
- graph1.getBulkUpdateHandler().removeAll() ;
+ graph1.clear() ;
SSE.write(graph1) ; System.out.println();
graph1.add(t1) ;
SSE.write(graph1) ; System.out.println();
Modified: jena/branches/streaming-update/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java (original)
+++ jena/branches/streaming-update/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java Tue Jan 8 19:07:23 2013
@@ -18,40 +18,37 @@
package com.hp.hpl.jena.sdb.graph;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.ArrayList ;
+import java.util.List ;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.graph.impl.AllCapabilities;
-import com.hp.hpl.jena.graph.query.QueryHandler;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.sdb.SDB;
-import com.hp.hpl.jena.sdb.Store;
-import com.hp.hpl.jena.sdb.core.SDBRequest;
-import com.hp.hpl.jena.sdb.engine.QueryEngineSDB;
-import com.hp.hpl.jena.sdb.sql.SDBConnection;
-import com.hp.hpl.jena.sdb.store.DatasetStoreGraph;
-import com.hp.hpl.jena.sdb.store.StoreLoader;
-import com.hp.hpl.jena.sdb.store.StoreLoaderPlus;
-import com.hp.hpl.jena.shared.PrefixMapping;
-import com.hp.hpl.jena.sparql.algebra.Op;
-import com.hp.hpl.jena.sparql.algebra.op.OpQuadPattern;
-import com.hp.hpl.jena.sparql.core.BasicPattern;
-import com.hp.hpl.jena.sparql.core.Quad;
-import com.hp.hpl.jena.sparql.core.Var;
-import com.hp.hpl.jena.sparql.engine.Plan;
-import com.hp.hpl.jena.sparql.engine.QueryIterator;
-import com.hp.hpl.jena.sparql.engine.binding.Binding;
-import com.hp.hpl.jena.sparql.engine.binding.BindingRoot;
-import com.hp.hpl.jena.sparql.engine.iterator.QueryIterPlainWrapper;
+import com.hp.hpl.jena.graph.* ;
+import com.hp.hpl.jena.graph.impl.AllCapabilities ;
+import com.hp.hpl.jena.query.Query ;
+import com.hp.hpl.jena.sdb.SDB ;
+import com.hp.hpl.jena.sdb.Store ;
+import com.hp.hpl.jena.sdb.core.SDBRequest ;
+import com.hp.hpl.jena.sdb.engine.QueryEngineSDB ;
+import com.hp.hpl.jena.sdb.sql.SDBConnection ;
+import com.hp.hpl.jena.sdb.store.DatasetStoreGraph ;
+import com.hp.hpl.jena.sdb.store.StoreLoader ;
+import com.hp.hpl.jena.sdb.store.StoreLoaderPlus ;
+import com.hp.hpl.jena.shared.PrefixMapping ;
+import com.hp.hpl.jena.sparql.algebra.Op ;
+import com.hp.hpl.jena.sparql.algebra.op.OpQuadPattern ;
+import com.hp.hpl.jena.sparql.core.BasicPattern ;
+import com.hp.hpl.jena.sparql.core.Quad ;
+import com.hp.hpl.jena.sparql.core.Var ;
+import com.hp.hpl.jena.sparql.engine.Plan ;
+import com.hp.hpl.jena.sparql.engine.QueryIterator ;
+import com.hp.hpl.jena.sparql.engine.binding.Binding ;
+import com.hp.hpl.jena.sparql.engine.binding.BindingRoot ;
+import com.hp.hpl.jena.sparql.engine.iterator.QueryIterPlainWrapper ;
import com.hp.hpl.jena.sparql.graph.GraphBase2 ;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.util.iterator.NiceIterator;
-
-
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.util.iterator.NiceIterator ;
public class GraphSDB extends GraphBase2 implements Graph
{
@@ -255,6 +252,7 @@ public class GraphSDB extends GraphBase2
public StoreLoader getBulkLoader() { return store.getLoader() ; }
+ @Deprecated
@Override
public BulkUpdateHandler getBulkUpdateHandler()
{
@@ -263,12 +261,6 @@ public class GraphSDB extends GraphBase2
}
@Override
- public QueryHandler queryHandler()
- {
- return new GraphQueryHandlerSDB(this, graphNode, datasetStore) ;
- }
-
- @Override
public GraphEventManager getEventManager()
{
if (gem == null) gem = new EventManagerSDB( this );
Modified: jena/branches/streaming-update/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/UpdateHandlerSDB.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/UpdateHandlerSDB.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/UpdateHandlerSDB.java (original)
+++ jena/branches/streaming-update/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/UpdateHandlerSDB.java Tue Jan 8 19:07:23 2013
@@ -110,7 +110,4 @@ public class UpdateHandlerSDB extends Si
try { ((GraphSDB) graph).startBulkUpdate(); ((GraphSDB) graph).deleteAll(); }
finally { ((GraphSDB) graph).finishBulkUpdate(); }
}
-
-
-
}
Modified: jena/branches/streaming-update/jena-sdb/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-sdb/src/main/resources/META-INF/NOTICE?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-sdb/src/main/resources/META-INF/NOTICE (original)
+++ jena/branches/streaming-update/jena-sdb/src/main/resources/META-INF/NOTICE Tue Jan 8 19:07:23 2013
@@ -1,5 +1,5 @@
Apache Jena - module SDB
-Copyright 2011, 2012 The Apache Software Foundation
+Copyright 2011-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: jena/branches/streaming-update/jena-sdb/src/test/java/com/hp/hpl/jena/sdb/test/graph/AbstractTestGraphSDB.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-sdb/src/test/java/com/hp/hpl/jena/sdb/test/graph/AbstractTestGraphSDB.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-sdb/src/test/java/com/hp/hpl/jena/sdb/test/graph/AbstractTestGraphSDB.java (original)
+++ jena/branches/streaming-update/jena-sdb/src/test/java/com/hp/hpl/jena/sdb/test/graph/AbstractTestGraphSDB.java Tue Jan 8 19:07:23 2013
@@ -20,7 +20,7 @@ package com.hp.hpl.jena.sdb.test.graph;
import com.hp.hpl.jena.graph.test.AbstractTestGraph;
-public class AbstractTestGraphSDB extends AbstractTestGraph
+public abstract class AbstractTestGraphSDB extends AbstractTestGraph
{
public AbstractTestGraphSDB(String x) { super(x); }
// Tests to skip.
Modified: jena/branches/streaming-update/jena-tdb/NOTICE
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-tdb/NOTICE?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-tdb/NOTICE (original)
+++ jena/branches/streaming-update/jena-tdb/NOTICE Tue Jan 8 19:07:23 2013
@@ -1,5 +1,5 @@
Apache Jena - module TDB
-Copyright 2011, 2012 The Apache Software Foundation
+Copyright 2011-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: jena/branches/streaming-update/jena-tdb/ReleaseNotes.txt
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-tdb/ReleaseNotes.txt?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-tdb/ReleaseNotes.txt (original)
+++ jena/branches/streaming-update/jena-tdb/ReleaseNotes.txt Tue Jan 8 19:07:23 2013
@@ -1,8 +1,12 @@
ChangeLog for TDB
=================
-==== Jena 2.10.0
+==== TDB 0.10.0
+** TDB 0.10.0 depends on Jena 2.10.0 (ARQ 2.10.0)
+
++ JENA-289 : QueryExecution timeouts now cause TDB BGPs to timeout even if they produce no output.
++ JENA-363 : Fix to handling of integers with absolute values between 2^56 and 2^63.
+ JENA-346 : Further fixes for default union graph + write transactions.
+ Consolidation of versions numbers.
+ JENA-344 : Union default graph now works for SPARQL Update WHERE clauses.
@@ -18,7 +22,7 @@ ChangeLog for TDB
+ Bug fix: out-of-range derived integers (e.g. xsd:int)
+ Cache read transaction datastructures and reuse view when possible.
+ Add StoreConnection flush() operation to push delayed writer-commits if possible.
-+ JENA-290 - TDB txn creation touched stats unnecessarily, causing slow down.
++ JENA-290 : TDB txn creation touched stats unnecessarily, causing slow down.
==== TDB 0.9.3
Modified: jena/branches/streaming-update/jena-tdb/bin/tdb_path
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-tdb/bin/tdb_path?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-tdb/bin/tdb_path (original)
+++ jena/branches/streaming-update/jena-tdb/bin/tdb_path Tue Jan 8 19:07:23 2013
@@ -34,6 +34,8 @@ if [ -e "$TDBROOT/classes" ]
then
[ -z "$CP" ] || CP="${CP}${SEP}"
CP="${CP}$TDBROOT/classes"
+ CP="${CP}${SEP}$TDBROOT/../jena-arq/classes"
+ CP="${CP}${SEP}$TDBROOT/../jena-core/classes"
elif [ -e "$TDBROOT/target/classes" ]
then
[ -z "$CP" ] || CP="${CP}${SEP}"
Modified: jena/branches/streaming-update/jena-tdb/log4j.properties
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-tdb/log4j.properties?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-tdb/log4j.properties (original)
+++ jena/branches/streaming-update/jena-tdb/log4j.properties Tue Jan 8 19:07:23 2013
@@ -14,7 +14,7 @@ log4j.logger.org.apache.jena.tdb.loader=
# Everything else in Jena
log4j.logger.com.hp.hpl.jena=WARN
-log4j.logger.org.openjena.riot=INFO
+log4j.logger.org.apache.jena.riot=INFO
# TDB
# TDB syslog.
Modified: jena/branches/streaming-update/jena-tdb/pom.xml
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-tdb/pom.xml?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-tdb/pom.xml (original)
+++ jena/branches/streaming-update/jena-tdb/pom.xml Tue Jan 8 19:07:23 2013
@@ -22,7 +22,7 @@
<artifactId>jena-tdb</artifactId>
<packaging>jar</packaging>
<name>Apache Jena - TDB (Native Triple Store)</name>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<parent>
<groupId>org.apache.jena</groupId>
@@ -62,28 +62,28 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
- <version>2.9.5-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
<classifier>tests</classifier>
- <version>2.9.5-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
- <version>2.7.5-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<classifier>tests</classifier>
- <version>2.7.5-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java (original)
+++ jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java Tue Jan 8 19:07:23 2013
@@ -22,8 +22,8 @@ import java.util.Iterator ;
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.lib.Sync ;
-import org.openjena.riot.SysRIOT ;
-import org.openjena.riot.lang.LangRDFXML ;
+import org.apache.jena.riot.RIOT ;
+import org.apache.jena.riot.lang.LangRDFXML ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -188,7 +188,7 @@ public class TDB
return ;
initialized = true ;
- SysRIOT.wireIntoJena() ;
+ RIOT.init() ;
SystemTDB.init() ;
ARQ.init() ;
LangRDFXML.RiotUniformCompatibility = true ;
Modified: jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java (original)
+++ jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java Tue Jan 8 19:07:23 2013
@@ -26,7 +26,7 @@ import java.io.OutputStream ;
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.logging.Log ;
-import org.openjena.riot.out.NQuadsWriter ;
+import org.apache.jena.riot.out.NQuadsWriter ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.ReadWrite ;
Modified: jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBLoader.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBLoader.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBLoader.java (original)
+++ jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBLoader.java Tue Jan 8 19:07:23 2013
@@ -22,7 +22,8 @@ import java.io.InputStream ;
import java.util.ArrayList ;
import java.util.List ;
-import org.openjena.riot.Lang ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
import org.slf4j.Logger ;
import com.hp.hpl.jena.graph.Node ;
@@ -38,8 +39,8 @@ import com.hp.hpl.jena.tdb.store.bulkloa
public class TDBLoader
{
/** Load the contents of URL into a dataset. URL must name a quads format file (NQuads or TriG - NTriples is also accepted).
- * To a triples format, use @link{#load(GraphTDB, String)}
- * or @link{#loadTriples(DatasetGraphTDB, List<String>, boolean)}
+ * To a triples format, use {@link #load(GraphTDB, String)}
+ * or {@link #load(DatasetGraphTDB, List, boolean)}
*/
public static void load(DatasetGraphTDB dataset, String url)
{
@@ -47,8 +48,8 @@ public class TDBLoader
}
/** Load the contents of URL into a dataset. URL must name a quads format file (NQuads or TriG - NTriples is also accepted).
- * To a triples format, use @link{#load(GraphTDB, String, boolean)}
- * or @link{#loadTriples(DatasetGraphTDB, List<String>, boolean)}
+ * To a triples format, use {@link #load(GraphTDB, String, boolean)}
+ * or {@link #load(DatasetGraphTDB, List, boolean)}
*/
public static void load(DatasetGraphTDB dataset, String url, boolean showProgress)
{
@@ -56,8 +57,8 @@ public class TDBLoader
}
/** Load the contents of URL into a dataset. URL must name a quads format file (NQuads or TriG - NTriples is also accepted).
- * To load a triples format, use @link{#load(GraphTDB, List<String>, boolean)}
- * or @link{#loadTriples(DatasetGraphTDB, List<String>, boolean)}
+ * To load a triples format, use {@link #load(GraphTDB, List, boolean)}
+ * or {@link #load(DatasetGraphTDB, List, boolean)}
*/
public static void load(DatasetGraphTDB dataset, List<String> urls)
{
@@ -65,8 +66,8 @@ public class TDBLoader
}
/** Load the contents of URL into a dataset. URL must name a quads format file (NQuads or TriG - NTriples is also accepted).
- * To load a triples format, use @link{#load(GraphTDB, List<String>, boolean)}
- * or @link{#loadTriples(DatasetGraphTDB, List<String>, boolean)}
+ * To load a triples format, use {@link #load(GraphTDB, List, boolean)}
+ * or {@link #load(DatasetGraphTDB, List, boolean)}
*/
public static void load(DatasetGraphTDB dataset, List<String> urls, boolean showProgress)
{
@@ -234,8 +235,8 @@ public class TDBLoader
{
for ( String url : urls )
{
- Lang lang = Lang.guess(url) ;
- if ( lang != null && ! lang.isQuads() )
+ Lang lang = RDFLanguages.filenameToLang(url) ;
+ if ( lang != null && RDFLanguages.isQuads(lang) )
throw new TDBException("Not a triples language") ;
}
}
Modified: jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/graph/BulkUpdateHandlerTDB.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/graph/BulkUpdateHandlerTDB.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/graph/BulkUpdateHandlerTDB.java (original)
+++ jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/graph/BulkUpdateHandlerTDB.java Tue Jan 8 19:07:23 2013
@@ -18,19 +18,11 @@
package com.hp.hpl.jena.tdb.graph;
-import java.util.Iterator;
-
-import org.apache.jena.atlas.lib.Tuple ;
-
-
-
-import com.hp.hpl.jena.graph.BulkUpdateHandler;
-import com.hp.hpl.jena.graph.GraphEvents;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.impl.SimpleBulkUpdateHandler;
-import com.hp.hpl.jena.tdb.nodetable.NodeTupleTable ;
-import com.hp.hpl.jena.tdb.store.GraphTDBBase;
-import com.hp.hpl.jena.tdb.store.NodeId;
+import com.hp.hpl.jena.graph.BulkUpdateHandler ;
+import com.hp.hpl.jena.graph.GraphEvents ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.impl.SimpleBulkUpdateHandler ;
+import com.hp.hpl.jena.tdb.store.GraphTDBBase ;
public class BulkUpdateHandlerTDB extends SimpleBulkUpdateHandler implements BulkUpdateHandler
{
@@ -42,75 +34,24 @@ public class BulkUpdateHandlerTDB extend
this.graphTDB = graph ;
}
+ @Deprecated
@Override
public void remove(Node s, Node p, Node o)
{
s = fix(s) ;
p = fix(p) ;
o = fix(o) ;
- removeWorker(s,p,o) ;
+ GraphTDBBase.removeWorker(graphTDB, s,p,o) ;
manager.notifyEvent( graph, GraphEvents.remove( s, p, o ) );
}
private static Node fix(Node n) { return (n!=null)? n : Node.ANY ; }
+ @Deprecated
@Override
public void removeAll()
{
- removeWorker(null, null, null) ;
+ GraphTDBBase.removeWorker(graphTDB, null, null, null) ;
notifyRemoveAll();
}
-
- private static final int sliceSize = 1000 ;
-
- private void removeWorker(Node s, Node p, Node o)
- {
- graphTDB.startUpdate() ;
-
- // Delete in batches.
- // That way, there is no active iterator when a delete
- // from the indexes happens.
-
- NodeTupleTable t = graphTDB.getNodeTupleTable() ;
- Node gn = graphTDB.getGraphNode() ;
-
- @SuppressWarnings("unchecked")
- Tuple<NodeId>[] array = (Tuple<NodeId>[])new Tuple<?>[sliceSize] ;
-
- while (true)
- {
- // Convert/cache s,p,o?
- // The Node Cache will catch these so don't worry unduely.
- Iterator<Tuple<NodeId>> iter = null ;
- if ( gn == null )
- iter = t.findAsNodeIds(s, p, o) ;
- else
- iter = t.findAsNodeIds(gn, s, p, o) ;
-
- if ( iter == null )
- // Finished?
- return ;
-
- // Get a slice
- int len = 0 ;
- for ( ; len < sliceSize ; len++ )
- {
- if ( !iter.hasNext() ) break ;
- array[len] = iter.next() ;
- }
-
- // Delete them.
- for ( int i = 0 ; i < len ; i++ )
- {
- t.getTupleTable().delete(array[i]) ;
- array[i] = null ;
- }
- // Finished?
- if ( len < sliceSize )
- break ;
- }
-
- graphTDB.finishUpdate() ;
-
- }
}
Modified: jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/NodeFmtLib.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/NodeFmtLib.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/NodeFmtLib.java (original)
+++ jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/NodeFmtLib.java Tue Jan 8 19:07:23 2013
@@ -19,9 +19,9 @@
package com.hp.hpl.jena.tdb.lib;
import org.apache.jena.atlas.lib.Chars ;
-import org.openjena.riot.system.PrefixMap ;
-import org.openjena.riot.system.Prologue ;
-import org.openjena.riot.system.RiotChars ;
+import org.apache.jena.riot.system.PrefixMap ;
+import org.apache.jena.riot.system.Prologue ;
+import org.apache.jena.riot.system.RiotChars ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Node_Literal ;
Modified: jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java (original)
+++ jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java Tue Jan 8 19:07:23 2013
@@ -22,11 +22,11 @@ import java.nio.ByteBuffer ;
import org.apache.jena.atlas.io.BlockUTF8 ;
import org.apache.jena.atlas.lib.StrUtils ;
-import org.openjena.riot.LangTag ;
-import org.openjena.riot.RiotException ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
+import org.apache.jena.riot.web.LangTag ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.rdf.model.AnonId ;
Modified: jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryIterTDB.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryIterTDB.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryIterTDB.java (original)
+++ jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryIterTDB.java Tue Jan 8 19:07:23 2013
@@ -18,23 +18,26 @@
package com.hp.hpl.jena.tdb.solver;
-import java.util.Iterator;
+import java.util.Iterator ;
+import java.util.List ;
-import com.hp.hpl.jena.sparql.engine.ExecutionContext;
-import com.hp.hpl.jena.sparql.engine.QueryIterator;
-import com.hp.hpl.jena.sparql.engine.binding.Binding;
-import com.hp.hpl.jena.sparql.engine.iterator.QueryIterPlainWrapper;
+import com.hp.hpl.jena.sparql.engine.ExecutionContext ;
+import com.hp.hpl.jena.sparql.engine.QueryIterator ;
+import com.hp.hpl.jena.sparql.engine.binding.Binding ;
+import com.hp.hpl.jena.sparql.engine.iterator.QueryIterPlainWrapper ;
public class QueryIterTDB extends QueryIterPlainWrapper
{
// Rename as QueryIterCloseOther?
final private QueryIterator originalInput ;
+ private List<Abortable> killList ;
// The original input needs closing as well.
- public QueryIterTDB(Iterator<Binding> iterBinding, QueryIterator originalInput, ExecutionContext execCxt)
+ public QueryIterTDB(Iterator<Binding> iterBinding, List<Abortable> killList , QueryIterator originalInput, ExecutionContext execCxt)
{
super(iterBinding, execCxt) ;
this.originalInput = originalInput ;
+ this.killList = killList ;
}
@Override
@@ -44,4 +47,12 @@ public class QueryIterTDB extends QueryI
originalInput.close();
super.closeIterator() ;
}
+
+ @Override
+ protected void requestCancel()
+ {
+ if ( killList != null )
+ for ( Abortable it : killList )
+ it.abort() ;
+ }
}
Modified: jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java (original)
+++ jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java Tue Jan 8 19:07:23 2013
@@ -20,14 +20,11 @@ package com.hp.hpl.jena.tdb.solver;
import static com.hp.hpl.jena.tdb.lib.Lib2.printAbbrev ;
-import java.util.Collection ;
-import java.util.HashSet ;
-import java.util.Iterator ;
-import java.util.List ;
-import java.util.Set ;
+import java.util.* ;
import org.apache.jena.atlas.iterator.Filter ;
import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.IteratorWrapper ;
import org.apache.jena.atlas.iterator.Transform ;
import org.apache.jena.atlas.lib.Tuple ;
import org.slf4j.Logger ;
@@ -35,6 +32,7 @@ import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.query.QueryCancelledException ;
import com.hp.hpl.jena.sparql.core.BasicPattern ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.engine.ExecutionContext ;
@@ -94,7 +92,6 @@ public class SolverLib
public static Iterator<Binding> convertToNodes(Iterator<BindingNodeId> iterBindingIds, NodeTable nodeTable)
{ return Iter.map(iterBindingIds, convToBinding(nodeTable)) ; }
-
// The worker. Callers choose the NodeTupleTable.
// graphNode may be Node.ANY, meaning we should make triples unique.
@@ -120,6 +117,7 @@ public class SolverLib
NodeTable nodeTable = nodeTupleTable.getNodeTable() ;
Iterator<BindingNodeId> chain = Iter.map(input, SolverLib.convFromBinding(nodeTable)) ;
+ List<Abortable> killList = new ArrayList<Abortable>() ;
for ( Triple triple : triples )
{
@@ -131,6 +129,7 @@ public class SolverLib
// 4-tuples.
tuple = Tuple.create(graphNode, triple.getSubject(), triple.getPredicate(), triple.getObject()) ;
chain = solve(nodeTupleTable, tuple, anyGraph, chain, filter, execCxt) ;
+ chain = makeAbortable(chain, killList) ;
}
// DEBUG POINT
@@ -142,13 +141,67 @@ public class SolverLib
System.out.println("No results") ;
}
- // XXX
+ // Timeout wrapper ****
+ // QueryIterTDB gets called async.
+ // Iter.abortable?
+ // Or each iterator has a place to test.
+ // or pass in a thing to test?
+
// Need to make sure the bindings here point to parent.
Iterator<Binding> iterBinding = converter.convert(nodeTable, chain) ;
// "input" will be closed by QueryIterTDB but is otherwise unused.
- return new QueryIterTDB(iterBinding, input, execCxt) ;
+ // "killList" wil be aborted on timeout.
+ return new QueryIterTDB(iterBinding, killList, input, execCxt) ;
+ }
+
+ /** Create an abortable iterator, storing it in the killList.
+ * Just return the input iterator if kilList is null.
+ */
+ static <T> Iterator<T> makeAbortable(Iterator<T> iter, List<Abortable> killList)
+ {
+ if ( killList == null )
+ return iter ;
+ IterAbortable<T> k = new IterAbortable<T>(iter) ;
+ killList.add(k) ;
+ return k ;
+ }
+
+ /** Iterator that adds an abort operation which can be called
+ * at any time, including from another thread, and causes the
+ * iterator to throw an exception when next touched (hasNext, next).
+ */
+ static class IterAbortable<T> extends IteratorWrapper<T> implements Abortable
+ {
+ volatile boolean abortFlag = false ;
+
+ public IterAbortable(Iterator<T> iterator)
+ {
+ super(iterator) ;
+ }
+
+ /** Can call asynchronously at anytime */
+ @Override
+ public void abort() {
+ abortFlag = true ;
+ }
+
+ @Override
+ public boolean hasNext()
+ {
+ if ( abortFlag )
+ throw new QueryCancelledException() ;
+ return iterator.hasNext() ;
+ }
+
+ @Override
+ public T next()
+ {
+ if ( abortFlag )
+ throw new QueryCancelledException() ;
+ return iterator.next() ;
+ }
}
private static Iterator<BindingNodeId> solve(NodeTupleTable nodeTupleTable,
@@ -231,11 +284,18 @@ public class SolverLib
QueryIterator input, Filter<Tuple<NodeId>> filter,
ExecutionContext execCxt)
{
+ List<Abortable> killList = new ArrayList<Abortable>() ;
Iterator<Tuple<NodeId>> iter1 = ds.getQuadTable().getNodeTupleTable().find(NodeId.NodeIdAny, NodeId.NodeIdAny, NodeId.NodeIdAny, NodeId.NodeIdAny) ;
if ( filter != null )
iter1 = Iter.filter(iter1, filter) ;
+
Iterator<NodeId> iter2 = Tuple.project(0, iter1) ;
+ // Project is cheap - don't brother wrapping iter1
+ iter2 = makeAbortable(iter2, killList) ;
+
Iterator<NodeId> iter3 = Iter.distinct(iter2) ;
+ iter3 = makeAbortable(iter3, killList) ;
+
Iterator<Node> iter4 = NodeLib.nodes(ds.getQuadTable().getNodeTupleTable().getNodeTable(), iter3) ;
final Var var = Var.alloc(graphNode) ;
@@ -248,8 +308,8 @@ public class SolverLib
} ;
Iterator<Binding> iterBinding = Iter.map(iter4, bindGraphName) ;
-
- return new QueryIterTDB(iterBinding, input, execCxt) ;
+ // Not abortable.
+ return new QueryIterTDB(iterBinding, killList, input, execCxt) ;
}
/** Turn a BasicPattern into an abbreviated string for debugging */
Modified: jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java (original)
+++ jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java Tue Jan 8 19:07:23 2013
@@ -28,6 +28,7 @@ import org.apache.jena.atlas.lib.Sync ;
import org.apache.jena.atlas.lib.Tuple ;
import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.GraphUtil ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.query.Dataset ;
@@ -305,7 +306,7 @@ public class DatasetGraphTDB extends Dat
public void addGraph(Node graphName, Graph graph)
{
Graph g = getGraph(graphName) ;
- g.getBulkUpdateHandler().add(graph) ;
+ GraphUtil.addInto(g, graph) ;
}
@Override
Modified: jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDBBase.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDBBase.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDBBase.java (original)
+++ jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDBBase.java Tue Jan 8 19:07:23 2013
@@ -23,19 +23,18 @@ import static com.hp.hpl.jena.sparql.cor
import java.util.Iterator ;
import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.lib.Tuple ;
import org.slf4j.Logger ;
import com.hp.hpl.jena.graph.* ;
-import com.hp.hpl.jena.graph.query.QueryHandler ;
import com.hp.hpl.jena.shared.Lock ;
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.graph.GraphBase2 ;
-import com.hp.hpl.jena.sparql.graph.Reifier2 ;
import com.hp.hpl.jena.tdb.TDB ;
import com.hp.hpl.jena.tdb.graph.BulkUpdateHandlerTDB ;
-import com.hp.hpl.jena.tdb.graph.QueryHandlerTDB ;
import com.hp.hpl.jena.tdb.graph.TransactionHandlerTDB ;
import com.hp.hpl.jena.tdb.lib.NodeFmtLib ;
+import com.hp.hpl.jena.tdb.nodetable.NodeTupleTable ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
import com.hp.hpl.jena.util.iterator.WrappedIterator ;
@@ -43,8 +42,6 @@ import com.hp.hpl.jena.util.iterator.Wra
/** General operations for TDB graphs (free-standing graph, default graph and named graphs) */
public abstract class GraphTDBBase extends GraphBase2 implements GraphTDB
{
- @SuppressWarnings("hiding")
- private final QueryHandlerTDB queryHandler = new QueryHandlerTDB(this) ;
private final TransactionHandler transactionHandler = new TransactionHandlerTDB(this) ;
private final BulkUpdateHandler bulkUpdateHandler = new BulkUpdateHandlerTDB(this) ;
protected final DatasetGraphTDB dataset ;
@@ -134,12 +131,6 @@ public abstract class GraphTDBBase exten
return WrappedIterator.createNoRemove(iterTriples) ;
}
- @Override
- protected Reifier constructReifier()
- {
- return new Reifier2(this) ;
- }
-
protected abstract Logger getLog() ;
/** Iterator over something that, when counted, is the graph size. */
@@ -184,6 +175,7 @@ public abstract class GraphTDBBase exten
public void remove() { iter.remove(); }
}
+ @Deprecated
@Override
public BulkUpdateHandler getBulkUpdateHandler() { return bulkUpdateHandler ; }
@@ -216,10 +208,74 @@ public abstract class GraphTDBBase exten
}
@Override
- public QueryHandler queryHandler()
- { return queryHandler ; }
-
- @Override
public TransactionHandler getTransactionHandler()
{ return transactionHandler ; }
+
+ @Override
+ public void clear()
+ {
+ removeWorker(this, Node.ANY, Node.ANY, Node.ANY) ;
+ getEventManager().notifyEvent(this, GraphEvents.removeAll ) ;
+ }
+
+ @Override
+ public void remove( Node s, Node p, Node o )
+ {
+ removeWorker(this, s, p, o) ;
+ getEventManager().notifyEvent(this, GraphEvents.remove(s, p, o) ) ;
+ }
+
+
+ private static final int sliceSize = 1000 ;
+
+ public static void removeWorker(GraphTDBBase g, Node s, Node p, Node o)
+ {
+ g.startUpdate() ;
+
+ // Delete in batches.
+ // That way, there is no active iterator when a delete
+ // from the indexes happens.
+
+ NodeTupleTable t = g.getNodeTupleTable() ;
+ Node gn = g.getGraphNode() ;
+
+ @SuppressWarnings("unchecked")
+ Tuple<NodeId>[] array = (Tuple<NodeId>[])new Tuple<?>[sliceSize] ;
+
+ while (true)
+ {
+ // Convert/cache s,p,o?
+ // The Node Cache will catch these so don't worry unduely.
+ Iterator<Tuple<NodeId>> iter = null ;
+ if ( gn == null )
+ iter = t.findAsNodeIds(s, p, o) ;
+ else
+ iter = t.findAsNodeIds(gn, s, p, o) ;
+
+ if ( iter == null )
+ // Finished?
+ return ;
+
+ // Get a slice
+ int len = 0 ;
+ for ( ; len < sliceSize ; len++ )
+ {
+ if ( !iter.hasNext() ) break ;
+ array[len] = iter.next() ;
+ }
+
+ // Delete them.
+ for ( int i = 0 ; i < len ; i++ )
+ {
+ t.getTupleTable().delete(array[i]) ;
+ array[i] = null ;
+ }
+ // Finished?
+ if ( len < sliceSize )
+ break ;
+ }
+
+ g.finishUpdate() ;
+ }
+
}
Modified: jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/IntegerNode.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/IntegerNode.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/IntegerNode.java (original)
+++ jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/IntegerNode.java Tue Jan 8 19:07:23 2013
@@ -25,12 +25,12 @@ public class IntegerNode
// 56 bits of value, including sign bit.
public static int LEN = 56 ;
public static int LBITS = Long.SIZE ;
- public static long MAX = (1L<< (LEN-1) ) ;
- public static long MIN = (1L<< (LEN-1) ) ;
+ public static long MAX = (1L<< (LEN-1) )-1;
+ public static long MIN = -(1L<< (LEN-1) ) ;
public static long pack(long v)
{
- if ( v < MIN || v > MAX )
+ if ( v >= MIN && v <= MAX )
{
v = BitsLong.clear(v, LEN, LBITS) ;
v = NodeId.setType(v, NodeId.INTEGER) ;