Merge pull request #2004 from abcfy2/main

Make GenericRecord and ClickHouseBinaryFormatReader easy to iterate

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/AbstractBinaryFormatReader.java

@@ -32,12 +32,7 @@
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;

client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/BinaryReaderBackedRecord.java

@@ -1,24 +1,20 @@
 package com.clickhouse.client.api.data_formats.internal;
 
 import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
+import com.clickhouse.client.api.metadata.TableSchema;
 import com.clickhouse.client.api.query.GenericRecord;
-import com.clickhouse.data.value.ClickHouseBitmap;
-import com.clickhouse.data.value.ClickHouseGeoMultiPolygonValue;
-import com.clickhouse.data.value.ClickHouseGeoPointValue;
-import com.clickhouse.data.value.ClickHouseGeoPolygonValue;
-import com.clickhouse.data.value.ClickHouseGeoRingValue;
+import com.clickhouse.data.ClickHouseColumn;
+import com.clickhouse.data.value.*;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZonedDateTime;
+import java.time.*;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 public class BinaryReaderBackedRecord implements GenericRecord {
 
@@ -377,4 +373,16 @@ public ClickHouseBitmap getClickHouseBitmap(String colName) {
     public ClickHouseBitmap getClickHouseBitmap(int index) {
         return reader.readValue(index);
     }
+
+    @Override
+    public TableSchema getSchema() {
+        return reader.getSchema();
+    }
+
+    @Override
+    public Map<String, Object> getValues() {
+        return this.getSchema().getColumns().stream().collect(Collectors.toMap(
+                ClickHouseColumn::getColumnName,
+                column -> this.getObject(column.getColumnName())));
+    }
 }

client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/MapBackedRecord.java

@@ -5,23 +5,13 @@
 import com.clickhouse.client.api.query.GenericRecord;
 import com.clickhouse.client.api.query.NullValueException;
 import com.clickhouse.data.ClickHouseColumn;
-import com.clickhouse.data.value.ClickHouseArrayValue;
-import com.clickhouse.data.value.ClickHouseBitmap;
-import com.clickhouse.data.value.ClickHouseGeoMultiPolygonValue;
-import com.clickhouse.data.value.ClickHouseGeoPointValue;
-import com.clickhouse.data.value.ClickHouseGeoPolygonValue;
-import com.clickhouse.data.value.ClickHouseGeoRingValue;
+import com.clickhouse.data.value.*;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
+import java.time.*;
 import java.time.temporal.ChronoUnit;
 import java.util.HashMap;
 import java.util.List;
@@ -33,7 +23,7 @@ public class MapBackedRecord implements GenericRecord {
 
     private final Map<String, Object> record;
 
-    private TableSchema schema;
+    private final TableSchema schema;
 
     private Map[] columnConverters;
 
@@ -513,6 +503,11 @@ public ClickHouseBitmap getClickHouseBitmap(int index) {
         return readValue(index);
     }
 
+    @Override
+    public TableSchema getSchema() {
+        return this.schema;
+    }
+
     @Override
     public Object getObject(String colName) {
         return readValue(colName);
@@ -522,4 +517,9 @@ public Object getObject(String colName) {
     public Object getObject(int index) {
         return readValue(index);
     }
+
+    @Override
+    public Map<String, Object> getValues() {
+        return this.record;
+    }
 }

client-v2/src/main/java/com/clickhouse/client/api/query/GenericRecord.java

@@ -1,21 +1,15 @@
 package com.clickhouse.client.api.query;
 
-import com.clickhouse.data.value.ClickHouseBitmap;
-import com.clickhouse.data.value.ClickHouseGeoMultiPolygonValue;
-import com.clickhouse.data.value.ClickHouseGeoPointValue;
-import com.clickhouse.data.value.ClickHouseGeoPolygonValue;
-import com.clickhouse.data.value.ClickHouseGeoRingValue;
+import com.clickhouse.client.api.metadata.TableSchema;
+import com.clickhouse.data.value.*;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZonedDateTime;
+import java.time.*;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 public interface GenericRecord {
@@ -500,4 +494,13 @@ public interface GenericRecord {
     ClickHouseBitmap getClickHouseBitmap(String colName);
 
     ClickHouseBitmap getClickHouseBitmap(int index);
+
+    TableSchema getSchema();
+
+    /**
+     * Returns all values of this record in Map.
+     *
+     * @return a Map of column names and values.
+     */
+    Map<String, Object> getValues();
 }