You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/04/21 12:54:16 UTC

[iotdb] branch master updated: [IOTDB-2880] Fix import check style (#5629)

This is an automated email from the ASF dual-hosted git repository.

jackietien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new b2520b31b0 [IOTDB-2880] Fix import check style (#5629)
b2520b31b0 is described below

commit b2520b31b02902921dad83926c9bba6eaafffabe
Author: cmlmakahts <82...@users.noreply.github.com>
AuthorDate: Thu Apr 21 20:54:10 2022 +0800

    [IOTDB-2880] Fix import check style (#5629)
---
 .../iotdb/procedure/CompletedProcedureCleaner.java   | 20 +-------------------
 .../java/org/apache/iotdb/procedure/Procedure.java   |  6 +++++-
 .../apache/iotdb/procedure/ProcedureExecutor.java    | 12 ++++++++++--
 .../apache/iotdb/procedure/store/ProcedureWAL.java   |  5 ++++-
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/procedure/src/main/java/org/apache/iotdb/procedure/CompletedProcedureCleaner.java b/procedure/src/main/java/org/apache/iotdb/procedure/CompletedProcedureCleaner.java
index 60eca313dc..4b31929030 100644
--- a/procedure/src/main/java/org/apache/iotdb/procedure/CompletedProcedureCleaner.java
+++ b/procedure/src/main/java/org/apache/iotdb/procedure/CompletedProcedureCleaner.java
@@ -29,25 +29,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-/**
- * Internal cleaner that removes the completed procedure results after a TTL.
- *
- * <p>NOTE: This is a special case handled in timeoutLoop().
- *
- * <p>Since the client code looks more or less like:
- *
- * <pre>
- *   procId = master.doOperation()
- *   while (master.getProcResult(procId) == ProcInProgress);
- * </pre>
- *
- * The master should not throw away the proc result as soon as the procedure is done but should wait
- * a result request from the client (see executor.removeResult(procId)) The client will call
- * something like master.isProcDone() or master.getProcResult() which will return the result/state
- * to the client, and it will mark the completed proc as ready to delete. note that the client may
- * not receive the response from the master (e.g. master failover) so, if we delay a bit the real
- * deletion of the proc result the client will be able to get the result the next try.
- */
+/** Internal cleaner that removes the completed procedure results after a TTL. */
 public class CompletedProcedureCleaner<Env> extends InternalProcedure<Env> {
   private static final Logger LOG = LoggerFactory.getLogger(CompletedProcedureCleaner.class);
 
diff --git a/procedure/src/main/java/org/apache/iotdb/procedure/Procedure.java b/procedure/src/main/java/org/apache/iotdb/procedure/Procedure.java
index 6cbb3ec69a..9122bf610a 100644
--- a/procedure/src/main/java/org/apache/iotdb/procedure/Procedure.java
+++ b/procedure/src/main/java/org/apache/iotdb/procedure/Procedure.java
@@ -19,7 +19,11 @@
 
 package org.apache.iotdb.procedure;
 
-import org.apache.iotdb.procedure.exception.*;
+import org.apache.iotdb.procedure.exception.ProcedureAbortedException;
+import org.apache.iotdb.procedure.exception.ProcedureException;
+import org.apache.iotdb.procedure.exception.ProcedureSuspendedException;
+import org.apache.iotdb.procedure.exception.ProcedureTimeoutException;
+import org.apache.iotdb.procedure.exception.ProcedureYieldException;
 import org.apache.iotdb.procedure.store.IProcedureStore;
 import org.apache.iotdb.service.rpc.thrift.ProcedureState;
 
diff --git a/procedure/src/main/java/org/apache/iotdb/procedure/ProcedureExecutor.java b/procedure/src/main/java/org/apache/iotdb/procedure/ProcedureExecutor.java
index c8a8c5b268..cddc7796df 100644
--- a/procedure/src/main/java/org/apache/iotdb/procedure/ProcedureExecutor.java
+++ b/procedure/src/main/java/org/apache/iotdb/procedure/ProcedureExecutor.java
@@ -33,8 +33,16 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Deque;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
diff --git a/procedure/src/main/java/org/apache/iotdb/procedure/store/ProcedureWAL.java b/procedure/src/main/java/org/apache/iotdb/procedure/store/ProcedureWAL.java
index 2be9831008..9400d49777 100644
--- a/procedure/src/main/java/org/apache/iotdb/procedure/store/ProcedureWAL.java
+++ b/procedure/src/main/java/org/apache/iotdb/procedure/store/ProcedureWAL.java
@@ -24,7 +24,10 @@ import org.apache.iotdb.procedure.Procedure;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.file.Files;