fix(task): preserve result-loading compatibility

Author: contrueCT

hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/task/TaskAndResultScheduler.java

@@ -129,7 +129,7 @@ public <V> HugeTask<V> task(Id id, boolean withResult) {
 
     @Override
     public <V> Iterator<HugeTask<V>> tasks(List<Id> ids) {
-        return this.tasks(ids, false);
+        return this.tasks(ids, true);
     }
 
     @Override
@@ -144,7 +144,7 @@ public <V> Iterator<HugeTask<V>> tasks(List<Id> ids,
     @Override
     public <V> Iterator<HugeTask<V>> tasks(TaskStatus status, long limit,
                                            String page) {
-        return this.tasks(status, limit, page, false);
+        return this.tasks(status, limit, page, true);
     }
 
     @Override

hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/TaskCoreTest.java

@@ -20,7 +20,6 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Random;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.hugegraph.HugeException;
@@ -120,46 +119,42 @@ public void testTask() throws TimeoutException {
     public void testTaskWithoutResult() throws TimeoutException {
         HugeGraph graph = graph();
         TaskScheduler scheduler = graph.taskScheduler();
-        CountDownLatch latch = new CountDownLatch(1);
-
-        TaskCallable<String> callable = new TaskCallable<String>() {
-            @Override
-            public String call() throws Exception {
-                latch.await();
-                return "metadata-result";
-            }
-
-            @Override
-            protected void done() {
-                scheduler.save(this.task());
-            }
-        };
 
         Id id = IdGenerator.of(88889);
-        HugeTask<?> task = new HugeTask<>(id, null, callable);
+        HugeTask<?> task = new HugeTask<>(id, null, new SleepCallable<>());
         task.type("test");
-        task.name("metadata-task");
+        task.name("metadata-task-in-memory");
         scheduler.schedule(task);
 
         try {
             Whitebox.setInternalState(task, "result", "\"in-memory-result\"");
 
             HugeTask<?> taskWithoutResult = scheduler.task(id, false);
-            Assert.assertEquals("metadata-task", taskWithoutResult.name());
+            Assert.assertEquals("metadata-task-in-memory",
+                                taskWithoutResult.name());
             Assert.assertNull(taskWithoutResult.result());
 
             Iterator<HugeTask<Object>> iter = scheduler.tasks(ImmutableList.of(id),
                                                               false);
             Assert.assertTrue(iter.hasNext());
             taskWithoutResult = iter.next();
-            Assert.assertEquals("metadata-task", taskWithoutResult.name());
+            Assert.assertEquals("metadata-task-in-memory",
+                                taskWithoutResult.name());
             Assert.assertNull(taskWithoutResult.result());
             Assert.assertFalse(iter.hasNext());
         } finally {
             Whitebox.setInternalState(task, "result", null);
-            latch.countDown();
         }
 
+        scheduler.waitUntilTaskCompleted(id, 10);
+        scheduler.delete(id, false);
+
+        id = IdGenerator.of(88890);
+        task = new HugeTask<>(id, null, new MetadataResultCallable());
+        task.type("test");
+        task.name("metadata-task");
+        scheduler.schedule(task);
+
         scheduler.waitUntilTaskCompleted(id, 10);
 
         HugeTask<?> taskWithResult = scheduler.task(id, true);
@@ -169,8 +164,14 @@ protected void done() {
         Assert.assertEquals("metadata-task", taskWithoutResult.name());
         Assert.assertNull(taskWithoutResult.result());
 
-        Iterator<HugeTask<Object>> iter = scheduler.tasks(ImmutableList.of(id),
-                                                          false);
+        Iterator<HugeTask<Object>> iter = scheduler.tasks(ImmutableList.of(id));
+        Assert.assertTrue(iter.hasNext());
+        taskWithResult = iter.next();
+        Assert.assertEquals("metadata-task", taskWithResult.name());
+        Assert.assertEquals("\"metadata-result\"", taskWithResult.result());
+        Assert.assertFalse(iter.hasNext());
+
+        iter = scheduler.tasks(ImmutableList.of(id), false);
         Assert.assertTrue(iter.hasNext());
         taskWithoutResult = iter.next();
         Assert.assertEquals("metadata-task", taskWithoutResult.name());
@@ -183,9 +184,16 @@ protected void done() {
         Assert.assertEquals("metadata-task", taskWithoutResult.name());
         Assert.assertNull(taskWithoutResult.result());
 
-        scheduler.delete(id, false);
+        iter = scheduler.tasks(TaskStatus.SUCCESS, 10, null);
+        Assert.assertTrue(iter.hasNext());
+        taskWithResult = iter.next();
+        Assert.assertEquals("metadata-task", taskWithResult.name());
+        Assert.assertEquals("\"metadata-result\"", taskWithResult.result());
+
+        Id taskId = id;
+        scheduler.delete(taskId, false);
         Assert.assertThrows(NotFoundException.class, () -> {
-            scheduler.task(id);
+            scheduler.task(taskId);
         });
     }
 
@@ -788,4 +796,21 @@ public void done() {
             this.graph().taskScheduler().save(this.task());
         }
     }
+
+    public static class MetadataResultCallable extends TaskCallable<String> {
+
+        public MetadataResultCallable() {
+            // pass
+        }
+
+        @Override
+        public String call() {
+            return "metadata-result";
+        }
+
+        @Override
+        public void done() {
+            this.graph().taskScheduler().save(this.task());
+        }
+    }
 }