From 4372979fe4fd4e6526fadc5e51071b32ed7e78e7 Mon Sep 17 00:00:00 2001 From: Thomas Pelletier Date: Mon, 4 Nov 2019 17:17:01 -0500 Subject: [PATCH 1/5] Expose hostname in exceptions --- clickhouse_exception.go | 2 ++ connect.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/clickhouse_exception.go b/clickhouse_exception.go index 3d8d20fdc7..72d107b60b 100644 --- a/clickhouse_exception.go +++ b/clickhouse_exception.go @@ -10,6 +10,7 @@ type Exception struct { Name string Message string StackTrace string + Host string nested error } @@ -43,5 +44,6 @@ func (ch *clickhouse) exception() error { if hasNested { e.nested = ch.exception() } + e.Host = ch.conn.hostname return &e } diff --git a/connect.go b/connect.go index a6bf3eec04..18144e7c85 100644 --- a/connect.go +++ b/connect.go @@ -99,6 +99,7 @@ func dial(options connOptions) (*connect, error) { buffer: bufio.NewReader(conn), readTimeout: options.readTimeout, writeTimeout: options.writeTimeout, + hostname: options.hosts[num], }, nil } else { options.logf( @@ -119,6 +120,7 @@ type connect struct { net.Conn logf func(string, ...interface{}) ident int + hostname string buffer *bufio.Reader closed bool readTimeout time.Duration From 7cdd555e2872ebaec1eacdc8e32009829262c68d Mon Sep 17 00:00:00 2001 From: Thomas Pelletier Date: Mon, 4 Nov 2019 17:23:21 -0500 Subject: [PATCH 2/5] Use segmentio/gomod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 5b3ff45a84..5ac8ad5df7 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/kshvakov/clickhouse +module github.com/segmentio/clickhouse go 1.12 From 6971db49cfea74e93f0770c5c7043fcb02ac41be Mon Sep 17 00:00:00 2001 From: Thomas Pelletier Date: Mon, 4 Nov 2019 17:27:31 -0500 Subject: [PATCH 3/5] kshvakov/clickhouse => segmentio/clickhouse --- bootstrap.go | 8 ++++---- clickhouse.go | 10 +++++----- clickhouse_columnar_test.go | 4 ++-- clickhouse_direct_test.go | 6 +++--- clickhouse_negative_test.go | 2 +- clickhouse_ping.go | 2 +- clickhouse_read_block.go | 2 +- clickhouse_read_meta.go | 4 ++-- clickhouse_send_query.go | 4 ++-- clickhouse_test.go | 6 +++--- clickhouse_write_block.go | 4 ++-- examples/columnar.go | 4 ++-- examples/direct.go | 2 +- examples/multiple.go | 2 +- examples/simple.go | 2 +- examples/sqlx.go | 2 +- go.mod | 1 + go.sum | 5 +++++ lib/binary/compress_reader.go | 2 +- lib/binary/compress_test.go | 2 +- lib/binary/compress_writer.go | 4 ++-- lib/binary/compress_writer_clz4.go | 2 +- lib/column/array.go | 2 +- lib/column/column.go | 2 +- lib/column/column_benchmark_test.go | 2 +- lib/column/column_test.go | 4 ++-- lib/column/date.go | 2 +- lib/column/datetime.go | 2 +- lib/column/decimal.go | 2 +- lib/column/enum.go | 2 +- lib/column/fixed_string.go | 2 +- lib/column/float32.go | 2 +- lib/column/float64.go | 2 +- lib/column/int16.go | 2 +- lib/column/int32.go | 2 +- lib/column/int64.go | 2 +- lib/column/int8.go | 2 +- lib/column/ipv4.go | 2 +- lib/column/ipv6.go | 2 +- lib/column/nullable.go | 2 +- lib/column/string.go | 2 +- lib/column/uint16.go | 2 +- lib/column/uint32.go | 2 +- lib/column/uint64.go | 2 +- lib/column/uint8.go | 2 +- lib/column/uuid.go | 2 +- lib/data/block.go | 6 +++--- lib/data/block_write_column.go | 2 +- lib/data/client_info.go | 2 +- lib/data/server_info.go | 4 ++-- lib/writebuffer/buffer.go | 2 +- lib/writebuffer/buffer_test.go | 2 +- query_settings.go | 2 +- rows.go | 6 +++--- stmt.go | 2 +- write_column.go | 2 +- 56 files changed, 83 insertions(+), 77 deletions(-) diff --git a/bootstrap.go b/bootstrap.go index ea219c4327..d192afe83d 100644 --- a/bootstrap.go +++ b/bootstrap.go @@ -15,11 +15,11 @@ import ( "sync/atomic" "time" - "github.com/kshvakov/clickhouse/lib/leakypool" + "github.com/segmentio/clickhouse/lib/leakypool" - "github.com/kshvakov/clickhouse/lib/binary" - "github.com/kshvakov/clickhouse/lib/data" - "github.com/kshvakov/clickhouse/lib/protocol" + "github.com/segmentio/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/data" + "github.com/segmentio/clickhouse/lib/protocol" ) const ( diff --git a/clickhouse.go b/clickhouse.go index dcb05a3161..b789cf32c9 100644 --- a/clickhouse.go +++ b/clickhouse.go @@ -13,11 +13,11 @@ import ( "sync" "time" - "github.com/kshvakov/clickhouse/lib/binary" - "github.com/kshvakov/clickhouse/lib/column" - "github.com/kshvakov/clickhouse/lib/data" - "github.com/kshvakov/clickhouse/lib/protocol" - "github.com/kshvakov/clickhouse/lib/types" + "github.com/segmentio/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/column" + "github.com/segmentio/clickhouse/lib/data" + "github.com/segmentio/clickhouse/lib/protocol" + "github.com/segmentio/clickhouse/lib/types" ) type ( diff --git a/clickhouse_columnar_test.go b/clickhouse_columnar_test.go index 0f1aa016ca..e4c0c778e2 100644 --- a/clickhouse_columnar_test.go +++ b/clickhouse_columnar_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/kshvakov/clickhouse" - "github.com/kshvakov/clickhouse/lib/data" + "github.com/segmentio/clickhouse" + "github.com/segmentio/clickhouse/lib/data" "github.com/stretchr/testify/assert" ) diff --git a/clickhouse_direct_test.go b/clickhouse_direct_test.go index bd831395ee..6f95b29267 100644 --- a/clickhouse_direct_test.go +++ b/clickhouse_direct_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/kshvakov/clickhouse" - "github.com/kshvakov/clickhouse/lib/column" - "github.com/kshvakov/clickhouse/lib/types" + "github.com/segmentio/clickhouse" + "github.com/segmentio/clickhouse/lib/column" + "github.com/segmentio/clickhouse/lib/types" "github.com/stretchr/testify/assert" ) diff --git a/clickhouse_negative_test.go b/clickhouse_negative_test.go index ba680f02d7..5d0f8e8508 100644 --- a/clickhouse_negative_test.go +++ b/clickhouse_negative_test.go @@ -4,7 +4,7 @@ import ( "database/sql" "testing" - "github.com/kshvakov/clickhouse" + "github.com/segmentio/clickhouse" "github.com/stretchr/testify/assert" ) diff --git a/clickhouse_ping.go b/clickhouse_ping.go index c1df034deb..9f5db5fa71 100644 --- a/clickhouse_ping.go +++ b/clickhouse_ping.go @@ -4,7 +4,7 @@ import ( "context" "database/sql/driver" - "github.com/kshvakov/clickhouse/lib/protocol" + "github.com/segmentio/clickhouse/lib/protocol" ) func (ch *clickhouse) Ping(ctx context.Context) error { diff --git a/clickhouse_read_block.go b/clickhouse_read_block.go index 1d4507cf1f..bef9dafc8c 100644 --- a/clickhouse_read_block.go +++ b/clickhouse_read_block.go @@ -1,7 +1,7 @@ package clickhouse import ( - "github.com/kshvakov/clickhouse/lib/data" + "github.com/segmentio/clickhouse/lib/data" ) func (ch *clickhouse) readBlock() (*data.Block, error) { diff --git a/clickhouse_read_meta.go b/clickhouse_read_meta.go index 790b13848b..d0b8253388 100644 --- a/clickhouse_read_meta.go +++ b/clickhouse_read_meta.go @@ -3,8 +3,8 @@ package clickhouse import ( "fmt" - "github.com/kshvakov/clickhouse/lib/data" - "github.com/kshvakov/clickhouse/lib/protocol" + "github.com/segmentio/clickhouse/lib/data" + "github.com/segmentio/clickhouse/lib/protocol" ) func (ch *clickhouse) readMeta() (*data.Block, error) { diff --git a/clickhouse_send_query.go b/clickhouse_send_query.go index 8fe8209cc9..31e4486e3a 100644 --- a/clickhouse_send_query.go +++ b/clickhouse_send_query.go @@ -1,8 +1,8 @@ package clickhouse import ( - "github.com/kshvakov/clickhouse/lib/data" - "github.com/kshvakov/clickhouse/lib/protocol" + "github.com/segmentio/clickhouse/lib/data" + "github.com/segmentio/clickhouse/lib/protocol" ) func (ch *clickhouse) sendQuery(query string) error { diff --git a/clickhouse_test.go b/clickhouse_test.go index cae66ed0d2..6634b702ae 100644 --- a/clickhouse_test.go +++ b/clickhouse_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/kshvakov/clickhouse" - "github.com/kshvakov/clickhouse/lib/column" - "github.com/kshvakov/clickhouse/lib/types" + "github.com/segmentio/clickhouse" + "github.com/segmentio/clickhouse/lib/column" + "github.com/segmentio/clickhouse/lib/types" "github.com/stretchr/testify/assert" ) diff --git a/clickhouse_write_block.go b/clickhouse_write_block.go index a98b991e8e..fb8ef12c58 100644 --- a/clickhouse_write_block.go +++ b/clickhouse_write_block.go @@ -1,8 +1,8 @@ package clickhouse import ( - "github.com/kshvakov/clickhouse/lib/data" - "github.com/kshvakov/clickhouse/lib/protocol" + "github.com/segmentio/clickhouse/lib/data" + "github.com/segmentio/clickhouse/lib/protocol" ) func (ch *clickhouse) writeBlock(block *data.Block) error { diff --git a/examples/columnar.go b/examples/columnar.go index e7ca5e7225..8128558a22 100644 --- a/examples/columnar.go +++ b/examples/columnar.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/kshvakov/clickhouse" - data "github.com/kshvakov/clickhouse/lib/data" + "github.com/segmentio/clickhouse" + data "github.com/segmentio/clickhouse/lib/data" ) func main() { diff --git a/examples/direct.go b/examples/direct.go index d363e8360d..531c888d9c 100644 --- a/examples/direct.go +++ b/examples/direct.go @@ -5,7 +5,7 @@ import ( "log" "time" - "github.com/kshvakov/clickhouse" + "github.com/segmentio/clickhouse" ) func main() { diff --git a/examples/multiple.go b/examples/multiple.go index 702ab64d2a..a1fb10c4cc 100644 --- a/examples/multiple.go +++ b/examples/multiple.go @@ -6,7 +6,7 @@ import ( "log" "time" - "github.com/kshvakov/clickhouse" + "github.com/segmentio/clickhouse" ) func main() { diff --git a/examples/simple.go b/examples/simple.go index 5e3cecd2f2..4926540b76 100644 --- a/examples/simple.go +++ b/examples/simple.go @@ -6,7 +6,7 @@ import ( "log" "time" - "github.com/kshvakov/clickhouse" + "github.com/segmentio/clickhouse" ) func main() { diff --git a/examples/sqlx.go b/examples/sqlx.go index 54c98cde27..3f7d247707 100644 --- a/examples/sqlx.go +++ b/examples/sqlx.go @@ -6,7 +6,7 @@ import ( "time" "github.com/jmoiron/sqlx" - "github.com/kshvakov/clickhouse" + "github.com/segmentio/clickhouse" ) func main() { diff --git a/go.mod b/go.mod index 5ac8ad5df7..7edf2cb5db 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.12 require ( github.com/bkaradzic/go-lz4 v1.0.0 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 + github.com/jmoiron/sqlx v1.2.0 github.com/pierrec/lz4 v2.0.5+incompatible github.com/stretchr/testify v1.3.0 ) diff --git a/go.sum b/go.sum index 1c63a020c6..c3d6a6f69b 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,11 @@ github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 h1:F1EaeKL/ta07PY github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA= +github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= +github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/lib/binary/compress_reader.go b/lib/binary/compress_reader.go index 521e1a2257..4c9deb380a 100644 --- a/lib/binary/compress_reader.go +++ b/lib/binary/compress_reader.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/kshvakov/clickhouse/lib/lz4" + "github.com/segmentio/clickhouse/lib/lz4" ) type compressReader struct { diff --git a/lib/binary/compress_test.go b/lib/binary/compress_test.go index 15bb32322e..d099a43d15 100644 --- a/lib/binary/compress_test.go +++ b/lib/binary/compress_test.go @@ -9,8 +9,8 @@ import ( bklz4 "github.com/bkaradzic/go-lz4" cflz4 "github.com/cloudflare/golz4" - ownlz4 "github.com/kshvakov/clickhouse/lib/lz4" pilz4 "github.com/pierrec/lz4" + ownlz4 "github.com/segmentio/clickhouse/lib/lz4" ) func Test_CompressCorrect(t *testing.T) { diff --git a/lib/binary/compress_writer.go b/lib/binary/compress_writer.go index ee9f0afac1..b8981f174b 100644 --- a/lib/binary/compress_writer.go +++ b/lib/binary/compress_writer.go @@ -6,8 +6,8 @@ import ( "encoding/binary" "io" - "github.com/kshvakov/clickhouse/lib/cityhash102" - "github.com/kshvakov/clickhouse/lib/lz4" + "github.com/segmentio/clickhouse/lib/cityhash102" + "github.com/segmentio/clickhouse/lib/lz4" ) type compressWriter struct { diff --git a/lib/binary/compress_writer_clz4.go b/lib/binary/compress_writer_clz4.go index b308b9e4ed..4fe7370120 100644 --- a/lib/binary/compress_writer_clz4.go +++ b/lib/binary/compress_writer_clz4.go @@ -7,7 +7,7 @@ import ( "io" lz4 "github.com/cloudflare/golz4" - "github.com/kshvakov/clickhouse/lib/cityhash102" + "github.com/segmentio/clickhouse/lib/cityhash102" ) type compressWriter struct { diff --git a/lib/column/array.go b/lib/column/array.go index 7a24c057dd..a6dc0c6c10 100644 --- a/lib/column/array.go +++ b/lib/column/array.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type Array struct { diff --git a/lib/column/column.go b/lib/column/column.go index e7694ad4d7..d0157fc48d 100644 --- a/lib/column/column.go +++ b/lib/column/column.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type Column interface { diff --git a/lib/column/column_benchmark_test.go b/lib/column/column_benchmark_test.go index f13fcf678c..1041b05418 100644 --- a/lib/column/column_benchmark_test.go +++ b/lib/column/column_benchmark_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) func Benchmark_Column_Int8(b *testing.B) { diff --git a/lib/column/column_test.go b/lib/column/column_test.go index 0baf3d8583..42cc1c2081 100644 --- a/lib/column/column_test.go +++ b/lib/column/column_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/kshvakov/clickhouse/lib/binary" - columns "github.com/kshvakov/clickhouse/lib/column" + "github.com/segmentio/clickhouse/lib/binary" + columns "github.com/segmentio/clickhouse/lib/column" "github.com/stretchr/testify/assert" ) diff --git a/lib/column/date.go b/lib/column/date.go index 69055142f9..ba1d03422f 100644 --- a/lib/column/date.go +++ b/lib/column/date.go @@ -3,7 +3,7 @@ package column import ( "time" - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type Date struct { diff --git a/lib/column/datetime.go b/lib/column/datetime.go index 7568ffcd89..959a097bbe 100644 --- a/lib/column/datetime.go +++ b/lib/column/datetime.go @@ -3,7 +3,7 @@ package column import ( "time" - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type DateTime struct { diff --git a/lib/column/decimal.go b/lib/column/decimal.go index ed9eb039c9..54ce1f5c4f 100644 --- a/lib/column/decimal.go +++ b/lib/column/decimal.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) // Table of powers of 10 for fast casting from floating types to decimal type diff --git a/lib/column/enum.go b/lib/column/enum.go index 06804eddb4..2e77e93ab2 100644 --- a/lib/column/enum.go +++ b/lib/column/enum.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type Enum struct { diff --git a/lib/column/fixed_string.go b/lib/column/fixed_string.go index c1b1fe3f38..401d26af0c 100644 --- a/lib/column/fixed_string.go +++ b/lib/column/fixed_string.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type FixedString struct { diff --git a/lib/column/float32.go b/lib/column/float32.go index 0ea0e57595..b83714a224 100644 --- a/lib/column/float32.go +++ b/lib/column/float32.go @@ -1,7 +1,7 @@ package column import ( - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type Float32 struct{ base } diff --git a/lib/column/float64.go b/lib/column/float64.go index 00d5c2e492..ae2d820169 100644 --- a/lib/column/float64.go +++ b/lib/column/float64.go @@ -1,7 +1,7 @@ package column import ( - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type Float64 struct{ base } diff --git a/lib/column/int16.go b/lib/column/int16.go index 18f5c9c9ab..8918411565 100644 --- a/lib/column/int16.go +++ b/lib/column/int16.go @@ -1,7 +1,7 @@ package column import ( - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type Int16 struct{ base } diff --git a/lib/column/int32.go b/lib/column/int32.go index ee158b983c..dafe9b86cd 100644 --- a/lib/column/int32.go +++ b/lib/column/int32.go @@ -1,7 +1,7 @@ package column import ( - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type Int32 struct{ base } diff --git a/lib/column/int64.go b/lib/column/int64.go index fa6af2579e..50e804446c 100644 --- a/lib/column/int64.go +++ b/lib/column/int64.go @@ -1,7 +1,7 @@ package column import ( - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type Int64 struct{ base } diff --git a/lib/column/int8.go b/lib/column/int8.go index 90f2378fcd..9657daf19b 100644 --- a/lib/column/int8.go +++ b/lib/column/int8.go @@ -1,7 +1,7 @@ package column import ( - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type Int8 struct{ base } diff --git a/lib/column/ipv4.go b/lib/column/ipv4.go index 2cf34ba78a..a201ab9f8b 100644 --- a/lib/column/ipv4.go +++ b/lib/column/ipv4.go @@ -3,7 +3,7 @@ package column import ( "net" - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type IPv4 struct { diff --git a/lib/column/ipv6.go b/lib/column/ipv6.go index 0dfe4f320c..16ea5ef745 100644 --- a/lib/column/ipv6.go +++ b/lib/column/ipv6.go @@ -3,7 +3,7 @@ package column import ( "net" - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type IPv6 struct { diff --git a/lib/column/nullable.go b/lib/column/nullable.go index bb95f23cb6..e6fdd51141 100644 --- a/lib/column/nullable.go +++ b/lib/column/nullable.go @@ -5,7 +5,7 @@ import ( "reflect" "time" - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type Nullable struct { diff --git a/lib/column/string.go b/lib/column/string.go index d458c05150..b4b6114d19 100644 --- a/lib/column/string.go +++ b/lib/column/string.go @@ -1,7 +1,7 @@ package column import ( - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type String struct{ base } diff --git a/lib/column/uint16.go b/lib/column/uint16.go index 0b5548485a..dcfe618875 100644 --- a/lib/column/uint16.go +++ b/lib/column/uint16.go @@ -1,7 +1,7 @@ package column import ( - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type UInt16 struct{ base } diff --git a/lib/column/uint32.go b/lib/column/uint32.go index 6904d8a9ea..2fead0e718 100644 --- a/lib/column/uint32.go +++ b/lib/column/uint32.go @@ -1,7 +1,7 @@ package column import ( - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type UInt32 struct{ base } diff --git a/lib/column/uint64.go b/lib/column/uint64.go index 7ac1e67f99..002952e635 100644 --- a/lib/column/uint64.go +++ b/lib/column/uint64.go @@ -1,7 +1,7 @@ package column import ( - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type UInt64 struct{ base } diff --git a/lib/column/uint8.go b/lib/column/uint8.go index 77b23cd9a4..ffb8a7bf25 100644 --- a/lib/column/uint8.go +++ b/lib/column/uint8.go @@ -1,7 +1,7 @@ package column import ( - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type UInt8 struct{ base } diff --git a/lib/column/uuid.go b/lib/column/uuid.go index 7b38866855..6bc1c566ff 100644 --- a/lib/column/uuid.go +++ b/lib/column/uuid.go @@ -6,7 +6,7 @@ import ( "fmt" "reflect" - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) const ( diff --git a/lib/data/block.go b/lib/data/block.go index 2f603b658d..e6848a4af7 100644 --- a/lib/data/block.go +++ b/lib/data/block.go @@ -7,9 +7,9 @@ import ( "reflect" "strings" - "github.com/kshvakov/clickhouse/lib/binary" - "github.com/kshvakov/clickhouse/lib/column" - wb "github.com/kshvakov/clickhouse/lib/writebuffer" + "github.com/segmentio/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/column" + wb "github.com/segmentio/clickhouse/lib/writebuffer" ) type offset [][]int diff --git a/lib/data/block_write_column.go b/lib/data/block_write_column.go index 2d1479f0b8..bae75f20f7 100644 --- a/lib/data/block_write_column.go +++ b/lib/data/block_write_column.go @@ -5,7 +5,7 @@ import ( "reflect" "time" - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) func (block *Block) WriteDate(c int, v time.Time) error { diff --git a/lib/data/client_info.go b/lib/data/client_info.go index ba41fd4514..ff77105984 100644 --- a/lib/data/client_info.go +++ b/lib/data/client_info.go @@ -3,7 +3,7 @@ package data import ( "fmt" - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) const ClientName = "Golang SQLDriver" diff --git a/lib/data/server_info.go b/lib/data/server_info.go index c2c6c2e229..09e18b6b4c 100644 --- a/lib/data/server_info.go +++ b/lib/data/server_info.go @@ -5,8 +5,8 @@ import ( //"io" "time" - "github.com/kshvakov/clickhouse/lib/binary" - "github.com/kshvakov/clickhouse/lib/protocol" + "github.com/segmentio/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/protocol" ) type ServerInfo struct { diff --git a/lib/writebuffer/buffer.go b/lib/writebuffer/buffer.go index ec7c75a3b2..c082b62d3e 100644 --- a/lib/writebuffer/buffer.go +++ b/lib/writebuffer/buffer.go @@ -3,7 +3,7 @@ package writebuffer import ( "io" - "github.com/kshvakov/clickhouse/lib/leakypool" + "github.com/segmentio/clickhouse/lib/leakypool" ) const InitialSize = 256 * 1024 diff --git a/lib/writebuffer/buffer_test.go b/lib/writebuffer/buffer_test.go index 8a958b209c..7243560b7a 100644 --- a/lib/writebuffer/buffer_test.go +++ b/lib/writebuffer/buffer_test.go @@ -3,7 +3,7 @@ package writebuffer import ( "testing" - "github.com/kshvakov/clickhouse/lib/leakypool" + "github.com/segmentio/clickhouse/lib/leakypool" "github.com/stretchr/testify/assert" ) diff --git a/query_settings.go b/query_settings.go index 74b7bc773e..4ca166f1ff 100644 --- a/query_settings.go +++ b/query_settings.go @@ -5,7 +5,7 @@ import ( "net/url" "strconv" - "github.com/kshvakov/clickhouse/lib/binary" + "github.com/segmentio/clickhouse/lib/binary" ) type querySettingType int diff --git a/rows.go b/rows.go index 2535a2498e..bbb16d26fa 100644 --- a/rows.go +++ b/rows.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "github.com/kshvakov/clickhouse/lib/column" - "github.com/kshvakov/clickhouse/lib/data" - "github.com/kshvakov/clickhouse/lib/protocol" + "github.com/segmentio/clickhouse/lib/column" + "github.com/segmentio/clickhouse/lib/data" + "github.com/segmentio/clickhouse/lib/protocol" ) type rows struct { diff --git a/stmt.go b/stmt.go index 5ec84e55b8..2535bc0396 100644 --- a/stmt.go +++ b/stmt.go @@ -6,7 +6,7 @@ import ( "database/sql/driver" "unicode" - "github.com/kshvakov/clickhouse/lib/data" + "github.com/segmentio/clickhouse/lib/data" ) type stmt struct { diff --git a/write_column.go b/write_column.go index 7db5330a25..cdc792f029 100644 --- a/write_column.go +++ b/write_column.go @@ -5,7 +5,7 @@ import ( "database/sql/driver" "time" - "github.com/kshvakov/clickhouse/lib/data" + "github.com/segmentio/clickhouse/lib/data" ) // Interface for Clickhouse driver From 7b4446b09fc3c8d56137acd0b9da0719b71626fc Mon Sep 17 00:00:00 2001 From: Thomas Pelletier Date: Mon, 4 Nov 2019 22:07:09 -0500 Subject: [PATCH 4/5] add debug --- bootstrap.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bootstrap.go b/bootstrap.go index d192afe83d..a4d8486cc1 100644 --- a/bootstrap.go +++ b/bootstrap.go @@ -173,6 +173,9 @@ func open(dsn string) (*clickhouse, error) { if debug, err := strconv.ParseBool(url.Query().Get("debug")); err == nil && debug { ch.logf = logger.Printf } + ch.logf = func(format string, v ...interface{}) { + fmt.Printf("debug output: "+format, v...) + } ch.logf("host(s)=%s, database=%s, username=%s", strings.Join(hosts, ", "), database, From a80961da885d191668505bdf8269842a9005b86e Mon Sep 17 00:00:00 2001 From: Thomas Pelletier Date: Mon, 4 Nov 2019 22:22:35 -0500 Subject: [PATCH 5/5] add missing newline --- bootstrap.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.go b/bootstrap.go index a4d8486cc1..8a47a1a877 100644 --- a/bootstrap.go +++ b/bootstrap.go @@ -174,7 +174,7 @@ func open(dsn string) (*clickhouse, error) { ch.logf = logger.Printf } ch.logf = func(format string, v ...interface{}) { - fmt.Printf("debug output: "+format, v...) + fmt.Printf("debug output: "+format+"\n", v...) } ch.logf("host(s)=%s, database=%s, username=%s", strings.Join(hosts, ", "),