Commit 7cf1c4d5 authored by unknown's avatar unknown
Browse files

wl2135 test prg + bug fixes 


ndb/include/ndbapi/NdbConnection.hpp:
  Add support for removing op from list
ndb/include/ndbapi/NdbScanOperation.hpp:
  virtual destructor
ndb/src/ndbapi/NdbConnection.cpp:
  Add support for removing op from list
ndb/src/ndbapi/NdbScanOperation.cpp:
  Set magic number to invalid before first prepareSendScan
  (so that prepareSendScan is only called once incase of restarts)
ndb/src/ndbapi/Ndblist.cpp:
  Use correct type
ndb/test/src/UtilTransactions.cpp:
  Update test prg.
  - use LM_Read to maintain locks
  - set iop = null on temporary error (restart transaction)
parent e8b47674

ndb/include/ndbapi/NdbConnection.hpp

+2 −0
Original line number Diff line number Diff line
@@ -673,6 +673,8 @@ private: 
  void printState();

#endif

  bool checkState_TransId(const Uint32 * transId) const;



  void remove_list(NdbOperation*& head, NdbOperation*);

  void define_scan_op(NdbIndexScanOperation*);

};

ndb/include/ndbapi/NdbScanOperation.hpp

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ protected: 
  CursorType m_cursor_type;



  NdbScanOperation(Ndb* aNdb);

  ~NdbScanOperation();

  virtual ~NdbScanOperation();



  int nextResult(bool fetchAllowed = true);

  virtual void release();

ndb/src/ndbapi/NdbConnection.cpp

+13 −0
Original line number Diff line number Diff line
@@ -1128,6 +1128,19 @@ NdbConnection::getNdbScanOperation(const NdbTableImpl * tab) 
  return NULL;

}//NdbConnection::getNdbScanOperation()



void

NdbConnection::remove_list(NdbOperation*& list, NdbOperation* op){

  NdbOperation* tmp= list;

  if(tmp == op)

    list = op->next();

  else {

    while(tmp && tmp->next() != op) tmp = tmp->next();

    if(tmp)

      tmp->next(op->next());

  }

  op->next(NULL);

}



void

