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 2014/02/10 22:13:52 UTC

svn commit: r1566747 - in /jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki: async/AsyncPool.java async/AsyncTask.java mgt/ActionBackup.java mgt/ActionTasks.java

Author: andy
Date: Mon Feb 10 21:13:51 2014
New Revision: 1566747

URL: http://svn.apache.org/r1566747
Log:
More on async tasks.

Modified:
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/async/AsyncTask.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionTasks.java

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java?rev=1566747&r1=1566746&r2=1566747&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java Mon Feb 10 21:13:51 2014
@@ -20,10 +20,13 @@ package org.apache.jena.fuseki.async;
 
 import java.util.ArrayList ;
 import java.util.Collection ;
-import java.util.List ;
+import java.util.HashMap ;
+import java.util.Map ;
 import java.util.concurrent.* ;
+import java.util.concurrent.atomic.AtomicLong ;
 
 import org.apache.jena.fuseki.server.DataService ;
+import org.eclipse.jetty.util.thread.Scheduler.Task ;
 
 /** The set of currently active async tasks */
 public class AsyncPool
@@ -35,7 +38,8 @@ public class AsyncPool
                                                               120L, TimeUnit.SECONDS,
                                                               new LinkedBlockingQueue<Runnable>()) ;
     private final Object mutex = new Object() ; 
-    private List<AsyncTask> running = new ArrayList<>() ; 
+    private AtomicLong counter = new AtomicLong(0) ;
+    private Map<String, AsyncTask> running = new HashMap<>() ; 
     
     private static AsyncPool instance = new AsyncPool() ;
     public static AsyncPool get() 
@@ -43,24 +47,26 @@ public class AsyncPool
 
     private AsyncPool() { }
     
-    public AsyncTask add(Runnable task, String displayName, DataService dataService) { 
+    public AsyncTask submit(Runnable task, String displayName, DataService dataService) { 
         synchronized(mutex) {
+            String taskId = Long.toString(counter.incrementAndGet()) ;
             Callable<Object> c = Executors.callable(task) ;
-            AsyncTask t = new AsyncTask(c, this, displayName, dataService) ;
-            Future<Object> x = executor.submit(t) ; 
-            return t ;
+            AsyncTask asyncTask = new AsyncTask(c, this, taskId, displayName, dataService) ;
+            Future<Object> x = executor.submit(asyncTask) ;
+            running.put(taskId, asyncTask) ;
+            return asyncTask ;
         }
     }
     
-    public Collection<AsyncTask> task() {
+    public Collection<AsyncTask> tasks() {
         synchronized(mutex) {
-            return new ArrayList<>(running) ;
+            return new ArrayList<>(running.values()) ;
         }
     }
     
     public void finished(AsyncTask task) { 
         synchronized(mutex) {
-            running.remove(task) ;
+            running.remove(task.getTaskId()) ;
         }
     }
 }

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/async/AsyncTask.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/async/AsyncTask.java?rev=1566747&r1=1566746&r2=1566747&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/async/AsyncTask.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/async/AsyncTask.java Mon Feb 10 21:13:51 2014
@@ -29,22 +29,29 @@ public class AsyncTask implements Callab
 {
     private static Logger log = Fuseki.serverLog ; 
     
-    private Callable<Object> callable ;
-    private AsyncPool pool ;
+    private final Callable<Object> callable ;
+    private final AsyncPool pool ;
 
     private final String displayName ;
     private final DataService dataService ;
 
-    public AsyncTask(Callable<Object> callable, 
-                     AsyncPool pool,
-                     String displayName,
-                     DataService dataService ) {
+    private final String taskId ;
+
+    /*package*/ AsyncTask(Callable<Object> callable, 
+                          AsyncPool pool,
+                          String taskId,
+                          String displayName,
+                          DataService dataService ) {
         this.callable = callable ;
         this.pool = pool ;
+        this.taskId = taskId ; 
         this.displayName = displayName ;
         this.dataService = dataService ;
     }
 
+    /** Unique task id */
+    public String getTaskId() { return taskId ; }
+    
     /** Display name - no newlines */
     public String displayName() { return displayName ; }
     

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java?rev=1566747&r1=1566746&r2=1566747&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java Mon Feb 10 21:13:51 2014
@@ -62,16 +62,19 @@ public class ActionBackup extends Action
     @Override
     protected JsonValue execPostItem(HttpAction action) {
         String name = action.getDatasetName() ;
-        if ( name == null )
-            name = "''" ;
+        if ( name == null ) {
+            action.log.error("Null for dataset name in item request") ;  
+            ServletOps.errorOccurred("Null for dataset name in item request");
+            return null ;
+        }
         action.log.info(format("[%d] Backup dataset %s", action.id, name)) ;
         
         Task task = new Task(action) ;
-        AsyncTask asyncTask = asyncPool.add(task, name, null) ;
+        AsyncTask asyncTask = asyncPool.submit(task, "backup", action.getDataService()) ;
         
         JsonBuilder builder = new JsonBuilder() ;
         builder.startObject("outer") ;
-        builder.key("task").value(action.id) ;
+        builder.key("task").value(asyncTask.getTaskId()) ;
         builder.finishObject("outer") ;
         return builder.build() ;
     }

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionTasks.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionTasks.java?rev=1566747&r1=1566746&r2=1566747&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionTasks.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionTasks.java Mon Feb 10 21:13:51 2014
@@ -22,7 +22,10 @@ import static java.lang.String.format ;
 import javax.servlet.http.HttpServletRequest ;
 import javax.servlet.http.HttpServletResponse ;
 
+import org.apache.jena.atlas.json.JsonBuilder ;
 import org.apache.jena.fuseki.Fuseki ;
+import org.apache.jena.fuseki.async.AsyncPool ;
+import org.apache.jena.fuseki.async.AsyncTask ;
 import org.apache.jena.fuseki.servlets.ActionBase ;
 import org.apache.jena.fuseki.servlets.HttpAction ;
 import org.apache.jena.fuseki.servlets.ServletOps ;
@@ -30,6 +33,8 @@ import org.apache.jena.web.HttpSC ;
 
 public class ActionTasks extends ActionBase //ActionContainerItem
 {
+    private static AsyncPool[] pools = { AsyncPool.get() } ; 
+    
     public ActionTasks() { super(Fuseki.serverLog) ; }
     
     @Override
@@ -67,7 +72,22 @@ public class ActionTasks extends ActionB
     private void execGet(HttpAction action, String name) {
         String _name = (name==null)?"''":name ;
         log.info(format("[%d] Task %s", action.id, _name));
-        ServletOps.success(action);
+        
+        if ( name == null ) {
+            JsonBuilder builder = new JsonBuilder() ;
+            builder.startArray() ;
+            
+            for ( AsyncPool pool : pools ) {
+                for ( AsyncTask aTask : pool.tasks() ) {
+                    builder.value(aTask.getTaskId()) ;
+                }
+            }
+            
+            builder.startArray() ;
+            ServletOps.success(action);
+        } else {
+            // Ping the task is active
+        }
     }
 
     private void execPost(HttpAction action, String name) {