*: tiny refactor, more go idiom (pingcap#9660)

colin2wang · Mar 12, 2019 · 52c8267 · 52c8267
1 parent 7d0b660
commit 52c8267
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/executor/executor.go b/executor/executor.go
@@ -1287,11 +1287,10 @@ func (e *UnionExec) Close() error {
 // Before every execution, we must clear statement context.
 func ResetContextOfStmt(ctx sessionctx.Context, s ast.StmtNode) (err error) {
 	vars := ctx.GetSessionVars()
-	sc := new(stmtctx.StatementContext)
-	sc.TimeZone = vars.Location()
-	sc.MemTracker = memory.NewTracker(s.Text(), vars.MemQuotaQuery)
-	sc.NowTs = time.Time{}
-	sc.SysTs = time.Time{}
+	sc := &stmtctx.StatementContext{
+		TimeZone:   vars.Location(),
+		MemTracker: memory.NewTracker(s.Text(), vars.MemQuotaQuery),
+	}
 	switch config.GetGlobalConfig().OOMAction {
 	case config.OOMActionCancel:
 		sc.MemTracker.SetActionOnExceed(&memory.PanicOnExceed{})

diff --git a/util/memory/tracker.go b/util/memory/tracker.go
@@ -55,7 +55,6 @@ func NewTracker(label string, bytesLimit int64) *Tracker {
 		label:          label,
 		bytesLimit:     bytesLimit,
 		actionOnExceed: &LogOnExceed{},
-		parent:         nil,
 	}
 }