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 181fb96346 HOP-4126 added timezone to encoded/decoded base64 date
new ad825d3d90 Merge pull request #1651 from bamaer/HOP-4126
181fb96346 is described below
commit 181fb963461a0fc927dcc6e44e55c50e39f8596b
Author: Bart Maertens <[email protected]>
AuthorDate: Mon Aug 22 09:58:58 2022 +0200
HOP-4126 added timezone to encoded/decoded base64 date
---
.../transforms/0011-calculator-base64.hpl | 37 ++++++++++++++++------
.../datasets/golden-calculator-base64.csv | 2 +-
.../metadata/dataset/golden-calculator-base64.json | 4 +--
3 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/integration-tests/transforms/0011-calculator-base64.hpl
b/integration-tests/transforms/0011-calculator-base64.hpl
index 3295d3a7f8..3c628a8970 100644
--- a/integration-tests/transforms/0011-calculator-base64.hpl
+++ b/integration-tests/transforms/0011-calculator-base64.hpl
@@ -41,8 +41,8 @@ limitations under the License.
</notepads>
<order>
<hop>
- <from>encode</from>
- <to>decode</to>
+ <from>clean</from>
+ <to>verify</to>
<enabled>Y</enabled>
</hop>
<hop>
@@ -51,13 +51,13 @@ limitations under the License.
<enabled>Y</enabled>
</hop>
<hop>
- <from>decode</from>
- <to>clean</to>
+ <from>encode</from>
+ <to>decode</to>
<enabled>Y</enabled>
</hop>
<hop>
- <from>clean</from>
- <to>verify</to>
+ <from>decode</from>
+ <to>clean</to>
<enabled>Y</enabled>
</hop>
</order>
@@ -92,10 +92,27 @@ limitations under the License.
<name>decodedString</name>
</field>
<select_unspecified>N</select_unspecified>
+ <meta>
+ <name>decodedDate</name>
+ <rename>decodedDate</rename>
+ <type>Date</type>
+ <length>-2</length>
+ <precision>-2</precision>
+ <conversion_mask>EEE MMM dd HH:mm:ss ZZZ yyyy</conversion_mask>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone>UTC</date_format_timezone>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
</fields>
<attributes/>
<GUI>
- <xloc>496</xloc>
+ <xloc>445</xloc>
<yloc>80</yloc>
</GUI>
</transform>
@@ -167,7 +184,7 @@ limitations under the License.
</calculation>
<attributes/>
<GUI>
- <xloc>368</xloc>
+ <xloc>334</xloc>
<yloc>80</yloc>
</GUI>
</transform>
@@ -235,7 +252,7 @@ limitations under the License.
</calculation>
<attributes/>
<GUI>
- <xloc>240</xloc>
+ <xloc>223</xloc>
<yloc>80</yloc>
</GUI>
</transform>
@@ -324,7 +341,7 @@ limitations under the License.
</partitioning>
<attributes/>
<GUI>
- <xloc>608</xloc>
+ <xloc>556</xloc>
<yloc>80</yloc>
</GUI>
</transform>
diff --git a/integration-tests/transforms/datasets/golden-calculator-base64.csv
b/integration-tests/transforms/datasets/golden-calculator-base64.csv
index 687e2066d6..0807f90705 100644
--- a/integration-tests/transforms/datasets/golden-calculator-base64.csv
+++ b/integration-tests/transforms/datasets/golden-calculator-base64.csv
@@ -1,2 +1,2 @@
decodedBool,decodedDate,decodedInt,decodedNull,decodedNumber,decodedString
-N,Wed Aug 17 00:00:00 CEST 2022,123456,,12.34,abcd
+N,Wed Aug 17 00:00:00 +0200 2022,123456,,12.34,abcd
diff --git
a/integration-tests/transforms/metadata/dataset/golden-calculator-base64.json
b/integration-tests/transforms/metadata/dataset/golden-calculator-base64.json
index cc1fbf3193..58046984a5 100644
---
a/integration-tests/transforms/metadata/dataset/golden-calculator-base64.json
+++
b/integration-tests/transforms/metadata/dataset/golden-calculator-base64.json
@@ -14,9 +14,9 @@
{
"field_comment": "Base64 Decode",
"field_length": -1,
- "field_type": 2,
+ "field_type": 3,
"field_precision": -1,
- "field_format": "",
+ "field_format": "EEE MMM dd HH:mm:ss ZZZ yyyy",
"field_name": "decodedDate"
},
{
