Merge pull request #404 from florianl/flo-bytes-buffer

Improve CPU utilization by reducing allocation overhead

Author: kshvakov

bootstrap.go

@@ -15,8 +15,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ClickHouse/clickhouse-go/lib/leakypool"
-
 	"github.com/ClickHouse/clickhouse-go/lib/binary"
 	"github.com/ClickHouse/clickhouse-go/lib/data"
 	"github.com/ClickHouse/clickhouse-go/lib/protocol"
@@ -100,7 +98,6 @@ func open(dsn string) (*clickhouse, error) {
 		readTimeout      = DefaultReadTimeout
 		writeTimeout     = DefaultWriteTimeout
 		connOpenStrategy = connOpenRandom
-		poolSize         = 100
 	)
 	if len(database) == 0 {
 		database = DefaultDatabase
@@ -134,12 +131,6 @@ func open(dsn string) (*clickhouse, error) {
 	if size, err := strconv.ParseInt(query.Get("block_size"), 10, 64); err == nil {
 		blockSize = int(size)
 	}
-	if size, err := strconv.ParseInt(query.Get("pool_size"), 10, 64); err == nil {
-		poolSize = int(size)
-	}
-	poolInit.Do(func() {
-		leakypool.InitBytePool(poolSize)
-	})
 	if altHosts := strings.Split(query.Get("alt_hosts"), ","); len(altHosts) != 0 {
 		for _, host := range altHosts {
 			if len(host) != 0 {

lib/data/block.go

@@ -1,6 +1,7 @@
 package data
 
 import (
+	"bytes"
 	"database/sql/driver"
 	"fmt"
 	"io"
@@ -9,7 +10,6 @@ import (
 
 	"github.com/ClickHouse/clickhouse-go/lib/binary"
 	"github.com/ClickHouse/clickhouse-go/lib/column"
-	wb "github.com/ClickHouse/clickhouse-go/lib/writebuffer"
 )
 
 type offset [][]int
@@ -165,8 +165,8 @@ func (block *Block) Reserve() {
 		block.offsets = make([]offset, len(block.Columns))
 		for i := 0; i < len(block.Columns); i++ {
 			var (
-				offsetBuffer = wb.New(wb.InitialSize)
-				columnBuffer = wb.New(wb.InitialSize)
+				offsetBuffer = new(bytes.Buffer)
+				columnBuffer = new(bytes.Buffer)
 			)
 			block.buffers[i] = &buffer{
 				Offset:       binary.NewEncoder(offsetBuffer),
@@ -289,8 +289,8 @@ func (info *blockInfo) write(encoder *binary.Encoder) error {
 type buffer struct {
 	Offset       *binary.Encoder
 	Column       *binary.Encoder
-	offsetBuffer *wb.WriteBuffer
-	columnBuffer *wb.WriteBuffer
+	offsetBuffer *bytes.Buffer
+	columnBuffer *bytes.Buffer
 }
 
 func (buf *buffer) WriteTo(w io.Writer) (int64, error) {