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 70eadb3 [INLONG-3055][Sort] Fix bug occurred when deserializing
TransformationInfo json string (#3056)
70eadb3 is described below
commit 70eadb356607ef96eee8b4edb23e8e0a5c1149ae
Author: Kevin Wen <[email protected]>
AuthorDate: Fri Mar 11 10:02:33 2022 +0800
[INLONG-3055][Sort] Fix bug occurred when deserializing TransformationInfo
json string (#3056)
---
.../protocol/transformation/FieldMappingRule.java | 44 ++++++++++++
.../transformation/TransformationInfo.java | 19 +++++
.../transformation/TransformationRule.java | 10 +++
.../transformation/FieldMappingRuleTest.java | 72 +++++++++++++++++++
.../transformation/TransformationInfoTest.java | 80 ++++++++++++++++++++++
5 files changed, 225 insertions(+)
diff --git
a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/FieldMappingRule.java
b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/FieldMappingRule.java
index fce2648..6e4cffb 100644
---
a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/FieldMappingRule.java
+++
b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/FieldMappingRule.java
@@ -18,16 +18,23 @@
package org.apache.inlong.sort.protocol.transformation;
import com.google.common.base.Preconditions;
+
import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Objects;
+
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.inlong.sort.protocol.FieldInfo;
public class FieldMappingRule implements TransformationRule, Serializable {
+ private static final long serialVersionUID = -3285027125865704371L;
+
@JsonProperty("field_mapping_units")
private final FieldMappingUnit[] fieldMappingUnits;
+ @JsonCreator
public FieldMappingRule(
@JsonProperty("field_mapping_units") FieldMappingUnit[]
fieldMappingUnits) {
this.fieldMappingUnits = fieldMappingUnits;
@@ -38,8 +45,27 @@ public class FieldMappingRule implements TransformationRule,
Serializable {
return fieldMappingUnits;
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ FieldMappingRule that = (FieldMappingRule) o;
+ return Arrays.equals(fieldMappingUnits, that.fieldMappingUnits);
+ }
+
+ @Override
+ public int hashCode() {
+ return Arrays.hashCode(fieldMappingUnits);
+ }
+
public static class FieldMappingUnit implements Serializable {
+ private static final long serialVersionUID = 1525401917124693789L;
+
@JsonProperty("source_field")
private final FieldInfo sourceFieldInfo;
@@ -63,5 +89,23 @@ public class FieldMappingRule implements TransformationRule,
Serializable {
public FieldInfo getSinkFieldInfo() {
return sinkFieldInfo;
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ FieldMappingUnit that = (FieldMappingUnit) o;
+ return Objects.equals(sourceFieldInfo, that.sourceFieldInfo) &&
Objects.equals(sinkFieldInfo,
+ that.sinkFieldInfo);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(sourceFieldInfo, sinkFieldInfo);
+ }
}
}
diff --git
a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/TransformationInfo.java
b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/TransformationInfo.java
index 59d52f3..411e57e 100644
---
a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/TransformationInfo.java
+++
b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/TransformationInfo.java
@@ -18,6 +18,8 @@
package org.apache.inlong.sort.protocol.transformation;
import java.io.Serializable;
+import java.util.Objects;
+
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
@@ -37,4 +39,21 @@ public class TransformationInfo implements Serializable {
public TransformationRule getTransformRule() {
return transformRule;
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ TransformationInfo that = (TransformationInfo) o;
+ return Objects.equals(transformRule, that.transformRule);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(transformRule);
+ }
}
diff --git
a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/TransformationRule.java
b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/TransformationRule.java
index bafb77e..8699a1c 100644
---
a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/TransformationRule.java
+++
b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/transformation/TransformationRule.java
@@ -17,6 +17,16 @@
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;
+
+@JsonTypeInfo(
+ use = JsonTypeInfo.Id.NAME,
+ include = JsonTypeInfo.As.PROPERTY,
+ property = "type")
+@JsonSubTypes({
+ @JsonSubTypes.Type(value = FieldMappingRule.class, name =
"field_mapping")
+})
public interface TransformationRule {
}
diff --git
a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/FieldMappingRuleTest.java
b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/FieldMappingRuleTest.java
new file mode 100644
index 0000000..90f4beb
--- /dev/null
+++
b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/FieldMappingRuleTest.java
@@ -0,0 +1,72 @@
+/*
+ * 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;
+
+import org.apache.inlong.sort.formats.common.DoubleFormatInfo;
+import org.apache.inlong.sort.formats.common.StringFormatInfo;
+import org.apache.inlong.sort.protocol.FieldInfo;
+import org.apache.inlong.sort.protocol.ProtocolBaseTest;
+
+public class FieldMappingRuleTest extends ProtocolBaseTest {
+
+ @Override
+ public void init() {
+ expectedObject = new FieldMappingRule(new
FieldMappingRule.FieldMappingUnit[] {
+ new FieldMappingRule.FieldMappingUnit(
+ new FieldInfo("f1", StringFormatInfo.INSTANCE),
+ new FieldInfo("f2", DoubleFormatInfo.INSTANCE)
+ )
+ });
+
+ expectedJson = "{\n"
+ + " \"type\":\"field_mapping\",\n"
+ + " \"field_mapping_units\":[\n"
+ + " {\n"
+ + " \"source_field\":{\n"
+ + " \"type\":\"base\",\n"
+ + " \"name\":\"f1\",\n"
+ + " \"format_info\":{\n"
+ + " \"type\":\"string\"\n"
+ + " }\n"
+ + " },\n"
+ + " \"sink_field\":{\n"
+ + " \"type\":\"base\",\n"
+ + " \"name\":\"f2\",\n"
+ + " \"format_info\":{\n"
+ + " \"type\":\"double\"\n"
+ + " }\n"
+ + " }\n"
+ + " }\n"
+ + " ]\n"
+ + "}";
+
+ equalObj1 = expectedObject;
+ equalObj2 = new FieldMappingRule(new
FieldMappingRule.FieldMappingUnit[] {
+ new FieldMappingRule.FieldMappingUnit(
+ new FieldInfo("f1", StringFormatInfo.INSTANCE),
+ new FieldInfo("f2", DoubleFormatInfo.INSTANCE)
+ )
+ });
+ unequalObj = new FieldMappingRule(new
FieldMappingRule.FieldMappingUnit[] {
+ new FieldMappingRule.FieldMappingUnit(
+ new FieldInfo("f1", StringFormatInfo.INSTANCE),
+ new FieldInfo("f3", DoubleFormatInfo.INSTANCE)
+ )
+ });
+ }
+}
diff --git
a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/TransformationInfoTest.java
b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/TransformationInfoTest.java
new file mode 100644
index 0000000..99ae634
--- /dev/null
+++
b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/TransformationInfoTest.java
@@ -0,0 +1,80 @@
+/*
+ * 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;
+
+import org.apache.inlong.sort.formats.common.DoubleFormatInfo;
+import org.apache.inlong.sort.formats.common.StringFormatInfo;
+import org.apache.inlong.sort.protocol.FieldInfo;
+import org.apache.inlong.sort.protocol.ProtocolBaseTest;
+
+public class TransformationInfoTest extends ProtocolBaseTest {
+
+ @Override
+ public void init() {
+ expectedObject = new TransformationInfo(
+ new FieldMappingRule(new FieldMappingRule.FieldMappingUnit[] {
+ new FieldMappingRule.FieldMappingUnit(
+ new FieldInfo("f1", StringFormatInfo.INSTANCE),
+ new FieldInfo("f2", DoubleFormatInfo.INSTANCE)
+ )
+ })
+ );
+
+ expectedJson = "{\n"
+ + " \"transform_rule\":{\n"
+ + " \"type\":\"field_mapping\",\n"
+ + " \"field_mapping_units\":[\n"
+ + " {\n"
+ + " \"source_field\":{\n"
+ + " \"type\":\"base\",\n"
+ + " \"name\":\"f1\",\n"
+ + " \"format_info\":{\n"
+ + " \"type\":\"string\"\n"
+ + " }\n"
+ + " },\n"
+ + " \"sink_field\":{\n"
+ + " \"type\":\"base\",\n"
+ + " \"name\":\"f2\",\n"
+ + " \"format_info\":{\n"
+ + " \"type\":\"double\"\n"
+ + " }\n"
+ + " }\n"
+ + " }\n"
+ + " ]\n"
+ + " }\n"
+ + "}";
+
+ equalObj1 = expectedObject;
+ equalObj2 = new TransformationInfo(
+ new FieldMappingRule(new FieldMappingRule.FieldMappingUnit[] {
+ new FieldMappingRule.FieldMappingUnit(
+ new FieldInfo("f1", StringFormatInfo.INSTANCE),
+ new FieldInfo("f2", DoubleFormatInfo.INSTANCE)
+ )
+ })
+ );
+ unequalObj = new TransformationInfo(
+ new FieldMappingRule(new FieldMappingRule.FieldMappingUnit[] {
+ new FieldMappingRule.FieldMappingUnit(
+ new FieldInfo("f1", StringFormatInfo.INSTANCE),
+ new FieldInfo("f3", DoubleFormatInfo.INSTANCE)
+ )
+ })
+ );
+ }
+}
