Add default rounding mode as suggested in #864

ClickHouse · Mar 14, 2022 · 772d304 · 772d304
1 parent 37d261b
commit 772d304
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 22 deletions.
diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseValues.java b/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseValues.java
@@ -4,6 +4,7 @@
 import java.lang.reflect.Array;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.math.RoundingMode;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
@@ -27,6 +28,7 @@
 import java.util.UUID;
 import java.util.Map.Entry;
 
+import com.clickhouse.client.config.ClickHouseDefaults;
 import com.clickhouse.client.data.ClickHouseArrayValue;
 import com.clickhouse.client.data.ClickHouseBigDecimalValue;
 import com.clickhouse.client.data.ClickHouseBigIntegerValue;
@@ -83,6 +85,8 @@ public final class ClickHouseValues {
     public static final String EMPTY_STRING_EXPR = "''";
 
     public static final BigDecimal NANOS = new BigDecimal(BigInteger.TEN.pow(9));
+    public static final RoundingMode ROUNDING_MODE = (RoundingMode) ClickHouseDefaults.ROUNDING_MODE
+            .getEffectiveDefaultValue();
 
     public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
     public static final DateTimeFormatter TIME_FORMATTER = new DateTimeFormatterBuilder().appendPattern("HH:mm:ss")

diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseDefaults.java b/clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseDefaults.java
@@ -1,6 +1,7 @@
 package com.clickhouse.client.config;
 
 import java.io.Serializable;
+import java.math.RoundingMode;
 
 import com.clickhouse.client.ClickHouseChecker;
 import com.clickhouse.client.ClickHouseFormat;
@@ -69,6 +70,10 @@ public enum ClickHouseDefaults implements ClickHouseOption {
      * Max requests.
      */
     MAX_REQUESTS("max_requests", 0, "Maximum size of shared thread pool, 0 means no limit."),
+    /**
+     * Rounding mode for type conversion.
+     */
+    ROUNDING_MODE("rounding_mode", RoundingMode.DOWN, "Default rounding mode for BigDecimal."),
     /**
      * Thread keep alive timeout in milliseconds.
      */

diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseBigDecimalValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseBigDecimalValue.java
@@ -2,7 +2,6 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.math.RoundingMode;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.time.LocalDate;
@@ -124,7 +123,7 @@ public BigDecimal asBigDecimal() {
     public BigDecimal asBigDecimal(int scale) {
         BigDecimal v = getValue();
         if (v != null && v.scale() != scale) {
-            v = v.setScale(scale, RoundingMode.DOWN);
+            v = v.setScale(scale, ClickHouseValues.ROUNDING_MODE);
         }
 
         return v;

diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseDateTimeValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseDateTimeValue.java
@@ -2,7 +2,6 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.math.RoundingMode;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
@@ -171,7 +170,7 @@ public BigDecimal asBigDecimal(int scale) {
             v = new BigDecimal(BigInteger.valueOf(value.atZone(tz.toZoneId()).toEpochSecond()), scale);
             if (scale != 0 && nanoSeconds != 0) {
                 v = v.add(BigDecimal.valueOf(nanoSeconds).divide(ClickHouseValues.NANOS).setScale(scale,
-                        RoundingMode.HALF_UP));
+                        ClickHouseValues.ROUNDING_MODE));
             }
         }
         return v;
@@ -290,7 +289,7 @@ public ClickHouseDateTimeValue update(BigDecimal value) {
             resetToNullOrEmpty();
         } else {
             if (value.scale() != scale) {
-                value = value.setScale(scale, RoundingMode.HALF_UP);
+                value = value.setScale(scale, ClickHouseValues.ROUNDING_MODE);
             }
             set(ClickHouseValues.convertToDateTime(value));
         }

diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseDoubleValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseDoubleValue.java
@@ -2,7 +2,6 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.math.RoundingMode;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
@@ -31,8 +30,7 @@ public static ClickHouseDoubleValue ofNull() {
      * @return same object as {@code ref} or a new instance if it's null
      */
     public static ClickHouseDoubleValue ofNull(ClickHouseValue ref) {
-        return ref instanceof ClickHouseDoubleValue ?
-                ((ClickHouseDoubleValue) ref).set(true, 0D)
+        return ref instanceof ClickHouseDoubleValue ? ((ClickHouseDoubleValue) ref).set(true, 0D)
                 : new ClickHouseDoubleValue(true, 0D);
     }
 
@@ -55,8 +53,7 @@ public static ClickHouseDoubleValue of(double value) {
      * @return same object as {@code ref} or a new instance if it's null
      */
     public static ClickHouseDoubleValue of(ClickHouseValue ref, double value) {
-        return ref instanceof ClickHouseDoubleValue ?
-                ((ClickHouseDoubleValue) ref).set(false, value)
+        return ref instanceof ClickHouseDoubleValue ? ((ClickHouseDoubleValue) ref).set(false, value)
                 : new ClickHouseDoubleValue(false, value);
     }
 
@@ -142,7 +139,7 @@ public BigDecimal asBigDecimal(int scale) {
             if (diff > 0) {
                 dec = dec.divide(BigDecimal.TEN.pow(diff + 1));
             } else if (diff < 0) {
-                dec = dec.setScale(scale, RoundingMode.DOWN);
+                dec = dec.setScale(scale, ClickHouseValues.ROUNDING_MODE);
             }
         }
         return dec;
@@ -160,7 +157,8 @@ public String asString(int length, Charset charset) {
         }
         String str = String.valueOf(value);
         if (length > 0) {
-            ClickHouseChecker.notWithDifferentLength(str.getBytes(charset == null ? StandardCharsets.UTF_8 : charset), length);
+            ClickHouseChecker.notWithDifferentLength(str.getBytes(charset == null ? StandardCharsets.UTF_8 : charset),
+                    length);
         }
         return str;
     }

diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseFloatValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseFloatValue.java
@@ -2,7 +2,6 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.math.RoundingMode;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import com.clickhouse.client.ClickHouseChecker;
@@ -158,7 +157,7 @@ public BigDecimal asBigDecimal(int scale) {
             if (diff > 0) {
                 dec = dec.divide(BigDecimal.TEN.pow(diff + 1));
             } else if (diff < 0) {
-                dec = dec.setScale(scale, RoundingMode.DOWN);
+                dec = dec.setScale(scale, ClickHouseValues.ROUNDING_MODE);
             }
         }
         return dec;

diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseInstantValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseInstantValue.java
@@ -2,7 +2,6 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.math.RoundingMode;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
@@ -167,7 +166,7 @@ public BigDecimal asBigDecimal(int scale) {
             v = new BigDecimal(BigInteger.valueOf(value.getEpochSecond()), scale);
             if (scale != 0 && nanoSeconds != 0) {
                 v = v.add(BigDecimal.valueOf(nanoSeconds).divide(ClickHouseValues.NANOS).setScale(scale,
-                        RoundingMode.HALF_UP));
+                        ClickHouseValues.ROUNDING_MODE));
             }
         }
         return v;
@@ -292,7 +291,7 @@ public ClickHouseInstantValue update(BigDecimal value) {
             resetToNullOrEmpty();
         } else {
             if (value.scale() != scale) {
-                value = value.setScale(scale, RoundingMode.HALF_UP);
+                value = value.setScale(scale, ClickHouseValues.ROUNDING_MODE);
             }
             set(ClickHouseValues.convertToInstant(value));
         }

diff --git a/...khouse-client/src/main/java/com/clickhouse/client/data/ClickHouseOffsetDateTimeValue.java b/...khouse-client/src/main/java/com/clickhouse/client/data/ClickHouseOffsetDateTimeValue.java
@@ -2,7 +2,6 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.math.RoundingMode;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
@@ -145,7 +144,7 @@ public BigDecimal asBigDecimal(int scale) {
             v = new BigDecimal(BigInteger.valueOf(value.toEpochSecond()), scale);
             if (scale != 0 && nanoSeconds != 0) {
                 v = v.add(BigDecimal.valueOf(nanoSeconds).divide(ClickHouseValues.NANOS).setScale(scale,
-                        RoundingMode.HALF_UP));
+                        ClickHouseValues.ROUNDING_MODE));
             }
         }
         return v;
