You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@iotdb.apache.org by GitBox <gi...@apache.org> on 2021/03/02 12:20:37 UTC
[GitHub] [iotdb] Alima777 commented on a change in pull request #2759: [ISSUE-2758] NullPointerException in QueryTimeManager.checkQueryAlive()
Alima777 commented on a change in pull request #2759:
URL: https://github.com/apache/iotdb/pull/2759#discussion_r585516906
##########
File path: server/src/main/java/org/apache/iotdb/db/query/control/QueryTimeManager.java
##########
@@ -90,20 +90,18 @@ public AtomicBoolean unRegisterQuery(long queryId) {
queryId,
(k, v) -> {
successRemoved.set(true);
- return null;
- });
- queryScheduledTaskMap.computeIfPresent(
- queryId,
- (k, v) -> {
- queryScheduledTaskMap.get(queryId).cancel(false);
+ ScheduledFuture<?> scheduledFuture = queryScheduledTaskMap.remove(queryId);
+ if (scheduledFuture != null) {
+ scheduledFuture.cancel(false);
+ }
return null;
});
return successRemoved;
}
public static void checkQueryAlive(long queryId) {
- if (getInstance().queryInfoMap.get(queryId) != null
- && getInstance().queryInfoMap.get(queryId).isInterrupted()) {
+ QueryInfo queryInfo = getInstance().queryInfoMap.get(queryId);
+ if (queryInfo != null && queryInfo.isInterrupted()) {
if (getInstance().unRegisterQuery(queryId).get()) {
Review comment:
It may return false but never return null. Am i wrong?
##########
File path: server/src/main/java/org/apache/iotdb/db/query/control/QueryTimeManager.java
##########
@@ -90,20 +90,18 @@ public AtomicBoolean unRegisterQuery(long queryId) {
queryId,
(k, v) -> {
successRemoved.set(true);
- return null;
- });
- queryScheduledTaskMap.computeIfPresent(
- queryId,
- (k, v) -> {
- queryScheduledTaskMap.get(queryId).cancel(false);
+ ScheduledFuture<?> scheduledFuture = queryScheduledTaskMap.remove(queryId);
+ if (scheduledFuture != null) {
+ scheduledFuture.cancel(false);
+ }
return null;
});
return successRemoved;
}
public static void checkQueryAlive(long queryId) {
- if (getInstance().queryInfoMap.get(queryId) != null
- && getInstance().queryInfoMap.get(queryId).isInterrupted()) {
+ QueryInfo queryInfo = getInstance().queryInfoMap.get(queryId);
+ if (queryInfo != null && queryInfo.isInterrupted()) {
if (getInstance().unRegisterQuery(queryId).get()) {
Review comment:
It may return false but never return null. Am i wrong?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org