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

export slow queries #792

Merged
merged 16 commits into from
Nov 24, 2020
Merged

export slow queries #792

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
818a1f1
refactor: export utils
unbyte Nov 6, 2020
4da1ec5
feat: export slowquery
unbyte Nov 6, 2020
1461a88
ui: support exporting slow queries
unbyte Nov 7, 2020
28c76a7
done
unbyte Nov 7, 2020
d7eebae
remove unused import
unbyte Nov 7, 2020
498cd8c
try to fix lint error
unbyte Nov 12, 2020
60fd8d4
remove limit and modify request
unbyte Nov 12, 2020
5fd8c4d
fix limit
unbyte Nov 12, 2020
31806ff
remove useless return stmt
unbyte Nov 12, 2020
90d5720
add i18n for error
unbyte Nov 12, 2020
ee229c9
resolve conflicts
unbyte Nov 12, 2020
23157d2
edit
unbyte Nov 16, 2020
9e41d9e
modify error
unbyte Nov 21, 2020
ef4f21b
Merge branch 'master' into feat-export-slow-query
unbyte Nov 23, 2020
525f1b7
resolve comments
unbyte Nov 23, 2020
8b17c85
patch
unbyte Nov 24, 2020
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
9 changes: 7 additions & 2 deletions pkg/apiserver/slowquery/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
package slowquery

import (
"errors"
"fmt"
"github.com/joomcode/errorx"
"net/http"
"strings"
"time"
Expand All @@ -28,6 +28,11 @@ import (
"github.com/pingcap-incubator/tidb-dashboard/pkg/tidb"
)

var (
ErrNS = errorx.NewNamespace("error.api.export")
ErrNoData = ErrNS.NewType("no_data")
)

type ServiceParams struct {
fx.In
TiDBClient *tidb.Client
Expand Down Expand Up @@ -124,7 +129,7 @@ func (s *Service) downloadTokenHandler(c *gin.Context) {
return
}
if len(list) == 0 {
utils.MakeInvalidRequestErrorFromError(c, errors.New("no data to export"))
_ = c.Error(ErrNoData.NewWithNoMessage())
return
}

Expand Down
9 changes: 7 additions & 2 deletions pkg/apiserver/statement/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
package statement

import (
"errors"
"fmt"
"github.com/joomcode/errorx"
unbyte marked this conversation as resolved.
Show resolved Hide resolved
"net/http"
"strings"
"time"
Expand All @@ -29,6 +29,11 @@ import (
"github.com/pingcap-incubator/tidb-dashboard/pkg/tidb"
)

var (
ErrNS = errorx.NewNamespace("error.api.export")
baurine marked this conversation as resolved.
Show resolved Hide resolved
ErrNoData = ErrNS.NewType("no_data")
)

type ServiceParams struct {
fx.In
TiDBClient *tidb.Client
Expand Down Expand Up @@ -253,7 +258,7 @@ func (s *Service) downloadTokenHandler(c *gin.Context) {
return
}
if len(overviews) == 0 {
utils.MakeInvalidRequestErrorFromError(c, errors.New("no data to export"))
_ = c.Error(ErrNoData.NewWithNoMessage())
return
}

Expand Down
2 changes: 2 additions & 0 deletions ui/lib/client/translations/en.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ error:
user:
signin:
invalid_code: Authorization Code is invalid or expired
export:
no_data: No data can be exported
other: Other error
tidb:
no_alive_tidb: No live TiDB instance in the cluster
Expand Down
2 changes: 2 additions & 0 deletions ui/lib/client/translations/zh.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ error:
user:
signin:
invalid_code: 授权码无效或已过期
export:
no_data: 没有可导出数据
other: 其他错误
tidb:
no_alive_tidb: 集群未启动 TiDB 实例
Expand Down