NdbConnection::define_scan_op(NdbIndexScanOperation * tOp){

  // Link scan operation into list of cursor operations

ndb/src/ndbapi/NdbScanOperation.cpp

+29 −23
Original line number Diff line number Diff line
@@ -117,6 +117,8 @@ NdbScanOperation::init(const NdbTableImpl* tab, NdbConnection* myConnection) 
  

  theStatus = GetValue;

  theOperationType = OpenScanRequest;

  theNdbCon->theMagicNumber = 0xFE11DF;



  return 0;

}
@@ -217,7 +219,10 @@ NdbResultSet* NdbScanOperation::readTuples(NdbScanOperation::LockMode lm, 
  req->transId2 = (Uint32) (transId >> 32);



  NdbApiSignal* tSignal = 

    theFirstKEYINFO = theLastKEYINFO = theNdb->getSignal();

    theFirstKEYINFO;



  theFirstKEYINFO = (tSignal ? tSignal : tSignal = theNdb->getSignal());

  theLastKEYINFO = tSignal;

  

  tSignal->setSignal(GSN_KEYINFO);

  theKEYINFOptr = ((KeyInfo*)tSignal->getDataPtrSend())->keyData;
@@ -259,18 +264,7 @@ NdbScanOperation::fix_receivers(Uint32 parallel){ 
    m_allocated_receivers = parallel;

  }

  

  for(Uint32 i = 0; i<parallel; i++){

    m_receivers[i]->m_list_index = i;

    m_prepared_receivers[i] = m_receivers[i]->getId();

    m_sent_receivers[i] = m_receivers[i];

    m_conf_receivers[i] = 0;

    m_api_receivers[i] = 0;

  }

  

  m_api_receivers_count = 0;

  m_current_api_receiver = 0;

  m_sent_receivers_count = parallel;

  m_conf_receivers_count = 0;

  reset_receivers(parallel, 0);

  return 0;

}
@@ -414,14 +408,22 @@ NdbScanOperation::executeCursor(int nodeId){ 
  NdbConnection * tCon = theNdbCon;

  TransporterFacade* tp = TransporterFacade::instance();

  Guard guard(tp->theMutexPtr);



  Uint32 magic = tCon->theMagicNumber;

  Uint32 seq = tCon->theNodeSequence;



  if (tp->get_node_alive(nodeId) &&

      (tp->getNodeSequence(nodeId) == seq)) {



    if(prepareSendScan(tCon->theTCConPtr, tCon->theTransactionId) == -1)

    /**

     * Only call prepareSendScan first time (incase of restarts)

     *   - check with theMagicNumber

     */

    tCon->theMagicNumber = 0x37412619;

    if(magic != 0x37412619 && 

       prepareSendScan(tCon->theTCConPtr, tCon->theTransactionId) == -1)

      return -1;

    

    tCon->theMagicNumber = 0x37412619;

    

    if (doSendScan(nodeId) == -1)

      return -1;
@@ -718,9 +720,6 @@ int NdbScanOperation::prepareSendScan(Uint32 aTC_ConnectPtr, 
    ((NdbIndexScanOperation*)this)->fix_get_values();

  }

  

  const Uint32 transId1 = (Uint32) (aTransactionId & 0xFFFFFFFF);

  const Uint32 transId2 = (Uint32) (aTransactionId >> 32);

  

  theCurrentATTRINFO->setLength(theAI_LenInCurrAI);



  /**
@@ -991,13 +990,15 @@ NdbIndexScanOperation::~NdbIndexScanOperation(){ 
}



int

NdbIndexScanOperation::setBound(const char* anAttrName, int type, const void* aValue, Uint32 len)

NdbIndexScanOperation::setBound(const char* anAttrName, int type, 

				const void* aValue, Uint32 len)

{

  return setBound(m_accessTable->getColumn(anAttrName), type, aValue, len);

}



int

NdbIndexScanOperation::setBound(Uint32 anAttrId, int type, const void* aValue, Uint32 len)

NdbIndexScanOperation::setBound(Uint32 anAttrId, int type, 

				const void* aValue, Uint32 len)

{

  return setBound(m_accessTable->getColumn(anAttrId), type, aValue, len);

}
@@ -1522,6 +1523,7 @@ NdbScanOperation::restart() 
   */

  reset_receivers(theParallelism, m_ordered);

  

  theError.code = 0;

  if (doSendScan(nodeId) == -1)

    return -1;
@@ -1540,12 +1542,16 @@ NdbIndexScanOperation::reset_bounds(){ 


  if(!res)

  {

    theError.code = 0;

    reset_receivers(theParallelism, m_ordered);

    

    theLastKEYINFO = theFirstKEYINFO;

    theKEYINFOptr = ((KeyInfo*)theFirstKEYINFO->getDataPtrSend())->keyData;

    theTupKeyLen = 0;

    theTotalNrOfKeyWordInSignal = 0;

    

    m_transConnection

      ->remove_list((NdbOperation*)m_transConnection->m_firstExecutedScanOp,

		    this);

    m_transConnection->define_scan_op(this);

    return 0;

  }

ndb/src/ndbapi/Ndblist.cpp

+2 −2
Original line number Diff line number Diff line
@@ -649,8 +649,8 @@ Remark: Always release the first item in the free list 
void

Ndb::freeScanOperation()

{

  NdbScanOperation* tOp = theScanOpIdleList;

  theScanOpIdleList = (NdbIndexScanOperation *) theScanOpIdleList->next();

  NdbIndexScanOperation* tOp = theScanOpIdleList;

  theScanOpIdleList = (NdbIndexScanOperation *)tOp->next();

  delete tOp;

}