This is an automated email from the ASF dual-hosted git repository.
hansva 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 e79a5ec445 fix merge rows regression for MDI, fixes #6069 (#6083)
e79a5ec445 is described below
commit e79a5ec445a435002b83e14019c36ee39b1a3d7f
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Wed Nov 26 15:42:48 2025 +0100
fix merge rows regression for MDI, fixes #6069 (#6083)
---
integration-tests/mdi/0030-merge-rows.hpl | 24 +++++-----------------
.../transforms/mergerows/MergeRowsMeta.java | 6 ++----
2 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/integration-tests/mdi/0030-merge-rows.hpl
b/integration-tests/mdi/0030-merge-rows.hpl
index b14f42124c..180662915a 100644
--- a/integration-tests/mdi/0030-merge-rows.hpl
+++ b/integration-tests/mdi/0030-merge-rows.hpl
@@ -107,18 +107,11 @@ limitations under the License.
<mappings>
<mapping>
<target_transform_name>Merge rows</target_transform_name>
- <target_attribute_key>VALUE_FIELD</target_attribute_key>
- <target_detail>Y</target_detail>
+ <target_attribute_key>VALUE_FIELDS</target_attribute_key>
+ <target_detail>N</target_detail>
<source_transform>values</source_transform>
<source_field>value</source_field>
</mapping>
- <mapping>
- <target_transform_name>Merge rows</target_transform_name>
- <target_attribute_key>KEY_FIELD</target_attribute_key>
- <target_detail>Y</target_detail>
- <source_transform>keys</source_transform>
- <source_field>key</source_field>
- </mapping>
<mapping>
<target_transform_name>Merge rows</target_transform_name>
<target_attribute_key>FLAG_FIELD</target_attribute_key>
@@ -128,17 +121,10 @@ limitations under the License.
</mapping>
<mapping>
<target_transform_name>Merge rows</target_transform_name>
- <target_attribute_key>COMPARE_TRANSFORM</target_attribute_key>
- <target_detail>N</target_detail>
- <source_transform>metadata</source_transform>
- <source_field>compare</source_field>
- </mapping>
- <mapping>
- <target_transform_name>Merge rows</target_transform_name>
- <target_attribute_key>REFERENCE_TRANSFORM</target_attribute_key>
+ <target_attribute_key>KEY_FIELDS</target_attribute_key>
<target_detail>N</target_detail>
- <source_transform>metadata</source_transform>
- <source_field>reference</source_field>
+ <source_transform>keys</source_transform>
+ <source_field>key</source_field>
</mapping>
</mappings>
<attributes/>
diff --git
a/plugins/transforms/mergerows/src/main/java/org/apache/hop/pipeline/transforms/mergerows/MergeRowsMeta.java
b/plugins/transforms/mergerows/src/main/java/org/apache/hop/pipeline/transforms/mergerows/MergeRowsMeta.java
index 280ac0f9b0..c72bff7080 100644
---
a/plugins/transforms/mergerows/src/main/java/org/apache/hop/pipeline/transforms/mergerows/MergeRowsMeta.java
+++
b/plugins/transforms/mergerows/src/main/java/org/apache/hop/pipeline/transforms/mergerows/MergeRowsMeta.java
@@ -68,18 +68,16 @@ public class MergeRowsMeta extends
BaseTransformMeta<MergeRows, MergeRowsData> {
@HopMetadataProperty(
key = "key",
groupKey = "keys",
- injectionKey = "KEY_FIELD",
+ injectionKey = "KEY_FIELDS",
injectionKeyDescription = "MergeRows.Injection.KEY_FIELD",
- injectionGroupKey = "KEY_FIELDS",
injectionGroupDescription = "MergeRows.Injection.KEY_FIELDS")
private List<String> keyFields;
@HopMetadataProperty(
key = "value",
groupKey = "values",
- injectionKey = "VALUE_FIELD",
+ injectionKey = "VALUE_FIELDS",
injectionKeyDescription = "MergeRows.Injection.VALUE_FIELD",
- injectionGroupKey = "VALUE_FIELDS",
injectionGroupDescription = "MergeRows.Injection.VALUE_FIELDS")
private List<String> valueFields;