Remove old version 1 of the NdbWaitGroup API

This simplifies code reading & understanding for bug#20351656

Author: jdduncan

storage/ndb/src/ndbapi/NdbWaitGroup.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -37,17 +37,13 @@ NdbWaitGroup::NdbWaitGroup(Ndb_cluster_connection *_conn, int ndbs) :
   m_multiWaitHandler(0),
   m_pos_overflow(0),
   m_nodeId(0),
-  m_active_version(0),
   m_conn(_conn)
 {
   const int pointers_per_cache_line = NDB_CL / sizeof(Ndb *);
 
   /* round array size up to a whole cache line */
   m_array_size = round_up(ndbs, pointers_per_cache_line);
 
-  /* m_pos is used in the version 1 api */
-  m_pos = m_array_size;
-
   /* overflow list is 1/8 of array, also rounded up */
   m_overflow_size = m_array_size / 8;
   m_overflow_size = round_up(m_overflow_size, pointers_per_cache_line);
@@ -90,52 +86,6 @@ void NdbWaitGroup::wakeup()
 }
 
 
-/*  Old-API addNdb() 
-*/
-bool NdbWaitGroup::addNdb(Ndb *ndb)
-{
-  if(unlikely(ndb->theNode != Uint32(m_nodeId)))
-  {
-    return false; // Ndb belongs to wrong ndb_cluster_connection
-  }
-
-  if(unlikely(m_pos == 0))
-  {
-    return false; // array is full
-  }
-
-  m_array[--m_pos] = ndb;
-  return true;
-}
-
-
-/*  Old-API version of wait().
-    It is single-threaded without any concurrent push().
-*/
-int NdbWaitGroup::wait(Ndb ** & arrayHead    /* out */,
-                       Uint32 timeout_millis,
-                       int min_ndbs)
-{
-  int nready;
-  int nwait = m_array_size - m_pos;
-  Ndb ** ndblist = m_array + m_pos;
-  arrayHead = NULL;
-  m_active_version = 1;
-  int wait_rc = m_multiWaitHandler->waitForInput(ndblist,
-                                                 nwait,
-                                                 min_ndbs,
-                                                 timeout_millis,
-                                                 &nready);
-  if(wait_rc == 0) 
-  {
-    arrayHead = ndblist; 
-    m_pos += nready;
-    return nready;
-  }
-  return wait_rc ? -1 : nready;
-}
-
-
 /* Version 2 API */
 
 /* 
@@ -198,14 +148,10 @@ int NdbWaitGroup::push(Ndb *ndb)
 
 
 /* wait() takes the lock before and after wait (not during).
-   In 7.2, shifting or resizing the list requires a PollGuard,
-   but in 7.3, the underlying wakeupHandler will only touch the 
-   array during wait() so no lock is needed.
 */
 int NdbWaitGroup::wait(Uint32 timeout_millis, int pct_ready) 
 {
   int nready, nwait;
-  m_active_version = 2;
   assert(pct_ready >=0 && pct_ready <= 100);
 
   lock();

storage/ndb/src/ndbapi/NdbWaitGroup.hpp

@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -53,9 +53,7 @@ friend class Ndb_cluster_connection_impl;
 
   /** The private constructor is used only by ndb_cluster_connection.
       It allocates and initializes an NdbWaitGroup with an initial array 
-      of Ndb objects.
-      In the version 1 API, the initial size is the fixed maximum size.
-      In the version 2 API, the array will grow as needed.
+      of Ndb objects. The array will grow beyond the initial size as needed.
   */
   NdbWaitGroup(Ndb_cluster_connection *conn, int initial_size);
 
@@ -64,8 +62,6 @@ friend class Ndb_cluster_connection_impl;
 
 public:
 
-  /****** VERSION 2 API *******/
-
   /** Push an Ndb object onto the wait queue.
       This is thread-safe: multiple threads can call push().
       Returns 0 on success, non-zero on error.
@@ -99,55 +95,23 @@ friend class Ndb_cluster_connection_impl;
   */
   Ndb * pop();
 
-
-
-  /****** COMMON API *********/
-
   /** Wake up the thread that is currently waiting on this group.
       This can be used by other threads to signal a condition to the
       waiting thread.
       If no thread is currently waiting, then delivery is not guaranteed.
   */
   void wakeup();
 
-  
-  /****** VERSION 1 API *********/
-
-  /** Add an Ndb object to the group. 
-       
-      Returns true on success, false on error.  Error could be that the Ndb
-      is created from the wrong Ndb_cluster_connection, or is already in the
-      group, or that the group is full.
-  */
-  bool addNdb(Ndb *);
-
-  /** wait for Ndbs to be ready.
-      arrayhead (OUT): on return will hold the list of ready Ndbs.
-      The call will return when:
-        (a) at least min_ready Ndbs are ready for polling, or
-        (b) timeout milliseconds have elapsed, or
-        (c) another thread has called NdbWaitGroup::wakeup()
-
-     The return value is the number of Ndb objects ready for polling, or -1
-     if a timeout occured.
-
-      On return, arrayHead is set to point to the first element of
-      the array of Ndb object pointers that are ready for polling, and those
-      objects are implicitly no longer in the group.  These Ndb *'s must be
-      read from arrayHead before before any further calls to addNdb().
-  */
-  int wait(Ndb ** & arrayHead, Uint32 timeout_millis, int min_ready = 1 );
 
 private:  /* private instance variables */
    Ndb **m_array;
-   Int32 m_pos;
    Uint32 m_array_size, m_pos_return;
    Uint32 m_pos_new, m_pos_wait, m_pos_ready;
 
    MultiNdbWakeupHandler *m_multiWaitHandler;
    Ndb **m_overflow;
    Int32 m_overflow_size, m_pos_overflow;
-   Int32 m_nodeId, m_active_version;
+   Int32 m_nodeId;
 
    Ndb_cluster_connection *m_conn;
    Ndb *m_wakeNdb;