Code

test: merge blocks when prepare#6369

Code

Merged

ti-chi-bot merged 7 commits intopingcap:masterpingcap/tiflash:masterfrom breezewish:wenxuan/test_merge_blocksbreezewish/tiflash:wenxuan/test_merge_blocksCopy head branch name to clipboardNov 28, 2022

+199-226

Commits

Commits on Nov 25, 2022

• test: merge blocks when prepare

  Show description for d68847c
  breezewish

  committed
  d68847c

  Copy full SHA for d68847c

• Reformat

  Show description for 14c3b2a
  breezewish

  committed
  14c3b2a

  Copy full SHA for 14c3b2a

• Simplify code

  Show description for 41e7971
  breezewish

  committed
  41e7971

  Copy full SHA for 41e7971

Commits on Nov 26, 2022

• Simplify

  Show description for d251a43
  breezewish

  committed
  d251a43

  Copy full SHA for d251a43

• Merge branch 'master' into wenxuan/test_merge_blocks

  breezewish

  authored
  46f667c

  Copy full SHA for 46f667c

Commits on Nov 28, 2022

• Update dbms/src/Storages/DeltaMerge/tests/gtest_segment_test_basic.cpp

  Show description for 9eab6fa
  

  breezewish

  and

  Lloyd-Pottiger

  authored
  9eab6fa

  Copy full SHA for 9eab6fa

• Merge branch 'master' into wenxuan/test_merge_blocks

  ti-chi-bot

  authored
  27ccdc0

  Copy full SHA for 27ccdc0