You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by GitBox <gi...@apache.org> on 2022/11/04 02:43:53 UTC
[GitHub] [shardingsphere] sandynz commented on a diff in pull request #21929: Improve pipeline incremental_idle_seconds at migration job status
sandynz commented on code in PR #21929:
URL: https://github.com/apache/shardingsphere/pull/21929#discussion_r1013551258
##########
kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/pojo/InventoryIncrementalJobItemProgressInfo.java:
##########
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.data.pipeline.api.pojo;
+
+import lombok.Getter;
+import org.apache.shardingsphere.data.pipeline.api.job.JobStatus;
+import org.apache.shardingsphere.data.pipeline.api.job.progress.InventoryIncrementalJobItemProgress;
+
+@Getter
+public final class InventoryIncrementalJobItemProgressInfo {
+
+ private final int shardingItem;
+
+ private final String errorMessage;
+
+ private final long startTimeMillis;
+
+ private final JobStatus status;
+
+ private final String sourceDatabaseType;
+
+ private final String dataSourceName;
+
+ private final boolean active;
+
+ private final int inventoryFinishedPercentage;
+
+ private final long incrementalLatestActiveTimeMillis;
+
+ private final long processedRecordsCount;
+
+ private final long inventoryRecordsCount;
Review Comment:
Could we put `InventoryIncrementalJobItemProgress` here? There're too much duplicated columns
##########
kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/pojo/InventoryIncrementalJobItemProgressInfo.java:
##########
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.data.pipeline.api.pojo;
+
+import lombok.Getter;
+import org.apache.shardingsphere.data.pipeline.api.job.JobStatus;
+import org.apache.shardingsphere.data.pipeline.api.job.progress.InventoryIncrementalJobItemProgress;
+
+@Getter
+public final class InventoryIncrementalJobItemProgressInfo {
Review Comment:
Class java doc should be added
##########
kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/AbstractInventoryIncrementalJobAPIImpl.java:
##########
@@ -112,28 +115,38 @@ public PipelineProcessConfiguration showProcessConfiguration() {
return result;
}
- @Override
- public Map<Integer, InventoryIncrementalJobItemProgress> getJobProgress(final String jobId) {
- checkModeConfig();
- return getJobProgress(getJobConfiguration(jobId));
- }
-
@Override
public Map<Integer, InventoryIncrementalJobItemProgress> getJobProgress(final PipelineJobConfiguration jobConfig) {
String jobId = jobConfig.getJobId();
JobConfigurationPOJO jobConfigPOJO = getElasticJobConfigPOJO(jobId);
- long startTimeMillis = Long.parseLong(Optional.ofNullable(jobConfigPOJO.getProps().getProperty("start_time_millis")).orElse("0"));
return IntStream.range(0, jobConfig.getJobShardingCount()).boxed().collect(LinkedHashMap::new, (map, each) -> {
InventoryIncrementalJobItemProgress jobItemProgress = getJobItemProgress(jobId, each);
if (null != jobItemProgress) {
jobItemProgress.setActive(!jobConfigPOJO.isDisabled());
- jobItemProgress.setErrorMessage(getJobItemErrorMessage(jobId, each));
- jobItemProgress.setStartTimeMillis(startTimeMillis);
}
map.put(each, jobItemProgress);
}, LinkedHashMap::putAll);
}
+ @Override
+ public List<InventoryIncrementalJobItemProgressInfo> getJobProgressInfos(final String jobId) {
+ JobConfigurationPOJO jobConfigPOJO = getElasticJobConfigPOJO(jobId);
+ PipelineJobConfiguration jobConfig = getJobConfiguration(jobConfigPOJO);
+ long startTimeMillis = Long.parseLong(Optional.ofNullable(jobConfigPOJO.getProps().getProperty("start_time_millis")).orElse("0"));
+ Map<Integer, InventoryIncrementalJobItemProgress> jobProgress = getJobProgress(jobConfig);
+ List<InventoryIncrementalJobItemProgressInfo> result = new ArrayList<>(jobProgress.size());
+ for (Entry<Integer, InventoryIncrementalJobItemProgress> entry : jobProgress.entrySet()) {
+ if (null == entry.getValue()) {
+ continue;
+ }
Review Comment:
Seems it should not be ignored when entry.value is null, the `item` is shown in result currently
--
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.
To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org