fix: conflicts

emptyOVO · Sep 9, 2024 · b319062 · b319062
1 parent 8d513c2
commit b319062
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 361 deletions.
diff --git a/...sform-sdk/src/main/java/org/apache/inlong/sdk/transform/process/function/ChrFunction.java b/...sform-sdk/src/main/java/org/apache/inlong/sdk/transform/process/function/ChrFunction.java
diff --git a/...orm-sdk/src/main/java/org/apache/inlong/sdk/transform/process/function/LtrimFunction.java b/...orm-sdk/src/main/java/org/apache/inlong/sdk/transform/process/function/LtrimFunction.java
diff --git a/...orm-sdk/src/main/java/org/apache/inlong/sdk/transform/process/function/RtrimFunction.java b/...orm-sdk/src/main/java/org/apache/inlong/sdk/transform/process/function/RtrimFunction.java
diff --git a/...orm-sdk/src/test/java/org/apache/inlong/sdk/transform/process/TestBetweenAndOperator.java b/...orm-sdk/src/test/java/org/apache/inlong/sdk/transform/process/TestBetweenAndOperator.java
diff --git a/.../test/java/org/apache/inlong/sdk/transform/process/TestTransformChrFunctionProcessor.java b/.../test/java/org/apache/inlong/sdk/transform/process/TestTransformChrFunctionProcessor.java
diff --git a/...ic/TestTransformChrFunctionProcessor.java → .../function/arithmetic/TestChrFunction.java b/...ic/TestTransformChrFunctionProcessor.java → .../function/arithmetic/TestChrFunction.java
@@ -32,7 +32,7 @@
  * TestTransformChrFunctionProcessor
  * description: test chr functions in transform processor
  */
-public class TestTransformChrFunctionProcessor extends AbstractFunctionArithmeticTestBase {
+public class TestChrFunction extends AbstractFunctionArithmeticTestBase {
 
     @Test
     public void testChrFunction() throws Exception {