WL#8069: Post-push fix: A bit more work on the debugging framework for Partial LCP

Mikael Ronström · prashanttekriwal · commit fb8dd117ff51 · 2018-01-23T10:34:50.000+01:00
(cherry picked from commit 04aa7c4d023de5d50ae25d747785aedcd2db73d2)
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
@@ -31,7 +31,8 @@ extern EventLogger *g_eventLogger;
 
 #ifdef VM_TRACE
 //#define DEBUG_LCP 1
-//#define DEBUG_ROW_COUNT 1
+//#define DEBUG_ROW_COUNT_DEL 1
+//#define DEBUG_ROW_COUNT_INS 1
 //#define DEBUG_LCP_SKIP_DELETE_EXTRA 1
 //#define DEBUG_DELETE_EXTRA 1
 //#define DEBUG_INSERT_EXTRA 1
@@ -467,7 +468,7 @@ Dbtup::dealloc_tuple(Signal* signal,
   {
     ndbrequire(regFragPtr->m_row_count > 0);
     regFragPtr->m_row_count--;
-#ifdef DEBUG_ROW_COUNT
+#ifdef DEBUG_ROW_COUNT_DEL
     Local_key rowid = regOperPtr->m_tuple_location;
     rowid.m_page_no = page->frag_page_id;
     g_eventLogger->info("(%u) tab(%u,%u) Deleted row(%u,%u)"
@@ -1028,7 +1029,7 @@ Dbtup::commit_operation(Signal* signal,
   if (!regOperPtr->op_struct.bit_field.m_tuple_existed_at_start)
   {
     regFragPtr->m_row_count++;
-#ifdef DEBUG_ROW_COUNT
+#ifdef DEBUG_ROW_COUNT_INS
     Local_key rowid = regOperPtr->m_tuple_location;
     rowid.m_page_no = pagePtr.p->frag_page_id;
     g_eventLogger->info("(%u) tab(%u,%u) Inserted row(%u,%u)"
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
@@ -40,6 +40,7 @@
 #ifdef VM_TRACE
 //#define DEBUG_LCP 1
 //#define DEBUG_DELETE 1
+//#define DEBUG_DELETE_NR 1
 //#define DEBUG_LCP_LGMAN 1
 #endif
 #ifdef DEBUG_LCP
@@ -54,6 +55,12 @@
 #define DEB_DELETE(arglist) do { } while (0)
 #endif
 
+#ifdef DEBUG_DELETE_NR
+#define DEB_DELETE_NR(arglist) do { g_eventLogger->info arglist ; } while (0)
+#else
+#define DEB_DELETE_NR(arglist) do { } while (0)
+#endif
+
 #ifdef DEBUG_LCP_LGMAN
 #define DEB_LCP_LGMAN(arglist) do { g_eventLogger->info arglist ; } while (0)
 #else
@@ -4784,17 +4791,19 @@ Dbtup::nr_delete(Signal* signal, Uint32 senderData,
   Local_key disk;
   memcpy(&disk, ptr->get_disk_ref_ptr(tablePtr.p), sizeof(disk));
 
-  DEB_DELETE(("(%u)nr_delete, tab(%u,%u) row(%u,%u), gci: %u",
-               instance(),
-               fragPtr.p->fragTableId,
-               fragPtr.p->fragmentId,
-               key->m_page_no,
-               key->m_page_idx,
-               *ptr->get_mm_gci(tablePtr.p)));
-
   /* A row is deleted as part of Copy fragment or Restore */
   fragPtr.p->m_row_count--;
 
+  DEB_DELETE_NR(("(%u)nr_delete, tab(%u,%u) row(%u,%u), gci: %u"
+                 ", row_count: %llu",
+                 instance(),
+                 fragPtr.p->fragTableId,
+                 fragPtr.p->fragmentId,
+                 key->m_page_no,
+                 key->m_page_idx,
+                 *ptr->get_mm_gci(tablePtr.p),
+                 fragPtr.p->m_row_count));
+
   if (tablePtr.p->m_attributes[MM].m_no_of_varsize +
       tablePtr.p->m_attributes[MM].m_no_of_dynamic)
   {
