Array(T) performance improvement

Author: kshvakov

clickhouse.go

@@ -178,6 +178,12 @@ func (ch *clickhouse) CheckNamedValue(nv *driver.NamedValue) error {
 		return nil
 	}
 	switch v := nv.Value.(type) {
+	case
+		[]int, []int8, []int16, []int32, []int64,
+		[]uint, []uint8, []uint16, []uint32, []uint64,
+		[]float32, []float64,
+		[]string:
+		return nil
 	case net.IP:
 		nv.Value = column.IP(v)
 	case driver.Valuer:

lib/column/array.go

@@ -24,16 +24,7 @@ func (array *Array) Read(decoder *binary.Decoder) (interface{}, error) {
 }
 
 func (array *Array) Write(encoder *binary.Encoder, v interface{}) error {
-	value := reflect.ValueOf(v)
-	if value.Kind() != reflect.Slice {
-		return fmt.Errorf("unsupported Array(T) type [%T]", value.Interface())
-	}
-	for i := 0; i < value.Len(); i++ {
-		if err := array.column.Write(encoder, value.Index(i).Interface()); err != nil {
-			return err
-		}
-	}
-	return nil
+	return array.column.Write(encoder, v)
 }
 
 func (array *Array) ReadArray(decoder *binary.Decoder, rows int) (_ []interface{}, err error) {

lib/data/block.go

@@ -95,8 +95,7 @@ func (block *Block) Read(serverInfo *ServerInfo, decoder *binary.Decoder) (err e
 	return nil
 }
 
-func (block *Block) prepareArray(arr interface{}, num, level int) (values []interface{}) {
-	value := reflect.ValueOf(arr)
+func (block *Block) prepareArray(value reflect.Value, num, level int) (values []interface{}) {
 	switch {
 	case value.Kind() == reflect.Slice:
 		if len(block.offsets[num]) < level {
@@ -108,7 +107,7 @@ func (block *Block) prepareArray(arr interface{}, num, level int) (values []inte
 			)
 		}
 		for i := 0; i < value.Len(); i++ {
-			values = append(values, block.prepareArray(value.Index(i).Interface(), num, level+1)...)
+			values = append(values, block.prepareArray(value.Index(i), num, level+1)...)
 		}
 	default:
 		values = append(values, value.Interface())
@@ -127,9 +126,14 @@ func (block *Block) AppendRow(args []driver.Value) error {
 	for num, c := range block.Columns {
 		switch column := c.(type) {
 		case *column.Array:
-			values := block.prepareArray(args[num], num, 1)
-			if err := column.Write(block.buffers[num].Column, values); err != nil {
-				return err
+			value := reflect.ValueOf(args[num])
+			if value.Kind() != reflect.Slice {
+				return fmt.Errorf("unsupported Array(T) type [%T]", value.Interface())
+			}
+			for _, value := range block.prepareArray(value, num, 1) {
+				if err := column.Write(block.buffers[num].Column, value); err != nil {
+					return err
+				}
 			}
 		case *column.Nullable:
 			if err := column.WriteNull(block.buffers[num].Offset, block.buffers[num].Column, args[num]); err != nil {

lib/data/block_write_column.go

@@ -1,6 +1,8 @@
 package data
 
 import (
+	"fmt"
+	"reflect"
 	"time"
 
 	"github.com/kshvakov/clickhouse/lib/binary"
@@ -16,6 +18,13 @@ func (block *Block) WriteDateTime(c int, v time.Time) error {
 	return block.buffers[c].Column.UInt32(uint32(v.Unix()))
 }
 
+func (block *Block) WriteBool(c int, v bool) error {
+	if v {
+		return block.buffers[c].Column.UInt8(1)
+	}
+	return block.buffers[c].Column.UInt8(0)
+}
+
 func (block *Block) WriteInt8(c int, v int8) error {
 	return block.buffers[c].Column.Int8(v)
 }
@@ -81,9 +90,14 @@ func (block *Block) WriteFixedString(c int, v []byte) error {
 }
 
 func (block *Block) WriteArray(c int, v interface{}) error {
-	values := block.prepareArray(v, c, 1)
-	if err := block.Columns[c].Write(block.buffers[c].Column, values); err != nil {
-		return err
+	value := reflect.ValueOf(v)
+	if value.Kind() != reflect.Slice {
+		return fmt.Errorf("unsupported Array(T) type [%T]", value.Interface())
+	}
+	for _, value := range block.prepareArray(value, c, 1) {
+		if err := block.Columns[c].Write(block.buffers[c].Column, value); err != nil {
+			return err
+		}
 	}
 	return nil
 }