Skip to content

Commit ee7d2b3

Browse files
Mikael Ronströmprashanttekriwal
Mikael Ronström
authored and
prashanttekriwal
committed
WL#8069: Post-push fix, align debug printouts of rowid to row(x,y), more debug printouts
(cherry picked from commit 2fb53149a982ff4d78e2b6749c9214f80f5ca8d3)
1 parent 2e74bba commit ee7d2b3

File tree

8 files changed

+102
-34
lines changed

8 files changed

+102
-34
lines changed

‎storage/ndb/src/kernel/blocks/backup/Backup.cpp

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ static NDB_TICKS startTime;
8888
#define DEB_LCP(arglist) do { } while (0)
8989
#endif
9090

91+
//#define DEBUG_LCP_ROW 1
92+
9193
//#define DEBUG_LCP_DEL_FILES 1
9294
#ifdef DEBUG_LCP_DEL_FILES
9395
#define DEB_LCP_DEL_FILES(arglist) do { g_eventLogger->info arglist ; } while (0)
@@ -6334,7 +6336,7 @@ Backup::record_deleted_rowid(Uint32 pageNo, Uint32 pageIndex, Uint32 gci)
63346336
copy_array[0] = pageNo;
63356337
copy_array[1] = pageIndex;
63366338
copy_array[2] = gci;
6337-
DEB_LCP_DEL(("(%u) DELETE_BY_ROWID: rowid(%u,%u)",
6339+
DEB_LCP_DEL(("(%u) DELETE_BY_ROWID: row(%u,%u)",
63386340
instance(),
63396341
pageNo,
63406342
pageIndex));
@@ -6398,6 +6400,19 @@ Backup::execTRANSID_AI(Signal* signal)
63986400
const Uint32 * src = &signal->theData[3];
63996401
* dst = htonl(header);
64006402
memcpy(dst + 1, src, 4*dataLen);
6403+
#ifdef DEBUG_LCP_ROW
6404+
TablePtr debTabPtr;
6405+
FragmentPtr fragPtr;
6406+
ptr.p->tables.first(debTabPtr);
6407+
debTabPtr.p->fragments.getPtr(fragPtr, 0);
6408+
g_eventLogger->info("(%u) tab(%u,%u) Write row(%u,%u) into LCP, bits: %x",
6409+
instance(),
6410+
debTabPtr.p->tableId,
6411+
fragPtr.p->fragmentId,
6412+
src[0],
6413+
src[1],
6414+
src[3]));
6415+
#endif
64016416
if (unlikely(dataLen >= op.maxRecordSize))
64026417
{
64036418
g_eventLogger->info("dataLen: %u, op.maxRecordSize = %u, header: %u",

‎storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6488,7 +6488,7 @@ Dblqh::handle_nr_copy(Signal* signal, Ptr<TcConnectionrec> regTcPtr)
64886488
jam();
64896489
c_restore->delete_by_rowid_succ(regTcPtr.p->tcOprec);
64906490
}
6491-
DEB_LCP_RESTORE(("(%u)tab(%u,%u) rowid(%u,%u), set GCI = %u",
6491+
DEB_LCP_RESTORE(("(%u)tab(%u,%u) row(%u,%u), set GCI = %u",
64926492
instance(),
64936493
regTcPtr.p->tableref,
64946494
regTcPtr.p->fragmentid,

‎storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp

Lines changed: 55 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ extern EventLogger *g_eventLogger;
3636
#define DEB_LCP(arglist) do { } while (0)
3737
#endif
3838

39+
//#define DEBUG_ROW_COUNT 1
40+
//#define DEBUG_LCP_SKIP_DELETE_EXTRA 1
41+
3942
//#define DEBUG_DELETE_EXTRA 1
4043
#ifdef DEBUG_DELETE_EXTRA
4144
#define DEB_DELETE_EXTRA(arglist) do { g_eventLogger->info arglist ; } while (0)
@@ -115,7 +118,7 @@ void Dbtup::execTUP_DEALLOCREQ(Signal* signal)
115118
Local_key tmp;
116119
tmp.m_page_no= getRealpid(regFragPtr.p, frag_page_id);
117120
tmp.m_page_idx= page_index;
118-
DEB_DELETE(("(%u)dealloc tab(%u,%u), rowid(%u,%u)",
121+
DEB_DELETE(("(%u)dealloc tab(%u,%u), row(%u,%u)",
119122
instance(),
120123
regTabPtr.i,
121124
frag_id,
@@ -356,7 +359,7 @@ Dbtup::dealloc_tuple(Signal* signal,
356359
*/
357360
/* Coverage tested */
358361
extra_bits |= Tuple_header::LCP_SKIP;
359-
DEB_LCP_SKIP_DELETE(("(%u)tab(%u,%u), row_id(%u,%u),"
362+
DEB_LCP_SKIP_DELETE(("(%u)tab(%u,%u), row(%u,%u),"
360363
" handle_lcp_keep_commit"
361364
", set LCP_SKIP, bits: %x",
362365
instance(),
@@ -373,8 +376,8 @@ Dbtup::dealloc_tuple(Signal* signal,
373376
}
374377
else
375378
{
376-
/* ndbassert(false); COVERAGE TEST */
377-
DEB_LCP_SKIP_DELETE(("(%u)tab(%u,%u), row_id(%u,%u) DELETE"
379+
/* Coverage tested */
380+
DEB_LCP_SKIP_DELETE(("(%u)tab(%u,%u), row(%u,%u) DELETE"
378381
" already LCP:ed",
379382
instance(),
380383
regFragPtr->fragTableId,
@@ -383,13 +386,31 @@ Dbtup::dealloc_tuple(Signal* signal,
383386
rowid.m_page_idx));
384387
}
385388
}
389+
else
390+
{
391+
#ifdef DEBUG_LCP_SKIP_DELETE_EXTRA
392+
Local_key rowid = regOperPtr->m_tuple_location;
393+
rowid.m_page_no = page->frag_page_id;
394+
g_eventLogger->info("(%u)tab(%u,%u)row(%u,%u),"
395+
", skip LCP, bits: %x"
396+
", lcpScan_ptr: %u",
397+
instance(),
398+
regFragPtr->fragTableId,
399+
regFragPtr->fragmentId,
400+
rowid.m_page_no,
401+
rowid.m_page_idx,
402+
bits,
403+
lcpScan_ptr_i);
404+
#endif
405+
}
406+
386407

387408
#ifdef DEBUG_DELETE_EXTRA
388409
if (c_started)
389410
{
390411
Local_key rowid = regOperPtr->m_tuple_location;
391412
rowid.m_page_no = page->frag_page_id;
392-
DEB_DELETE_EXTRA(("(%u)tab(%u,%u),DELETE row_id(%u,%u)",
413+
DEB_DELETE_EXTRA(("(%u)tab(%u,%u),DELETE row(%u,%u)",
393414
instance(),
394415
regFragPtr->fragTableId,
395416
regFragPtr->fragmentId,
@@ -423,6 +444,19 @@ Dbtup::dealloc_tuple(Signal* signal,
423444
{
424445
ndbrequire(regFragPtr->m_row_count > 0);
425446
regFragPtr->m_row_count--;
447+
#ifdef DEBUG_ROW_COUNT
448+
Local_key rowid = regOperPtr->m_tuple_location;
449+
rowid.m_page_no = page->frag_page_id;
450+
g_eventLogger->info("(%u) tab(%u,%u) Deleted row(%u,%u)"
451+
", bits: %x, row_count = %llu",
452+
instance(),
453+
regFragPtr->fragTableId,
454+
regFragPtr->fragmentId,
455+
rowid.m_page_no,
456+
rowid.m_page_idx,
457+
ptr->m_header_bits,
458+
regFragPtr->m_row_count);
459+
#endif
426460
}
427461
}
428462

@@ -841,7 +875,7 @@ Dbtup::commit_operation(Signal* signal,
841875
{
842876
Local_key rowid = regOperPtr->m_tuple_location;
843877
rowid.m_page_no = pagePtr.p->frag_page_id;
844-
g_eventLogger->info("(%u)tab(%u,%u) commit rowid(%u,%u)",
878+
g_eventLogger->info("(%u)tab(%u,%u) commit row(%u,%u)",
845879
instance(),
846880
regFragPtr->fragTableId,
847881
regFragPtr->fragmentId,
@@ -874,7 +908,7 @@ Dbtup::commit_operation(Signal* signal,
874908
jam();
875909
/* Coverage tested */
876910
lcp_bits |= Tuple_header::LCP_SKIP;
877-
DEB_LCP_SKIP(("(%u)Set LCP_SKIP on tab(%u,%u), rowid(%u,%u)",
911+
DEB_LCP_SKIP(("(%u)Set LCP_SKIP on tab(%u,%u), row(%u,%u)",
878912
instance(),
879913
regFragPtr->fragTableId,
880914
regFragPtr->fragmentId,
@@ -890,7 +924,7 @@ Dbtup::commit_operation(Signal* signal,
890924
* operation.
891925
*/
892926
/* Coverage tested */
893-
DEB_LCP_DEL(("(%u)Set LCP_DELETE on tab(%u,%u), rowid(%u,%u)",
927+
DEB_LCP_DEL(("(%u)Set LCP_DELETE on tab(%u,%u), row(%u,%u)",
894928
instance(),
895929
regFragPtr->fragTableId,
896930
regFragPtr->fragmentId,
@@ -967,6 +1001,19 @@ Dbtup::commit_operation(Signal* signal,
9671001
if (!regOperPtr->op_struct.bit_field.m_tuple_existed_at_start)
9681002
{
9691003
regFragPtr->m_row_count++;
1004+
#ifdef DEBUG_ROW_COUNT
1005+
Local_key rowid = regOperPtr->m_tuple_location;
1006+
rowid.m_page_no = pagePtr.p->frag_page_id;
1007+
g_eventLogger->info("(%u) tab(%u,%u) Inserted row(%u,%u)"
1008+
", bits: %x, row_count = %llu",
1009+
instance(),
1010+
regFragPtr->fragTableId,
1011+
regFragPtr->fragmentId,
1012+
rowid.m_page_no,
1013+
rowid.m_page_idx,
1014+
tuple_ptr->m_header_bits,
1015+
regFragPtr->m_row_count);
1016+
#endif
9701017
}
9711018
}
9721019

‎storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,7 +1488,7 @@ Dbtup::disk_page_free(Signal *signal,
14881488
{
14891489
g_eventLogger->info(
14901490
"(%u)disk_page_free crash:tab(%u,%u):%u,page(%u,%u).%u.%u"
1491-
",gci:%u,rowid(%u,%u)",
1491+
",gci:%u,row(%u,%u)",
14921492
instance(),
14931493
fragPtrP->fragTableId,
14941494
fragPtrP->fragmentId,
@@ -1513,7 +1513,7 @@ Dbtup::disk_page_free(Signal *signal,
15131513
alloc_size);
15141514

15151515
DEB_PGMAN((
1516-
"(%u)disk_page_free:tab(%u,%u):%u,page(%u,%u).%u.%u,gci:%u,rowid(%u,%u)"
1516+
"(%u)disk_page_free:tab(%u,%u):%u,page(%u,%u).%u.%u,gci:%u,row(%u,%u)"
15171517
", lsn=%llu",
15181518
instance(),
15191519
fragPtrP->fragTableId,

‎storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2215,7 +2215,7 @@ int Dbtup::handleInsertReq(Signal* signal,
22152215
{
22162216
insert_str = (char*)"INSERT";
22172217
}
2218-
DEB_DELETE(("(%u)%s: tab(%u,%u) rowid(%u,%u)",
2218+
DEB_DELETE(("(%u)%s: tab(%u,%u) row(%u,%u)",
22192219
instance(),
22202220
insert_str,
22212221
regFragPtr->fragTableId,
@@ -4782,7 +4782,7 @@ Dbtup::nr_delete(Signal* signal, Uint32 senderData,
47824782
Local_key disk;
47834783
memcpy(&disk, ptr->get_disk_ref_ptr(tablePtr.p), sizeof(disk));
47844784

4785-
DEB_DELETE(("(%u)nr_delete, tab(%u,%u) rowid(%u,%u), gci: %u",
4785+
DEB_DELETE(("(%u)nr_delete, tab(%u,%u) row(%u,%u), gci: %u",
47864786
instance(),
47874787
fragPtr.p->fragTableId,
47884788
fragPtr.p->fragmentId,

‎storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ Dbtup::alloc_fix_rowid(Uint32 * err,
251251
case ZTH_MM_FREE:
252252
if (((Fix_page*)pagePtr.p)->alloc_record(idx) != idx)
253253
{
254-
DEB_899_ERROR(("(%u)899 error FREE: tab(%u,%u) rowid(%u,%u)",
254+
DEB_899_ERROR(("(%u)899 error FREE: tab(%u,%u) row(%u,%u)",
255255
instance(),
256256
regFragPtr->fragTableId,
257257
regFragPtr->fragmentId,
@@ -275,7 +275,7 @@ Dbtup::alloc_fix_rowid(Uint32 * err,
275275
return pagePtr.p->m_data + idx;
276276
case ZTH_MM_FULL:
277277
* err = ZROWID_ALLOCATED;
278-
DEB_899_ERROR(("(%u)899 error FULL: tab(%u,%u) rowid(%u,%u)",
278+
DEB_899_ERROR(("(%u)899 error FULL: tab(%u,%u) row(%u,%u)",
279279
instance(),
280280
regFragPtr->fragTableId,
281281
regFragPtr->fragmentId,

‎storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,7 +1546,7 @@ Dbtup::scanNext(Signal* signal, ScanOpPtr scanPtr)
15461546
if ((bits & ScanOp::SCAN_LCP) &&
15471547
(thbits & Tuple_header::LCP_DELETE))
15481548
{
1549-
g_eventLogger->info("(%u)LCP_DELETE on tab(%u,%u), rowid(%u,%u)"
1549+
g_eventLogger->info("(%u)LCP_DELETE on tab(%u,%u), row(%u,%u)"
15501550
" ALL ROWS page, header: %x",
15511551
instance(),
15521552
fragPtr.p->fragTableId,
@@ -1576,7 +1576,7 @@ Dbtup::scanNext(Signal* signal, ScanOpPtr scanPtr)
15761576
jam();
15771577
tuple_header_ptr->m_header_bits =
15781578
thbits & (~Tuple_header::LCP_SKIP);
1579-
DEB_LCP_SKIP(("(%u)Reset LCP_SKIP on tab(%u,%u), rowid(%u,%u)"
1579+
DEB_LCP_SKIP(("(%u)Reset LCP_SKIP on tab(%u,%u), row(%u,%u)"
15801580
", header: %x",
15811581
instance(),
15821582
fragPtr.p->fragTableId,
@@ -1622,7 +1622,7 @@ Dbtup::scanNext(Signal* signal, ScanOpPtr scanPtr)
16221622
goto found_tuple; // Locked tuple...
16231623
// skip free tuple
16241624
}
1625-
DEB_NR_SCAN_EXTRA(("(%u)NR_SCAN_SKIP:tab(%u,%u) rowid(%u,%u),"
1625+
DEB_NR_SCAN_EXTRA(("(%u)NR_SCAN_SKIP:tab(%u,%u) row(%u,%u),"
16261626
" recGCI: %u, scanGCI: %u, header: %x",
16271627
instance(),
16281628
fragPtr.p->fragTableId,
@@ -1681,7 +1681,7 @@ Dbtup::scanNext(Signal* signal, ScanOpPtr scanPtr)
16811681
tuple_header_ptr->m_header_bits);
16821682
ndbassert(!(thbits & Tuple_header::LCP_SKIP));
16831683
DEB_LCP_DEL(("(%u)Reset LCP_DELETE on tab(%u,%u),"
1684-
" rowid(%u,%u), header: %x",
1684+
" row(%u,%u), header: %x",
16851685
instance(),
16861686
fragPtr.p->fragTableId,
16871687
fragPtr.p->fragmentId,
@@ -1731,7 +1731,7 @@ Dbtup::scanNext(Signal* signal, ScanOpPtr scanPtr)
17311731
/* Coverage tested */
17321732
tuple_header_ptr->m_header_bits =
17331733
thbits & (~Tuple_header::LCP_SKIP);
1734-
DEB_LCP_SKIP(("(%u) 2 Reset LCP_SKIP on tab(%u,%u), rowid(%u,%u)"
1734+
DEB_LCP_SKIP(("(%u) 2 Reset LCP_SKIP on tab(%u,%u), row(%u,%u)"
17351735
", header: %x",
17361736
instance(),
17371737
fragPtr.p->fragTableId,
@@ -1746,7 +1746,7 @@ Dbtup::scanNext(Signal* signal, ScanOpPtr scanPtr)
17461746
}
17471747
else
17481748
{
1749-
DEB_LCP_SKIP_EXTRA(("(%u)Skipped tab(%u,%u), rowid(%u,%u),"
1749+
DEB_LCP_SKIP_EXTRA(("(%u)Skipped tab(%u,%u), row(%u,%u),"
17501750
" foundGCI: %u, scanGCI: %u, header: %x",
17511751
instance(),
17521752
fragPtr.p->fragTableId,
@@ -1784,7 +1784,7 @@ Dbtup::scanNext(Signal* signal, ScanOpPtr scanPtr)
17841784
jam();
17851785
/* Coverage tested */
17861786
ndbassert(!(thbits & Tuple_header::LCP_SKIP));
1787-
DEB_LCP_SKIP_EXTRA(("(%u)Skipped tab(%u,%u), rowid(%u,%u),"
1787+
DEB_LCP_SKIP_EXTRA(("(%u)Skipped tab(%u,%u), row(%u,%u),"
17881788
" foundGCI: %u, scanGCI: %u, header: %x",
17891789
instance(),
17901790
fragPtr.p->fragTableId,
@@ -1874,7 +1874,7 @@ Dbtup::scanNext(Signal* signal, ScanOpPtr scanPtr)
18741874
tuple_header_ptr->m_header_bits =
18751875
thbits & ~(Uint32)Tuple_header::LCP_SKIP;
18761876

1877-
DEB_LCP_SKIP(("(%u) 3 Reset LCP_SKIP on tab(%u,%u), rowid(%u,%u)"
1877+
DEB_LCP_SKIP(("(%u) 3 Reset LCP_SKIP on tab(%u,%u), row(%u,%u)"
18781878
", header: %x",
18791879
instance(),
18801880
fragPtr.p->fragTableId,
@@ -2010,7 +2010,7 @@ Dbtup::record_delete_by_rowid(Signal *signal,
20102010
bool set_scan_state)
20112011
{
20122012
const Uint32 bits = scan.m_bits;
2013-
DEB_LCP_DEL_EXTRA(("(%u)Delete by rowid tab(%u,%u), page(%u,%u)",
2013+
DEB_LCP_DEL_EXTRA(("(%u)Delete by rowid tab(%u,%u), row(%u,%u)",
20142014
instance(),
20152015
tableId,
20162016
fragmentId,
@@ -2200,10 +2200,13 @@ Dbtup::handle_lcp_keep(Signal* signal,
22002200
*/
22012201
c_backup->change_current_page_temp(copytuple[0]);
22022202
remove_top_from_lcp_keep_list(fragPtr.p, copytuple, tmp);
2203-
DEB_LCP_KEEP(("(%u)tab(%u,%u) page(%u,%u): Handle LCP keep insert entry",
2203+
DEB_LCP_KEEP(("(%u)tab(%u,%u) row(%u,%u) page(%u,%u): Handle LCP keep"
2204+
" insert entry",
22042205
instance(),
22052206
fragPtr.p->fragTableId,
22062207
fragPtr.p->fragmentId,
2208+
copytuple[0],
2209+
copytuple[1],
22072210
tmp.m_page_no,
22082211
tmp.m_page_idx));
22092212
Local_key save = tmp;
@@ -2452,10 +2455,13 @@ Dbtup::insert_lcp_keep_list(Fragrecord *fragPtrP,
24522455
Local_key nil;
24532456
nil.setNull();
24542457
memcpy(copytuple+2, &nil, sizeof(Local_key));
2455-
DEB_LCP_KEEP(("(%u)tab(%u,%u) Insert LCP keep location page(%u,%u)",
2458+
DEB_LCP_KEEP(("(%u)tab(%u,%u) Insert LCP keep for row(%u,%u)"
2459+
" from location page(%u,%u)",
24562460
instance(),
24572461
fragPtrP->fragTableId,
24582462
fragPtrP->fragmentId,
2463+
rowid->m_page_no,
2464+
rowid->m_page_idx,
24592465
location.m_page_no,
24602466
location.m_page_idx));
24612467

0 commit comments

Comments
 (0)