From d6d27e7ed6386c09a5403d51da7b26d7b5300a18 Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Mon, 15 Jul 2024 19:01:30 +0800 Subject: [PATCH] executor: do not track membuffer's memory in executor (#53985) (#54578) close pingcap/tidb#53984 --- pkg/executor/delete.go | 5 ----- pkg/executor/insert_common.go | 5 ----- pkg/executor/replace.go | 2 -- 3 files changed, 12 deletions(-) diff --git a/pkg/executor/delete.go b/pkg/executor/delete.go index 3a70d190bae9e..50571625f4fed 100644 --- a/pkg/executor/delete.go +++ b/pkg/executor/delete.go @@ -150,11 +150,6 @@ func (e *DeleteExec) deleteSingleTableByChunk(ctx context.Context) error { } func (e *DeleteExec) doBatchDelete(ctx context.Context) error { - txn, err := e.Ctx().Txn(false) - if err != nil { - return exeerrors.ErrBatchInsertFail.GenWithStack("BatchDelete failed with error: %v", err) - } - e.memTracker.Consume(-int64(txn.Size())) e.Ctx().StmtCommit(ctx) if err := sessiontxn.NewTxnInStmt(ctx, e.Ctx()); err != nil { // We should return a special error for batch insert. diff --git a/pkg/executor/insert_common.go b/pkg/executor/insert_common.go index 1f1d7ff412f8d..3a80cf1963e9e 100644 --- a/pkg/executor/insert_common.go +++ b/pkg/executor/insert_common.go @@ -518,11 +518,6 @@ func insertRowsFromSelect(ctx context.Context, base insertCommon) error { } func (e *InsertValues) doBatchInsert(ctx context.Context) error { - txn, err := e.Ctx().Txn(false) - if err != nil { - return exeerrors.ErrBatchInsertFail.GenWithStack("BatchInsert failed with error: %v", err) - } - e.memTracker.Consume(-int64(txn.Size())) e.Ctx().StmtCommit(ctx) if err := sessiontxn.NewTxnInStmt(ctx, e.Ctx()); err != nil { // We should return a special error for batch insert. diff --git a/pkg/executor/replace.go b/pkg/executor/replace.go index 037cbc8b9ddcf..abbbe11082d19 100644 --- a/pkg/executor/replace.go +++ b/pkg/executor/replace.go @@ -160,7 +160,6 @@ func (e *ReplaceExec) exec(ctx context.Context, newRows [][]types.Datum) error { if err != nil { return err } - txnSize := txn.Size() if e.collectRuntimeStatsEnabled() { if snapshot := txn.GetSnapshot(); snapshot != nil { @@ -186,7 +185,6 @@ func (e *ReplaceExec) exec(ctx context.Context, newRows [][]types.Datum) error { return err } } - e.memTracker.Consume(int64(txn.Size() - txnSize)) return nil }