Revert "executor: track the memroy usage in HashJoin probe phase (pingcap#41081)"

This reverts commit 5cb8418.

Author: XuHuaiyu

executor/hash_table.go

@@ -114,8 +114,7 @@ type hashRowContainer struct {
 	memTracker   *memory.Tracker
 
 	// chkBuf buffer the data reads from the disk if rowContainer is spilled.
-	chkBuf                *chunk.Chunk
-	chkBufSizeForOneProbe int64
+	chkBuf *chunk.Chunk
 }
 
 func newHashRowContainer(sCtx sessionctx.Context, hCtx *hashContext, allTypes []*types.FieldType) *hashRowContainer {
@@ -214,15 +213,6 @@ func (c *hashRowContainer) GetAllMatchedRows(probeHCtx *hashContext, probeSideRo
 	return matched, nil
 }
 
-// signalCheckpointForJoin indicates the times of row probe that a signal detection will be triggered.
-const signalCheckpointForJoin int = 1 << 14
-
-// rowSize is the size of Row.
-const rowSize = int64(unsafe.Sizeof(chunk.Row{}))
-
-// rowPtrSize is the size of RowPtr.
-const rowPtrSize = int64(unsafe.Sizeof(chunk.RowPtr{}))
-
 // GetMatchedRowsAndPtrs get matched rows and Ptrs from probeRow. It can be called
 // in multiple goroutines while each goroutine should keep its own
 // h and buf.
@@ -235,19 +225,7 @@ func (c *hashRowContainer) GetMatchedRowsAndPtrs(probeKey uint64, probeRow chunk
 	matched = matched[:0]
 	var matchedRow chunk.Row
 	matchedPtrs = matchedPtrs[:0]
-
-	// Some variables used for memTracker.
-	var (
-		matchedDataSize                  = int64(cap(matched))*rowSize + int64(cap(matchedPtrs))*rowPtrSize
-		lastChunkBufPointer *chunk.Chunk = nil
-		memDelta            int64        = 0
-	)
-	c.chkBuf = nil
-	c.memTracker.Consume(-c.chkBufSizeForOneProbe + int64(cap(innerPtrs))*rowPtrSize)
-	defer c.memTracker.Consume(-int64(cap(innerPtrs))*rowPtrSize + memDelta)
-	c.chkBufSizeForOneProbe = 0
-
-	for i, ptr := range innerPtrs {
+	for _, ptr := range innerPtrs {
 		matchedRow, c.chkBuf, err = c.rowContainer.GetRowAndAppendToChunk(ptr, c.chkBuf)
 		if err != nil {
 			return nil, nil, err
@@ -257,19 +235,6 @@ func (c *hashRowContainer) GetMatchedRowsAndPtrs(probeKey uint64, probeRow chunk
 		if err != nil {
 			return nil, nil, err
 		}
-		if c.chkBuf != lastChunkBufPointer && lastChunkBufPointer != nil {
-			lastChunkSize := lastChunkBufPointer.MemoryUsage()
-			c.chkBufSizeForOneProbe += lastChunkSize
-			memDelta += lastChunkSize
-		}
-		lastChunkBufPointer = c.chkBuf
-		if i&signalCheckpointForJoin == 0 {
-			// Trigger Consume for checking the OOM Action signal
-			memDelta += int64(cap(matched))*rowSize + int64(cap(matchedPtrs))*rowPtrSize - matchedDataSize
-			matchedDataSize = int64(cap(matched))*rowSize + int64(cap(matchedPtrs))*rowPtrSize
-			c.memTracker.Consume(memDelta + 1)
-			memDelta = 0
-		}
 		if !ok {
 			atomic.AddInt64(&c.stat.probeCollision, 1)
 			continue

executor/join_test.go

@@ -2892,20 +2892,3 @@ func TestOuterJoin(t *testing.T) {
 		),
 	)
 }
-
-func TestCartesianJoinPanic(t *testing.T) {
-	store := testkit.CreateMockStore(t)
-	tk := testkit.NewTestKit(t, store)
-	tk.MustExec("use test")
-	tk.MustExec("create table t(a int)")
-	tk.MustExec("insert into t values(1)")
-	tk.MustExec("set tidb_mem_quota_query = 1 << 30")
-	tk.MustExec("set global tidb_mem_oom_action = 'CANCEL'")
-	tk.MustExec("set global tidb_enable_tmp_storage_on_oom = off;")
-	for i := 0; i < 14; i++ {
-		tk.MustExec("insert into t select * from t")
-	}
-	err := tk.QueryToErr("desc analyze select * from t t1, t t2, t t3, t t4, t t5, t t6;")
-	require.NotNil(t, err)
-	require.True(t, strings.Contains(err.Error(), "Out Of Memory Quota!"))
-}