@@ -275,7 +274,7 @@ public ClickHouseOffsetDateTimeValue update(BigDecimal value) {
             resetToNullOrEmpty();
         } else {
             if (value.scale() != scale) {
-                value = value.setScale(scale, RoundingMode.HALF_UP);
+                value = value.setScale(scale, ClickHouseValues.ROUNDING_MODE);
             }
             set(ClickHouseValues.convertToDateTime(value, tz).toOffsetDateTime());
         }

diff --git a/clickhouse-client/src/test/java/com/clickhouse/client/data/ClickHouseDateTimeValueTest.java b/clickhouse-client/src/test/java/com/clickhouse/client/data/ClickHouseDateTimeValueTest.java
@@ -206,6 +206,6 @@ public void testValueWithScale() throws Exception {
                 Arrays.asList(dateTime) // Tuple
         );
         Assert.assertEquals(ClickHouseDateTimeValue.of(dateTime, 3, ClickHouseValues.UTC_TIMEZONE).asBigDecimal(4),
-                BigDecimal.valueOf(0.1235D));
+                BigDecimal.valueOf(0.1234D));
     }
 }
diff --git a/...se-client/src/test/java/com/clickhouse/client/data/ClickHouseOffsetDateTimeValueTest.java b/...se-client/src/test/java/com/clickhouse/client/data/ClickHouseOffsetDateTimeValueTest.java
@@ -203,7 +203,7 @@ public void testValueWithScale() throws Exception {
                 Arrays.asList(dateTime) // Tuple
         );
         Assert.assertEquals(ClickHouseOffsetDateTimeValue.of(dateTime.toLocalDateTime(), 3, null).asBigDecimal(4),
-                BigDecimal.valueOf(0.1235D));
+                BigDecimal.valueOf(0.1234D));
     }
 
     @Test(groups = { "unit" })