You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2025/02/14 12:30:04 UTC
(hop) branch main updated (9cca50b4af -> 8f1b4cb0ec)
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
from 9cca50b4af Merge pull request #4847 from hansva/1948
add b775e22ae8 add HopMetadataProperty to Mergejoin, fixes #1875
new 8f1b4cb0ec Merge pull request #4848 from hansva/1875
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/hop/core/Condition.java | 230 ++--------------
...rent.hpl => 0028-join-rows-metadata-parent.hpl} | 192 ++++++-------
.../0028-join-rows-template-child.hpl} | 187 ++++++-------
.../mdi/datasets/golden-join-rows.csv | 2 +
.../main-0028-join-rows.hwf} | 24 +-
.../metadata/dataset/golden-join-rows.json} | 8 +-
.../0028-join-rows-metadata-parent UNIT.json} | 29 +-
plugins/transforms/joinrows/pom.xml | 8 +
.../transforms/joinrows/JoinRowsDialog.java | 2 +-
.../pipeline/transforms/joinrows/JoinRowsMeta.java | 247 ++++++-----------
.../src/main/samples/transforms/join_rows.hpl | 298 ++++++++++-----------
.../joinrows/JoinRowsMetaInjectionTest.java | 12 +
.../transforms/joinrows/JoinRowsMetaTest.java | 68 +++--
.../join-rows-transform-with-condition.xml} | 60 ++---
.../src/test/resources/join-rows-transform.xml} | 27 +-
15 files changed, 535 insertions(+), 859 deletions(-)
copy integration-tests/mdi/{0025-get-variables-parent.hpl => 0028-join-rows-metadata-parent.hpl} (56%)
copy integration-tests/{transforms/0008-append.hpl => mdi/0028-join-rows-template-child.hpl} (68%)
create mode 100644 integration-tests/mdi/datasets/golden-join-rows.csv
copy integration-tests/{transforms/main-0018-avro-file-input.hwf => mdi/main-0028-join-rows.hwf} (88%)
copy integration-tests/{transforms/metadata/dataset/golden-json-grouped-output.json => mdi/metadata/dataset/golden-join-rows.json} (69%)
copy integration-tests/{transforms/metadata/unit-test/0030-data-grid UNIT.json => mdi/metadata/unit-test/0028-join-rows-metadata-parent UNIT.json} (52%)
copy integration-tests/transforms/0044-join-rows.hpl => plugins/transforms/joinrows/src/main/samples/transforms/join_rows.hpl (63%)
copy plugins/transforms/{filterrows/src/test/resources/filter-rows-transform-basic.xml => joinrows/src/test/resources/join-rows-transform-with-condition.xml} (68%)
copy plugins/transforms/{edi2xml/src/test/resources/edi-to-xml-transform.xml => joinrows/src/test/resources/join-rows-transform.xml} (70%)
(hop) 01/01: Merge pull request #4848 from hansva/1875
Posted by ha...@apache.org.
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
commit 8f1b4cb0ecbdf1f428f1669fdfbac377bfa716dd
Merge: 9cca50b4af b775e22ae8
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Fri Feb 14 13:29:59 2025 +0100
Merge pull request #4848 from hansva/1875
add HopMetadataProperty to Mergejoin, fixes #1875
.../main/java/org/apache/hop/core/Condition.java | 230 ++--------------
.../mdi/0028-join-rows-metadata-parent.hpl | 170 ++++++++++++
.../mdi/0028-join-rows-template-child.hpl | 185 +++++++++++++
.../mdi/datasets/golden-join-rows.csv | 2 +
integration-tests/mdi/main-0028-join-rows.hwf | 79 ++++++
.../mdi/metadata/dataset/golden-join-rows.json | 24 ++
.../0028-join-rows-metadata-parent UNIT.json | 33 +++
plugins/transforms/joinrows/pom.xml | 8 +
.../transforms/joinrows/JoinRowsDialog.java | 2 +-
.../pipeline/transforms/joinrows/JoinRowsMeta.java | 247 ++++++-----------
.../src/main/samples/transforms/join_rows.hpl | 299 +++++++++++++++++++++
.../joinrows/JoinRowsMetaInjectionTest.java | 12 +
.../transforms/joinrows/JoinRowsMetaTest.java | 68 +++--
.../join-rows-transform-with-condition.xml | 76 ++++++
.../test/resources/join-rows-transform.xml} | 46 ++--
15 files changed, 1056 insertions(+), 425 deletions(-)