Merge pull request #1313 from zhicwu/main

zhicwu · web-flow · commit a1ef19615f97 · 2023-04-16T23:40:03.000+08:00
converts empty string to default value
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## 0.4.3
 ### Bug Fixes
+* unable to convert empty string to default value when using text-based data format.
 * r2dbc driver does not support most client options. [#1299](https://github.com/ClickHouse/clickhouse-java/issues/1299)
 * incorrect content from Lz4InputStream when using text-based data format [#48446](https://github.com/ClickHouse/ClickHouse/issues/48446)
 
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/ClickHouseValues.java b/clickhouse-data/src/main/java/com/clickhouse/data/ClickHouseValues.java
@@ -30,6 +30,8 @@
 
 import com.clickhouse.data.value.ClickHouseArrayValue;
 import com.clickhouse.data.value.ClickHouseByteValue;
+import com.clickhouse.data.value.ClickHouseIpv4Value;
+import com.clickhouse.data.value.ClickHouseIpv6Value;
 
 /**
  * Help class for dealing with values.
@@ -55,7 +57,9 @@ public final class ClickHouseValues {
     public static final ClickHouseValue[] EMPTY_VALUES = new ClickHouseValue[0];
 
     public static final String EMPTY_ARRAY_EXPR = "[]";
+    public static final String EMPTY_MAP_EXPR = "{}";
     public static final String EMPTY_STRING_EXPR = "''";
+    public static final String EMPTY_TUPLE_EXPR = "()";
 
     public static final BigDecimal NANOS = new BigDecimal(BigInteger.TEN.pow(9));
 
@@ -386,6 +390,8 @@ public static Inet4Address convertToIpv4(int value) {
     public static Inet4Address convertToIpv4(String value) {
         if (value == null) {
             return null;
+        } else if (value.isEmpty()) {
+            return ClickHouseIpv4Value.DEFAULT;
         }
 
         try {
@@ -471,6 +477,8 @@ public static Inet6Address convertToIpv6(Inet4Address value) {
     public static Inet6Address convertToIpv6(String value) {
         if (value == null) {
             return null;
+        } else if (value.isEmpty()) {
+            return ClickHouseIpv6Value.DEFAULT;
         }
 
         try {
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseArrayValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseArrayValue.java
@@ -485,7 +485,14 @@ public ClickHouseArrayValue<T> update(Map<?, ?> value) {
     @Override
     @SuppressWarnings("unchecked")
     public ClickHouseArrayValue<T> update(String value) {
-        set((T[]) new String[] { value });
+        if (value == null) {
+            resetToNullOrEmpty();
+        } else if (value.isEmpty() || ClickHouseValues.EMPTY_ARRAY_EXPR.equals(value)) {
+            resetToDefault();
+        } else {
+            // TODO parse string
+            set((T[]) new String[] { value });
+        }
         return this;
     }
 
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseBigDecimalValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseBigDecimalValue.java
@@ -279,6 +279,8 @@ public ClickHouseBigDecimalValue update(LocalDateTime value) {
     public ClickHouseBigDecimalValue update(String value) {
         if (value == null) {
             resetToNullOrEmpty();
+        } else if (value.isEmpty()) {
+            resetToDefault();
         } else {
             set(new BigDecimal(value));
         }
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseBigIntegerValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseBigIntegerValue.java
@@ -254,6 +254,8 @@ public ClickHouseBigIntegerValue update(LocalDateTime value) {
     public ClickHouseBigIntegerValue update(String value) {
         if (value == null) {
             resetToNullOrEmpty();
+        } else if (value.isEmpty()) {
+            resetToDefault();
         } else {
             set(new BigInteger(value));
         }
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseBitmapValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseBitmapValue.java
@@ -320,6 +320,8 @@ public ClickHouseBitmapValue update(LocalDateTime value) {
     public ClickHouseBitmapValue update(String value) {
         if (value == null) {
             resetToNullOrEmpty();
+        } else if (value.isEmpty()) {
+            resetToDefault();
         } else {
             set(ClickHouseBitmap.wrap(Long.parseLong(value)));
         }
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseByteValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseByteValue.java
@@ -85,7 +85,14 @@ public ClickHouseByteValue update(BigDecimal value) {
 
         @Override
         public ClickHouseByteValue update(String value) {
-            return value == null ? resetToNullOrEmpty() : set(false, (byte) UnsignedByte.valueOf(value).byteValue());
+            if (value == null) {
+                resetToNullOrEmpty();
+            } else if (value.isEmpty()) {
+                resetToDefault();
+            } else {
+                set(false, UnsignedByte.valueOf(value).byteValue());
+            }
+            return this;
         }
     }
 
@@ -375,7 +382,14 @@ public ClickHouseByteValue update(Enum<?> value) {
 
     @Override
     public ClickHouseByteValue update(String value) {
-        return value == null ? resetToNullOrEmpty() : set(false, Byte.parseByte(value));
+        if (value == null) {
+            resetToNullOrEmpty();
+        } else if (value.isEmpty()) {
+            resetToDefault();
+        } else {
+            set(false, Byte.parseByte(value));
+        }
+        return this;
     }
 
     @Override
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseDateTimeValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseDateTimeValue.java
@@ -365,6 +365,8 @@ public ClickHouseValue update(ZonedDateTime value) {
     public ClickHouseDateTimeValue update(String value) {
         if (value == null) {
             resetToNullOrEmpty();
+        } else if (value.isEmpty()) {
+            resetToDefault();
         } else {
             set(LocalDateTime.parse(value, ClickHouseValues.DATETIME_FORMATTER));
         }
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseDateValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseDateValue.java
@@ -254,6 +254,8 @@ public ClickHouseDateValue update(LocalDateTime value) {
     public ClickHouseDateValue update(String value) {
         if (value == null) {
             resetToNullOrEmpty();
+        } else if (value.isEmpty()) {
+            resetToDefault();
         } else {
             set(LocalDate.parse(value, ClickHouseValues.DATE_FORMATTER));
         }
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseDoubleValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseDoubleValue.java
@@ -254,7 +254,14 @@ public ClickHouseDoubleValue update(Enum<?> value) {
 
     @Override
     public ClickHouseDoubleValue update(String value) {
-        return value == null ? resetToNullOrEmpty() : set(false, Double.parseDouble(value));
+        if (value == null) {
+            resetToNullOrEmpty();
+        } else if (value.isEmpty()) {
+            resetToDefault();
+        } else {
+            set(false, Double.parseDouble(value));
+        }
+        return this;
     }
 
     @Override
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseEnumValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseEnumValue.java
@@ -284,7 +284,14 @@ public ClickHouseEnumValue update(Enum<?> value) {
 
     @Override
     public ClickHouseEnumValue update(String value) {
-        return value == null ? resetToNullOrEmpty() : set(false, type.value(value));
+        if (value == null) {
+            resetToNullOrEmpty();
+        } else if (value.isEmpty()) {
+            resetToDefault();
+        } else {
+            set(false, type.value(value));
+        }
+        return this;
     }
 
     @Override
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseFloatValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseFloatValue.java
@@ -274,7 +274,14 @@ public ClickHouseFloatValue update(Enum<?> value) {
 
     @Override
     public ClickHouseFloatValue update(String value) {
-        return value == null ? resetToNullOrEmpty() : set(false, Float.parseFloat(value));
+        if (value == null) {
+            resetToNullOrEmpty();
+        } else if (value.isEmpty()) {
+            resetToDefault();
+        } else {
+            set(false, Float.parseFloat(value));
+        }
+        return this;
     }
 
     @Override
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseInstantValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseInstantValue.java
@@ -371,6 +371,8 @@ public ClickHouseInstantValue update(ZonedDateTime value) {
     public ClickHouseInstantValue update(String value) {
         if (value == null) {
             resetToNullOrEmpty();
+        } else if (value.isEmpty()) {
+            resetToDefault();
         } else {
             set(LocalDateTime.parse(value, ClickHouseValues.DATETIME_FORMATTER).atZone(tz.toZoneId()).toInstant());
         }
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseIntegerValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseIntegerValue.java
@@ -84,7 +84,14 @@ public ClickHouseIntegerValue update(BigDecimal value) {
 
         @Override
         public ClickHouseIntegerValue update(String value) {
-            return value == null ? resetToNullOrEmpty() : set(false, Integer.parseUnsignedInt(value));
+            if (value == null) {
+                resetToNullOrEmpty();
+            } else if (value.isEmpty()) {
+                resetToDefault();
+            } else {
+                set(false, Integer.parseUnsignedInt(value));
+            }
+            return this;
         }
     }
 
@@ -348,7 +355,14 @@ public ClickHouseIntegerValue update(Enum<?> value) {
 
     @Override
     public ClickHouseIntegerValue update(String value) {
-        return value == null ? resetToNullOrEmpty() : set(false, Integer.parseInt(value));
+        if (value == null) {
+            resetToNullOrEmpty();
+        } else if (value.isEmpty()) {
+            resetToDefault();
+        } else {
+            set(false, Integer.parseInt(value));
+        }
+        return this;
     }
 
     @Override
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseLongValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseLongValue.java
@@ -99,7 +99,14 @@ public ClickHouseLongValue update(BigDecimal value) {
 
         @Override
         public ClickHouseLongValue update(String value) {
-            return value == null ? resetToNullOrEmpty() : set(false, Long.parseUnsignedLong(value));
+            if (value == null) {
+                resetToNullOrEmpty();
+            } else if (value.isEmpty()) {
+                resetToDefault();
+            } else {
+                set(false, Long.parseUnsignedLong(value));
+            }
+            return this;
         }
     }
 
@@ -394,7 +401,14 @@ public ClickHouseLongValue update(Enum<?> value) {
 
     @Override
     public ClickHouseLongValue update(String value) {
-        return value == null ? resetToNullOrEmpty() : set(false, Long.parseLong(value));
+        if (value == null) {
+            resetToNullOrEmpty();
+        } else if (value.isEmpty()) {
+            resetToDefault();
+        } else {
+            set(false, Long.parseLong(value));
+        }
+        return this;
     }
 
     @Override
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseMapValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseMapValue.java
@@ -140,7 +140,7 @@ public <K, V> Map<K, V> asMap(Class<K> keyClass, Class<V> valueClass) {
     public String asString() {
         Map<?, ?> value = getValue();
         if (value == null || value.isEmpty()) {
-            return "{}";
+            return ClickHouseValues.EMPTY_MAP_EXPR;
         }
         StringBuilder builder = new StringBuilder().append('{');
         for (Entry<?, ?> e : value.entrySet()) {
@@ -171,7 +171,7 @@ public ClickHouseMapValue resetToNullOrEmpty() {
     public String toSqlExpression() {
         Map<?, ?> value = getValue();
         if (value == null || value.isEmpty()) {
-            return "{}";
+            return ClickHouseValues.EMPTY_MAP_EXPR;
         }
 
         StringBuilder builder = new StringBuilder().append('{');
@@ -248,10 +248,15 @@ public ClickHouseMapValue update(BigDecimal value) {
     @Override
     public ClickHouseMapValue update(String value) {
         if (value == null) {
-            return resetToNullOrEmpty();
+            resetToNullOrEmpty();
+        } else if (value.isEmpty() || ClickHouseValues.EMPTY_MAP_EXPR.equals(value)) {
+            resetToDefault();
+        } else {
+            // TODO parse string
+            set(Collections.singletonMap(getDefaultKey(), valueType.cast(value)));
         }
 
-        return set(Collections.singletonMap(getDefaultKey(), valueType.cast(value)));
+        return this;
     }
 
     @Override
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseNestedValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseNestedValue.java
@@ -532,10 +532,14 @@ public ClickHouseNestedValue update(Map<?, ?> value) {
     @Override
     public ClickHouseNestedValue update(String value) {
         if (value == null) {
-            return resetToNullOrEmpty();
+            resetToNullOrEmpty();
+        } else if (value.isEmpty() || ClickHouseValues.EMPTY_ARRAY_EXPR.equals(value)) {
+            resetToDefault();
+        } else {
+            // TODO parse string
+            set(new Object[][] { new String[] { value } });
         }
-        // TODO parse string
-        return set(new Object[][] { new String[] { value } });
+        return this;
     }
 
     @Override
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseOffsetDateTimeValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseOffsetDateTimeValue.java
@@ -365,6 +365,8 @@ public ClickHouseOffsetDateTimeValue update(ZonedDateTime value) {
     public ClickHouseOffsetDateTimeValue update(String value) {
         if (value == null) {
             resetToNullOrEmpty();
+        } else if (value.isEmpty()) {
+            resetToDefault();
         } else {
             set(LocalDateTime.parse(value, ClickHouseValues.DATETIME_FORMATTER).atZone(tz.toZoneId())
                     .toOffsetDateTime());
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseShortValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseShortValue.java
@@ -85,7 +85,14 @@ public ClickHouseShortValue update(BigDecimal value) {
 
         @Override
         public ClickHouseShortValue update(String value) {
-            return value == null ? resetToNullOrEmpty() : set(false, UnsignedShort.valueOf(value).shortValue());
+            if (value == null) {
+                resetToNullOrEmpty();
+            } else if (value.isEmpty()) {
+                resetToDefault();
+            } else {
+                set(false, UnsignedShort.valueOf(value).shortValue());
+            }
+            return this;
         }
     }
 
@@ -380,7 +387,14 @@ public ClickHouseShortValue update(Enum<?> value) {
 
     @Override
     public ClickHouseShortValue update(String value) {
-        return value == null ? resetToNullOrEmpty() : set(false, Short.parseShort(value));
+        if (value == null) {
+            resetToNullOrEmpty();
+        } else if (value.isEmpty()) {
+            resetToDefault();
+        } else {
+            set(false, Short.parseShort(value));
+        }
+        return this;
     }
 
     @Override
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseTupleValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseTupleValue.java
@@ -451,10 +451,13 @@ public ClickHouseTupleValue update(Map<?, ?> value) {
     @Override
     public ClickHouseTupleValue update(String value) {
         if (value == null) {
-            return resetToNullOrEmpty();
+            resetToNullOrEmpty();
+        } else if (value.isEmpty() || ClickHouseValues.EMPTY_TUPLE_EXPR.equals(value)) {
+            resetToDefault();
+        } else {
+            // TODO parse string
+            set(Collections.singletonList(value));
         }
-        // TODO parse string
-        set(Collections.singletonList(value));
         return this;
     }
 
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseUuidValue.java b/clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseUuidValue.java
@@ -237,6 +237,8 @@ public ClickHouseUuidValue update(LocalDateTime value) {
     public ClickHouseUuidValue update(String value) {
         if (value == null) {
             resetToNullOrEmpty();
+        } else if (value.isEmpty()) {
+            resetToDefault();
         } else {
             set(UUID.fromString(value));
         }
diff --git a/clickhouse-data/src/test/java/com/clickhouse/data/value/ClickHouseStringValueTest.java b/clickhouse-data/src/test/java/com/clickhouse/data/value/ClickHouseStringValueTest.java
@@ -105,8 +105,8 @@ public void testValue() throws UnknownHostException {
                 DateTimeParseException.class, // Date
                 DateTimeParseException.class, // DateTime
                 DateTimeParseException.class, // DateTime(9)
-                Inet4Address.getAllByName("127.0.0.1")[0], // Inet4Address
-                ClickHouseValues.convertToIpv6("127.0.0.1"), // Inet6Address
+                Inet4Address.getAllByName("0.0.0.0")[0], // Inet4Address
+                ClickHouseValues.convertToIpv6("0:0:0:0:0:0:0:0"), // Inet6Address
                 "", // String
                 "''", // SQL Expression
                 DateTimeParseException.class, // Time

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,8 @@ public ClickHouseBigDecimalValue update(LocalDateTime value) {`
`279`	`279`	`public ClickHouseBigDecimalValue update(String value) {`
`280`	`280`	`if (value == null) {`
`281`	`281`	`resetToNullOrEmpty();`
	`282`	`+ } else if (value.isEmpty()) {`
	`283`	`+ resetToDefault();`
`282`	`284`	`} else {`
`283`	`285`	`set(new BigDecimal(value));`
`284`	`286`	`}`
Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,8 @@ public ClickHouseBigIntegerValue update(LocalDateTime value) {`
`254`	`254`	`public ClickHouseBigIntegerValue update(String value) {`
`255`	`255`	`if (value == null) {`
`256`	`256`	`resetToNullOrEmpty();`
	`257`	`+ } else if (value.isEmpty()) {`
	`258`	`+ resetToDefault();`
`257`	`259`	`} else {`
`258`	`260`	`set(new BigInteger(value));`
`259`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -320,6 +320,8 @@ public ClickHouseBitmapValue update(LocalDateTime value) {`
`320`	`320`	`public ClickHouseBitmapValue update(String value) {`
`321`	`321`	`if (value == null) {`
`322`	`322`	`resetToNullOrEmpty();`
	`323`	`+ } else if (value.isEmpty()) {`
	`324`	`+ resetToDefault();`
`323`	`325`	`} else {`
`324`	`326`	`set(ClickHouseBitmap.wrap(Long.parseLong(value)));`
`325`	`327`	`}`
Original file line number	Diff line number	Diff line change
`@@ -365,6 +365,8 @@ public ClickHouseValue update(ZonedDateTime value) {`
`365`	`365`	`public ClickHouseDateTimeValue update(String value) {`
`366`	`366`	`if (value == null) {`
`367`	`367`	`resetToNullOrEmpty();`
	`368`	`+ } else if (value.isEmpty()) {`
	`369`	`+ resetToDefault();`
`368`	`370`	`} else {`
`369`	`371`	`set(LocalDateTime.parse(value, ClickHouseValues.DATETIME_FORMATTER));`
`370`	`372`	`}`
Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,8 @@ public ClickHouseDateValue update(LocalDateTime value) {`
`254`	`254`	`public ClickHouseDateValue update(String value) {`
`255`	`255`	`if (value == null) {`
`256`	`256`	`resetToNullOrEmpty();`
	`257`	`+ } else if (value.isEmpty()) {`
	`258`	`+ resetToDefault();`
`257`	`259`	`} else {`
`258`	`260`	`set(LocalDate.parse(value, ClickHouseValues.DATE_FORMATTER));`
`259`	`261`	`}`