This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/improve_query_fe
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/beyyes/improve_query_fe by
this push:
new e9014a0447d fix code smells
e9014a0447d is described below
commit e9014a0447d365f24a85f4d95793e46ce3cb85b1
Author: Beyyes <[email protected]>
AuthorDate: Sun Jun 25 19:42:57 2023 +0800
fix code smells
---
.github/workflows/sonar-coveralls.yml | 24 +++++------
.../scheduler/AbstractFragInsStateTracker.java | 4 --
.../plan/scheduler/AsyncSendPlanNodeHandler.java | 1 +
.../db/mpp/plan/scheduler/ClusterScheduler.java | 15 +------
.../scheduler/FragmentInstanceDispatcherImpl.java | 16 ++++---
.../iotdb/db/mpp/plan/scheduler/IScheduler.java | 6 ---
.../scheduler/load/LoadTsFileDispatcherImpl.java | 10 +++--
.../plan/scheduler/load/LoadTsFileScheduler.java | 50 ++++++++++------------
8 files changed, 53 insertions(+), 73 deletions(-)
diff --git a/.github/workflows/sonar-coveralls.yml
b/.github/workflows/sonar-coveralls.yml
index 17a2fe2a314..f649f789712 100644
--- a/.github/workflows/sonar-coveralls.yml
+++ b/.github/workflows/sonar-coveralls.yml
@@ -5,21 +5,21 @@ name: Sonar-Coveralls
on:
push:
-# branches:
-# - master
-# - "rel/*"
-# - "new_*"
+ branches:
+ - master
+ - "rel/*"
+ - "new_*"
+ paths-ignore:
+ - "docs/**"
+ - 'site/**'
+ pull_request:
+ branches:
+ - master
+ - "rel/*"
+ - "new_*"
paths-ignore:
- "docs/**"
- 'site/**'
-# pull_request:
-# branches:
-# - master
-# - "rel/*"
-# - "new_*"
-# paths-ignore:
-# - "docs/**"
-# - 'site/**'
# allow manually run the action:
workflow_dispatch:
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/AbstractFragInsStateTracker.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/AbstractFragInsStateTracker.java
index 92d289ee609..00c126db0de 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/AbstractFragInsStateTracker.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/AbstractFragInsStateTracker.java
@@ -65,10 +65,6 @@ public abstract class AbstractFragInsStateTracker implements
IFragInstanceStateT
this.localhostInternalPort =
IoTDBDescriptor.getInstance().getConfig().getInternalPort();
}
- public abstract void start();
-
- public abstract void abort();
-
protected FragmentInstanceInfo fetchInstanceInfo(FragmentInstance instance)
throws ClientManagerException, TException {
TEndPoint endPoint = instance.getHostDataNode().internalEndPoint;
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/AsyncSendPlanNodeHandler.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/AsyncSendPlanNodeHandler.java
index 31f0dd5a4ef..033e63b1b3c 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/AsyncSendPlanNodeHandler.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/AsyncSendPlanNodeHandler.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.db.mpp.plan.scheduler;
import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics;
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/ClusterScheduler.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/ClusterScheduler.java
index 15e46620906..4ef9a1e72b0 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/ClusterScheduler.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/ClusterScheduler.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.db.mpp.plan.scheduler;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
@@ -23,9 +24,7 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.IClientManager;
import
org.apache.iotdb.commons.client.async.AsyncDataNodeInternalServiceClient;
import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient;
-import org.apache.iotdb.db.mpp.common.FragmentInstanceId;
import org.apache.iotdb.db.mpp.common.MPPQueryContext;
-import org.apache.iotdb.db.mpp.common.PlanFragmentId;
import org.apache.iotdb.db.mpp.execution.QueryStateMachine;
import org.apache.iotdb.db.mpp.execution.fragment.FragmentInfo;
import org.apache.iotdb.db.mpp.metric.QueryExecutionMetricSet;
@@ -177,16 +176,4 @@ public class ClusterScheduler implements IScheduler {
public FragmentInfo getFragmentInfo() {
return null;
}
-
- @Override
- public void abortFragmentInstance(FragmentInstanceId instanceId, Throwable
failureCause) {}
-
- @Override
- public void cancelFragment(PlanFragmentId planFragmentId) {}
-
- // Send the instances to other nodes
- private void sendFragmentInstances() {}
-
- // After sending, start to collect the states of these fragment instances
- private void startMonitorInstances() {}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java
index 168a288ca6a..2fe6a966111 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java
@@ -81,6 +81,10 @@ public class FragmentInstanceDispatcherImpl implements
IFragInstanceDispatcher {
private static final PerformanceOverviewMetrics PERFORMANCE_OVERVIEW_METRICS
=
PerformanceOverviewMetrics.getInstance();
+ private static final String DISPATCH_FAILED = "[DispatchFailed]";
+
+ private static final String UNEXPECTED_ERRORS = "Unexpected errors: ";
+
public FragmentInstanceDispatcherImpl(
QueryType type,
MPPQueryContext queryContext,
@@ -119,11 +123,11 @@ public class FragmentInstanceDispatcherImpl implements
IFragInstanceDispatcher {
} catch (FragmentInstanceDispatchException e) {
return immediateFuture(new
FragInstanceDispatchResult(e.getFailureStatus()));
} catch (Throwable t) {
- logger.warn("[DispatchFailed]", t);
+ logger.warn(DISPATCH_FAILED, t);
return immediateFuture(
new FragInstanceDispatchResult(
RpcUtils.getStatus(
- TSStatusCode.INTERNAL_SERVER_ERROR, "Unexpected errors: "
+ t.getMessage())));
+ TSStatusCode.INTERNAL_SERVER_ERROR, UNEXPECTED_ERRORS +
t.getMessage())));
} finally {
QUERY_EXECUTION_METRIC_SET.recordExecutionCost(
DISPATCH_READ, System.nanoTime() - startTime);
@@ -149,10 +153,10 @@ public class FragmentInstanceDispatcherImpl implements
IFragInstanceDispatcher {
}
}
} catch (Throwable t) {
- logger.warn("[DispatchFailed]", t);
+ logger.warn(DISPATCH_FAILED, t);
failureStatusList.add(
RpcUtils.getStatus(
- TSStatusCode.INTERNAL_SERVER_ERROR, "Unexpected errors: " +
t.getMessage()));
+ TSStatusCode.INTERNAL_SERVER_ERROR, UNEXPECTED_ERRORS +
t.getMessage()));
}
}
if (failureStatusList.isEmpty()) {
@@ -194,10 +198,10 @@ public class FragmentInstanceDispatcherImpl implements
IFragInstanceDispatcher {
} catch (FragmentInstanceDispatchException e) {
dataNodeFailureList.add(e.getFailureStatus());
} catch (Throwable t) {
- logger.warn("[DispatchFailed]", t);
+ logger.warn(DISPATCH_FAILED, t);
dataNodeFailureList.add(
RpcUtils.getStatus(
- TSStatusCode.INTERNAL_SERVER_ERROR, "Unexpected errors: " +
t.getMessage()));
+ TSStatusCode.INTERNAL_SERVER_ERROR, UNEXPECTED_ERRORS +
t.getMessage()));
}
}
PERFORMANCE_OVERVIEW_METRICS.recordScheduleLocalCost(
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/IScheduler.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/IScheduler.java
index 9bd83813245..0968c8df765 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/IScheduler.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/IScheduler.java
@@ -18,8 +18,6 @@
*/
package org.apache.iotdb.db.mpp.plan.scheduler;
-import org.apache.iotdb.db.mpp.common.FragmentInstanceId;
-import org.apache.iotdb.db.mpp.common.PlanFragmentId;
import org.apache.iotdb.db.mpp.execution.fragment.FragmentInfo;
import io.airlift.units.Duration;
@@ -33,8 +31,4 @@ public interface IScheduler {
Duration getTotalCpuTime();
FragmentInfo getFragmentInfo();
-
- void abortFragmentInstance(FragmentInstanceId instanceId, Throwable
failureCause);
-
- void cancelFragment(PlanFragmentId planFragmentId);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileDispatcherImpl.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileDispatcherImpl.java
index f527232e48f..95edd11a269 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileDispatcherImpl.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileDispatcherImpl.java
@@ -68,6 +68,7 @@ public class LoadTsFileDispatcherImpl implements
IFragInstanceDispatcher {
private final IClientManager<TEndPoint, SyncDataNodeInternalServiceClient>
internalServiceClientManager;
private final ExecutorService executor;
+ private static final String NODE_CONNECTION_ERROR = "can't connect to node
{}";
public LoadTsFileDispatcherImpl(
IClientManager<TEndPoint, SyncDataNodeInternalServiceClient>
internalServiceClientManager) {
@@ -140,10 +141,10 @@ public class LoadTsFileDispatcherImpl implements
IFragInstanceDispatcher {
throw new FragmentInstanceDispatchException(loadResp.status);
}
} catch (ClientManagerException | TException e) {
- logger.warn("can't connect to node {}", endPoint, e);
+ logger.warn(NODE_CONNECTION_ERROR, endPoint, e);
TSStatus status = new TSStatus();
status.setCode(TSStatusCode.DISPATCH_ERROR.getStatusCode());
- status.setMessage("can't connect to node {}" + endPoint);
+ status.setMessage(NODE_CONNECTION_ERROR + endPoint);
throw new FragmentInstanceDispatchException(status);
}
}
@@ -227,11 +228,12 @@ public class LoadTsFileDispatcherImpl implements
IFragInstanceDispatcher {
throw new FragmentInstanceDispatchException(loadResp.status);
}
} catch (ClientManagerException | TException e) {
- logger.warn("can't connect to node {}", endPoint, e);
+ logger.warn(NODE_CONNECTION_ERROR, endPoint, e);
TSStatus status = new TSStatus();
status.setCode(TSStatusCode.DISPATCH_ERROR.getStatusCode());
status.setMessage(
- "can't connect to node {}, please reset longer
dn_connection_timeout_ms in iotdb-common.properties and restart iotdb."
+ NODE_CONNECTION_ERROR
+ + "please reset longer dn_connection_timeout_ms in
iotdb-common.properties and restart iotdb."
+ endPoint);
throw new FragmentInstanceDispatchException(status);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileScheduler.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileScheduler.java
index bf37b748587..f371e5e293e 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileScheduler.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileScheduler.java
@@ -35,7 +35,6 @@ import org.apache.iotdb.db.engine.load.ChunkData;
import org.apache.iotdb.db.engine.load.TsFileData;
import org.apache.iotdb.db.engine.load.TsFileSplitter;
import org.apache.iotdb.db.exception.mpp.FragmentInstanceDispatchException;
-import org.apache.iotdb.db.mpp.common.FragmentInstanceId;
import org.apache.iotdb.db.mpp.common.MPPQueryContext;
import org.apache.iotdb.db.mpp.common.PlanFragmentId;
import org.apache.iotdb.db.mpp.execution.QueryStateMachine;
@@ -162,15 +161,17 @@ public class LoadTsFileScheduler implements IScheduler {
}
if (isLoadSingleTsFileSuccess) {
logger.info(
- String.format(
- "Load TsFile %s Successfully, load process [%s/%s]",
- node.getTsFileResource().getTsFilePath(), i + 1,
tsFileNodeListSize));
+ "Load TsFile {} Successfully, load process [{}/{}]",
+ node.getTsFileResource().getTsFilePath(),
+ i + 1,
+ tsFileNodeListSize);
} else {
isLoadSuccess = false;
logger.warn(
- String.format(
- "Can not Load TsFile %s, load process [%s/%s]",
- node.getTsFileResource().getTsFilePath(), i + 1,
tsFileNodeListSize));
+ "Can not Load TsFile {}, load process [{}/{}]",
+ node.getTsFileResource().getTsFilePath(),
+ i + 1,
+ tsFileNodeListSize);
}
} catch (Exception e) {
isLoadSuccess = false;
@@ -236,12 +237,12 @@ public class LoadTsFileScheduler implements IScheduler {
if (!result.isSuccessful()) {
// TODO: retry.
logger.warn(
- String.format(
- "Dispatch one piece to ReplicaSet %s error. Result status code
%s. Result status message %s. Dispatch piece node error:%n%s",
- replicaSet,
-
TSStatusCode.representOf(result.getFailureStatus().getCode()).name(),
- result.getFailureStatus().getMessage(),
- pieceNode));
+ "Dispatch one piece to ReplicaSet {} error. Result status code {}.
"
+ + "Result status message {}. Dispatch piece node error:%n{}",
+ replicaSet,
+
TSStatusCode.representOf(result.getFailureStatus().getCode()).name(),
+ result.getFailureStatus().getMessage(),
+ pieceNode);
if (result.getFailureStatus().getSubStatus() != null) {
for (TSStatus status : result.getFailureStatus().getSubStatus()) {
logger.warn(
@@ -287,13 +288,13 @@ public class LoadTsFileScheduler implements IScheduler {
if (!result.isSuccessful()) {
// TODO: retry.
logger.warn(
- String.format(
- "Dispatch load command %s of TsFile %s error to replicaSets %s
error. Result status code %s. Result status message %s.",
- loadCommandReq,
- tsFile,
- allReplicaSets,
-
TSStatusCode.representOf(result.getFailureStatus().getCode()).name(),
- result.getFailureStatus().getMessage()));
+ "Dispatch load command {} of TsFile {} error to replicaSets {}
error. "
+ + "Result status code {}, Result status message {}.",
+ loadCommandReq,
+ tsFile,
+ allReplicaSets,
+
TSStatusCode.representOf(result.getFailureStatus().getCode()).name(),
+ result.getFailureStatus().getMessage());
TSStatus status = result.getFailureStatus();
status.setMessage(
String.format("Load %s error in 2nd phase. Because ", tsFile) +
status.getMessage());
@@ -327,7 +328,8 @@ public class LoadTsFileScheduler implements IScheduler {
} catch (FragmentInstanceDispatchException e) {
logger.warn(
String.format(
- "Dispatch tsFile %s error to local error. Result status code %s.
Result status message %s.",
+ "Dispatch tsFile %s error to local error. Result status code %s.
"
+ + "Result status message %s.",
node.getTsFileResource().getTsFile(),
TSStatusCode.representOf(e.getFailureStatus().getCode()).name(),
e.getFailureStatus().getMessage()));
@@ -350,12 +352,6 @@ public class LoadTsFileScheduler implements IScheduler {
return null;
}
- @Override
- public void abortFragmentInstance(FragmentInstanceId instanceId, Throwable
failureCause) {}
-
- @Override
- public void cancelFragment(PlanFragmentId planFragmentId) {}
-
public enum LoadCommand {
EXECUTE,
ROLLBACK
