You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/04/20 01:58:25 UTC
[incubator-inlong] branch master updated: [INLONG-3805][Sort] Add operators definition to support transform (#3820)
This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new a683bfe51 [INLONG-3805][Sort] Add operators definition to support transform (#3820)
a683bfe51 is described below
commit a683bfe512158f123056990c327b59c953b6623f
Author: yunqingmoswu <44...@users.noreply.github.com>
AuthorDate: Wed Apr 20 09:58:18 2022 +0800
[INLONG-3805][Sort] Add operators definition to support transform (#3820)
* Add AndOperator definition to support transform feature
* Add operators definition to support transform
* Fix unit test error
---
.../protocol/transformation/CompareOperator.java | 23 ++++++++
.../protocol/transformation/FunctionParam.java | 26 +++++++++
.../protocol/transformation/LogicOperator.java | 9 +++
.../transformation/MultiValueCompareOperator.java | 7 +++
.../sort/protocol/transformation/Operator.java | 29 ++++++++++
.../transformation/SingleValueCompareOperator.java | 19 +++++++
.../{Operator.java => operator/AndOperator.java} | 33 +++++++----
.../{Operator.java => operator/EmptyOperator.java} | 33 +++++++----
.../{Operator.java => operator/EqualOperator.java} | 33 +++++++----
.../{Operator.java => operator/InOperator.java} | 36 ++++++++----
.../IsNotNullOperator.java} | 33 +++++++----
.../IsNullOperator.java} | 33 +++++++----
.../LessThanOperator.java} | 33 +++++++----
.../LessThanOrEqualOperator.java} | 33 +++++++----
.../MoreThanOperator.java} | 33 +++++++----
.../MoreThanOrEqualOperator.java} | 33 +++++++----
.../NotEqualOperator.java} | 33 +++++++----
.../{Operator.java => operator/NotInOperator.java} | 36 ++++++++----
.../{Operator.java => operator/OrOperator.java} | 33 +++++++----
.../transformation/operator/AndOperatorTest.java} | 23 ++++----
.../operator/EmptyOperatorTest.java} | 23 ++++----
.../operator/EqualOperatorTest.java} | 23 ++++----
.../transformation/operator/InOperatorTest.java} | 23 ++++----
.../operator/IsNotNullOperatorTest.java} | 23 ++++----
.../operator/IsNullOperatorTest.java} | 23 ++++----
.../operator/LessThanOperatorTest.java} | 23 ++++----
.../operator/LessThanOrEqualOperatorTest.java} | 23 ++++----
.../operator/MoreThanOperatorTest.java} | 23 ++++----
.../operator/MoreThanOrEqualOperatorTest.java} | 23 ++++----
.../operator/NotEqualOperatorTest.java} | 23 ++++----
.../operator/NotInOperatorTest.java} | 23 ++++----
.../transformation/operator/OperatorBaseTest.java | 65 ++++++++++++++++++++++
.../transformation/operator/OrOperatorTest.java} | 23 ++++----
33 files changed, 628 insertions(+), 284 deletions(-)
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/CompareOperator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/CompareOperator.java
index 2542c74fb..b09e7ff08 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/CompareOperator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/CompareOperator.java
@@ -17,12 +17,35 @@
package org.apache.inlong.sort.protocol.transformation;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.operator.EqualOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.InOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.IsNotNullOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.IsNullOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.LessThanOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.LessThanOrEqualOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.MoreThanOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.MoreThanOrEqualOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.NotEqualOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.NotInOperator;
@JsonTypeInfo(
use = JsonTypeInfo.Id.NAME,
include = JsonTypeInfo.As.PROPERTY,
property = "type")
+@JsonSubTypes({
+ @JsonSubTypes.Type(value = EqualOperator.class, name = "equal"),
+ @JsonSubTypes.Type(value = NotEqualOperator.class, name = "notEqual"),
+ @JsonSubTypes.Type(value = IsNotNullOperator.class, name = "isNotNull"),
+ @JsonSubTypes.Type(value = IsNullOperator.class, name = "isNull"),
+ @JsonSubTypes.Type(value = LessThanOperator.class, name = "lessThan"),
+ @JsonSubTypes.Type(value = LessThanOrEqualOperator.class, name = "lessThanOrEqual"),
+ @JsonSubTypes.Type(value = MoreThanOperator.class, name = "moreThan"),
+ @JsonSubTypes.Type(value = MoreThanOrEqualOperator.class, name = "moreThanOrEqual"),
+ @JsonSubTypes.Type(value = InOperator.class, name = "in"),
+ @JsonSubTypes.Type(value = NotInOperator.class, name = "notIn")
+})
public interface CompareOperator extends Operator {
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/FunctionParam.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/FunctionParam.java
index dbe39c852..2c2e767a6 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/FunctionParam.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/FunctionParam.java
@@ -22,6 +22,19 @@ import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSub
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
import org.apache.inlong.sort.protocol.BuiltInFieldInfo;
import org.apache.inlong.sort.protocol.FieldInfo;
+import org.apache.inlong.sort.protocol.transformation.operator.AndOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.EmptyOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.EqualOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.InOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.IsNotNullOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.IsNullOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.LessThanOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.LessThanOrEqualOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.MoreThanOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.MoreThanOrEqualOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.NotEqualOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.NotInOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.OrOperator;
@JsonTypeInfo(
use = JsonTypeInfo.Id.NAME,
@@ -32,6 +45,19 @@ import org.apache.inlong.sort.protocol.FieldInfo;
@JsonSubTypes.Type(value = BuiltInFieldInfo.class, name = "builtin"),
@JsonSubTypes.Type(value = ConstantParam.class, name = "constant"),
@JsonSubTypes.Type(value = TimeUnitConstantParam.class, name = "timeUnitConstant"),
+ @JsonSubTypes.Type(value = AndOperator.class, name = "and"),
+ @JsonSubTypes.Type(value = OrOperator.class, name = "or"),
+ @JsonSubTypes.Type(value = EmptyOperator.class, name = "empty"),
+ @JsonSubTypes.Type(value = EqualOperator.class, name = "equal"),
+ @JsonSubTypes.Type(value = NotEqualOperator.class, name = "notEqual"),
+ @JsonSubTypes.Type(value = IsNotNullOperator.class, name = "isNotNull"),
+ @JsonSubTypes.Type(value = IsNullOperator.class, name = "isNull"),
+ @JsonSubTypes.Type(value = LessThanOperator.class, name = "lessThan"),
+ @JsonSubTypes.Type(value = LessThanOrEqualOperator.class, name = "lessThanOrEqual"),
+ @JsonSubTypes.Type(value = MoreThanOperator.class, name = "moreThan"),
+ @JsonSubTypes.Type(value = MoreThanOrEqualOperator.class, name = "moreThanOrEqual"),
+ @JsonSubTypes.Type(value = InOperator.class, name = "in"),
+ @JsonSubTypes.Type(value = NotInOperator.class, name = "notIn"),
@JsonSubTypes.Type(value = WatermarkField.class, name = "watermark")
})
public interface FunctionParam {
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/LogicOperator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/LogicOperator.java
index 23eb73489..0780337c3 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/LogicOperator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/LogicOperator.java
@@ -17,12 +17,21 @@
package org.apache.inlong.sort.protocol.transformation;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.operator.AndOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.EmptyOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.OrOperator;
@JsonTypeInfo(
use = JsonTypeInfo.Id.NAME,
include = JsonTypeInfo.As.PROPERTY,
property = "type")
+@JsonSubTypes({
+ @JsonSubTypes.Type(value = AndOperator.class, name = "and"),
+ @JsonSubTypes.Type(value = OrOperator.class, name = "or"),
+ @JsonSubTypes.Type(value = EmptyOperator.class, name = "empty")
+})
public interface LogicOperator extends Operator {
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/MultiValueCompareOperator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/MultiValueCompareOperator.java
index e9cdb8f8b..71df6c7f8 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/MultiValueCompareOperator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/MultiValueCompareOperator.java
@@ -17,12 +17,19 @@
package org.apache.inlong.sort.protocol.transformation;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.operator.InOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.NotInOperator;
@JsonTypeInfo(
use = JsonTypeInfo.Id.NAME,
include = JsonTypeInfo.As.PROPERTY,
property = "type")
+@JsonSubTypes({
+ @JsonSubTypes.Type(value = InOperator.class, name = "in"),
+ @JsonSubTypes.Type(value = NotInOperator.class, name = "notIn")
+})
public interface MultiValueCompareOperator extends CompareOperator {
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
index 2c0a4bd07..e73953a97 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
@@ -17,12 +17,41 @@
package org.apache.inlong.sort.protocol.transformation;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.operator.AndOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.EmptyOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.EqualOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.InOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.IsNotNullOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.IsNullOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.LessThanOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.LessThanOrEqualOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.MoreThanOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.MoreThanOrEqualOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.NotEqualOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.NotInOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.OrOperator;
@JsonTypeInfo(
use = JsonTypeInfo.Id.NAME,
include = JsonTypeInfo.As.PROPERTY,
property = "type")
+@JsonSubTypes({
+ @JsonSubTypes.Type(value = AndOperator.class, name = "and"),
+ @JsonSubTypes.Type(value = OrOperator.class, name = "or"),
+ @JsonSubTypes.Type(value = EmptyOperator.class, name = "empty"),
+ @JsonSubTypes.Type(value = EqualOperator.class, name = "equal"),
+ @JsonSubTypes.Type(value = NotEqualOperator.class, name = "notEqual"),
+ @JsonSubTypes.Type(value = IsNotNullOperator.class, name = "isNotNull"),
+ @JsonSubTypes.Type(value = IsNullOperator.class, name = "isNull"),
+ @JsonSubTypes.Type(value = LessThanOperator.class, name = "lessThan"),
+ @JsonSubTypes.Type(value = LessThanOrEqualOperator.class, name = "lessThanOrEqual"),
+ @JsonSubTypes.Type(value = MoreThanOperator.class, name = "moreThan"),
+ @JsonSubTypes.Type(value = MoreThanOrEqualOperator.class, name = "moreThanOrEqual"),
+ @JsonSubTypes.Type(value = InOperator.class, name = "in"),
+ @JsonSubTypes.Type(value = NotInOperator.class, name = "notIn")
+})
public interface Operator extends FunctionParam {
@Override
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/SingleValueCompareOperator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/SingleValueCompareOperator.java
index e45ba717e..7789441cc 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/SingleValueCompareOperator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/SingleValueCompareOperator.java
@@ -17,12 +17,31 @@
package org.apache.inlong.sort.protocol.transformation;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.operator.EqualOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.IsNotNullOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.IsNullOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.LessThanOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.LessThanOrEqualOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.MoreThanOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.MoreThanOrEqualOperator;
+import org.apache.inlong.sort.protocol.transformation.operator.NotEqualOperator;
@JsonTypeInfo(
use = JsonTypeInfo.Id.NAME,
include = JsonTypeInfo.As.PROPERTY,
property = "type")
+@JsonSubTypes({
+ @JsonSubTypes.Type(value = EqualOperator.class, name = "equal"),
+ @JsonSubTypes.Type(value = NotEqualOperator.class, name = "notEqual"),
+ @JsonSubTypes.Type(value = IsNotNullOperator.class, name = "isNotNull"),
+ @JsonSubTypes.Type(value = IsNullOperator.class, name = "isNull"),
+ @JsonSubTypes.Type(value = LessThanOperator.class, name = "lessThan"),
+ @JsonSubTypes.Type(value = LessThanOrEqualOperator.class, name = "lessThanOrEqual"),
+ @JsonSubTypes.Type(value = MoreThanOperator.class, name = "moreThan"),
+ @JsonSubTypes.Type(value = MoreThanOrEqualOperator.class, name = "moreThanOrEqual")
+})
public interface SingleValueCompareOperator extends CompareOperator {
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/AndOperator.java
similarity index 56%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/AndOperator.java
index 2c0a4bd07..078ea867f 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/AndOperator.java
@@ -15,22 +15,31 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeName;
+import org.apache.inlong.sort.protocol.transformation.LogicOperator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+import java.io.Serializable;
- @Override
- default String getName() {
- return "operator";
+@JsonTypeName("and")
+@Data
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class AndOperator implements LogicOperator, Serializable {
+
+ private static final long serialVersionUID = 1753460543103193203L;
+
+ private static final AndOperator INSTANCE = new AndOperator();
+
+ public static AndOperator getInstance() {
+ return INSTANCE;
}
@Override
- String format();
-
+ public String format() {
+ return "AND";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/EmptyOperator.java
similarity index 56%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/EmptyOperator.java
index 2c0a4bd07..8341e20c8 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/EmptyOperator.java
@@ -15,22 +15,31 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeName;
+import org.apache.inlong.sort.protocol.transformation.LogicOperator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+import java.io.Serializable;
- @Override
- default String getName() {
- return "operator";
+@JsonTypeName("empty")
+@Data
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class EmptyOperator implements LogicOperator, Serializable {
+
+ private static final long serialVersionUID = -6879494992609865493L;
+
+ private static final EmptyOperator INSTANCE = new EmptyOperator();
+
+ public static EmptyOperator getInstance() {
+ return INSTANCE;
}
@Override
- String format();
-
+ public String format() {
+ return "";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/EqualOperator.java
similarity index 55%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/EqualOperator.java
index 2c0a4bd07..aacfc1f34 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/EqualOperator.java
@@ -15,22 +15,31 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeName;
+import org.apache.inlong.sort.protocol.transformation.SingleValueCompareOperator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+import java.io.Serializable;
- @Override
- default String getName() {
- return "operator";
+@JsonTypeName("equal")
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@Data
+public class EqualOperator implements SingleValueCompareOperator, Serializable {
+
+ private static final long serialVersionUID = -1098367949098922950L;
+
+ private static final EqualOperator INSTANCE = new EqualOperator();
+
+ public static EqualOperator getInstance() {
+ return INSTANCE;
}
@Override
- String format();
-
+ public String format() {
+ return "=";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/InOperator.java
similarity index 54%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/InOperator.java
index 2c0a4bd07..5a31441f8 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/InOperator.java
@@ -15,22 +15,36 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeName;
+import org.apache.inlong.sort.protocol.transformation.MultiValueCompareOperator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+import java.io.Serializable;
- @Override
- default String getName() {
- return "operator";
+@JsonTypeName("in")
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@Data
+public class InOperator implements MultiValueCompareOperator, Serializable {
+
+ private static final long serialVersionUID = 8080256460638878190L;
+
+ private static final InOperator INSTANCE = new InOperator();
+
+ public static InOperator getInstance() {
+ return INSTANCE;
}
@Override
- String format();
+ public String getName() {
+ return "IN";
+ }
+ @Override
+ public String format() {
+ return getName();
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/IsNotNullOperator.java
similarity index 54%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/IsNotNullOperator.java
index 2c0a4bd07..2ba8b910f 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/IsNotNullOperator.java
@@ -15,22 +15,31 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeName;
+import org.apache.inlong.sort.protocol.transformation.SingleValueCompareOperator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+import java.io.Serializable;
- @Override
- default String getName() {
- return "operator";
+@JsonTypeName("isNotNull")
+@Data
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class IsNotNullOperator implements SingleValueCompareOperator, Serializable {
+
+ private static final long serialVersionUID = -4726896495529204485L;
+
+ private static final IsNotNullOperator INSTANCE = new IsNotNullOperator();
+
+ public static IsNotNullOperator getInstance() {
+ return INSTANCE;
}
@Override
- String format();
-
+ public String format() {
+ return "IS NOT NULL";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/IsNullOperator.java
similarity index 55%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/IsNullOperator.java
index 2c0a4bd07..7c685f5fa 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/IsNullOperator.java
@@ -15,22 +15,31 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeName;
+import org.apache.inlong.sort.protocol.transformation.SingleValueCompareOperator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+import java.io.Serializable;
- @Override
- default String getName() {
- return "operator";
+@JsonTypeName("isNull")
+@Data
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class IsNullOperator implements SingleValueCompareOperator, Serializable {
+
+ private static final long serialVersionUID = 3717205614011343457L;
+
+ private static final IsNullOperator INSTANCE = new IsNullOperator();
+
+ public static IsNullOperator getInstance() {
+ return INSTANCE;
}
@Override
- String format();
-
+ public String format() {
+ return "IS NULL";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/LessThanOperator.java
similarity index 55%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/LessThanOperator.java
index 2c0a4bd07..4ce94c7c1 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/LessThanOperator.java
@@ -15,22 +15,31 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeName;
+import org.apache.inlong.sort.protocol.transformation.SingleValueCompareOperator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+import java.io.Serializable;
- @Override
- default String getName() {
- return "operator";
+@JsonTypeName("lessThan")
+@Data
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class LessThanOperator implements SingleValueCompareOperator, Serializable {
+
+ private static final long serialVersionUID = -6691600249649956571L;
+
+ private static final LessThanOperator INSTANCE = new LessThanOperator();
+
+ public static LessThanOperator getInstance() {
+ return INSTANCE;
}
@Override
- String format();
-
+ public String format() {
+ return "<";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/LessThanOrEqualOperator.java
similarity index 53%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/LessThanOrEqualOperator.java
index 2c0a4bd07..dc36e8ba8 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/LessThanOrEqualOperator.java
@@ -15,22 +15,31 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeName;
+import org.apache.inlong.sort.protocol.transformation.SingleValueCompareOperator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+import java.io.Serializable;
- @Override
- default String getName() {
- return "operator";
+@JsonTypeName("lessThanOrEqual")
+@Data
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class LessThanOrEqualOperator implements SingleValueCompareOperator, Serializable {
+
+ private static final long serialVersionUID = 4332523327041411866L;
+
+ private static final LessThanOrEqualOperator INSTANCE = new LessThanOrEqualOperator();
+
+ public static LessThanOrEqualOperator getInstance() {
+ return INSTANCE;
}
@Override
- String format();
-
+ public String format() {
+ return "<=";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/MoreThanOperator.java
similarity index 55%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/MoreThanOperator.java
index 2c0a4bd07..24ea7e168 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/MoreThanOperator.java
@@ -15,22 +15,31 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeName;
+import org.apache.inlong.sort.protocol.transformation.SingleValueCompareOperator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+import java.io.Serializable;
- @Override
- default String getName() {
- return "operator";
+@JsonTypeName("moreThan")
+@Data
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class MoreThanOperator implements SingleValueCompareOperator, Serializable {
+
+ private static final long serialVersionUID = 3857765441746772170L;
+
+ private static final MoreThanOperator INSTANCE = new MoreThanOperator();
+
+ public static MoreThanOperator getInstance() {
+ return INSTANCE;
}
@Override
- String format();
-
+ public String format() {
+ return ">";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/MoreThanOrEqualOperator.java
similarity index 53%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/MoreThanOrEqualOperator.java
index 2c0a4bd07..12e4be322 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/MoreThanOrEqualOperator.java
@@ -15,22 +15,31 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeName;
+import org.apache.inlong.sort.protocol.transformation.SingleValueCompareOperator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+import java.io.Serializable;
- @Override
- default String getName() {
- return "operator";
+@JsonTypeName("moreThanOrEqual")
+@Data
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class MoreThanOrEqualOperator implements SingleValueCompareOperator, Serializable {
+
+ private static final long serialVersionUID = -4691873310038875147L;
+
+ private static final MoreThanOrEqualOperator INSTANCE = new MoreThanOrEqualOperator();
+
+ public static MoreThanOrEqualOperator getInstance() {
+ return INSTANCE;
}
@Override
- String format();
-
+ public String format() {
+ return ">=";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/NotEqualOperator.java
similarity index 55%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/NotEqualOperator.java
index 2c0a4bd07..7fdfaa6e9 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/NotEqualOperator.java
@@ -15,22 +15,31 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeName;
+import org.apache.inlong.sort.protocol.transformation.SingleValueCompareOperator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+import java.io.Serializable;
- @Override
- default String getName() {
- return "operator";
+@JsonTypeName("notEqual")
+@Data
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class NotEqualOperator implements SingleValueCompareOperator, Serializable {
+
+ private static final long serialVersionUID = 8020325187907699008L;
+
+ private static final NotEqualOperator INSTANCE = new NotEqualOperator();
+
+ public static NotEqualOperator getInstance() {
+ return INSTANCE;
}
@Override
- String format();
-
+ public String format() {
+ return "<>";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/NotInOperator.java
similarity index 53%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/NotInOperator.java
index 2c0a4bd07..09019da7d 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/NotInOperator.java
@@ -15,22 +15,36 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeName;
+import org.apache.inlong.sort.protocol.transformation.MultiValueCompareOperator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+import java.io.Serializable;
- @Override
- default String getName() {
- return "operator";
+@JsonTypeName("notIn")
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@Data
+public class NotInOperator implements MultiValueCompareOperator, Serializable {
+
+ private static final long serialVersionUID = 8080256460638878190L;
+
+ private static final NotInOperator INSTANCE = new NotInOperator();
+
+ public static NotInOperator getInstance() {
+ return INSTANCE;
}
@Override
- String format();
+ public String getName() {
+ return "NOT IN";
+ }
+ @Override
+ public String format() {
+ return getName();
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/OrOperator.java
similarity index 56%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/OrOperator.java
index 2c0a4bd07..901fba318 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/operator/OrOperator.java
@@ -15,22 +15,31 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeName;
+import org.apache.inlong.sort.protocol.transformation.LogicOperator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+import java.io.Serializable;
- @Override
- default String getName() {
- return "operator";
+@JsonTypeName("or")
+@Data
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class OrOperator implements LogicOperator, Serializable {
+
+ private static final long serialVersionUID = -5062182569422834309L;
+
+ private static final OrOperator INSTANCE = new OrOperator();
+
+ public static OrOperator getInstance() {
+ return INSTANCE;
}
@Override
- String format();
-
+ public String format() {
+ return "OR";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/AndOperatorTest.java
similarity index 66%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/AndOperatorTest.java
index 2c0a4bd07..28a18bb3b 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/AndOperatorTest.java
@@ -15,22 +15,25 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.Operator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+public class AndOperatorTest extends OperatorBaseTest {
@Override
- default String getName() {
- return "operator";
+ public Operator getOperator() {
+ return AndOperator.getInstance();
}
@Override
- String format();
+ public String getExpectFormat() {
+ return "AND";
+ }
+
+ @Override
+ public String getExpectSerializeStr() {
+ return "{\"type\":\"and\"}";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/EmptyOperatorTest.java
similarity index 65%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/EmptyOperatorTest.java
index 2c0a4bd07..d8577cdd7 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/EmptyOperatorTest.java
@@ -15,22 +15,25 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.Operator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+public class EmptyOperatorTest extends OperatorBaseTest {
@Override
- default String getName() {
- return "operator";
+ public Operator getOperator() {
+ return EmptyOperator.getInstance();
}
@Override
- String format();
+ public String getExpectFormat() {
+ return "";
+ }
+
+ @Override
+ public String getExpectSerializeStr() {
+ return "{\"type\":\"empty\"}";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/EqualOperatorTest.java
similarity index 65%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/EqualOperatorTest.java
index 2c0a4bd07..769a0bd9d 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/EqualOperatorTest.java
@@ -15,22 +15,25 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.Operator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+public class EqualOperatorTest extends OperatorBaseTest {
@Override
- default String getName() {
- return "operator";
+ public Operator getOperator() {
+ return EqualOperator.getInstance();
}
@Override
- String format();
+ public String getExpectFormat() {
+ return "=";
+ }
+
+ @Override
+ public String getExpectSerializeStr() {
+ return "{\"type\":\"equal\"}";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/InOperatorTest.java
similarity index 66%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/InOperatorTest.java
index 2c0a4bd07..f19b1e346 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/InOperatorTest.java
@@ -15,22 +15,25 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.Operator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+public class InOperatorTest extends OperatorBaseTest {
@Override
- default String getName() {
- return "operator";
+ public Operator getOperator() {
+ return InOperator.getInstance();
}
@Override
- String format();
+ public String getExpectFormat() {
+ return "IN";
+ }
+
+ @Override
+ public String getExpectSerializeStr() {
+ return "{\"type\":\"in\"}";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/IsNotNullOperatorTest.java
similarity index 64%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/IsNotNullOperatorTest.java
index 2c0a4bd07..73dac2e1d 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/IsNotNullOperatorTest.java
@@ -15,22 +15,25 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.Operator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+public class IsNotNullOperatorTest extends OperatorBaseTest {
@Override
- default String getName() {
- return "operator";
+ public Operator getOperator() {
+ return IsNotNullOperator.getInstance();
}
@Override
- String format();
+ public String getExpectFormat() {
+ return "IS NOT NULL";
+ }
+
+ @Override
+ public String getExpectSerializeStr() {
+ return "{\"type\":\"isNotNull\"}";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/IsNullOperatorTest.java
similarity index 65%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/IsNullOperatorTest.java
index 2c0a4bd07..614201322 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/IsNullOperatorTest.java
@@ -15,22 +15,25 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.Operator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+public class IsNullOperatorTest extends OperatorBaseTest {
@Override
- default String getName() {
- return "operator";
+ public Operator getOperator() {
+ return IsNullOperator.getInstance();
}
@Override
- String format();
+ public String getExpectFormat() {
+ return "IS NULL";
+ }
+
+ @Override
+ public String getExpectSerializeStr() {
+ return "{\"type\":\"isNull\"}";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/LessThanOperatorTest.java
similarity index 65%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/LessThanOperatorTest.java
index 2c0a4bd07..1b91242bc 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/LessThanOperatorTest.java
@@ -15,22 +15,25 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.Operator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+public class LessThanOperatorTest extends OperatorBaseTest {
@Override
- default String getName() {
- return "operator";
+ public Operator getOperator() {
+ return LessThanOperator.getInstance();
}
@Override
- String format();
+ public String getExpectFormat() {
+ return "<";
+ }
+
+ @Override
+ public String getExpectSerializeStr() {
+ return "{\"type\":\"lessThan\"}";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/LessThanOrEqualOperatorTest.java
similarity index 64%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/LessThanOrEqualOperatorTest.java
index 2c0a4bd07..33de99e0b 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/LessThanOrEqualOperatorTest.java
@@ -15,22 +15,25 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.Operator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+public class LessThanOrEqualOperatorTest extends OperatorBaseTest {
@Override
- default String getName() {
- return "operator";
+ public Operator getOperator() {
+ return LessThanOrEqualOperator.getInstance();
}
@Override
- String format();
+ public String getExpectFormat() {
+ return "<=";
+ }
+
+ @Override
+ public String getExpectSerializeStr() {
+ return "{\"type\":\"lessThanOrEqual\"}";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/MoreThanOperatorTest.java
similarity index 65%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/MoreThanOperatorTest.java
index 2c0a4bd07..04ac51a25 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/MoreThanOperatorTest.java
@@ -15,22 +15,25 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.Operator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+public class MoreThanOperatorTest extends OperatorBaseTest {
@Override
- default String getName() {
- return "operator";
+ public Operator getOperator() {
+ return MoreThanOperator.getInstance();
}
@Override
- String format();
+ public String getExpectFormat() {
+ return ">";
+ }
+
+ @Override
+ public String getExpectSerializeStr() {
+ return "{\"type\":\"moreThan\"}";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/MoreThanOrEqualOperatorTest.java
similarity index 64%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/MoreThanOrEqualOperatorTest.java
index 2c0a4bd07..c62aca496 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/MoreThanOrEqualOperatorTest.java
@@ -15,22 +15,25 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.Operator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+public class MoreThanOrEqualOperatorTest extends OperatorBaseTest {
@Override
- default String getName() {
- return "operator";
+ public Operator getOperator() {
+ return MoreThanOrEqualOperator.getInstance();
}
@Override
- String format();
+ public String getExpectFormat() {
+ return ">=";
+ }
+
+ @Override
+ public String getExpectSerializeStr() {
+ return "{\"type\":\"moreThanOrEqual\"}";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/NotEqualOperatorTest.java
similarity index 65%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/NotEqualOperatorTest.java
index 2c0a4bd07..768ffd780 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/NotEqualOperatorTest.java
@@ -15,22 +15,25 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.Operator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+public class NotEqualOperatorTest extends OperatorBaseTest {
@Override
- default String getName() {
- return "operator";
+ public Operator getOperator() {
+ return NotEqualOperator.getInstance();
}
@Override
- String format();
+ public String getExpectFormat() {
+ return "<>";
+ }
+
+ @Override
+ public String getExpectSerializeStr() {
+ return "{\"type\":\"notEqual\"}";
+ }
}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/NotInOperatorTest.java
similarity index 65%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/NotInOperatorTest.java
index 2c0a4bd07..193c51769 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/NotInOperatorTest.java
@@ -15,22 +15,25 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.Operator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+public class NotInOperatorTest extends OperatorBaseTest {
@Override
- default String getName() {
- return "operator";
+ public Operator getOperator() {
+ return NotInOperator.getInstance();
}
@Override
- String format();
+ public String getExpectFormat() {
+ return "NOT IN";
+ }
+
+ @Override
+ public String getExpectSerializeStr() {
+ return "{\"type\":\"notIn\"}";
+ }
}
diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/OperatorBaseTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/OperatorBaseTest.java
new file mode 100644
index 000000000..b53a4a051
--- /dev/null
+++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/OperatorBaseTest.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.inlong.sort.protocol.transformation.operator;
+
+import com.google.common.base.Preconditions;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.inlong.sort.protocol.transformation.Operator;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public abstract class OperatorBaseTest {
+
+ private final ObjectMapper objectMapper = new ObjectMapper();
+ private String expectFormat;
+ private String expectSerializeStr;
+ private Operator operator;
+
+ public abstract Operator getOperator();
+
+ public abstract String getExpectFormat();
+
+ public abstract String getExpectSerializeStr();
+
+ @Before
+ public void init() {
+ this.expectFormat = Preconditions.checkNotNull(getExpectFormat());
+ this.operator = Preconditions.checkNotNull(getOperator());
+ this.expectSerializeStr = getExpectSerializeStr();
+ }
+
+ @Test
+ public void testSerialize() throws JsonProcessingException {
+ assertEquals(expectSerializeStr, objectMapper.writeValueAsString(operator));
+ }
+
+ @Test
+ public void testDeserialize() throws JsonProcessingException {
+ ObjectMapper objectMapper = new ObjectMapper();
+ Operator expected = objectMapper.readValue(expectSerializeStr, operator.getClass());
+ assertEquals(expected, operator);
+ }
+
+ @Test
+ public void testFormat() throws JsonProcessingException {
+ assertEquals(expectFormat, operator.format());
+ }
+}
diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/OrOperatorTest.java
similarity index 66%
copy from inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
copy to inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/OrOperatorTest.java
index 2c0a4bd07..b20b35674 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/Operator.java
+++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/operator/OrOperatorTest.java
@@ -15,22 +15,25 @@
* limitations under the License.
*/
-package org.apache.inlong.sort.protocol.transformation;
+package org.apache.inlong.sort.protocol.transformation.operator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.inlong.sort.protocol.transformation.Operator;
-@JsonTypeInfo(
- use = JsonTypeInfo.Id.NAME,
- include = JsonTypeInfo.As.PROPERTY,
- property = "type")
-public interface Operator extends FunctionParam {
+public class OrOperatorTest extends OperatorBaseTest {
@Override
- default String getName() {
- return "operator";
+ public Operator getOperator() {
+ return OrOperator.getInstance();
}
@Override
- String format();
+ public String getExpectFormat() {
+ return "OR";
+ }
+
+ @Override
+ public String getExpectSerializeStr() {
+ return "{\"type\":\"or\"}";
+ }
}