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

executor: fix query slow_query error when slow-log file not exist (#20000) #20050

Merged
merged 6 commits into from
Sep 17, 2020
Merged

executor: fix query slow_query error when slow-log file not exist (#20000) #20050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
faae7c9
cherry pick #20000 to release-3.0
crazycs520 Sep 15, 2020
36c2884
Revert "cherry pick #20000 to release-3.0"
crazycs520 Sep 17, 2020
09d12dd
fix conflict
crazycs520 Sep 17, 2020
ee68f41
Merge branch 'release-3.0' into release-3.0-aed24e46e2af
crazycs520 Sep 17, 2020
3d98487
Merge branch 'release-3.0' into release-3.0-aed24e46e2af
crazycs520 Sep 17, 2020
d764383
Merge branch 'release-3.0' into release-3.0-aed24e46e2af
crazycs520 Sep 17, 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
3 changes: 3 additions & 0 deletions infoschema/slow_log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ func dataForSlowLog(ctx sessionctx.Context) ([][]types.Datum, error) {
func parseSlowLogFile(tz *time.Location, filePath string) ([][]types.Datum, error) {
file, err := os.Open(filePath)
if err != nil {
if os.IsNotExist(err) {
return nil, nil
}
return nil, errors.Trace(err)
}
defer func() {
Expand Down
16 changes: 16 additions & 0 deletions infoschema/tables_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package infoschema_test
import (
"crypto/tls"
"fmt"
"math"
"os"
"strconv"
"strings"
Expand All @@ -26,6 +27,7 @@ import (
"github.com/pingcap/parser/model"
"github.com/pingcap/parser/mysql"
"github.com/pingcap/parser/terror"
"github.com/pingcap/tidb/config"
"github.com/pingcap/tidb/domain"
"github.com/pingcap/tidb/infoschema"
"github.com/pingcap/tidb/kv"
Expand Down Expand Up @@ -645,3 +647,17 @@ func (s *testTableSuite) TestStmtSummarySensitiveQuery(c *C) {
"set password for user user_sensitive@%",
))
}

func (s *testTableSuite) TestSlowQueryWithoutSlowLog(c *C) {
tk := testkit.NewTestKit(c, s.store)
originCfg := config.GetGlobalConfig()
newCfg := *originCfg
newCfg.Log.SlowQueryFile = "tidb-slow-not-exist.log"
newCfg.Log.SlowThreshold = math.MaxUint64
config.StoreGlobalConfig(&newCfg)
defer func() {
config.StoreGlobalConfig(originCfg)
}()
tk.MustQuery("select query from information_schema.slow_query").Check(testkit.Rows())
tk.MustQuery("select query from information_schema.slow_query where time > '2020-09-15 12:16:39' and time < now()").Check(testkit.Rows())
}