You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ta...@apache.org on 2023/01/05 05:39:17 UTC
[iotdb] branch master updated: fix some code smells (#8731)
This is an automated email from the ASF dual-hosted git repository.
tanxinyu 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 067519f297 fix some code smells (#8731)
067519f297 is described below
commit 067519f29787abe659343068300c876fba480b03
Author: BUAAserein <65...@users.noreply.github.com>
AuthorDate: Thu Jan 5 13:39:12 2023 +0800
fix some code smells (#8731)
---
.../main/java/org/apache/iotdb/commons/concurrent/ThreadName.java | 4 ++--
.../commons/concurrent/threadpool/WrappedThreadPoolExecutor.java | 1 +
.../apache/iotdb/commons/service/AbstractThriftServiceThread.java | 6 +++---
.../java/org/apache/iotdb/commons/sync/metadata/SyncMetadata.java | 2 ++
.../java/org/apache/iotdb/commons/udf/builtin/UDTFBottomK.java | 2 +-
.../commons/udf/builtin/UDTFEqualSizeBucketRandomSample.java | 1 +
.../src/main/java/org/apache/iotdb/db/engine/StorageEngine.java | 8 ++++----
7 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadName.java b/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadName.java
index 89c64f4bc9..2d23373b99 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadName.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadName.java
@@ -49,8 +49,8 @@ public enum ThreadName {
INSERTION_SERVICE("MultithreadingInsertionPool"),
WINDOW_EVALUATION_SERVICE("WindowEvaluationTaskPoolManager"),
TTL_CHECK_SERVICE("TTL-CHECK"),
- TIMED_FlUSH_SEQ_MEMTABLE("Timed-Flush-Seq-Memtable"),
- TIMED_FlUSH_UNSEQ_MEMTABLE("Timed-Flush-Unseq-Memtable"),
+ TIMED_FLUSH_SEQ_MEMTABLE("Timed-Flush-Seq-Memtable"),
+ TIMED_FLUSH_UNSEQ_MEMTABLE("Timed-Flush-Unseq-Memtable"),
SETTLE_SERVICE("Settle"),
SYNC_SENDER_PIPE("Sync-Pipe"),
SYNC_SENDER_HEARTBEAT("Sync-Heartbeat"),
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedThreadPoolExecutor.java b/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedThreadPoolExecutor.java
index 4538603e60..5e2726e4d5 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedThreadPoolExecutor.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedThreadPoolExecutor.java
@@ -87,6 +87,7 @@ public class WrappedThreadPoolExecutor extends ThreadPoolExecutor
return getQueue().size();
}
+ @Override
protected void afterExecute(Runnable r, Throwable t) {
super.afterExecute(r, t);
if (t == null && r instanceof Future<?>) {
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/service/AbstractThriftServiceThread.java b/node-commons/src/main/java/org/apache/iotdb/commons/service/AbstractThriftServiceThread.java
index a8429e9862..cbdaa6f081 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/service/AbstractThriftServiceThread.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/service/AbstractThriftServiceThread.java
@@ -102,7 +102,7 @@ public abstract class AbstractThriftServiceThread extends Thread {
/** for asynced ThriftService. */
@SuppressWarnings("squid:S107")
public AbstractThriftServiceThread(
- TBaseAsyncProcessor processor,
+ TBaseAsyncProcessor<?> processor,
String serviceName,
String threadsName,
String bindAddress,
@@ -195,7 +195,7 @@ public abstract class AbstractThriftServiceThread extends Thread {
}
private TThreadedSelectorServer.Args initAsyncedSelectorPoolArgs(
- TBaseAsyncProcessor processor,
+ TBaseAsyncProcessor<?> processor,
String threadsName,
int selectorThreads,
int minWorkerThreads,
@@ -217,7 +217,7 @@ public abstract class AbstractThriftServiceThread extends Thread {
}
private THsHaServer.Args initAsyncedHshaPoolArgs(
- TBaseAsyncProcessor processor,
+ TBaseAsyncProcessor<?> processor,
String threadsName,
int minWorkerThreads,
int maxWorkerThreads,
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/sync/metadata/SyncMetadata.java b/node-commons/src/main/java/org/apache/iotdb/commons/sync/metadata/SyncMetadata.java
index 2597e2a749..e9d9e0f9c8 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/sync/metadata/SyncMetadata.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/sync/metadata/SyncMetadata.java
@@ -213,6 +213,8 @@ public class SyncMetadata implements SnapshotProcessor {
case STOP:
writer.operatePipe(pipeInfo.getPipeName(), SyncOperation.STOP_PIPE);
break;
+ default:
+ break;
}
}
}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/UDTFBottomK.java b/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/UDTFBottomK.java
index 6fc676fc0b..f92c2b662f 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/UDTFBottomK.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/UDTFBottomK.java
@@ -53,7 +53,7 @@ public class UDTFBottomK extends UDTFSelectK {
final String cs1 = pairB.right;
final String cs2 = pairA.right;
- if (Objects.requireNonNull(cs1) == Objects.requireNonNull(cs2)) {
+ if (Objects.requireNonNull(cs1).equals(Objects.requireNonNull(cs2))) {
return 0;
}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/UDTFEqualSizeBucketRandomSample.java b/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/UDTFEqualSizeBucketRandomSample.java
index aaaf937f46..52a6790598 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/UDTFEqualSizeBucketRandomSample.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/UDTFEqualSizeBucketRandomSample.java
@@ -60,6 +60,7 @@ public class UDTFEqualSizeBucketRandomSample extends UDTFEqualSizeBucketSample {
break;
case DOUBLE:
collector.putDouble(row.getTime(), row.getDouble(0));
+ break;
default:
// This will not happen
throw new UDFInputSeriesDataTypeNotValidException(
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
index 6b19953548..2ff2f66463 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
@@ -341,7 +341,7 @@ public class StorageEngine implements IService {
if (config.isEnableTimedFlushSeqMemtable()) {
seqMemtableTimedFlushCheckThread =
IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor(
- ThreadName.TIMED_FlUSH_SEQ_MEMTABLE.getName());
+ ThreadName.TIMED_FLUSH_SEQ_MEMTABLE.getName());
ScheduledExecutorUtil.safelyScheduleAtFixedRate(
seqMemtableTimedFlushCheckThread,
this::timedFlushSeqMemTable,
@@ -354,7 +354,7 @@ public class StorageEngine implements IService {
if (config.isEnableTimedFlushUnseqMemtable()) {
unseqMemtableTimedFlushCheckThread =
IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor(
- ThreadName.TIMED_FlUSH_UNSEQ_MEMTABLE.getName());
+ ThreadName.TIMED_FLUSH_UNSEQ_MEMTABLE.getName());
ScheduledExecutorUtil.safelyScheduleAtFixedRate(
unseqMemtableTimedFlushCheckThread,
this::timedFlushUnseqMemTable,
@@ -392,9 +392,9 @@ public class StorageEngine implements IService {
syncCloseAllProcessor();
ThreadUtils.stopThreadPool(ttlCheckThread, ThreadName.TTL_CHECK_SERVICE);
ThreadUtils.stopThreadPool(
- seqMemtableTimedFlushCheckThread, ThreadName.TIMED_FlUSH_SEQ_MEMTABLE);
+ seqMemtableTimedFlushCheckThread, ThreadName.TIMED_FLUSH_SEQ_MEMTABLE);
ThreadUtils.stopThreadPool(
- unseqMemtableTimedFlushCheckThread, ThreadName.TIMED_FlUSH_UNSEQ_MEMTABLE);
+ unseqMemtableTimedFlushCheckThread, ThreadName.TIMED_FLUSH_UNSEQ_MEMTABLE);
if (cachedThreadPool != null) {
cachedThreadPool.shutdownNow();
}