This is an automated email from the ASF dual-hosted git repository.
mcasters pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new 8ff5bd2c2b Fix #5225 (#6194)
8ff5bd2c2b is described below
commit 8ff5bd2c2b436b7ea41416c4fb260f4ae4c82780
Author: Sergio Ramazzina <[email protected]>
AuthorDate: Tue Dec 16 21:26:10 2025 +0100
Fix #5225 (#6194)
* Fix #5225 - Cannot wire Workflow Executor results rows hop to next
transform
* Fix #5225 - Added integration test to check for execution results' rows
---
.../0083-workflow-executor-called-wf.hwf | 119 ++++++++
.../transforms/0083-workflow-executor-run-wf.hpl | 320 +++++++++++++++++++++
.../main-0083-workflow-executor-test.hwf | 126 ++++++++
.../pipelineexecutor/PipelineExecutorMeta.java | 12 +
.../workflowexecutor/WorkflowExecutorMeta.java | 9 +
5 files changed, 586 insertions(+)
diff --git a/integration-tests/transforms/0083-workflow-executor-called-wf.hwf
b/integration-tests/transforms/0083-workflow-executor-called-wf.hwf
new file mode 100644
index 0000000000..8c0bb3257f
--- /dev/null
+++ b/integration-tests/transforms/0083-workflow-executor-called-wf.hwf
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+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.
+
+-->
+<workflow>
+ <name>0083-workflow-executor-called-wf</name>
+ <name_sync_with_filename>Y</name_sync_with_filename>
+ <description/>
+ <extended_description/>
+ <workflow_version/>
+ <workflow_status>0</workflow_status>
+ <created_user>-</created_user>
+ <created_date>2012/07/23 09:53:39.204</created_date>
+ <modified_user>-</modified_user>
+ <modified_date>2012/07/23 09:53:39.204</modified_date>
+ <parameters>
+ <parameter>
+ <name>TabellaLbL</name>
+ <default_value/>
+ <description/>
+ </parameter>
+ </parameters>
+ <actions>
+ <action>
+ <name>START</name>
+ <description/>
+ <type>SPECIAL</type>
+ <attributes/>
+ <DayOfMonth>1</DayOfMonth>
+ <doNotWaitOnFirstExecution>N</doNotWaitOnFirstExecution>
+ <hour>12</hour>
+ <intervalMinutes>60</intervalMinutes>
+ <intervalSeconds>0</intervalSeconds>
+ <minutes>0</minutes>
+ <repeat>N</repeat>
+ <schedulerType>0</schedulerType>
+ <weekDay>1</weekDay>
+ <parallel>N</parallel>
+ <xloc>112</xloc>
+ <yloc>112</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>Abort workflow</name>
+ <description/>
+ <type>ABORT</type>
+ <attributes/>
+ <always_log_rows>N</always_log_rows>
+ <parallel>N</parallel>
+ <xloc>280</xloc>
+ <yloc>240</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>Success</name>
+ <description/>
+ <type>SUCCESS</type>
+ <attributes/>
+ <parallel>N</parallel>
+ <xloc>480</xloc>
+ <yloc>112</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>Log info no LbL table</name>
+ <description/>
+ <type>WRITE_TO_LOG</type>
+ <attributes/>
+ <loglevel>Basic</loglevel>
+ <logmessage>Operations has no valid LbL table: ${TabellaLbL}</logmessage>
+ <logsubject/>
+ <parallel>N</parallel>
+ <xloc>280</xloc>
+ <yloc>112</yloc>
+ <attributes_hac/>
+ </action>
+ </actions>
+ <hops>
+ <hop>
+ <from>START</from>
+ <to>Log info no LbL table</to>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>Y</unconditional>
+ </hop>
+ <hop>
+ <from>Log info no LbL table</from>
+ <to>Success</to>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>Log info no LbL table</from>
+ <to>Abort workflow</to>
+ <enabled>Y</enabled>
+ <evaluation>N</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ </hops>
+ <notepads>
+ </notepads>
+ <attributes/>
+</workflow>
diff --git a/integration-tests/transforms/0083-workflow-executor-run-wf.hpl
b/integration-tests/transforms/0083-workflow-executor-run-wf.hpl
new file mode 100644
index 0000000000..a39c2379b9
--- /dev/null
+++ b/integration-tests/transforms/0083-workflow-executor-run-wf.hpl
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+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.
+
+-->
+<pipeline>
+ <info>
+ <name>0083-workflow-executor-run-wf</name>
+ <name_sync_with_filename>Y</name_sync_with_filename>
+ <description/>
+ <extended_description/>
+ <pipeline_version/>
+ <pipeline_type>Normal</pipeline_type>
+ <pipeline_status>0</pipeline_status>
+ <parameters>
+ </parameters>
+ <capture_transform_performance>N</capture_transform_performance>
+
<transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
+
<transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
+ <created_user>-</created_user>
+ <created_date>2025/07/30 11:59:58.006</created_date>
+ <modified_user>-</modified_user>
+ <modified_date>2025/07/30 11:59:58.006</modified_date>
+ </info>
+ <notepads>
+ </notepads>
+ <order>
+ <hop>
+ <from>Data grid</from>
+ <to>Movimenti_linee_credito_starter</to>
+ <enabled>Y</enabled>
+ </hop>
+ <hop>
+ <from>Movimenti_linee_credito_starter</from>
+ <to>Metadata structure of stream</to>
+ <enabled>Y</enabled>
+ </hop>
+ <hop>
+ <from>Metadata structure of stream</from>
+ <to>Group by</to>
+ <enabled>Y</enabled>
+ </hop>
+ <hop>
+ <from>Group by</from>
+ <to>Add constants</to>
+ <enabled>Y</enabled>
+ </hop>
+ <hop>
+ <from>Add constants</from>
+ <to>Filter rows</to>
+ <enabled>Y</enabled>
+ </hop>
+ <hop>
+ <from>Filter rows</from>
+ <to>Success</to>
+ <enabled>Y</enabled>
+ </hop>
+ <hop>
+ <from>Filter rows</from>
+ <to>Abort</to>
+ <enabled>Y</enabled>
+ </hop>
+ </order>
+ <transform>
+ <name>Abort</name>
+ <type>Abort</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <abort_option>ABORT_WITH_ERROR</abort_option>
+ <always_log_rows>Y</always_log_rows>
+ <message>Workflow executor: output fields set is different than
expected!</message>
+ <row_threshold>0</row_threshold>
+ <attributes/>
+ <GUI>
+ <xloc>976</xloc>
+ <yloc>224</yloc>
+ </GUI>
+ </transform>
+ <transform>
+ <name>Add constants</name>
+ <type>Constant</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <fields>
+ <field>
+ <currency/>
+ <decimal/>
+ <format/>
+ <group/>
+ <length>-1</length>
+ <name>expected</name>
+ <nullif>ExecutionTime, ExecutionResult, ExecutionNrErrors,
ExecutionLinesRead, ExecutionLinesWritten, ExecutionLinesInput,
ExecutionLinesOutput, ExecutionLinesRejected, ExecutionLinesUpdated,
ExecutionLinesDeleted, ExecutionFilesRetrieved, ExecutionExitStatus,
ExecutionLogText, ExecutionLogChannelId</nullif>
+ <precision>-1</precision>
+ <set_empty_string>N</set_empty_string>
+ <type>String</type>
+ </field>
+ </fields>
+ <attributes/>
+ <GUI>
+ <xloc>768</xloc>
+ <yloc>112</yloc>
+ </GUI>
+ </transform>
+ <transform>
+ <name>Data grid</name>
+ <type>DataGrid</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <data>
+ <line>
+ <item>1</item>
+ </line>
+ </data>
+ <fields>
+ <field>
+ <length>-1</length>
+ <precision>-1</precision>
+ <set_empty_string>N</set_empty_string>
+ <name>f1</name>
+ <type>String</type>
+ </field>
+ </fields>
+ <attributes/>
+ <GUI>
+ <xloc>64</xloc>
+ <yloc>112</yloc>
+ </GUI>
+ </transform>
+ <transform>
+ <name>Filter rows</name>
+ <type>FilterRows</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <compare>
+ <condition>
+ <conditions>
+</conditions>
+ <function>=</function>
+ <leftvalue>result</leftvalue>
+ <negated>N</negated>
+ <operator>-</operator>
+ <rightvalue>expected</rightvalue>
+ </condition>
+ </compare>
+ <send_false_to>Abort</send_false_to>
+ <send_true_to>Success</send_true_to>
+ <attributes/>
+ <GUI>
+ <xloc>944</xloc>
+ <yloc>112</yloc>
+ </GUI>
+ </transform>
+ <transform>
+ <name>Group by</name>
+ <type>GroupBy</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <add_linenr>N</add_linenr>
+ <all_rows>N</all_rows>
+ <directory>${java.io.tmpdir}</directory>
+ <fields>
+ <field>
+ <aggregate>result</aggregate>
+ <subject>Fieldname</subject>
+ <type>CONCAT_COMMA</type>
+ </field>
+ </fields>
+ <give_back_row>N</give_back_row>
+ <group>
+</group>
+ <ignore_aggregate>N</ignore_aggregate>
+ <prefix>grp</prefix>
+ <attributes/>
+ <GUI>
+ <xloc>624</xloc>
+ <yloc>112</yloc>
+ </GUI>
+ </transform>
+ <transform>
+ <name>Metadata structure of stream</name>
+ <type>TransformMetaStructure</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <commentsFieldname>Comments</commentsFieldname>
+ <fieldFieldname>Fieldname</fieldFieldname>
+ <includeCommentsField>Y</includeCommentsField>
+ <includeFieldnameField>Y</includeFieldnameField>
+ <includeLengthField>Y</includeLengthField>
+ <includeMaskField>Y</includeMaskField>
+ <includeOriginField>Y</includeOriginField>
+ <includePositionField>Y</includePositionField>
+ <includePrecisionField>Y</includePrecisionField>
+ <includeTypeField>Y</includeTypeField>
+ <lengthFieldname>Length</lengthFieldname>
+ <maskFieldname>FormatMask</maskFieldname>
+ <originFieldname>Origin</originFieldname>
+ <outputRowcount>N</outputRowcount>
+ <positionFieldname>Position</positionFieldname>
+ <precisionFieldname>Precision</precisionFieldname>
+ <typeFieldname>Type</typeFieldname>
+ <attributes/>
+ <GUI>
+ <xloc>464</xloc>
+ <yloc>112</yloc>
+ </GUI>
+ </transform>
+ <transform>
+ <name>Movimenti_linee_credito_starter</name>
+ <type>WorkflowExecutor</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+
<execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+
<execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+
<execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+
<execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+
<execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+ <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+
<execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+
<execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+
<execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+
<execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+ <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+ <execution_result_field>ExecutionResult</execution_result_field>
+ <execution_result_target_transform>Metadata structure of
stream</execution_result_target_transform>
+ <execution_time_field>ExecutionTime</execution_time_field>
+ <filename>${PROJECT_HOME}/0083-workflow-executor-called-wf.hwf</filename>
+ <group_size>1</group_size>
+ <inherit_all_vars>Y</inherit_all_vars>
+ <parameters>
+ <variablemapping>
+ <field>f1</field>
+ <variable>TabellaLbL</variable>
+ </variablemapping>
+ </parameters>
+ <result_files_file_name_field>FileName</result_files_file_name_field>
+ <run_configuration>local</run_configuration>
+ <attributes/>
+ <GUI>
+ <xloc>240</xloc>
+ <yloc>112</yloc>
+ </GUI>
+ </transform>
+ <transform>
+ <name>Success</name>
+ <type>Dummy</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <attributes/>
+ <GUI>
+ <xloc>1120</xloc>
+ <yloc>112</yloc>
+ </GUI>
+ </transform>
+ <transform_error_handling>
+ </transform_error_handling>
+ <attributes/>
+</pipeline>
diff --git a/integration-tests/transforms/main-0083-workflow-executor-test.hwf
b/integration-tests/transforms/main-0083-workflow-executor-test.hwf
new file mode 100644
index 0000000000..895b54c5da
--- /dev/null
+++ b/integration-tests/transforms/main-0083-workflow-executor-test.hwf
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+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.
+
+-->
+<workflow>
+ <name>main-0083-workflow-executor-test</name>
+ <name_sync_with_filename>Y</name_sync_with_filename>
+ <description/>
+ <extended_description/>
+ <workflow_version/>
+ <created_user>-</created_user>
+ <created_date>2020/12/07 13:03:35.562</created_date>
+ <modified_user>-</modified_user>
+ <modified_date>2020/12/07 13:03:35.562</modified_date>
+ <parameters>
+ </parameters>
+ <actions>
+ <action>
+ <name>START</name>
+ <description/>
+ <type>SPECIAL</type>
+ <attributes/>
+ <DayOfMonth>1</DayOfMonth>
+ <doNotWaitOnFirstExecution>N</doNotWaitOnFirstExecution>
+ <hour>12</hour>
+ <intervalMinutes>60</intervalMinutes>
+ <intervalSeconds>0</intervalSeconds>
+ <minutes>0</minutes>
+ <repeat>N</repeat>
+ <schedulerType>0</schedulerType>
+ <weekDay>1</weekDay>
+ <parallel>N</parallel>
+ <xloc>160</xloc>
+ <yloc>96</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>Success</name>
+ <description/>
+ <type>SUCCESS</type>
+ <attributes/>
+ <parallel>N</parallel>
+ <xloc>544</xloc>
+ <yloc>96</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>Abort workflow</name>
+ <description/>
+ <type>ABORT</type>
+ <attributes/>
+ <always_log_rows>N</always_log_rows>
+ <parallel>N</parallel>
+ <xloc>320</xloc>
+ <yloc>256</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>0083-workflow-executor-run-wf.hpl</name>
+ <description/>
+ <type>PIPELINE</type>
+ <attributes/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <clear_files>N</clear_files>
+ <clear_rows>N</clear_rows>
+ <create_parent_folder>N</create_parent_folder>
+ <exec_per_row>N</exec_per_row>
+ <filename>${PROJECT_HOME}/0083-workflow-executor-run-wf.hpl</filename>
+ <loglevel>Basic</loglevel>
+ <parameters>
+ <pass_all_parameters>Y</pass_all_parameters>
+ </parameters>
+ <params_from_previous>N</params_from_previous>
+ <run_configuration>local</run_configuration>
+ <set_append_logfile>N</set_append_logfile>
+ <set_logfile>N</set_logfile>
+ <wait_until_finished>Y</wait_until_finished>
+ <parallel>N</parallel>
+ <xloc>320</xloc>
+ <yloc>98</yloc>
+ <attributes_hac/>
+ </action>
+ </actions>
+ <hops>
+ <hop>
+ <from>START</from>
+ <to>0083-workflow-executor-run-wf.hpl</to>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>Y</unconditional>
+ </hop>
+ <hop>
+ <from>0083-workflow-executor-run-wf.hpl</from>
+ <to>Success</to>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>0083-workflow-executor-run-wf.hpl</from>
+ <to>Abort workflow</to>
+ <enabled>Y</enabled>
+ <evaluation>N</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ </hops>
+ <notepads>
+ </notepads>
+ <attributes/>
+</workflow>
diff --git
a/plugins/transforms/pipelineexecutor/src/main/java/org/apache/hop/pipeline/transforms/pipelineexecutor/PipelineExecutorMeta.java
b/plugins/transforms/pipelineexecutor/src/main/java/org/apache/hop/pipeline/transforms/pipelineexecutor/PipelineExecutorMeta.java
index 2b7c60371a..2038d736f1 100644
---
a/plugins/transforms/pipelineexecutor/src/main/java/org/apache/hop/pipeline/transforms/pipelineexecutor/PipelineExecutorMeta.java
+++
b/plugins/transforms/pipelineexecutor/src/main/java/org/apache/hop/pipeline/transforms/pipelineexecutor/PipelineExecutorMeta.java
@@ -502,15 +502,19 @@ public class PipelineExecutorMeta
switch (index) {
case 0:
setExecutionResultTargetTransformMeta(transform);
+ setExecutionResultTargetTransform(transform.getName());
break;
case 1:
setOutputRowsSourceTransformMeta(transform);
+ setOutputRowsSourceTransform(transform.getName());
break;
case 2:
setResultFilesTargetTransformMeta(transform);
+ setResultFilesTargetTransform(transform.getName());
break;
case 3:
setExecutorsOutputTransformMeta(transform);
+ setExecutorsOutputTransform(transform.getName());
break;
default:
break;
@@ -586,9 +590,13 @@ public class PipelineExecutorMeta
public boolean cleanAfterHopFromRemove() {
setExecutionResultTargetTransformMeta(null);
+ setExecutionResultTargetTransform(null);
setOutputRowsSourceTransformMeta(null);
+ setOutputRowsSourceTransform(null);
setResultFilesTargetTransformMeta(null);
+ setResultFilesTargetTransform(null);
setExecutorsOutputTransformMeta(null);
+ setExecutorsOutputTransform(null);
return true;
}
@@ -604,18 +612,22 @@ public class PipelineExecutorMeta
if (getExecutionResultTargetTransformMeta() != null
&&
toTransformName.equals(getExecutionResultTargetTransformMeta().getName())) {
setExecutionResultTargetTransformMeta(null);
+ setExecutionResultTargetTransform(null);
hasChanged = true;
} else if (getOutputRowsSourceTransformMeta() != null
&&
toTransformName.equals(getOutputRowsSourceTransformMeta().getName())) {
setOutputRowsSourceTransformMeta(null);
+ setOutputRowsSourceTransform(null);
hasChanged = true;
} else if (getResultFilesTargetTransformMeta() != null
&&
toTransformName.equals(getResultFilesTargetTransformMeta().getName())) {
setResultFilesTargetTransformMeta(null);
+ setResultFilesTargetTransform(null);
hasChanged = true;
} else if (getExecutorsOutputTransformMeta() != null
&&
toTransformName.equals(getExecutorsOutputTransformMeta().getName())) {
setExecutorsOutputTransformMeta(null);
+ setExecutorsOutputTransform(null);
hasChanged = true;
}
return hasChanged;
diff --git
a/plugins/transforms/workflowexecutor/src/main/java/org/apache/hop/pipeline/transforms/workflowexecutor/WorkflowExecutorMeta.java
b/plugins/transforms/workflowexecutor/src/main/java/org/apache/hop/pipeline/transforms/workflowexecutor/WorkflowExecutorMeta.java
index a83251fba6..e9afebd41e 100644
---
a/plugins/transforms/workflowexecutor/src/main/java/org/apache/hop/pipeline/transforms/workflowexecutor/WorkflowExecutorMeta.java
+++
b/plugins/transforms/workflowexecutor/src/main/java/org/apache/hop/pipeline/transforms/workflowexecutor/WorkflowExecutorMeta.java
@@ -627,12 +627,15 @@ public class WorkflowExecutorMeta
switch (index) {
case 0:
setExecutionResultTargetTransformMeta(transform);
+ setExecutionResultTargetTransform(transform.getName());
break;
case 1:
setResultRowsTargetTransformMeta(transform);
+ setResultRowsTargetTransform(transform.getName());
break;
case 2:
setResultFilesTargetTransformMeta(transform);
+ setResultFilesTargetTransform(transform.getName());
break;
default:
break;
@@ -706,8 +709,11 @@ public class WorkflowExecutorMeta
@Override
public boolean cleanAfterHopFromRemove() {
setExecutionResultTargetTransformMeta(null);
+ setExecutionResultTargetTransform(null);
setResultRowsTargetTransformMeta(null);
+ setResultRowsTargetTransform(null);
setResultFilesTargetTransformMeta(null);
+ setResultFilesTargetTransform(null);
return true;
}
@@ -723,14 +729,17 @@ public class WorkflowExecutorMeta
if (getExecutionResultTargetTransformMeta() != null
&&
toTransformName.equals(getExecutionResultTargetTransformMeta().getName())) {
setExecutionResultTargetTransformMeta(null);
+ setExecutionResultTargetTransform(null);
hasChanged = true;
} else if (getResultRowsTargetTransformMeta() != null
&&
toTransformName.equals(getResultRowsTargetTransformMeta().getName())) {
setResultRowsTargetTransformMeta(null);
+ setResultRowsTargetTransform(null);
hasChanged = true;
} else if (getResultFilesTargetTransformMeta() != null
&&
toTransformName.equals(getResultFilesTargetTransformMeta().getName())) {
setResultFilesTargetTransformMeta(null);
+ setResultFilesTargetTransform(null);
hasChanged = true;
}
return hasChanged;
