rename internal to lib

kshvakov · kshvakov · commit fa7c3dd7f04b · 2017-08-16T11:13:42.000+03:00
diff --git a/array.go b/array.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/kshvakov/clickhouse/internal/types"
+	"github.com/kshvakov/clickhouse/lib/types"
 )
 
 func Array(v interface{}) *types.Array {
diff --git a/bootstrap.go b/bootstrap.go
@@ -12,9 +12,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
-	"github.com/kshvakov/clickhouse/internal/data"
-	"github.com/kshvakov/clickhouse/internal/protocol"
+	"github.com/kshvakov/clickhouse/lib/binary"
+	"github.com/kshvakov/clickhouse/lib/data"
+	"github.com/kshvakov/clickhouse/lib/protocol"
 )
 
 const (
diff --git a/clickhouse.go b/clickhouse.go
@@ -10,9 +10,9 @@ import (
 	"regexp"
 	"sync/atomic"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
-	"github.com/kshvakov/clickhouse/internal/data"
-	"github.com/kshvakov/clickhouse/internal/protocol"
+	"github.com/kshvakov/clickhouse/lib/binary"
+	"github.com/kshvakov/clickhouse/lib/data"
+	"github.com/kshvakov/clickhouse/lib/protocol"
 )
 
 var (
@@ -189,10 +189,16 @@ func (ch *clickhouse) process() error {
 				return err
 			}
 			ch.logf("[process] <- profiling: rows=%d, bytes=%d, blocks=%d", profileInfo.rows, profileInfo.bytes, profileInfo.blocks)
+		case protocol.ServerData:
+			block, err := ch.readBlock(ch.decoder)
+			if err != nil {
+				return err
+			}
+			ch.logf("[process] <- data: packet=%d, columns=%d, rows=%d", packet, block.NumColumns, block.NumRows)
 		case protocol.ServerEndOfStream:
 			return nil
 		default:
-			return fmt.Errorf("unexpected packet [%d] from server", packet)
+			return fmt.Errorf("[process] unexpected packet [%d] from server", packet)
 		}
 		if packet, err = ch.decoder.Uvarint(); err != nil {
 			return err
diff --git a/clickhouse_ping.go b/clickhouse_ping.go
@@ -3,7 +3,7 @@ package clickhouse
 import (
 	"context"
 
-	"github.com/kshvakov/clickhouse/internal/protocol"
+	"github.com/kshvakov/clickhouse/lib/protocol"
 )
 
 func (ch *clickhouse) Ping(ctx context.Context) error {
diff --git a/clickhouse_progress.go b/clickhouse_progress.go
@@ -1,7 +1,7 @@
 package clickhouse
 
 import (
-	"github.com/kshvakov/clickhouse/internal/protocol"
+	"github.com/kshvakov/clickhouse/lib/protocol"
 )
 
 type progress struct {
diff --git a/clickhouse_read_block.go b/clickhouse_read_block.go
@@ -1,9 +1,9 @@
 package clickhouse
 
 import (
-	"github.com/kshvakov/clickhouse/internal/binary"
-	"github.com/kshvakov/clickhouse/internal/data"
-	"github.com/kshvakov/clickhouse/internal/protocol"
+	"github.com/kshvakov/clickhouse/lib/binary"
+	"github.com/kshvakov/clickhouse/lib/data"
+	"github.com/kshvakov/clickhouse/lib/protocol"
 )
 
 func (ch *clickhouse) readBlock(decoder *binary.Decoder) (*data.Block, error) {
diff --git a/clickhouse_read_meta.go b/clickhouse_read_meta.go
@@ -3,8 +3,8 @@ package clickhouse
 import (
 	"fmt"
 
-	"github.com/kshvakov/clickhouse/internal/data"
-	"github.com/kshvakov/clickhouse/internal/protocol"
+	"github.com/kshvakov/clickhouse/lib/data"
+	"github.com/kshvakov/clickhouse/lib/protocol"
 )
 
 func (ch *clickhouse) readMeta() (*data.Block, error) {
diff --git a/clickhouse_send_query.go b/clickhouse_send_query.go
@@ -1,8 +1,8 @@
 package clickhouse
 
 import (
-	"github.com/kshvakov/clickhouse/internal/data"
-	"github.com/kshvakov/clickhouse/internal/protocol"
+	"github.com/kshvakov/clickhouse/lib/data"
+	"github.com/kshvakov/clickhouse/lib/protocol"
 )
 
 func (ch *clickhouse) sendQuery(query string) error {
diff --git a/clickhouse_write_block.go b/clickhouse_write_block.go
@@ -1,8 +1,8 @@
 package clickhouse
 
 import (
-	"github.com/kshvakov/clickhouse/internal/data"
-	"github.com/kshvakov/clickhouse/internal/protocol"
+	"github.com/kshvakov/clickhouse/lib/data"
+	"github.com/kshvakov/clickhouse/lib/protocol"
 )
 
 func (ch *clickhouse) writeBlock(block *data.Block) error {
diff --git a/connect.go b/connect.go
@@ -59,7 +59,7 @@ func (conn *connect) Read(b []byte) (int, error) {
 	for total < dstLen {
 		if n, err = conn.Conn.Read(b[total:]); err != nil {
 			conn.logf("[connect] read error: %v", err)
-			atomic.CompareAndSwapInt32(&conn.closed, 0, 1)
+			conn.Close()
 			return n, driver.ErrBadConn
 		}
 		total += n
@@ -80,7 +80,7 @@ func (conn *connect) Write(b []byte) (int, error) {
 	for total < srcLen {
 		if n, err = conn.Conn.Write(b[total:]); err != nil {
 			conn.logf("[connect] write error: %v", err)
-			atomic.CompareAndSwapInt32(&conn.closed, 0, 1)
+			conn.Close()
 			return n, driver.ErrBadConn
 		}
 		total += n
diff --git a/lib/binary/decoder.go b/lib/binary/decoder.go
diff --git a/lib/binary/encoder.go b/lib/binary/encoder.go
diff --git a/lib/binary/read_test.go b/lib/binary/read_test.go
diff --git a/lib/column/array.go b/lib/column/array.go
@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
+	"github.com/kshvakov/clickhouse/lib/binary"
 )
 
 type ArrayWriter interface {
diff --git a/lib/column/column.go b/lib/column/column.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
+	"github.com/kshvakov/clickhouse/lib/binary"
 )
 
 type Column interface {
diff --git a/lib/column/common.go b/lib/column/common.go
diff --git a/lib/column/datetime.go b/lib/column/datetime.go
@@ -3,7 +3,7 @@ package column
 import (
 	"time"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
+	"github.com/kshvakov/clickhouse/lib/binary"
 )
 
 type DateTime struct {
diff --git a/lib/column/enum.go b/lib/column/enum.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
+	"github.com/kshvakov/clickhouse/lib/binary"
 )
 
 type Enum struct {
diff --git a/lib/column/fixed_string.go b/lib/column/fixed_string.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
+	"github.com/kshvakov/clickhouse/lib/binary"
 )
 
 type FixedString struct {
diff --git a/lib/column/float32.go b/lib/column/float32.go
@@ -3,7 +3,7 @@ package column
 import (
 	"fmt"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
+	"github.com/kshvakov/clickhouse/lib/binary"
 )
 
 type Float32 struct{ base }
diff --git a/lib/column/float64.go b/lib/column/float64.go
@@ -3,7 +3,7 @@ package column
 import (
 	"fmt"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
+	"github.com/kshvakov/clickhouse/lib/binary"
 )
 
 type Float64 struct{ base }
diff --git a/lib/column/int16.go b/lib/column/int16.go
@@ -3,7 +3,7 @@ package column
 import (
 	"fmt"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
+	"github.com/kshvakov/clickhouse/lib/binary"
 )
 
 type Int16 struct{ base }
diff --git a/lib/column/int32.go b/lib/column/int32.go
@@ -3,7 +3,7 @@ package column
 import (
 	"fmt"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
+	"github.com/kshvakov/clickhouse/lib/binary"
 )
 
 type Int32 struct{ base }
diff --git a/lib/column/int64.go b/lib/column/int64.go
@@ -3,7 +3,7 @@ package column
 import (
 	"fmt"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
+	"github.com/kshvakov/clickhouse/lib/binary"
 )
 
 type Int64 struct{ base }
diff --git a/lib/column/int8.go b/lib/column/int8.go
@@ -3,7 +3,7 @@ package column
 import (
 	"fmt"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
+	"github.com/kshvakov/clickhouse/lib/binary"
 )
 
 type Int8 struct{ base }
diff --git a/lib/column/string.go b/lib/column/string.go
@@ -3,7 +3,7 @@ package column
 import (
 	"fmt"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
+	"github.com/kshvakov/clickhouse/lib/binary"
 )
 
 type String struct{ base }
diff --git a/lib/column/uint16.go b/lib/column/uint16.go
@@ -3,7 +3,7 @@ package column
 import (
 	"fmt"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
+	"github.com/kshvakov/clickhouse/lib/binary"
 )
 
 type UInt16 struct{ base }
diff --git a/lib/column/uint32.go b/lib/column/uint32.go
@@ -3,7 +3,7 @@ package column
 import (
 	"fmt"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
+	"github.com/kshvakov/clickhouse/lib/binary"
 )
 
 type UInt32 struct{ base }
diff --git a/lib/column/uint64.go b/lib/column/uint64.go
@@ -3,7 +3,7 @@ package column
 import (
 	"fmt"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
+	"github.com/kshvakov/clickhouse/lib/binary"
 )
 
 type UInt64 struct{ base }
diff --git a/lib/column/uint8.go b/lib/column/uint8.go
@@ -3,7 +3,7 @@ package column
 import (
 	"fmt"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
+	"github.com/kshvakov/clickhouse/lib/binary"
 )
 
 type UInt8 struct{ base }
diff --git a/lib/data/block.go b/lib/data/block.go
@@ -6,10 +6,10 @@ import (
 	"io"
 	"strings"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
-	"github.com/kshvakov/clickhouse/internal/column"
-	"github.com/kshvakov/clickhouse/internal/protocol"
-	wb "github.com/kshvakov/clickhouse/internal/writebuffer"
+	"github.com/kshvakov/clickhouse/lib/binary"
+	"github.com/kshvakov/clickhouse/lib/column"
+	"github.com/kshvakov/clickhouse/lib/protocol"
+	wb "github.com/kshvakov/clickhouse/lib/writebuffer"
 )
 
 type Block struct {
diff --git a/lib/data/client_info.go b/lib/data/client_info.go
@@ -3,7 +3,7 @@ package data
 import (
 	"fmt"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
+	"github.com/kshvakov/clickhouse/lib/binary"
 )
 
 const ClientName = "Golang SQLDriver"
diff --git a/lib/data/server_info.go b/lib/data/server_info.go
@@ -5,8 +5,8 @@ import (
 	//"io"
 	"time"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
-	"github.com/kshvakov/clickhouse/internal/protocol"
+	"github.com/kshvakov/clickhouse/lib/binary"
+	"github.com/kshvakov/clickhouse/lib/protocol"
 )
 
 type ServerInfo struct {
diff --git a/lib/protocol/protocol.go b/lib/protocol/protocol.go
diff --git a/lib/types/array.go b/lib/types/array.go
@@ -6,9 +6,9 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
-	"github.com/kshvakov/clickhouse/internal/column"
-	"github.com/kshvakov/clickhouse/internal/writebuffer"
+	"github.com/kshvakov/clickhouse/lib/binary"
+	"github.com/kshvakov/clickhouse/lib/column"
+	"github.com/kshvakov/clickhouse/lib/writebuffer"
 )
 
 func NewArray(v interface{}) *Array {
diff --git a/lib/writebuffer/buffer.go b/lib/writebuffer/buffer.go
diff --git a/rows.go b/rows.go
@@ -6,9 +6,9 @@ import (
 	"io"
 	"reflect"
 
-	"github.com/kshvakov/clickhouse/internal/binary"
-	"github.com/kshvakov/clickhouse/internal/data"
-	"github.com/kshvakov/clickhouse/internal/protocol"
+	"github.com/kshvakov/clickhouse/lib/binary"
+	"github.com/kshvakov/clickhouse/lib/data"
+	"github.com/kshvakov/clickhouse/lib/protocol"
 )
 
 type rows struct {
diff --git a/value_converter.go b/value_converter.go
@@ -9,7 +9,7 @@ import (
 	"net"
 	"reflect"
 
-	"github.com/kshvakov/clickhouse/internal/types"
+	"github.com/kshvakov/clickhouse/lib/types"
 )
 
 var _converter = &converter{}

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"time"`
`6`	`6`
`7`		`- "github.com/kshvakov/clickhouse/internal/types"`
	`7`	`+ "github.com/kshvakov/clickhouse/lib/types"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func Array(v interface{}) *types.Array {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package clickhouse`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`
`6`		`- "github.com/kshvakov/clickhouse/internal/protocol"`
	`6`	`+ "github.com/kshvakov/clickhouse/lib/protocol"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func (ch *clickhouse) Ping(ctx context.Context) error {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package clickhouse`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/kshvakov/clickhouse/internal/protocol"`
	`4`	`+ "github.com/kshvakov/clickhouse/lib/protocol"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`type progress struct {`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package clickhouse`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`		`- "github.com/kshvakov/clickhouse/internal/data"`
`7`		`- "github.com/kshvakov/clickhouse/internal/protocol"`
	`6`	`+ "github.com/kshvakov/clickhouse/lib/data"`
	`7`	`+ "github.com/kshvakov/clickhouse/lib/protocol"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func (ch clickhouse) readMeta() (data.Block, error) {`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package clickhouse`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/kshvakov/clickhouse/internal/data"`
`5`		`- "github.com/kshvakov/clickhouse/internal/protocol"`
	`4`	`+ "github.com/kshvakov/clickhouse/lib/data"`
	`5`	`+ "github.com/kshvakov/clickhouse/lib/protocol"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`func (ch *clickhouse) sendQuery(query string) error {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"reflect"`
`7`	`7`	`"time"`
`8`	`8`
`9`		`- "github.com/kshvakov/clickhouse/internal/binary"`
	`9`	`+ "github.com/kshvakov/clickhouse/lib/binary"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`type ArrayWriter interface {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"strings"`
`7`	`7`	`"time"`
`8`	`8`
`9`		`- "github.com/kshvakov/clickhouse/internal/binary"`
	`9`	`+ "github.com/kshvakov/clickhouse/lib/binary"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`type Column interface {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package column`
`3`	`3`	`import (`
`4`	`4`	`"time"`
`5`	`5`
`6`		`- "github.com/kshvakov/clickhouse/internal/binary"`
	`6`	`+ "github.com/kshvakov/clickhouse/lib/binary"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`type DateTime struct {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"strconv"`
`6`	`6`	`"strings"`
`7`	`7`
`8`		`- "github.com/kshvakov/clickhouse/internal/binary"`
	`8`	`+ "github.com/kshvakov/clickhouse/lib/binary"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type Enum struct {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package data`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`		`- "github.com/kshvakov/clickhouse/internal/binary"`
	`6`	`+ "github.com/kshvakov/clickhouse/lib/binary"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`const ClientName = "Golang SQLDriver"`