Skip to content

Commit 5cee2ab

Browse files
committed
name
1 parent 47f4553 commit 5cee2ab

File tree

9 files changed

+45
-24
lines changed

9 files changed

+45
-24
lines changed

paimon-common/src/main/java/org/apache/paimon/predicate/CastTransform.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ public static Optional<Transform> tryCreate(FieldRef fieldRef, DataType type) {
6161
}
6262
}
6363

64+
@Override
65+
public String name() {
66+
return "CAST";
67+
}
68+
6469
@Override
6570
public List<Object> inputs() {
6671
return Collections.singletonList(fieldRef);

paimon-common/src/main/java/org/apache/paimon/predicate/ConcatTransform.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ public ConcatTransform(List<Object> inputs) {
3131
super(inputs);
3232
}
3333

34+
@Override
35+
public String name() {
36+
return "CONCAT";
37+
}
38+
3439
@Override
3540
public BinaryString transform(List<BinaryString> inputs) {
3641
return BinaryString.concat(inputs);

paimon-common/src/main/java/org/apache/paimon/predicate/ConcatWsTransform.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ public ConcatWsTransform(List<Object> inputs) {
3434
checkArgument(inputs.size() >= 2);
3535
}
3636

37+
@Override
38+
public String name() {
39+
return "CONCAT_WS";
40+
}
41+
3742
@Override
3843
public BinaryString transform(List<BinaryString> inputs) {
3944
BinaryString separator = inputs.get(0);

paimon-common/src/main/java/org/apache/paimon/predicate/FieldRef.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ public int hashCode() {
7171

7272
@Override
7373
public String toString() {
74-
return "FieldRef{" + "index=" + index + ", name='" + name + '\'' + ", type=" + type + '}';
74+
return name;
7575
}
7676
}

paimon-common/src/main/java/org/apache/paimon/predicate/FieldTransform.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ public FieldTransform(FieldRef fieldRef) {
3939
this.fieldRef = fieldRef;
4040
}
4141

42+
@Override
43+
public String name() {
44+
return "FIELD_REF";
45+
}
46+
4247
public FieldRef fieldRef() {
4348
return fieldRef;
4449
}
@@ -80,6 +85,6 @@ public int hashCode() {
8085

8186
@Override
8287
public String toString() {
83-
return "FieldTransform{" + "fieldRef=" + fieldRef + '}';
88+
return fieldRef.name();
8489
}
8590
}

paimon-common/src/main/java/org/apache/paimon/predicate/LeafPredicate.java

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -172,28 +172,18 @@ public int hashCode() {
172172

173173
@Override
174174
public String toString() {
175-
if (fieldRefOptional().isPresent()) {
176-
String literalsStr;
177-
int literalsSize = literals == null ? 0 : literals.size();
178-
if (literalsSize == 0) {
179-
literalsStr = "";
180-
} else if (literalsSize == 1) {
181-
literalsStr = Objects.toString(literals.get(0));
182-
} else {
183-
literalsStr = StringUtils.truncatedString(literals, "[", ", ", "]");
184-
}
185-
return literalsStr.isEmpty()
186-
? function + "(" + fieldName() + ")"
187-
: function + "(" + fieldName() + ", " + literalsStr + ")";
175+
String literalsStr;
176+
int literalsSize = literals == null ? 0 : literals.size();
177+
if (literalsSize == 0) {
178+
literalsStr = "";
179+
} else if (literalsSize == 1) {
180+
literalsStr = Objects.toString(literals.get(0));
181+
} else {
182+
literalsStr = StringUtils.truncatedString(literals, "[", ", ", "]");
188183
}
189-
return "{"
190-
+ "transform="
191-
+ transform
192-
+ ", function="
193-
+ function
194-
+ ", literals="
195-
+ literals
196-
+ '}';
184+
return literalsStr.isEmpty()
185+
? function + "(" + transform + ")"
186+
: function + "(" + transform + ", " + literalsStr + ")";
197187
}
198188

199189
private ListSerializer<Object> literalsSerializer() {
@@ -236,6 +226,7 @@ public String fieldName() {
236226
/** Use {@link #fieldRefOptional()} instead. */
237227
@Deprecated
238228
public FieldRef fieldRef() {
229+
//noinspection OptionalGetWithoutIsPresent
239230
return fieldRefOptional().get();
240231
}
241232

paimon-common/src/main/java/org/apache/paimon/predicate/StringTransform.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.ArrayList;
2727
import java.util.List;
2828
import java.util.Objects;
29+
import java.util.stream.Collectors;
2930

3031
import static org.apache.paimon.types.DataTypeFamily.CHARACTER_STRING;
3132
import static org.apache.paimon.utils.Preconditions.checkArgument;
@@ -95,6 +96,8 @@ public int hashCode() {
9596

9697
@Override
9798
public String toString() {
98-
return getClass().getSimpleName() + "{" + "inputs=" + inputs + '}';
99+
List<String> inputs =
100+
this.inputs.stream().map(Object::toString).collect(Collectors.toList());
101+
return name() + "(" + String.join(", ", inputs) + ')';
99102
}
100103
}

paimon-common/src/main/java/org/apache/paimon/predicate/Transform.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
/** Represents a transform function. */
2828
public interface Transform extends Serializable {
2929

30+
String name();
31+
3032
List<Object> inputs();
3133

3234
DataType outputType();

paimon-common/src/main/java/org/apache/paimon/predicate/UpperTransform.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ public UpperTransform(List<Object> inputs) {
3434
checkArgument(inputs.size() == 1);
3535
}
3636

37+
@Override
38+
public String name() {
39+
return "UPPER";
40+
}
41+
3742
@Override
3843
public BinaryString transform(List<BinaryString> inputs) {
3944
BinaryString string = inputs.get(0);

0 commit comments

Comments
 (0)