svn commit: r1425537 - in /jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena: query/QueryExecution.java sparql/engine/QueryExecutionBase.java sparql/engine/http/QueryEngineHTTP.java

[an...@apache.org]

Author: andy
Date: Sun Dec 23 22:09:31 2012
New Revision: 1425537

URL: http://svn.apache.org/viewvc?rev=1425537&view=rev
Log:
Add getting the timeout settings to QueryExecution.

Modified:
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java?rev=1425537&r1=1425536&r2=1425537&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java Sun Dec 23 22:09:31 2012
@@ -152,13 +152,17 @@ public interface QueryExecution
 	 * A timeout of less than zero means no timeout; this can be used for timeout1 or timeout2.
 	 */
 
-	//public void setTimeout(long timeout1, long timeout2) ;
 	public void setTimeout(long timeout1, TimeUnit timeUnit1, long timeout2, TimeUnit timeUnit2) ;
 
     /** Set time, in milliseconds
      *  @see #setTimeout(long, TimeUnit, long, TimeUnit)
      */
     public void setTimeout(long timeout1, long timeout2) ;
+
+    /** Return the first timeout (time to first result), in millseconds: negative if unset */
+    public long getTimeout1() ;
+    /** Return the second timeout (overall query execution after first result), in millseconds: negative if unset */
+    public long getTimeout2() ;
     
     //	/** Say whether this QueryExecution is useable or not.
 //	 * An active execution is one that has not been closed, ended or aborted yet.

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java?rev=1425537&r1=1425536&r2=1425537&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java Sun Dec 23 22:09:31 2012
@@ -385,6 +385,11 @@ public class QueryExecutionBase implemen
         return (duration < 0 ) ? duration : timeUnit.toMillis(duration) ;
     }
     
+    @Override
+    public long getTimeout1() { return timeout1 ; }
+    @Override
+    public long getTimeout2() { return timeout2 ; }
+    
     private static final long TIMEOUT_UNSET = -1 ;
     private static final long TIMEOUT_INF = -2 ;
     private long timeout1 = TIMEOUT_UNSET ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java?rev=1425537&r1=1425536&r2=1425537&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java Sun Dec 23 22:09:31 2012
@@ -69,9 +69,9 @@ public class QueryEngineHTTP implements 
     private boolean finished = false ;
     
     //Timeouts
-    private long connectTimeout = 0;
+    private long connectTimeout = -1 ;
     private TimeUnit connectTimeoutUnit = TimeUnit.MILLISECONDS;
-    private long readTimeout = 0;
+    private long readTimeout = -1 ;
     private TimeUnit readTimeoutUnit = TimeUnit.MILLISECONDS;
     
     //Compression Support
@@ -385,6 +385,17 @@ public class QueryEngineHTTP implements 
         this.connectTimeoutUnit = timeUnit2;
     }
     
+    @Override
+    public long getTimeout1() { return asMillis(readTimeout, readTimeoutUnit) ; } 
+    
+    @Override
+    public long getTimeout2() { return asMillis(connectTimeout, connectTimeoutUnit) ; } 
+
+    private static long asMillis(long duration, TimeUnit timeUnit)
+    {
+        return (duration < 0 ) ? duration : timeUnit.toMillis(duration) ;
+    }
+    
     private HttpQuery makeHttpQuery()
     {
         // Also need to tie to ResultSet returned which is streamed back if StAX.