Bug#33855045 Test ndbinfo_upgrade fails on valgrind builds [#4]

The NdbEventOperationImpl owns a NdbDictionary::Event by having a
pointer to the Event's implementation.

Make sure the pointer is always initialized in constructor and mark the
pointer const. Also mark NdbEventImpl's pointer to the Event as const.
Thus the m_eventImpl->m_facade pointer path should now be enforced by
compiler.

Change-Id: I469b39d66a4d83daf08307d980d555da1ab79827

Author: blaudden

storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp

@@ -519,7 +519,7 @@ class NdbEventImpl : public NdbDictionary::Event, public NdbDictObjectImpl {
 
   static NdbEventImpl & getImpl(NdbDictionary::Event & t);
   static NdbEventImpl & getImpl(const NdbDictionary::Event & t);
-  NdbDictionary::Event * m_facade;
+  NdbDictionary::Event * const m_facade;
 private:
   NdbTableImpl *m_tableImpl;
   void setTable(NdbTableImpl *tableImpl);

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp

@@ -97,33 +97,35 @@ NdbEventOperationImpl::NdbEventOperationImpl(NdbEventOperation &f,
   NdbEventOperation(*this),
   m_facade(&f),
   m_ndb(ndb),
+  m_eventImpl(&event->m_impl),
   m_state(EO_ERROR),
   m_oid(~(Uint32)0),
   m_stop_gci(),
   m_allow_empty_update(false)
 {
   DBUG_ENTER("NdbEventOperationImpl::NdbEventOperationImpl");
-  init(event->m_impl);
+  init();
   DBUG_VOID_RETURN;
 }
 
 NdbEventOperationImpl::NdbEventOperationImpl(Ndb *theNdb,
-                                             NdbEventImpl& evnt) :
+                                             NdbEventImpl* evnt) :
   NdbEventOperation(*this),
   m_facade(this),
   m_ndb(theNdb),
+  m_eventImpl(evnt),
   m_state(EO_ERROR),
   m_oid(~(Uint32)0),
   m_stop_gci(),
   m_allow_empty_update(false)
 {
   DBUG_ENTER("NdbEventOperationImpl::NdbEventOperationImpl [evnt]");
-  init(evnt);
+  init();
   DBUG_VOID_RETURN;
 }
 
 void
-NdbEventOperationImpl::init(NdbEventImpl& evnt)
+NdbEventOperationImpl::init()
 {
   DBUG_ENTER("NdbEventOperationImpl::init");
 
@@ -152,16 +154,13 @@ NdbEventOperationImpl::init(NdbEventImpl& evnt)
   theBlobVersion = 0;
 
   m_data_item= NULL;
-  m_eventImpl = NULL;
 
   m_custom_data= 0;
   m_has_error= 1;
 
   // we should lookup id in Dictionary, TODO
   // also make sure we only have one listener on each event
 
-  m_eventImpl = &evnt;
-
   m_oid= m_ndb->theImpl->mapRecipient(this);
 
   m_state= EO_CREATED;
@@ -211,8 +210,8 @@ NdbEventOperationImpl::~NdbEventOperationImpl()
 
   if (m_eventImpl)
   {
+    // NOTE! Destroys the Event which is owned by the NdbEventImpl pointer
     delete m_eventImpl->m_facade;
-    m_eventImpl= 0;
   }
 
   DBUG_VOID_RETURN;
@@ -408,7 +407,7 @@ NdbEventOperationImpl::getBlobHandle(const NdbColumnImpl *tAttrInfo, int n)
 
       // create blob event operation
       tBlobOp =
-        m_ndb->theEventBuffer->createEventOperationImpl(*blobEvnt, m_error);
+        m_ndb->theEventBuffer->createEventOperationImpl(blobEvnt, m_error);
       if (tBlobOp == NULL)
         DBUG_RETURN(NULL);
 
@@ -4303,11 +4302,11 @@ NdbEventBuffer::createEventOperation(const char* eventName,
 }
 
 NdbEventOperationImpl*
-NdbEventBuffer::createEventOperationImpl(NdbEventImpl& evnt,
+NdbEventBuffer::createEventOperationImpl(NdbEventImpl* event,
                                          NdbError &theError)
 {
   DBUG_ENTER("NdbEventBuffer::createEventOperationImpl");
-  NdbEventOperationImpl* tOp= new NdbEventOperationImpl(m_ndb, evnt);
+  NdbEventOperationImpl* tOp= new NdbEventOperationImpl(m_ndb, event);
   if (tOp == 0)
   {
     theError.code= 4000;

storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp

@@ -557,9 +557,9 @@ class NdbEventOperationImpl : public NdbEventOperation {
   NdbEventOperationImpl(NdbEventOperation &f,
                         Ndb *ndb,
                         const NdbDictionary::Event *myEvnt);
-  NdbEventOperationImpl(Ndb *theNdb, 
-			NdbEventImpl& evnt);
-  void init(NdbEventImpl& evnt);
+  NdbEventOperationImpl(Ndb *theNdb,
+                        NdbEventImpl *evnt);
+  void init();
   NdbEventOperationImpl(NdbEventOperationImpl&); //unimplemented
   NdbEventOperationImpl& operator=(const NdbEventOperationImpl&); //unimplemented
   ~NdbEventOperationImpl();
@@ -602,7 +602,8 @@ class NdbEventOperationImpl : public NdbEventOperation {
   NdbError m_error;
 
   Ndb *const m_ndb;
-  NdbEventImpl *m_eventImpl;
+  // The Event is owned by pointer to NdbEventImpl->m_facade
+  NdbEventImpl *const m_eventImpl;
 
   NdbRecAttr *theFirstPkAttrs[2];
   NdbRecAttr *theCurrentPkAttrs[2];
@@ -844,7 +845,7 @@ class NdbEventBuffer {
 
   NdbEventOperation *createEventOperation(const char* eventName,
 					  NdbError &);
-  NdbEventOperationImpl *createEventOperationImpl(NdbEventImpl& evnt,
+  NdbEventOperationImpl *createEventOperationImpl(NdbEventImpl* evnt,
                                                   NdbError &);
   void dropEventOperation(NdbEventOperation *);
   static NdbEventOperationImpl* getEventOperationImpl(NdbEventOperation* tOp);