From 98f0bafcd7d92137f46c79397567f089a0582544 Mon Sep 17 00:00:00 2001 From: Yang Keao Date: Tue, 31 Oct 2023 15:03:13 +0800 Subject: [PATCH] fix conflict Signed-off-by: Yang Keao --- executor/hash_table.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/executor/hash_table.go b/executor/hash_table.go index 5ec3051bb44c7..1562b37e8014c 100644 --- a/executor/hash_table.go +++ b/executor/hash_table.go @@ -242,17 +242,10 @@ func (c *hashRowContainer) GetMatchedRowsAndPtrs(probeKey uint64, probeRow chunk // Some variables used for memTracker. var ( -<<<<<<< HEAD:executor/hash_table.go matchedDataSize = int64(cap(matched))*rowSize + int64(cap(matchedPtrs))*rowPtrSize - lastChunkBufPointer *chunk.Chunk = nil + lastChunkBufPointer *chunk.Chunk = c.chkBuf memDelta int64 = 0 needTrackMemUsage = cap(innerPtrs) > signalCheckpointForJoinMask -======= - matchedDataSize = int64(cap(matched))*rowSize + int64(cap(matchedPtrs))*rowPtrSize - needTrackMemUsage = cap(innerPtrs) > signalCheckpointForJoinMask - lastChunkBufPointer = c.chkBuf - memDelta int64 ->>>>>>> f8ca23c6bfd (executor: reuse chunk for GetMatchedRowsAndPtrs calls (#48090)):pkg/executor/hash_table.go ) c.memTracker.Consume(-c.chkBufSizeForOneProbe) if needTrackMemUsage {