From 28b10eb453d227d3db19ab1907685d5f624f4322 Mon Sep 17 00:00:00 2001 From: Liang Zhang Date: Sat, 7 Sep 2024 12:13:24 +0800 Subject: [PATCH] Refactor ShowTableStatusMergedResult (#32803) --- .../merge/dal/show/ShowTableStatusMergedResult.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowTableStatusMergedResult.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowTableStatusMergedResult.java index 4f3ae659cd2aa..f70e9be766507 100644 --- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowTableStatusMergedResult.java +++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowTableStatusMergedResult.java @@ -74,14 +74,11 @@ private void merge(final MemoryQueryResultRow row, final MemoryQueryResultRow ne } private BigInteger sum(final Object num1, final Object num2) { - if (num1 == null && num2 == null) { - return null; - } - return getNonNullBigInteger(num1).add(getNonNullBigInteger(num2)); + return null == num1 && null == num2 ? null : getNonNullBigInteger(num1).add(getNonNullBigInteger(num2)); } private BigInteger avg(final Object sum, final Object number) { - if (sum == null && number == null) { + if (null == sum && null == number) { return null; } BigInteger numberBigInteger = getNonNullBigInteger(number); @@ -89,9 +86,6 @@ private BigInteger avg(final Object sum, final Object number) { } private BigInteger getNonNullBigInteger(final Object value) { - return Optional.ofNullable(value) - .filter(BigInteger.class::isInstance) - .map(BigInteger.class::cast) - .orElse(BigInteger.ZERO); + return Optional.ofNullable(value).filter(BigInteger.class::isInstance).map(BigInteger.class::cast).orElse(BigInteger.ZERO); } }