Skip to content

Commit fecabe1

Browse files
mymeiyimymeiyi
committed
modify case
1 parent 54f0d64 commit fecabe1

File tree

1 file changed

+42
-17
lines changed

1 file changed

+42
-17
lines changed

‎regression-test/suites/compaction/test_cu_compaction_remove_old_version_delete_bitmap.groovy

+42-17
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,20 @@ suite("test_cu_compaction_remove_old_version_delete_bitmap", "nonConcurrent") {
202202
set_be_param("compaction_promotion_version_count", "5")
203203
set_be_param("tablet_rowset_stale_sweep_time_sec", "0")
204204

205+
def get_tablet_status = { def tablets ->
206+
for (def tablet in tablets) {
207+
String tablet_id = tablet.TabletId
208+
String trigger_backend_id = tablet.BackendId
209+
getTabletStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id)
210+
getLocalDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id)
211+
if (isCloudMode()) {
212+
getMSDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id)
213+
}
214+
}
215+
}
216+
205217
try {
218+
GetDebugPoint().clearDebugPointsForAllBEs()
206219
GetDebugPoint().enableDebugPointForAllBEs("CumulativeCompaction.modify_rowsets.delete_expired_stale_rowsets")
207220
// 1. test normal
208221
sql "sync"
@@ -226,33 +239,38 @@ suite("test_cu_compaction_remove_old_version_delete_bitmap", "nonConcurrent") {
226239
def ms_delete_bitmap_cardinality = 0;
227240
for (def tablet in tablets) {
228241
String tablet_id = tablet.TabletId
229-
def tablet_info = sql_return_maparray """ show tablet ${tablet_id}; """
230-
logger.info("tablet: " + tablet_info)
242+
/*def tablet_info = sql_return_maparray """ show tablet ${tablet_id}; """
243+
logger.info("tablet: " + tablet_info)*/
231244
String trigger_backend_id = tablet.BackendId
232245
getTabletStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id);
233246

234247
// before compaction, delete_bitmap_count is (rowsets num - 1)
235-
local_delete_bitmap_count = getLocalDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id).delete_bitmap_count
236-
local_delete_bitmap_cardinality = getLocalDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id).cardinality
248+
def localDeleteBitmapStatus = getLocalDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id)
249+
local_delete_bitmap_count = localDeleteBitmapStatus.delete_bitmap_count
250+
local_delete_bitmap_cardinality = localDeleteBitmapStatus.cardinality
237251
logger.info("local_delete_bitmap_count:" + local_delete_bitmap_count)
238252
logger.info("local_delete_bitmap_cardinality:" + local_delete_bitmap_cardinality)
239253
assertTrue(local_delete_bitmap_count == 7)
240254
assertTrue(local_delete_bitmap_cardinality == 7)
241255

242256
if (isCloudMode()) {
243-
ms_delete_bitmap_count = getMSDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id).delete_bitmap_count
244-
ms_delete_bitmap_cardinality = getMSDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id).cardinality
257+
def msDeleteBitmapStatus = getMSDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id)
258+
ms_delete_bitmap_count = msDeleteBitmapStatus.delete_bitmap_count
259+
ms_delete_bitmap_cardinality = msDeleteBitmapStatus.cardinality
245260
logger.info("ms_delete_bitmap_count:" + ms_delete_bitmap_count)
246261
logger.info("ms_delete_bitmap_cardinality:" + ms_delete_bitmap_cardinality)
247262
assertTrue(ms_delete_bitmap_count == 7)
248263
assertTrue(ms_delete_bitmap_cardinality == 7)
249264
}
250265

251-
252266
assertTrue(triggerCompaction(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id],
253267
"cumulative", tablet_id).contains("Success"));
254268
waitForCompaction(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id)
255269
getTabletStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id);
270+
getLocalDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id)
271+
if (isCloudMode()) {
272+
getMSDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id)
273+
}
256274
}
257275

