Orange-Summer commented on code in PR #14702:
URL:
https://github.com/apache/dolphinscheduler/pull/14702#discussion_r1293279267
##########
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/utils/DependentExecute.java:
##########
@@ -267,12 +300,54 @@ public DependResult getModelDependResult(Date
currentTime, int testFlag) {
DependResult dependResult = getDependResultForItem(dependentItem,
currentTime, testFlag);
if (dependResult != DependResult.WAITING && dependResult !=
DependResult.FAILED) {
dependResultMap.put(dependentItem.getKey(), dependResult);
+ mergeVarPool(dependentItem);
}
+ dependItemVarPoolPropertyMap.clear();
+ dependItemVarPoolEndTimeMap.clear();
dependResultList.add(dependResult);
}
return DependentUtils.getDependResultForRelation(this.relation,
dependResultList);
}
+ /**
+ * add varPool of dependentItem to dependTaskVarPoolMap
+ *
+ * @param dependentItem
+ * @return
+ */
+ private void mergeVarPool(DependentItem dependentItem) {
+ if (dependentItem.getParameterPassing() &&
!dependItemVarPoolPropertyMap.isEmpty()) {
+ addTaskVarPool(dependItemVarPoolPropertyMap,
dependItemVarPoolEndTimeMap, dependTaskVarPoolPropertyMap,
+ dependTaskVarPoolEndTimeMap);
+ }
+ }
+
+ /**
+ * add varPool from dependItemVarPoolMap to dependTaskVarPoolMap
+ *
+ * @param dependItemVarPoolPropertyMap dependItemVarPoolPropertyMap
+ * @param dependItemVarPoolEndTimeMap dependItemVarPoolEndTimeMap
+ * @param dependTaskVarPoolPropertyMap dependTaskVarPoolPropertyMap
+ * @param dependTaskVarPoolEndTimeMap dependTaskVarPoolEndTimeMap
+ */
+ public static void addTaskVarPool(Map<String, Property>
dependItemVarPoolPropertyMap,
Review Comment:
Maybe it's better to put this method in `DependentUtils` class ?
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
