Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add 10 second deadline to clickhouse queries #159

Merged
merged 1 commit into from
Sep 8, 2019
Merged

add 10 second deadline to clickhouse queries #159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions pkg/model/clickhouse/clickhouse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@
package clickhouse

import (
"context"
sqlmodule "database/sql"
"fmt"
"github.com/golang/glog"
_ "github.com/mailru/go-clickhouse"
"strconv"
"time"
)

const (
Expand Down Expand Up @@ -69,6 +71,9 @@ func (c *Conn) Query(sql string) (*sqlmodule.Rows, error) {
return nil, nil
}

ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(10*time.Second))
defer cancel()

dsn := c.makeDsn()
//glog.V(1).Infof("Query ClickHouse DSN: %s", dsn)
connect, err := sqlmodule.Open("clickhouse", dsn)
Expand All @@ -77,12 +82,12 @@ func (c *Conn) Query(sql string) (*sqlmodule.Rows, error) {
return nil, err
}

if err := connect.Ping(); err != nil {
if err := connect.PingContext(ctx); err != nil {
glog.V(1).Infof("FAILED Ping(%s) %v for SQL: %s", dsn, err, sql)
return nil, err
}

rows, err := connect.Query(sql)
rows, err := connect.QueryContext(ctx, sql)
if err != nil {
glog.V(1).Infof("FAILED Query(%s) %v for SQL: %s", dsn, err, sql)
return nil, err
Expand All @@ -99,6 +104,9 @@ func (c *Conn) Exec(sql string) error {
return nil
}

ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(10*time.Second))
defer cancel()

dsn := c.makeDsn()
//glog.V(1).Infof("Exec ClickHouse DSN: %s", dsn)
connect, err := sqlmodule.Open("clickhouse", dsn)
Expand All @@ -107,12 +115,12 @@ func (c *Conn) Exec(sql string) error {
return err
}

if err := connect.Ping(); err != nil {
if err := connect.PingContext(ctx); err != nil {
glog.V(1).Infof("FAILED Ping(%s) %v for SQL: %s", dsn, err, sql)
return err
}

_, err = connect.Exec(sql)
_, err = connect.ExecContext(ctx, sql)

if err != nil {
glog.V(1).Infof("FAILED Exec(%s) %v for SQL: %s", dsn, err, sql)
Expand Down