This is an automated email from the ASF dual-hosted git repository. luchunliang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push: new 6203004031 [INLONG-11105][SDK] Fix the empty string is converted to a "null" (#11106) 6203004031 is described below commit 6203004031d3109e32c6bb90231f5f3a5bacb84f Author: vernedeng <verned...@apache.org> AuthorDate: Sun Sep 15 19:48:14 2024 +0800 [INLONG-11105][SDK] Fix the empty string is converted to a "null" (#11106) * [INLONG-11105][SDK] Fix the empty string is converted into a "null" * fix ut * fix --- .../inlong/sdk/transform/process/TransformProcessor.java | 6 +++++- .../sdk/transform/process/TestParseUrlFunctionProcessor.java | 6 +++--- .../transform/process/TestTransformChrFunctionProcessor.java | 2 +- .../process/TestTransformConcatWsFunctionProcessor.java | 2 +- .../transform/process/function/arithmetic/TestBinFunction.java | 2 +- .../process/function/arithmetic/TestIfNullFunction.java | 2 +- .../transform/process/function/arithmetic/TestMd5Function.java | 2 +- .../process/function/arithmetic/TestSha2Function.java | 4 ++-- .../transform/process/function/arithmetic/TestShaFunction.java | 2 +- .../process/function/flowcontrol/TestNullIfFunction.java | 4 ++-- .../transform/process/function/string/TestAsciiFunction.java | 2 +- .../process/function/string/TestBitLengthFunction.java | 2 +- .../process/function/string/TestCompressFunction.java | 4 ++-- .../process/function/string/TestFromBase64Function.java | 2 +- .../transform/process/function/string/TestLcaseFunction.java | 2 +- .../transform/process/function/string/TestLeftFunction.java | 4 ++-- .../transform/process/function/string/TestLengthFunction.java | 2 +- .../transform/process/function/string/TestLocateFunction.java | 2 +- .../transform/process/function/string/TestLowerFunction.java | 2 +- .../transform/process/function/string/TestLpadFunction.java | 8 ++++---- .../transform/process/function/string/TestLtrimFunction.java | 2 +- .../transform/process/function/string/TestRightFunction.java | 4 ++-- .../transform/process/function/string/TestRpadFunction.java | 8 ++++---- .../transform/process/function/string/TestRtrimFunction.java | 2 +- .../transform/process/function/string/TestSpaceFunction.java | 2 +- .../process/function/string/TestSplitIndexFunction.java | 10 +++++----- .../transform/process/function/string/TestStrcmpFunction.java | 2 +- .../transform/process/function/string/TestUcaseFunction.java | 2 +- .../process/function/string/TestUnCompressFunction.java | 8 ++++---- .../transform/process/function/string/TestUpperFunction.java | 2 +- .../process/function/temporal/TestDateDiffFunction.java | 6 +++--- 31 files changed, 57 insertions(+), 53 deletions(-) diff --git a/inlong-sdk/transform-sdk/src/main/java/org/apache/inlong/sdk/transform/process/TransformProcessor.java b/inlong-sdk/transform-sdk/src/main/java/org/apache/inlong/sdk/transform/process/TransformProcessor.java index 32024ec1be..6d650cfd4a 100644 --- a/inlong-sdk/transform-sdk/src/main/java/org/apache/inlong/sdk/transform/process/TransformProcessor.java +++ b/inlong-sdk/transform-sdk/src/main/java/org/apache/inlong/sdk/transform/process/TransformProcessor.java @@ -177,7 +177,11 @@ public class TransformProcessor<I, O> { } try { Object fieldValue = parser.parse(sourceData, i, context); - sinkData.addField(fieldName, String.valueOf(fieldValue)); + if (fieldValue == null) { + sinkData.addField(fieldName, ""); + } else { + sinkData.addField(fieldName, fieldValue.toString()); + } } catch (Throwable t) { sinkData.addField(fieldName, ""); } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/TestParseUrlFunctionProcessor.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/TestParseUrlFunctionProcessor.java index 407fa72d0a..5850d50d4b 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/TestParseUrlFunctionProcessor.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/TestParseUrlFunctionProcessor.java @@ -111,7 +111,7 @@ public class TestParseUrlFunctionProcessor { List<String> output5 = processor5.transform("http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1|QUERY|k1|cloud|1", new HashMap<>()); Assert.assertEquals(1, output5.size()); - Assert.assertEquals(output5.get(0), "result=null"); + Assert.assertEquals(output5.get(0), "result="); String transformSql6 = "select parse_url(string1, string2, stringX) from source"; TransformConfig config6 = new TransformConfig(transformSql6); @@ -122,7 +122,7 @@ public class TestParseUrlFunctionProcessor { List<String> output6 = processor6.transform("http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1|QUERY|k1|cloud|1", new HashMap<>()); Assert.assertEquals(1, output6.size()); - Assert.assertEquals(output6.get(0), "result=null"); + Assert.assertEquals(output6.get(0), "result="); Assert.assertEquals(output3.get(0), "result=v1"); String transformSql7 = "select parse_url(string1, string2) from source"; @@ -145,7 +145,7 @@ public class TestParseUrlFunctionProcessor { List<String> output8 = processor8 .transform("http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1|USERINFO|k1|cloud|1", new HashMap<>()); Assert.assertEquals(1, output8.size()); - Assert.assertEquals(output8.get(0), "result=null"); + Assert.assertEquals(output8.get(0), "result="); String transformSql9 = "select parse_url(string1, string2) from source"; TransformConfig config9 = new TransformConfig(transformSql9); diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/TestTransformChrFunctionProcessor.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/TestTransformChrFunctionProcessor.java index f89ef4c3b2..4bf2fe8760 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/TestTransformChrFunctionProcessor.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/TestTransformChrFunctionProcessor.java @@ -80,6 +80,6 @@ public class TestTransformChrFunctionProcessor { // case3: chr(null) List<String> output3 = processor2.transform("|5|6|8|1|9", new HashMap<>()); Assert.assertEquals(1, output3.size()); - Assert.assertEquals(output3.get(0), "result=null"); + Assert.assertEquals(output3.get(0), "result="); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/TestTransformConcatWsFunctionProcessor.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/TestTransformConcatWsFunctionProcessor.java index 76c253ea61..fae6af0e0b 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/TestTransformConcatWsFunctionProcessor.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/TestTransformConcatWsFunctionProcessor.java @@ -95,7 +95,7 @@ public class TestTransformConcatWsFunctionProcessor { SinkEncoderFactory.createKvEncoder(kvSink)); List<String> output4 = processor4.transform("apple|null|cloud|extra", new HashMap<>()); Assert.assertEquals(1, output4.size()); - Assert.assertEquals(output4.get(0), "result=null"); + Assert.assertEquals(output4.get(0), "result="); // case 5: concat_ws('-', '', '', '') String transformSql5 = "select concat_ws('-', string1, string2, string3) from source"; diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestBinFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestBinFunction.java index be69e35b6f..bc793f57dc 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestBinFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestBinFunction.java @@ -48,6 +48,6 @@ public class TestBinFunction extends AbstractFunctionArithmeticTestBase { // case: bin() List<String> output2 = processor2.transform("1|2|3|4", new HashMap<>()); Assert.assertEquals(1, output1.size()); - Assert.assertEquals(output2.get(0), "result=null"); + Assert.assertEquals(output2.get(0), "result="); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestIfNullFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestIfNullFunction.java index 5e86e534e1..418ef5c41d 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestIfNullFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestIfNullFunction.java @@ -90,6 +90,6 @@ public class TestIfNullFunction extends AbstractFunctionArithmeticTestBase { data = "6|0|3|5"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestMd5Function.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestMd5Function.java index 47f3c92d00..b597cfc6fc 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestMd5Function.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestMd5Function.java @@ -59,6 +59,6 @@ public class TestMd5Function extends AbstractFunctionArithmeticTestBase { SinkEncoderFactory.createKvEncoder(kvSink)); List<String> output4 = processor.transform("1|4|6|8"); Assert.assertEquals(1, output4.size()); - Assert.assertEquals("result=null", output4.get(0)); + Assert.assertEquals("result=", output4.get(0)); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestSha2Function.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestSha2Function.java index 2007499a41..c87a66cd79 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestSha2Function.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestSha2Function.java @@ -46,7 +46,7 @@ public class TestSha2Function extends AbstractFunctionArithmeticTestBase { data = "|3|3|5"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); // case2: sha2("5",224) data = "5|224|3|5"; @@ -69,6 +69,6 @@ public class TestSha2Function extends AbstractFunctionArithmeticTestBase { data = "3|224|3|5"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestShaFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestShaFunction.java index 087a8e4456..3a256c3876 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestShaFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/arithmetic/TestShaFunction.java @@ -63,6 +63,6 @@ public class TestShaFunction extends AbstractFunctionArithmeticTestBase { data = "3|3|3|5"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/flowcontrol/TestNullIfFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/flowcontrol/TestNullIfFunction.java index 868e922cc9..8c3f1f5c34 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/flowcontrol/TestNullIfFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/flowcontrol/TestNullIfFunction.java @@ -53,7 +53,7 @@ public class TestNullIfFunction extends AbstractFunctionArithmeticTestBase { data = "5|5|3|5"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); // case3: nullif(null,3) transformSql = "select nullif(xxd,numeric2) from source"; @@ -64,6 +64,6 @@ public class TestNullIfFunction extends AbstractFunctionArithmeticTestBase { data = "5|3|3|5"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestAsciiFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestAsciiFunction.java index 10d0c4032b..35ee9bc4c9 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestAsciiFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestAsciiFunction.java @@ -57,6 +57,6 @@ public class TestAsciiFunction extends AbstractFunctionStringTestBase { // case3: ascii(null) -> null List<String> output2 = processor2.transform("A|el|EL|2|1|3", new HashMap<>()); Assert.assertEquals(1, output2.size()); - Assert.assertEquals(output2.get(0), "result=null"); + Assert.assertEquals(output2.get(0), "result="); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestBitLengthFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestBitLengthFunction.java index 70de7aa31c..88ef27b121 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestBitLengthFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestBitLengthFunction.java @@ -56,7 +56,7 @@ public class TestBitLengthFunction extends AbstractFunctionStringTestBase { // case3: bit_length(null) output1 = processor1.transform("hello world|apple|cloud|2|1|3", new HashMap<>()); Assert.assertEquals(1, output1.size()); - Assert.assertEquals("result=null", output1.get(0)); + Assert.assertEquals("result=", output1.get(0)); transformSql = "select bit_length(string1,string2) from source"; config = new TransformConfig(transformSql); diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestCompressFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestCompressFunction.java index 0b8b2f2f1e..dd01c06ecb 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestCompressFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestCompressFunction.java @@ -60,7 +60,7 @@ public class TestCompressFunction extends AbstractFunctionStringTestBase { // case3: length(compress(null)) output1 = processor1.transform("hello world|apple|cloud|2|1|3", new HashMap<>()); Assert.assertEquals(1, output1.size()); - Assert.assertEquals("result=null", output1.get(0)); + Assert.assertEquals("result=", output1.get(0)); transformSql = "select length(compress(string1,string2)) from source"; config = new TransformConfig(transformSql); @@ -80,6 +80,6 @@ public class TestCompressFunction extends AbstractFunctionStringTestBase { // case5: length(compress('hello world','undefinedType')) output1 = processor1.transform("hello world|undefinedType|cloud|2|1|3", new HashMap<>()); Assert.assertEquals(1, output1.size()); - Assert.assertEquals("result=null", output1.get(0)); + Assert.assertEquals("result=", output1.get(0)); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestFromBase64Function.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestFromBase64Function.java index 021ef381d7..e575439287 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestFromBase64Function.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestFromBase64Function.java @@ -51,7 +51,7 @@ public class TestFromBase64Function extends AbstractFunctionStringTestBase { // case2: from_base64(null) -> null List<String> output2 = processor2.transform("|apple|banana|cloud|1", new HashMap<>()); Assert.assertEquals(1, output2.size()); - Assert.assertEquals(output2.get(0), "result=null"); + Assert.assertEquals(output2.get(0), "result="); // case3: from_base64('QXBhY2hlIEluTG9uZw==') -> 'Apache InLong' List<String> output3 = processor.transform("QXBhY2hlIEluTG9uZw==|apple|banana|cloud|1", new HashMap<>()); diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLcaseFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLcaseFunction.java index 355afae2d3..1752de3810 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLcaseFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLcaseFunction.java @@ -59,6 +59,6 @@ public class TestLcaseFunction extends AbstractFunctionStringTestBase { SinkEncoderFactory.createKvEncoder(kvSink)); List<String> output3 = processor2.transform("ApPlE|", new HashMap<>()); Assert.assertEquals(1, output3.size()); - Assert.assertEquals(output3.get(0), "result=null"); + Assert.assertEquals(output3.get(0), "result="); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLeftFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLeftFunction.java index 6663c63d70..f07a205af5 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLeftFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLeftFunction.java @@ -64,7 +64,7 @@ public class TestLeftFunction extends AbstractFunctionStringTestBase { data = "hello world|banana|cloud|5|3|3"; output1 = processor1.transform(data, new HashMap<>()); Assert.assertEquals(1, output1.size()); - Assert.assertEquals("result=null", output1.get(0)); + Assert.assertEquals("result=", output1.get(0)); // case5: left('hello world',null) transformSql = "select left(string1,xxd) from source"; @@ -75,6 +75,6 @@ public class TestLeftFunction extends AbstractFunctionStringTestBase { data = "hello world|banana|cloud|5|3|3"; output1 = processor1.transform(data, new HashMap<>()); Assert.assertEquals(1, output1.size()); - Assert.assertEquals("result=null", output1.get(0)); + Assert.assertEquals("result=", output1.get(0)); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLengthFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLengthFunction.java index 1094c4f055..7181dcedf9 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLengthFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLengthFunction.java @@ -50,6 +50,6 @@ public class TestLengthFunction extends AbstractFunctionStringTestBase { // case2: length(null) output1 = processor1.transform("hello world|apple|cloud|2|1|3", new HashMap<>()); Assert.assertEquals(1, output1.size()); - Assert.assertEquals("result=null", output1.get(0)); + Assert.assertEquals("result=", output1.get(0)); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLocateFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLocateFunction.java index ca21214bc4..f8663d2062 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLocateFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLocateFunction.java @@ -61,6 +61,6 @@ public class TestLocateFunction extends AbstractFunctionStringTestBase { // case5: locate('app', null) List<String> output5 = processor1.transform("app", new HashMap<>()); Assert.assertEquals(1, output5.size()); - Assert.assertEquals(output5.get(0), "result=null"); + Assert.assertEquals(output5.get(0), "result="); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLowerFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLowerFunction.java index 8050372a3c..211eeaf3f8 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLowerFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLowerFunction.java @@ -55,6 +55,6 @@ public class TestLowerFunction extends AbstractFunctionStringTestBase { SinkEncoderFactory.createKvEncoder(kvSink)); List<String> output3 = processor2.transform("ApPlE|banana|cloud|2|1|3", new HashMap<>()); Assert.assertEquals(1, output3.size()); - Assert.assertEquals(output3.get(0), "result=null"); + Assert.assertEquals(output3.get(0), "result="); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLpadFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLpadFunction.java index 333683aa75..df77623240 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLpadFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLpadFunction.java @@ -64,7 +64,7 @@ public class TestLpadFunction extends AbstractFunctionStringTestBase { data = "he|xxd|cloud|-1|3|3"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); // case5: lpad(null,5,'xxd') transformSql = "select lpad(xxd,numeric1,string2) from source"; @@ -75,7 +75,7 @@ public class TestLpadFunction extends AbstractFunctionStringTestBase { data = "he|xxd|cloud|5|3|3"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); // case6: lpad('he',null,'xxd') transformSql = "select lpad(string1,xxd,string2) from source"; @@ -86,7 +86,7 @@ public class TestLpadFunction extends AbstractFunctionStringTestBase { data = "he|xxd|cloud|5|3|3"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); // case7: lpad('he',5,null) transformSql = "select lpad(string1,numeric1,xxd) from source"; @@ -97,6 +97,6 @@ public class TestLpadFunction extends AbstractFunctionStringTestBase { data = "he|xxd|cloud|5|3|3"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLtrimFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLtrimFunction.java index 9697738d8d..07e66485de 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLtrimFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestLtrimFunction.java @@ -65,6 +65,6 @@ public class TestLtrimFunction extends AbstractFunctionStringTestBase { data = " in long|xxd|cloud|7|3|3"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestRightFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestRightFunction.java index 9728fda896..92eb54a197 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestRightFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestRightFunction.java @@ -64,7 +64,7 @@ public class TestRightFunction extends AbstractFunctionStringTestBase { data = "hello world|banana|cloud|5|3|3"; output1 = processor1.transform(data, new HashMap<>()); Assert.assertEquals(1, output1.size()); - Assert.assertEquals("result=null", output1.get(0)); + Assert.assertEquals("result=", output1.get(0)); // case5: right('hello world',null) transformSql = "select right(string1,xxd) from source"; @@ -75,6 +75,6 @@ public class TestRightFunction extends AbstractFunctionStringTestBase { data = "hello world|banana|cloud|5|3|3"; output1 = processor1.transform(data, new HashMap<>()); Assert.assertEquals(1, output1.size()); - Assert.assertEquals("result=null", output1.get(0)); + Assert.assertEquals("result=", output1.get(0)); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestRpadFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestRpadFunction.java index 7a58a8be43..833332aced 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestRpadFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestRpadFunction.java @@ -64,7 +64,7 @@ public class TestRpadFunction extends AbstractFunctionStringTestBase { data = "he|xxd|cloud|-1|3|3"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); // case5: rpad(null,5,'xxd') transformSql = "select rpad(xxd,numeric1,string2) from source"; @@ -75,7 +75,7 @@ public class TestRpadFunction extends AbstractFunctionStringTestBase { data = "he|xxd|cloud|5|3|3"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); // case6: rpad('he',null,'xxd') transformSql = "select rpad(string1,xxd,string2) from source"; @@ -86,7 +86,7 @@ public class TestRpadFunction extends AbstractFunctionStringTestBase { data = "he|xxd|cloud|5|3|3"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); // case7: rpad('he',5,null) transformSql = "select rpad(string1,numeric1,xxd) from source"; @@ -97,6 +97,6 @@ public class TestRpadFunction extends AbstractFunctionStringTestBase { data = "he|xxd|cloud|5|3|3"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestRtrimFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestRtrimFunction.java index 823a200f22..c92cb23665 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestRtrimFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestRtrimFunction.java @@ -65,6 +65,6 @@ public class TestRtrimFunction extends AbstractFunctionStringTestBase { data = " in long|xxd|cloud|7|3|3"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestSpaceFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestSpaceFunction.java index 308c54236c..70185604ad 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestSpaceFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestSpaceFunction.java @@ -63,7 +63,7 @@ public class TestSpaceFunction extends AbstractFunctionStringTestBase { data = "hello world|banana|cloud|5|3|3"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestSplitIndexFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestSplitIndexFunction.java index 1ad949aaa4..773f91f616 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestSplitIndexFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestSplitIndexFunction.java @@ -48,13 +48,13 @@ public class TestSplitIndexFunction extends AbstractFunctionStringTestBase { data = "a,b,c|,|cloud|-1|3|3"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); // case3: split_index('a,b,c', ',', 3) data = "a,b,c|,|cloud|3|3|3"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); // case4: split_index(null, ',', 1) transformSql = "select split_index(xxd, string2, numeric1) from source"; @@ -65,7 +65,7 @@ public class TestSplitIndexFunction extends AbstractFunctionStringTestBase { data = "abc|,|cloud|1|3|3"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); // case5: split_index('a,b,c', null, 1) transformSql = "select split_index(string1, xxd, numeric1) from source"; @@ -76,7 +76,7 @@ public class TestSplitIndexFunction extends AbstractFunctionStringTestBase { data = "a,b,c|xxd|cloud|1|3|3"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); // case6: split_index('a,b,c', ',', null) transformSql = "select split_index(string1, string2, xxd) from source"; @@ -87,7 +87,7 @@ public class TestSplitIndexFunction extends AbstractFunctionStringTestBase { data = "a,b,c|,|cloud|xxd|3|3"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); // case7: split_index('', ',', 0) transformSql = "select split_index(string1, string2, numeric1) from source"; diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestStrcmpFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestStrcmpFunction.java index 3534da6189..58817407f6 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestStrcmpFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestStrcmpFunction.java @@ -69,6 +69,6 @@ public class TestStrcmpFunction extends AbstractFunctionStringTestBase { data = "hello world|zzzzz|cloud|5|3|3"; output = processor.transform(data, new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestUcaseFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestUcaseFunction.java index c132f0e629..d53cc98210 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestUcaseFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestUcaseFunction.java @@ -59,6 +59,6 @@ public class TestUcaseFunction extends AbstractFunctionStringTestBase { SinkEncoderFactory.createKvEncoder(kvSink)); List<String> output3 = processor2.transform("ApPlE", new HashMap<>()); Assert.assertEquals(1, output3.size()); - Assert.assertEquals(output3.get(0), "result=null"); + Assert.assertEquals(output3.get(0), "result="); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestUnCompressFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestUnCompressFunction.java index 2e7091709e..9f4d9e5917 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestUnCompressFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestUnCompressFunction.java @@ -60,7 +60,7 @@ public class TestUnCompressFunction extends AbstractFunctionStringTestBase { // case3: uncompress(compress(null)) output1 = processor1.transform("h|apple|cloud|2|1|3", new HashMap<>()); Assert.assertEquals(1, output1.size()); - Assert.assertEquals("result=null", output1.get(0)); + Assert.assertEquals("result=", output1.get(0)); transformSql = "select uncompress(compress(string1)) from source"; config = new TransformConfig(transformSql); @@ -95,16 +95,16 @@ public class TestUnCompressFunction extends AbstractFunctionStringTestBase { // case7: uncompress(compress(null,'Gzip'),'Gzip') output1 = processor1.transform("hello world|Gzip|Gzip|2|1|3", new HashMap<>()); Assert.assertEquals(1, output1.size()); - Assert.assertEquals("result=null", output1.get(0)); + Assert.assertEquals("result=", output1.get(0)); // case8: uncompress(compress(null,'zip'),'zip') output1 = processor1.transform("hello world|zip|zip|2|1|3", new HashMap<>()); Assert.assertEquals(1, output1.size()); - Assert.assertEquals("result=null", output1.get(0)); + Assert.assertEquals("result=", output1.get(0)); // case8: uncompress(compress(null,'zip'),'undefinedType') output1 = processor1.transform("hello world|zip|undefinedType|2|1|3", new HashMap<>()); Assert.assertEquals(1, output1.size()); - Assert.assertEquals("result=null", output1.get(0)); + Assert.assertEquals("result=", output1.get(0)); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestUpperFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestUpperFunction.java index b4fd923ebd..242458c1d7 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestUpperFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/string/TestUpperFunction.java @@ -55,6 +55,6 @@ public class TestUpperFunction extends AbstractFunctionStringTestBase { SinkEncoderFactory.createKvEncoder(kvSink)); List<String> output3 = processor2.transform("ApPlE|banana|cloud|2|1|3", new HashMap<>()); Assert.assertEquals(1, output3.size()); - Assert.assertEquals(output3.get(0), "result=null"); + Assert.assertEquals(output3.get(0), "result="); } } diff --git a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/temporal/TestDateDiffFunction.java b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/temporal/TestDateDiffFunction.java index 6887d855dc..d1daefb4f0 100644 --- a/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/temporal/TestDateDiffFunction.java +++ b/inlong-sdk/transform-sdk/src/test/java/org/apache/inlong/sdk/transform/process/function/temporal/TestDateDiffFunction.java @@ -60,12 +60,12 @@ public class TestDateDiffFunction extends AbstractFunctionTemporalTestBase { // case4: datediff('2018-12-10 12:30:00', '') output = processor.transform("2018-12-10 12:30:00|", new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); // case5: datediff('2018-12', '2018-12-12') output = processor.transform("2018-12|2018-12-12", new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); // case6: datediff('1970-01-01',null) transformSql = "select datediff(string1,xxd) from source"; @@ -75,6 +75,6 @@ public class TestDateDiffFunction extends AbstractFunctionTemporalTestBase { SinkEncoderFactory.createKvEncoder(kvSink)); output = processor.transform("1970-01-01|1970-01-02", new HashMap<>()); Assert.assertEquals(1, output.size()); - Assert.assertEquals("result=null", output.get(0)); + Assert.assertEquals("result=", output.get(0)); } }