You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by sa...@apache.org on 2013/01/31 03:04:40 UTC
svn commit: r1440793 - in /jena/branches/streaming-update: ./ jena-arq/
jena-arq/bin/ jena-arq/src/test/java/org/apache/jena/riot/system/
jena-fuseki/ jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/
jena-fuseki/src/main/java/org/apache/jena/fusek...
Author: sallen
Date: Thu Jan 31 02:04:40 2013
New Revision: 1440793
URL: http://svn.apache.org/viewvc?rev=1440793&view=rev
Log:
Merge from trunk
Modified:
jena/branches/streaming-update/ (props changed)
jena/branches/streaming-update/jena-arq/ReleaseNotes.txt
jena/branches/streaming-update/jena-arq/bin/langtag
jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/system/TestAbbreviationPerformance.java
jena/branches/streaming-update/jena-fuseki/ReleaseNotes.txt
jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java
jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
jena/branches/streaming-update/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java
jena/branches/streaming-update/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java
Propchange: jena/branches/streaming-update/
------------------------------------------------------------------------------
Merged /jena/trunk:r1440101-1440792
Modified: jena/branches/streaming-update/jena-arq/ReleaseNotes.txt
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/ReleaseNotes.txt?rev=1440793&r1=1440792&r2=1440793&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/ReleaseNotes.txt (original)
+++ jena/branches/streaming-update/jena-arq/ReleaseNotes.txt Thu Jan 31 02:04:40 2013
@@ -20,6 +20,13 @@ ChangeLog for ARQ
+ JENA-345 : execConstructTriples() now excludes malformed triples (e.g. literal subjects) from it's output
+ Internal reorgansiation of packages
org.openjena.atlas moved to org.apache.jena.atlas
++ PipedRDFStream and PipedRDFIterator replace RIOTParserPuller as method for getting
+ an iterator over parser output
++ PrefixMap is now an interface
+ Use PrefixMapFactory as the primary means of creating prefix maps
+ Abbreviation performance for common namespace patterns (/ or # terminated) much improved
++ New FastAbbreviatingPrefixMap, can be much faster for abbreviation when namespaces
+ do not follow common patterns
==== ARQ 2.9.4
Modified: jena/branches/streaming-update/jena-arq/bin/langtag
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/bin/langtag?rev=1440793&r1=1440792&r2=1440793&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/bin/langtag (original)
+++ jena/branches/streaming-update/jena-arq/bin/langtag Thu Jan 31 02:04:40 2013
@@ -16,4 +16,4 @@ if [ ! -r "$INIT" ]
fi
. "$INIT"
-exec java $JVM_ARGS $SOCKS -cp "$ARQ_CP" org.openjena.riot.LangTag "$@"
+exec java $JVM_ARGS $SOCKS -cp "$ARQ_CP" org.apache.jena.riot.system.LangTag "$@"
Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/system/TestAbbreviationPerformance.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/system/TestAbbreviationPerformance.java?rev=1440793&r1=1440792&r2=1440793&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/system/TestAbbreviationPerformance.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/system/TestAbbreviationPerformance.java Thu Jan 31 02:04:40 2013
@@ -104,22 +104,6 @@ public class TestAbbreviationPerformance
test_amalgamated_performance(pmap, fmap, 1, false);
}
- //This test can go either way depending on machine conditions
-
-// /**
-// * Expect {@link FastAbbreviatingPrefixMap} to outperform {@link PrefixMapStd} as soon as
-// * there are a few namespaces
-// */
-// @Test
-// public void prefixMap_abbrev_performance_02() {
-// PrefixMapStd pmap = new PrefixMapStd();
-// populate(pmap, 5);
-// FastAbbreviatingPrefixMap fmap = new FastAbbreviatingPrefixMap();
-// populate(fmap, 5);
-//
-// test_amalgamated_performance(pmap, fmap, 5, true);
-// }
-
/**
* Expect {@link FastAbbreviatingPrefixMap} to significantly outperform
* {@link PrefixMapStd} once there are a good number of namespaces
Modified: jena/branches/streaming-update/jena-fuseki/ReleaseNotes.txt
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-fuseki/ReleaseNotes.txt?rev=1440793&r1=1440792&r2=1440793&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-fuseki/ReleaseNotes.txt (original)
+++ jena/branches/streaming-update/jena-fuseki/ReleaseNotes.txt Thu Jan 31 02:04:40 2013
@@ -5,6 +5,8 @@
+ Upgrade to Jetty 8.1.8.v20121106
+ Uses Jena 2.10.0.
+ JENA-376 : fuseki linux service script : Either use options as given or use defaults, not append defaults to any given.
++ JENA-387 : fuseki includes request ID in response headers as Fuseki-Request-ID to
+allow correlating problem HTTP responses with Fuseki log output
== Fuseki 0.2.5
Modified: jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java?rev=1440793&r1=1440792&r2=1440793&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java (original)
+++ jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java Thu Jan 31 02:04:40 2013
@@ -84,7 +84,8 @@ public class ActionBackup extends Servle
}
DatasetRef ref = DatasetRegistry.get().get(dataset) ;
- HttpAction action = new HttpAction(requestIdAlloc.incrementAndGet(), ref, request, response, false) ;
+ long id = allocRequestId(request, response);
+ HttpAction action = new HttpAction(id, ref, request, response, false) ;
scheduleBackup(action, dataset) ;
}
Modified: jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java?rev=1440793&r1=1440792&r2=1440793&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java (original)
+++ jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java Thu Jan 31 02:04:40 2013
@@ -54,7 +54,7 @@ public abstract class SPARQL_ServletBase
protected void doCommon(HttpServletRequest request, HttpServletResponse response)
//throws ServletException, IOException
{
- long id = requestIdAlloc.incrementAndGet() ;
+ long id = allocRequestId(request, response);
printRequest(id, request) ;
HttpServletResponseTracker responseTracked = new HttpServletResponseTracker(response) ;
Modified: jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java?rev=1440793&r1=1440792&r2=1440793&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java (original)
+++ jena/branches/streaming-update/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java Thu Jan 31 02:04:40 2013
@@ -35,7 +35,7 @@ import org.slf4j.Logger ;
public abstract class ServletBase extends HttpServlet
{
protected static final Logger log = Fuseki.requestLog ;
- protected static AtomicLong requestIdAlloc = new AtomicLong(0) ;
+ private static AtomicLong requestIdAlloc = new AtomicLong(0) ;
protected final boolean verbose_debug ;
protected ServletBase(boolean verbose_debug)
@@ -43,6 +43,27 @@ public abstract class ServletBase extend
this.verbose_debug = verbose_debug ;
}
+ /**
+ * Helper method which gets a unique request ID and appends it as a header to the response
+ * @param request HTTP Request
+ * @param response HTTP Response
+ * @return Request ID
+ */
+ protected long allocRequestId(HttpServletRequest request, HttpServletResponse response) {
+ long id = requestIdAlloc.incrementAndGet();
+ addRequestId(response, id);
+ return id;
+ }
+
+ /**
+ * Helper method for attaching a request ID to a response as a header
+ * @param response Response
+ * @param id Request ID
+ */
+ protected void addRequestId(HttpServletResponse response, long id) {
+ response.addHeader("Fuseki-Request-ID", Long.toString(id));
+ }
+
protected void responseSendError(HttpServletResponse response, int statusCode, String message)
{
try { response.sendError(statusCode, message) ; }
Modified: jena/branches/streaming-update/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java?rev=1440793&r1=1440792&r2=1440793&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java (original)
+++ jena/branches/streaming-update/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java Thu Jan 31 02:04:40 2013
@@ -18,6 +18,11 @@
package org.apache.jena.fuseki;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import junit.framework.Assert;
+
import org.apache.jena.fuseki.DatasetAccessor ;
import org.apache.jena.fuseki.DatasetAccessorFactory ;
import org.junit.AfterClass ;
@@ -62,6 +67,13 @@ public class TestQuery extends BaseServe
{
execQuery("SELECT * {?s ?p ?o}", 1) ;
}
+
+ @Test public void request_id_header_01() throws IOException
+ {
+ URL u = new URL(serviceQuery);
+ HttpURLConnection conn = (HttpURLConnection) u.openConnection();
+ Assert.assertTrue(conn.getHeaderField("Fuseki-Request-ID") != null);
+ }
private void execQuery(String queryString, int exceptedRowCount)
{
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=1440793&r1=1440792&r2=1440793&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 Thu Jan 31 02:04:40 2013
@@ -65,8 +65,6 @@ public class TDBBackup
DatasetGraphTxn dsg = sConn.begin(ReadWrite.READ, "backup") ;
NQuadsWriter.write(backupfile, dsg) ;
dsg.end();
- // Someway to decrement in StoreConnection
}
-
}