database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

ndb - old bench rescue

Browse Source 
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
This commit is contained in:
unknown
2005-02-11 06:39:00 +01:00
parent d4574b91af
commit 38e71e3ab8
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ndb/test/ndbapi/bench/mainPopulate.cpp
View File

@ -22,12 +22,12 @@
#include <NdbMain.h> #include <NdbMain.h>
#include <NdbOut.hpp> #include <NdbOut.hpp>
#include <random.h> #include <random.h>
#include <NDBT.hpp>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
int useTableLogging; int useTableLogging;
int useIndexTables;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
@ -44,7 +44,6 @@ void usage(const char *prog)
ndbout_c( ndbout_c(
"Usage: %s [-l]\n" "Usage: %s [-l]\n"
" -l Use logging and checkpointing on tables\n", " -l Use logging and checkpointing on tables\n",
" -i Use index tables\n",
prog); prog);
exit(1); exit(1);
@ -57,28 +56,26 @@ NDB_COMMAND(DbCreate, "DbCreate", "DbCreate", "DbCreate", 16384)
int i; int i;
UserHandle *uh; UserHandle *uh;
useTableLogging = useIndexTables = 0; useTableLogging = 0;
NDB_INIT(argv[0]); NDB_INIT(argv[0]);
for(i = 1; i<argc; i++){ for(i = 1; i<argc; i++){
if(strcmp(argv[i], "-l") == 0){ if(strcmp(argv[i], "-l") == 0){
useTableLogging = 1; useTableLogging = 1;
} else if(strcmp(argv[i], "-i") == 0){
useIndexTables = 1;
} else { } else {
usage(argv[0]); usage(argv[0]);
return 0; return 0;
} }
} }
ndbout_c("Using %s tables and %s key storage", ndbout_c("Using %s tables",
useTableLogging ? "logging" : "temporary", useTableLogging ? "logging" : "temporary");
useIndexTables ? "index" : "normal");
myRandom48Init(0x3e6f); myRandom48Init(0x3e6f);
uh = userDbConnect(1, "TEST_DB"); uh = userDbConnect(1, "TEST_DB");
dbPopulate(uh); dbPopulate(uh);
userDbDisconnect(uh); userDbDisconnect(uh);
return(0);
return NDBT_ProgramExit(NDBT_OK);
} }

3
ndb/test/ndbapi/bench/userInterface.cpp
View File

@ -134,7 +134,6 @@ userDbCommit(UserHandle *uh){
extern "C" { extern "C" {
#endif #endif
extern int useTableLogging; extern int useTableLogging;
extern int useIndexTables;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
@ -377,7 +376,7 @@ create_table_subscriber(Ndb * pNdb){
String, String,
MMBased, MMBased,
NotNullAttribute, NotNullAttribute,
(useIndexTables ? IndexStorageAttribute : NormalStorageAttribute), NormalStorageAttribute,
0, 0,
1, 1,
16); 16);

10
ndb/test/run-test/daily-devel-tests.txt
View File

@ -210,26 +210,26 @@ args:
max-time: 180 max-time: 180
cmd: DbAsyncGenerator cmd: DbAsyncGenerator
args: -t 60 -p 1 args: -time 60 -p 1
type: bench type: bench
max-time: 180 max-time: 180
cmd: DbAsyncGenerator cmd: DbAsyncGenerator
args: -t 60 -p 25 args: -time 60 -p 25
type: bench type: bench
max-time: 180 max-time: 180
cmd: DbAsyncGenerator cmd: DbAsyncGenerator
args: -t 60 -p 100 args: -time 60 -p 100
type: bench type: bench
max-time: 180 max-time: 180
cmd: DbAsyncGenerator cmd: DbAsyncGenerator
args: -t 60 -p 200 args: -time 60 -p 200
type: bench type: bench
max-time: 180 max-time: 180
cmd: DbAsyncGenerator cmd: DbAsyncGenerator
args: -t 60 -p 1 -proc 25 args: -time 60 -p 1 -proc 25
type: bench type: bench