added config parameter Group on connection

    moved NdbWaiter, m_ndb_cluster_connection, to impl class
    moved node selection things to cluster connection
    moved all private things to impl class
    added opts for shared memory and node selection
    changed opts handling somewhat; introduced enum for options and common handling of option variables
    added checks for transporter support
    automatic addition of shared mem transporters
    moved wait_until_ready code to cluster connection
    added control of usage of new node selection method


ndb/include/mgmapi/mgmapi_config_parameters.h:
  added config parameter Group on connection
ndb/include/ndbapi/Ndb.hpp:
  moved NdbWaiter, m_ndb_cluster_connection, to impl class
  moved node selection things to cluster connection
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  moved all private things to impl class
ndb/include/util/ndb_opts.h:
  added opts for shared memory and node selection
ndb/src/kernel/vm/Configuration.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/src/mgmclient/main.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/src/mgmsrv/ConfigInfo.cpp:
  added checks for transporter support
  automatic addition of shared mem transporters
ndb/src/mgmsrv/MgmtSrvr.cpp:
  in alloc node id first choose connection with specified hostname
ndb/src/mgmsrv/main.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/src/ndbapi/DictCache.hpp:
  added include file
ndb/src/ndbapi/Ndb.cpp:
  enabled using new node selection method
  moved wait_until_ready code to cluster connection
  moved node selection (hint) to cluster connection
  removed start transaction dgroup
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  removed and added inclusde files
ndb/src/ndbapi/NdbImpl.hpp:
  moved things from Ndb into Impl class
  moved waiter things to new file NdbWaiter.hpp
ndb/src/ndbapi/NdbScanOperation.cpp:
  ndbwaiter is no in impl class
ndb/src/ndbapi/Ndbif.cpp:
  ndbwaiter is no in impl class
ndb/src/ndbapi/Ndbinit.cpp:
  moved some Ndb things into impl class
ndb/src/ndbapi/TransporterFacade.hpp:
  changed friend declaration
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  moved node selection things to cluster connection
  moved things from cluster connection to cluster connection impl class
ndb/test/ndbapi/testNdbApi.cpp:
  removed start transaction dgroup
ndb/tools/delete_all.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/desc.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/drop_index.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/drop_tab.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/listTables.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/restore/restore_main.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/select_all.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/select_count.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/waiter.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
sql/ha_ndbcluster.cc:
  added control of usage of new node selection method
sql/mysqld.cc:
  added control of usage of new node selection method

1 files changed, 102 insertions, 0 deletions

diff --git a/ndb/src/ndbapi/NdbWaiter.hpp b/ndb/src/ndbapi/NdbWaiter.hpp
new file mode 100644
index 00000000000..8b7b2a75879
--- /dev/null
+++ b/ndb/src/ndbapi/NdbWaiter.hpp
@@ -0,0 +1,102 @@
+/* Copyright (C) 2003 MySQL AB
+   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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#ifndef NDB_WAITER_HPP
+#define NDB_WAITER_HPP
+
+#include <ndb_global.h>
+#include <NdbOut.hpp>
+#include <NdbError.hpp>
+#include <NdbCondition.h>
+#include <NdbReceiver.hpp>
+#include <NdbOperation.hpp>
+#include <kernel/ndb_limits.h>
+
+#include <NdbTick.h>
+
+enum WaitSignalType { 
+  NO_WAIT           = 0,
+  WAIT_NODE_FAILURE = 1,  // Node failure during wait
+  WST_WAIT_TIMEOUT  = 2,  // Timeout during wait
+
+  WAIT_TC_SEIZE     = 3,
+  WAIT_TC_RELEASE   = 4,
+  WAIT_NDB_TAMPER   = 5,
+  WAIT_SCAN         = 6,
+
+  // DICT stuff
+  WAIT_GET_TAB_INFO_REQ = 11,
+  WAIT_CREATE_TAB_REQ = 12,
+  WAIT_DROP_TAB_REQ = 13,
+  WAIT_ALTER_TAB_REQ = 14,
+  WAIT_CREATE_INDX_REQ = 15,
+  WAIT_DROP_INDX_REQ = 16,
+  WAIT_LIST_TABLES_CONF = 17
+};
+
+class NdbWaiter {
+public:
+  NdbWaiter();
+  ~NdbWaiter();
+
+  void wait(int waitTime);
+  void nodeFail(Uint32 node);
+  void signal(Uint32 state);
+
+  Uint32 m_node;
+  Uint32 m_state;
+  void * m_mutex;
+  struct NdbCondition * m_condition;  
+};
+
+inline
+void
+NdbWaiter::wait(int waitTime)
+{
+  const bool forever = (waitTime == -1);
+  const NDB_TICKS maxTime = NdbTick_CurrentMillisecond() + waitTime;
+  while (1) {
+    if (m_state == NO_WAIT || m_state == WAIT_NODE_FAILURE)
+      break;
+    if (forever) {
+      NdbCondition_Wait(m_condition, (NdbMutex*)m_mutex);
+    } else {
+      if (waitTime <= 0) {
+        m_state = WST_WAIT_TIMEOUT;
+        break;
+      }
+      NdbCondition_WaitTimeout(m_condition, (NdbMutex*)m_mutex, waitTime);
+      waitTime = maxTime - NdbTick_CurrentMillisecond();
+    }
+  }
+}
+
+inline
+void
+NdbWaiter::nodeFail(Uint32 aNodeId){
+  if (m_state != NO_WAIT && m_node == aNodeId){
+    m_state = WAIT_NODE_FAILURE;
+    NdbCondition_Signal(m_condition);
+  }
+}
+
+inline
+void 
+NdbWaiter::signal(Uint32 state){
+  m_state = state;
+  NdbCondition_Signal(m_condition);
+}
+
+#endif