This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 3e616123a [core] fix FieldCountAgg should return the same data type as
fieldType. (#3924)
3e616123a is described below
commit 3e616123ac043afbe99c8459ac522e26f07c2222
Author: HunterXHunter <[email protected]>
AuthorDate: Fri Aug 9 11:45:22 2024 +0800
[core] fix FieldCountAgg should return the same data type as fieldType.
(#3924)
---
.../mergetree/compact/aggregate/FieldCountAgg.java | 106 +++++++++++----------
.../compact/aggregate/FieldAggregatorTest.java | 12 +--
2 files changed, 60 insertions(+), 58 deletions(-)
diff --git
a/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/aggregate/FieldCountAgg.java
b/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/aggregate/FieldCountAgg.java
index 6a8d08906..0c1d8c094 100644
---
a/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/aggregate/FieldCountAgg.java
+++
b/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/aggregate/FieldCountAgg.java
@@ -36,63 +36,65 @@ public class FieldCountAgg extends FieldAggregator {
@Override
public Object agg(Object accumulator, Object inputField) {
- Object count;
- if (accumulator == null || inputField == null) {
- count = (accumulator == null ? (inputField == null ? 0 : 1) :
accumulator);
- } else {
- // ordered by type root definition
- switch (fieldType.getTypeRoot()) {
- case TINYINT:
- count = (byte) ((byte) accumulator + 1);
- break;
- case SMALLINT:
- count = (short) ((short) accumulator + 1);
- break;
- case INTEGER:
- count = (int) accumulator + 1;
- break;
- case BIGINT:
- count = (long) accumulator + 1L;
- break;
- default:
- String msg =
- String.format(
- "type %s not support in %s",
- fieldType.getTypeRoot().toString(),
this.getClass().getName());
- throw new IllegalArgumentException(msg);
- }
+
+ if (accumulator != null && inputField == null) {
+ return accumulator;
+ }
+ // ordered by type root definition
+ switch (fieldType.getTypeRoot()) {
+ case TINYINT:
+ return accumulator == null
+ ? (inputField == null ? (byte) 0 : (byte) 1)
+ : (byte) ((byte) accumulator + 1);
+ case SMALLINT:
+ return accumulator == null
+ ? (inputField == null ? (short) 0 : (short) 1)
+ : (short) ((short) accumulator + 1);
+ case INTEGER:
+ return accumulator == null ? (inputField == null ? 0 : 1) :
(int) accumulator + 1;
+ case BIGINT:
+ return accumulator == null
+ ? (inputField == null ? 0L : 1L)
+ : (long) accumulator + 1L;
+ default:
+ String msg =
+ String.format(
+ "type %s not support in %s",
+ fieldType.getTypeRoot().toString(),
this.getClass().getName());
+ throw new IllegalArgumentException(msg);
}
- return count;
}
@Override
public Object retract(Object accumulator, Object inputField) {
- Object count;
- if (accumulator == null || inputField == null) {
- count = (accumulator == null ? (inputField == null ? 0 : -1) :
accumulator);
- } else {
- // ordered by type root definition
- switch (fieldType.getTypeRoot()) {
- case TINYINT:
- count = (byte) ((byte) accumulator - 1);
- break;
- case SMALLINT:
- count = (short) ((short) accumulator - 1);
- break;
- case INTEGER:
- count = (int) accumulator - 1;
- break;
- case BIGINT:
- count = (long) accumulator - 1L;
- break;
- default:
- String msg =
- String.format(
- "type %s not support in %s",
- fieldType.getTypeRoot().toString(),
this.getClass().getName());
- throw new IllegalArgumentException(msg);
- }
+
+ if (accumulator != null && inputField == null) {
+ return accumulator;
+ }
+
+ // ordered by type root definition
+ switch (fieldType.getTypeRoot()) {
+ case TINYINT:
+ return accumulator == null
+ ? (inputField == null ? (byte) 0 : (byte) -1)
+ : (byte) ((byte) accumulator - 1);
+ case SMALLINT:
+ return accumulator == null
+ ? (inputField == null ? (short) 0 : (short) -1)
+ : (short) ((short) accumulator - 1);
+ case INTEGER:
+ return accumulator == null ? (inputField == null ? 0 : -1) :
(int) accumulator - 1;
+
+ case BIGINT:
+ return accumulator == null
+ ? (inputField == null ? 0L : -1L)
+ : (long) accumulator - 1L;
+ default:
+ String msg =
+ String.format(
+ "type %s not support in %s",
+ fieldType.getTypeRoot().toString(),
this.getClass().getName());
+ throw new IllegalArgumentException(msg);
}
- return count;
}
}
diff --git
a/paimon-core/src/test/java/org/apache/paimon/mergetree/compact/aggregate/FieldAggregatorTest.java
b/paimon-core/src/test/java/org/apache/paimon/mergetree/compact/aggregate/FieldAggregatorTest.java
index bf90c074b..3140ba5f1 100644
---
a/paimon-core/src/test/java/org/apache/paimon/mergetree/compact/aggregate/FieldAggregatorTest.java
+++
b/paimon-core/src/test/java/org/apache/paimon/mergetree/compact/aggregate/FieldAggregatorTest.java
@@ -166,23 +166,23 @@ public class FieldAggregatorTest {
assertThat(fieldCountAggInt.agg(3, 6)).isEqualTo(4);
FieldCountAgg fieldCountAggLong = new FieldCountAgg(new BigIntType());
- assertThat(fieldCountAggLong.agg(null, null)).isEqualTo(0);
+ assertThat(fieldCountAggLong.agg(null, null)).isEqualTo(0L);
assertThat(fieldCountAggLong.agg((long) 1, null)).isEqualTo((long) 1);
- assertThat(fieldCountAggLong.agg(null, (long) 15)).isEqualTo(1);
+ assertThat(fieldCountAggLong.agg(null, (long) 15)).isEqualTo(1L);
assertThat(fieldCountAggLong.agg((long) 1, 0)).isEqualTo((long) 2);
assertThat(fieldCountAggLong.agg((long) 3, (long) 6)).isEqualTo((long)
4);
FieldCountAgg fieldCountAggByte = new FieldCountAgg(new TinyIntType());
- assertThat(fieldCountAggByte.agg(null, null)).isEqualTo(0);
+ assertThat(fieldCountAggByte.agg(null, null)).isEqualTo((byte) 0);
assertThat(fieldCountAggByte.agg((byte) 1, null)).isEqualTo((byte) 1);
- assertThat(fieldCountAggByte.agg(null, (byte) 15)).isEqualTo(1);
+ assertThat(fieldCountAggByte.agg(null, (byte) 15)).isEqualTo((byte) 1);
assertThat(fieldCountAggByte.agg((byte) 1, 0)).isEqualTo((byte) 2);
assertThat(fieldCountAggByte.agg((byte) 3, (byte) 6)).isEqualTo((byte)
4);
FieldCountAgg fieldCountAggShort = new FieldCountAgg(new
SmallIntType());
- assertThat(fieldCountAggShort.agg(null, null)).isEqualTo(0);
+ assertThat(fieldCountAggShort.agg(null, null)).isEqualTo((short) 0);
assertThat(fieldCountAggShort.agg((short) 1, null)).isEqualTo((short)
1);
- assertThat(fieldCountAggShort.agg(null, (short) 15)).isEqualTo(1);
+ assertThat(fieldCountAggShort.agg(null, (short) 15)).isEqualTo((short)
1);
assertThat(fieldCountAggShort.agg((short) 1, 0)).isEqualTo((short) 2);
assertThat(fieldCountAggShort.agg((short) 3, (short)
6)).isEqualTo((short) 4);
}