258276
qt_sql "select * from ${testTable} order by plan_id"
@@ -262,13 +280,16 @@ suite("test_cu_compaction_remove_old_version_delete_bitmap", "nonConcurrent") {
262280
sql """ INSERT INTO ${testTable} VALUES (0,0,'9'),(1,9,'9'); """
263281
sql """ INSERT INTO ${testTable} VALUES (0,0,'10'),(1,10,'10'); """
264282
sql """ INSERT INTO ${testTable} VALUES (0,0,'11'),(1,11,'11'); """
283+
get_tablet_status(tablets)
284+
265285
// trigger one query
266286
GetDebugPoint().enableDebugPointForAllBEs("NewOlapScanner::_init_tablet_reader_params.block")
267287
Thread query_thread = new Thread(() -> query())
268288
query_thread.start()
269289
sleep(100)
270290
sql """ INSERT INTO ${testTable} VALUES (0,0,'12'),(1,12,'12'); """
271291
sql """ INSERT INTO ${testTable} VALUES (0,0,'13'),(1,13,'13'); """
292+
get_tablet_status(tablets)
272293

273294
def time_diff = System.currentTimeMillis() - now
274295
logger.info("time_diff:" + time_diff)
@@ -280,21 +301,23 @@ suite("test_cu_compaction_remove_old_version_delete_bitmap", "nonConcurrent") {
280301

281302
for (def tablet in tablets) {
282303
String tablet_id = tablet.TabletId
283-
def tablet_info = sql_return_maparray """ show tablet ${tablet_id}; """
284-
logger.info("tablet: " + tablet_info)
304+
/*def tablet_info = sql_return_maparray """ show tablet ${tablet_id}; """
305+
logger.info("tablet: " + tablet_info)*/
285306

286307
// before compaction, local delete_bitmap_count is (total rowsets num - 1), ms delete_bitmap_count is new rowset num
287308
String trigger_backend_id = tablet.BackendId
288-
local_delete_bitmap_count = getLocalDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id).delete_bitmap_count
289-
local_delete_bitmap_cardinality = getLocalDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id).cardinality
309+
def localDeleteBitmapStatus = getLocalDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id)
310+
local_delete_bitmap_count = localDeleteBitmapStatus.delete_bitmap_count
311+
local_delete_bitmap_cardinality = localDeleteBitmapStatus.cardinality
290312
logger.info("local_delete_bitmap_count:" + local_delete_bitmap_count)
291313
logger.info("local_delete_bitmap_cardinality:" + local_delete_bitmap_cardinality)
292314
assertTrue(local_delete_bitmap_count == 12)
293315
assertTrue(local_delete_bitmap_cardinality == 17)
294316

295317
if (isCloudMode()) {
296-
ms_delete_bitmap_count = getMSDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id).delete_bitmap_count
297-
ms_delete_bitmap_cardinality = getMSDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id).cardinality
318+
msDeleteBitmapStatus = getMSDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id)
319+
ms_delete_bitmap_count = msDeleteBitmapStatus.delete_bitmap_count
320+
ms_delete_bitmap_cardinality = msDeleteBitmapStatus.cardinality
298321
logger.info("ms_delete_bitmap_count:" + ms_delete_bitmap_count)
299322
logger.info("ms_delete_bitmap_cardinality:" + ms_delete_bitmap_cardinality)
300323
assertTrue(ms_delete_bitmap_count == 5)
@@ -309,15 +332,17 @@ suite("test_cu_compaction_remove_old_version_delete_bitmap", "nonConcurrent") {
309332

310333
Thread.sleep(1000)
311334
// after compaction, delete_bitmap_count is 1, cardinality is 2, check it
312-
local_delete_bitmap_count = getLocalDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id).delete_bitmap_count
313-
local_delete_bitmap_cardinality = getLocalDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id).cardinality
335+
localDeleteBitmapStatus = getLocalDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id)
336+
local_delete_bitmap_count = localDeleteBitmapStatus.delete_bitmap_count
337+
local_delete_bitmap_cardinality = localDeleteBitmapStatus.cardinality
314338
logger.info("local_delete_bitmap_count:" + local_delete_bitmap_count)
315339
logger.info("local_delete_bitmap_cardinality:" + local_delete_bitmap_cardinality)
316340
// assertTrue(local_delete_bitmap_count == 1)
317341
// assertTrue(local_delete_bitmap_cardinality == 2)
318342
if (isCloudMode()) {
319-
ms_delete_bitmap_count = getMSDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id).delete_bitmap_count
320-
ms_delete_bitmap_cardinality = getMSDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id).cardinality
343+
def msDeleteBitmapStatus = getMSDeleteBitmapStatus(backendId_to_backendIP[trigger_backend_id], backendId_to_backendHttpPort[trigger_backend_id], tablet_id)
344+
ms_delete_bitmap_count = msDeleteBitmapStatus.delete_bitmap_count
345+
ms_delete_bitmap_cardinality = msDeleteBitmapStatus.cardinality
321346
logger.info("ms_delete_bitmap_count:" + ms_delete_bitmap_count)
322347
logger.info("ms_delete_bitmap_cardinality:" + ms_delete_bitmap_cardinality)
323348
assertTrue(ms_delete_bitmap_count == 1)

0 commit comments

Comments
 (0)