Commit 3add897e authored by unknown's avatar unknown
Browse files

changed to using NdbTransaction scoped enums 

and removed usage of Ndb::waitUntilReady()
parent ae736acf

ndb/examples/ndbapi_async_example/ndbapi_async.cpp

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ int populate(Ndb * myNdb, int data, async_callback_t * cbData) 
      }     



      /*Prepare transaction (the transaction is NOT yet sent to NDB)*/

      transaction[current].conn->executeAsynchPrepare(Commit, 

      transaction[current].conn->executeAsynchPrepare(NdbTransaction::Commit, 

						       &callback,

						       cb);

      /**

ndb/examples/ndbapi_async_example1/ndbapi_async1.cpp

+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ int main() 
    myNdbOperation->setValue("ATTR2", 20 + i);

    

    // Prepare transaction (the transaction is NOT yet sent to NDB)

    myNdbTransaction[i]->executeAsynchPrepare(Commit, &callback, NULL);

    myNdbTransaction[i]->executeAsynchPrepare(NdbTransaction::Commit,

					      &callback, NULL);

  }



  // Send all transactions to NDB

ndb/examples/ndbapi_retries_example/ndbapi_retries.cpp

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ int insert(int transactionId, NdbTransaction* myTransaction) { 
    exit(-1);

  }



  return myTransaction->execute(NoCommit);

  return myTransaction->execute(NdbTransaction::NoCommit);

}
@@ -131,7 +131,7 @@ int executeInsertTransaction(int transactionId, Ndb* myNdb) { 
      result = -1;  // Failure

    } else if (insert(transactionId, myTransaction) || 

	       insert(10000+transactionId, myTransaction) ||

	       myTransaction->execute(Commit)) {

	       myTransaction->execute(NdbTransaction::Commit)) {

      TRANSERROR(myTransaction);

      ndberror = myTransaction->getNdbError();

      result = -1;  // Failure

ndb/examples/ndbapi_scan_example/ndbapi_scan.cpp

+7 −7
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ int populate(Ndb * myNdb) 
    myNdbOperation->setValue("COLOR", cars[i].color);

  }



  int check = myTrans->execute(Commit);

  int check = myTrans->execute(NdbTransaction::Commit);



  myTrans->close();
@@ -280,7 +280,7 @@ int scan_delete(Ndb* myNdb, 
    /**

     * Start scan    (NoCommit since we are only reading at this stage);

     */     

    if(myTrans->execute(NoCommit) != 0){      

    if(myTrans->execute(NdbTransaction::NoCommit) != 0){      

      err = myTrans->getNdbError();    

      if(err.status == NdbError::TemporaryError){

	std::cout << myTrans->getNdbError().message << std::endl;
@@ -322,7 +322,7 @@ int scan_delete(Ndb* myNdb, 
       */    

      if(check != -1)

      {

	check = myTrans->execute(Commit);   

	check = myTrans->execute(NdbTransaction::Commit);   

      }



      if(check == -1)
@@ -453,7 +453,7 @@ int scan_update(Ndb* myNdb, 
    /**

     * Start scan    (NoCommit since we are only reading at this stage);

     */     

    if(myTrans->execute(NoCommit) != 0)

    if(myTrans->execute(NdbTransaction::NoCommit) != 0)

    {      

      err = myTrans->getNdbError();    

      if(err.status == NdbError::TemporaryError){
@@ -501,7 +501,7 @@ int scan_update(Ndb* myNdb, 
       */    

      if(check != -1)

      {

	check = myTrans->execute(NoCommit);   

	check = myTrans->execute(NdbTransaction::NoCommit);   

      }



      /**
@@ -525,7 +525,7 @@ int scan_update(Ndb* myNdb, 
    /**

     * Commit all prepared operations

     */

    if(myTrans->execute(Commit) == -1)

    if(myTrans->execute(NdbTransaction::Commit) == -1)

    {

      if(err.status == NdbError::TemporaryError){

	std::cout << myTrans->getNdbError().message << std::endl;
@@ -640,7 +640,7 @@ int scan_print(Ndb * myNdb) 
    /**

     * Start scan   (NoCommit since we are only reading at this stage);

     */     

    if(myTrans->execute(NoCommit) != 0){      

    if(myTrans->execute(NdbTransaction::NoCommit) != 0){      

      err = myTrans->getNdbError();    

      if(err.status == NdbError::TemporaryError){

	std::cout << myTrans->getNdbError().message << std::endl;

ndb/examples/ndbapi_simple_example/ndbapi_simple.cpp

+4 −4
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static void do_insert(Ndb &myNdb) 
    myOperation->equal("ATTR1", i+5);

    myOperation->setValue("ATTR2", i+5);

    

    if (myTransaction->execute( Commit ) == -1)

    if (myTransaction->execute( NdbTransaction::Commit ) == -1)

      APIERROR(myTransaction->getNdbError());

    

    myNdb.closeTransaction(myTransaction);
@@ -193,7 +193,7 @@ static void do_update(Ndb &myNdb) 
    myOperation->equal( "ATTR1", i );

    myOperation->setValue( "ATTR2", i+10);

    

    if( myTransaction->execute( Commit ) == -1 ) 

    if( myTransaction->execute( NdbTransaction::Commit ) == -1 ) 

      APIERROR(myTransaction->getNdbError());

    

    myNdb.closeTransaction(myTransaction);
@@ -214,7 +214,7 @@ static void do_delete(Ndb &myNdb) 
  myOperation->deleteTuple();

  myOperation->equal( "ATTR1", 3 );

  

  if (myTransaction->execute(Commit) == -1) 

  if (myTransaction->execute(NdbTransaction::Commit) == -1) 

    APIERROR(myTransaction->getNdbError());

  

  myNdb.closeTransaction(myTransaction);
@@ -240,7 +240,7 @@ static void do_read(Ndb &myNdb) 
    NdbRecAttr *myRecAttr= myOperation->getValue("ATTR2", NULL);

    if (myRecAttr == NULL) APIERROR(myTransaction->getNdbError());

    

    if(myTransaction->execute( Commit ) == -1)

    if(myTransaction->execute( NdbTransaction::Commit ) == -1)

      if (i == 3) {

	std::cout << "Detected that deleted tuple doesn't exist!" << std::endl;

      } else {