This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/master by this push:
new 8e9e81a HOP-3579: fix integration test
new b112a07 Merge pull request #1271 from hansva/master
8e9e81a is described below
commit 8e9e81ab3d592a45ebfba6a3b0e702184661e3e9
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Tue Jan 11 09:05:33 2022 +0100
HOP-3579: fix integration test
---
.../transforms/0038-getfilenames-fromfield.hpl | 173 ++++++++++-----------
1 file changed, 80 insertions(+), 93 deletions(-)
diff --git a/integration-tests/transforms/0038-getfilenames-fromfield.hpl
b/integration-tests/transforms/0038-getfilenames-fromfield.hpl
index f1a820f..19f07e2 100644
--- a/integration-tests/transforms/0038-getfilenames-fromfield.hpl
+++ b/integration-tests/transforms/0038-getfilenames-fromfield.hpl
@@ -19,7 +19,7 @@ limitations under the License.
-->
<pipeline>
<info>
- <name>0037-getfilenames-fromfield</name>
+ <name>0038-getfilenames-fromfield</name>
<name_sync_with_filename>Y</name_sync_with_filename>
<description/>
<extended_description/>
@@ -67,8 +67,8 @@ limitations under the License.
</hop>
</order>
<transform>
- <name>Get file names</name>
- <type>GetFileNames</type>
+ <name>Check num rows</name>
+ <type>FilterRows</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
@@ -77,30 +77,28 @@ limitations under the License.
<method>none</method>
<schema_name/>
</partitioning>
- <isaddresult>N</isaddresult>
- <doNotFailIfNoFile>N</doNotFailIfNoFile>
- <exclude_wildcard_Field/>
- <filename_Field>dirname</filename_Field>
- <dynamic_include_subfolders>N</dynamic_include_subfolders>
- <wildcard_Field>wildcard</wildcard_Field>
- <filefield>Y</filefield>
- <file>
- <exclude_filemask/>
- <filemask/>
- <name/>
- <file_required>N</file_required>
- <include_subfolders>N</include_subfolders>
- </file>
- <filter>
- <filterfiletype>all_files</filterfiletype>
- </filter>
- <rownum>N</rownum>
- <raiseAnExceptionIfNoFile>N</raiseAnExceptionIfNoFile>
- <limit>0</limit>
- <rownum_field/>
+ <send_true_to>Success</send_true_to>
+ <send_false_to>No files found - Abort</send_false_to>
+ <compare>
+ <condition>
+ <negated>N</negated>
+ <leftvalue>num_file</leftvalue>
+ <function>=</function>
+ <rightvalue/>
+ <value>
+ <name>constant</name>
+ <type>Integer</type>
+ <text>3</text>
+ <length>-1</length>
+ <precision>0</precision>
+ <isnull>N</isnull>
+ <mask>####0;-####0</mask>
+ </value>
+ </condition>
+ </compare>
<attributes/>
<GUI>
- <xloc>400</xloc>
+ <xloc>688</xloc>
<yloc>96</yloc>
</GUI>
</transform>
@@ -140,8 +138,8 @@ limitations under the License.
</GUI>
</transform>
<transform>
- <name>Check num rows</name>
- <type>FilterRows</type>
+ <name>Generate rows</name>
+ <type>RowGenerator</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
@@ -150,34 +148,38 @@ limitations under the License.
<method>none</method>
<schema_name/>
</partitioning>
- <send_true_to>Success</send_true_to>
- <send_false_to>No files found - Abort</send_false_to>
- <compare>
- <condition>
- <negated>N</negated>
- <leftvalue>num_file</leftvalue>
- <function>=</function>
- <rightvalue/>
- <value>
- <name>constant</name>
- <type>Integer</type>
- <text>2</text>
- <length>-1</length>
- <precision>0</precision>
- <isnull>N</isnull>
- <mask>####0;-####0</mask>
- </value>
- </condition>
- </compare>
+ <fields>
+ <field>
+ <length>-1</length>
+ <name>wildcard</name>
+ <precision>-1</precision>
+ <set_empty_string>N</set_empty_string>
+ <type>String</type>
+ <nullif>s.*.txt</nullif>
+ </field>
+ <field>
+ <length>-1</length>
+ <name>dirname</name>
+ <precision>-1</precision>
+ <set_empty_string>N</set_empty_string>
+ <type>String</type>
+ <nullif>${PROJECT_HOME}/files</nullif>
+ </field>
+ </fields>
+ <interval_in_ms>5000</interval_in_ms>
+ <last_time_field>FiveSecondsAgo</last_time_field>
+ <never_ending>N</never_ending>
+ <limit>1</limit>
+ <row_time_field>now</row_time_field>
<attributes/>
<GUI>
- <xloc>688</xloc>
+ <xloc>256</xloc>
<yloc>96</yloc>
</GUI>
</transform>
<transform>
- <name>No files found - Abort</name>
- <type>Abort</type>
+ <name>Get file names</name>
+ <type>GetFileNames</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
@@ -186,19 +188,31 @@ limitations under the License.
<method>none</method>
<schema_name/>
</partitioning>
- <abort_option>ABORT_WITH_ERROR</abort_option>
- <always_log_rows>Y</always_log_rows>
- <message>No files found</message>
- <row_threshold>0</row_threshold>
+ <isaddresult>N</isaddresult>
+ <doNotFailIfNoFile>N</doNotFailIfNoFile>
+ <filename_Field>dirname</filename_Field>
+ <dynamic_include_subfolders>N</dynamic_include_subfolders>
+ <wildcard_Field>wildcard</wildcard_Field>
+ <filefield>Y</filefield>
+ <file>
+ <file_required>N</file_required>
+ <include_subfolders>N</include_subfolders>
+ </file>
+ <filter>
+ <filterfiletype>all_files</filterfiletype>
+ </filter>
+ <rownum>N</rownum>
+ <raiseAnExceptionIfNoFile>N</raiseAnExceptionIfNoFile>
+ <limit>0</limit>
<attributes/>
<GUI>
- <xloc>688</xloc>
- <yloc>256</yloc>
+ <xloc>400</xloc>
+ <yloc>96</yloc>
</GUI>
</transform>
<transform>
- <name>Success</name>
- <type>Dummy</type>
+ <name>No files found - Abort</name>
+ <type>Abort</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
@@ -207,15 +221,19 @@ limitations under the License.
<method>none</method>
<schema_name/>
</partitioning>
+ <abort_option>ABORT_WITH_ERROR</abort_option>
+ <always_log_rows>Y</always_log_rows>
+ <message>No files found</message>
+ <row_threshold>0</row_threshold>
<attributes/>
<GUI>
- <xloc>816</xloc>
- <yloc>96</yloc>
+ <xloc>688</xloc>
+ <yloc>256</yloc>
</GUI>
</transform>
<transform>
- <name>Generate rows</name>
- <type>RowGenerator</type>
+ <name>Success</name>
+ <type>Dummy</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
@@ -224,40 +242,9 @@ limitations under the License.
<method>none</method>
<schema_name/>
</partitioning>
- <fields>
- <field>
- <currency/>
- <decimal/>
- <format/>
- <group/>
- <length>-1</length>
- <name>wildcard</name>
- <precision>-1</precision>
- <set_empty_string>N</set_empty_string>
- <type>String</type>
- <nullif>s.*.txt</nullif>
- </field>
- <field>
- <currency/>
- <decimal/>
- <format/>
- <group/>
- <length>-1</length>
- <name>dirname</name>
- <precision>-1</precision>
- <set_empty_string>N</set_empty_string>
- <type>String</type>
- <nullif>${PROJECT_HOME}/files</nullif>
- </field>
- </fields>
- <interval_in_ms>5000</interval_in_ms>
- <last_time_field>FiveSecondsAgo</last_time_field>
- <never_ending>N</never_ending>
- <limit>1</limit>
- <row_time_field>now</row_time_field>
<attributes/>
<GUI>
- <xloc>256</xloc>
+ <xloc>816</xloc>
<yloc>96</yloc>
</GUI>
</transform>
