You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by sp...@apache.org on 2023/03/16 03:25:27 UTC
[iotdb] branch master updated: [IOTDB-5616] Fix some code smells (#9320)
This is an automated email from the ASF dual-hosted git repository.
spricoder 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 92549f8f30 [IOTDB-5616] Fix some code smells (#9320)
92549f8f30 is described below
commit 92549f8f3009350b6ff9e39ab60bd533da0f5306
Author: YuFengLiu <38...@users.noreply.github.com>
AuthorDate: Thu Mar 16 11:25:20 2023 +0800
[IOTDB-5616] Fix some code smells (#9320)
* fix code smell
* fixed by review
---
cli/src/main/java/org/apache/iotdb/tool/ImportCsv.java | 12 +++---------
.../confignode/client/sync/SyncConfigNodeClientPool.java | 2 ++
.../iotdb/confignode/client/sync/SyncDataNodeClientPool.java | 4 +++-
.../consensus/statemachine/ConfigRegionStateMachine.java | 6 +++++-
.../org/apache/iotdb/db/engine/flush/MemTableFlushTask.java | 3 +++
5 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/cli/src/main/java/org/apache/iotdb/tool/ImportCsv.java b/cli/src/main/java/org/apache/iotdb/tool/ImportCsv.java
index 90b5b94348..93f586a4b8 100644
--- a/cli/src/main/java/org/apache/iotdb/tool/ImportCsv.java
+++ b/cli/src/main/java/org/apache/iotdb/tool/ImportCsv.java
@@ -603,15 +603,9 @@ public class ImportCsv extends AbstractCsvTool {
if (!typeQueriedDevice.contains(deviceName.get())) {
try {
if (headerTypeMap.isEmpty()) {
- hasResult =
- queryType(
- new HashSet<String>() {
- {
- add(deviceName.get());
- }
- },
- headerTypeMap,
- "Device");
+ Set<String> devices = new HashSet<>();
+ devices.add(deviceName.get());
+ hasResult = queryType(devices, headerTypeMap, "Device");
}
typeQueriedDevice.add(deviceName.get());
} catch (IoTDBConnectionException e) {
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncConfigNodeClientPool.java b/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncConfigNodeClientPool.java
index 79a40be913..d1778c2b86 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncConfigNodeClientPool.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncConfigNodeClientPool.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.confignode.client.sync;
import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation;
@@ -137,6 +138,7 @@ public class SyncConfigNodeClientPool {
TimeUnit.MILLISECONDS.sleep(100L * (long) Math.pow(2, retryNum));
} catch (InterruptedException e) {
LOGGER.error("Retry wait failed.", e);
+ Thread.currentThread().interrupt();
}
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncDataNodeClientPool.java b/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncDataNodeClientPool.java
index ac5969776c..96615e5dee 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncDataNodeClientPool.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncDataNodeClientPool.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.confignode.client.sync;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
@@ -153,12 +154,13 @@ public class SyncDataNodeClientPool {
}
} catch (InterruptedException e) {
LOGGER.error("Retry wait failed.", e);
+ Thread.currentThread().interrupt();
}
}
/**
* change a region leader from the datanode to other datanode, other datanode should be in same
- * raft group
+ * raft group.
*
* @param regionId the region which will changer leader
* @param dataNode data node server, change regions leader from it
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigRegionStateMachine.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigRegionStateMachine.java
index b4c6dbd77d..b6617fd6de 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigRegionStateMachine.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigRegionStateMachine.java
@@ -364,7 +364,11 @@ public class ConfigRegionStateMachine
private void createLogFile(int endIndex) {
simpleLogFile = SystemFileFactory.INSTANCE.getFile(PROGRESS_FILE_PATH + endIndex);
try {
- simpleLogFile.createNewFile();
+ if (!simpleLogFile.createNewFile()) {
+ LOGGER.warn(
+ "ConfigNode SimpleConsensusFile has existed，filePath:{}",
+ simpleLogFile.getAbsolutePath());
+ }
simpleLogWriter = new LogWriter(simpleLogFile, false);
LOGGER.info("Create ConfigNode SimpleConsensusFile: {}", simpleLogFile.getAbsolutePath());
} catch (Exception e) {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java b/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
index bb7b45d993..0722a1dbbd 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
@@ -177,6 +177,9 @@ public class MemTableFlushTask {
encodingTaskFuture.get();
} catch (InterruptedException | ExecutionException e) {
ioTaskFuture.cancel(true);
+ if (e instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ }
throw e;
}