Commit 38e71e3a authored by unknown's avatar unknown
Browse files

ndb - old bench rescue 


ndb/test/ndbapi/bench/mainPopulate.cpp:
  return correct
ndb/test/ndbapi/bench/userInterface.cpp:
  remove NA setting
ndb/test/run-test/daily-devel-tests.txt:
  set correct args
parent d4574b91

ndb/test/ndbapi/bench/mainPopulate.cpp

+6 −9
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ 
#include <NdbMain.h>

#include <NdbOut.hpp>

#include <random.h>

#include <NDBT.hpp>



#ifdef	__cplusplus

extern "C" {

#endif

int useTableLogging;

int useIndexTables;

#ifdef	__cplusplus

}

#endif
@@ -44,7 +44,6 @@ void usage(const char *prog) 
  ndbout_c(

	   "Usage: %s [-l]\n"

	   "  -l                  Use logging and checkpointing on tables\n",

	   "  -i                  Use index tables\n",

	   prog);

  

  exit(1);
@@ -57,28 +56,26 @@ NDB_COMMAND(DbCreate, "DbCreate", "DbCreate", "DbCreate", 16384) 
  int i;

  UserHandle *uh;

  

  useTableLogging = useIndexTables = 0;

  useTableLogging = 0;

  NDB_INIT(argv[0]);

  

  for(i = 1; i<argc; i++){

    if(strcmp(argv[i], "-l") == 0){

      useTableLogging = 1;

    } else if(strcmp(argv[i], "-i") == 0){

      useIndexTables = 1;

    } else {

      usage(argv[0]);

      return 0;

    }

  }



  ndbout_c("Using %s tables and %s key storage",

	   useTableLogging ? "logging" : "temporary",

	   useIndexTables  ? "index" : "normal");

  ndbout_c("Using %s tables",

	   useTableLogging ? "logging" : "temporary");

  

  myRandom48Init(0x3e6f);

  

  uh = userDbConnect(1, "TEST_DB");

  dbPopulate(uh);

  userDbDisconnect(uh);

  return(0);

  

  return NDBT_ProgramExit(NDBT_OK);

}

ndb/test/ndbapi/bench/userInterface.cpp

+1 −2
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ userDbCommit(UserHandle *uh){ 
extern "C" {

#endif

extern int useTableLogging;

extern int useIndexTables;

#ifdef	__cplusplus

}

#endif
@@ -377,7 +376,7 @@ create_table_subscriber(Ndb * pNdb){ 
      String, 

      MMBased,

      NotNullAttribute,

      (useIndexTables ? IndexStorageAttribute : NormalStorageAttribute),

      NormalStorageAttribute,

      0,

      1,

      16);

ndb/test/run-test/daily-devel-tests.txt

+5 −5
Original line number Diff line number Diff line
@@ -210,26 +210,26 @@ args: 


max-time: 180

cmd: DbAsyncGenerator

args: -t 60 -p 1

args: -time 60 -p 1

type: bench



max-time: 180

cmd: DbAsyncGenerator

args: -t 60 -p 25

args: -time 60 -p 25

type: bench



max-time: 180

cmd: DbAsyncGenerator

args: -t 60 -p 100

args: -time 60 -p 100

type: bench



max-time: 180

cmd: DbAsyncGenerator

args: -t 60 -p 200

args: -time 60 -p 200

type: bench



max-time: 180

cmd: DbAsyncGenerator

args: -t 60 -p 1 -proc 25

args: -time 60 -p 1 -proc 25

type: bench