database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-03 05:41:09 +03:00
Code Activity

start the cleanup of the icc build of ydb. adddresses #1185

Browse Source 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6411 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Rich Prohaska
2013-04-16 23:57:20 -04:00
committed by Yoni Fogel
parent 681b3ed56e
commit e6fc3162e9
7 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Makefile
View File

@@ -10,13 +10,18 @@ VISIBILITY = -fvisibility=hidden
# PROF_FLAGS=-pg # PROF_FLAGS=-pg
OPTFLAGS = -O3 -finline-functions OPTFLAGS = -O3 -finline-functions
# GCOV_FLAGS = -fprofile-arcs -ftest-coverage # GCOV_FLAGS = -fprofile-arcs -ftest-coverage
CFLAGS = -W -fPIC $(OPTFLAGS) $(GCOV_FLAGS) CFLAGS = -fPIC $(OPTFLAGS) $(GCOV_FLAGS)
ifneq ($(CC),icc) ifeq ($(CC),icc)
CFLAGS += -Werror -Wall -Wextra -g3 -ggdb3 CFLAGS += -Wall -g
CFLAGS += -diag-disable 177
CFLAGS += -diag-disable 589
CFLAGS += -diag-disable 981
CFLAGS += -diag-disable 1418
CFLAGS += -diag-disable 1419
else else
CFLAGS += -g CFLAGS += -W -Werror -Wall -Wextra -g3 -ggdb3
endif
CFLAGS += -Wbad-function-cast -Wcast-align CFLAGS += -Wbad-function-cast -Wcast-align
endif
CPPFLAGS = -I../include -I../newbrt -I./lock_tree/ -I./range_tree/ CPPFLAGS = -I../include -I../newbrt -I./lock_tree/ -I./range_tree/
CPPFLAGS += -D_GNU_SOURCE -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CPPFLAGS += -D_GNU_SOURCE -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
CFLAGS+= $(VISIBILITY) $(PROF_FLAGS) CFLAGS+= $(VISIBILITY) $(PROF_FLAGS)

8
src/tests/test_txn_abort8.c
View File

@@ -16,9 +16,7 @@ test_abort_close (void) {
#if DB_VERSION_MAJOR==4 && DB_VERSION_MINOR==3 #if DB_VERSION_MAJOR==4 && DB_VERSION_MINOR==3
if (verbose) fprintf(stderr, "%s does not work for BDB %d.%d. Not running\n", __FILE__, DB_VERSION_MAJOR, DB_VERSION_MINOR); if (verbose) fprintf(stderr, "%s does not work for BDB %d.%d. Not running\n", __FILE__, DB_VERSION_MAJOR, DB_VERSION_MINOR);
return; return;
#endif #else
#endif
system("rm -rf " ENVDIR); system("rm -rf " ENVDIR);
mkdir(ENVDIR, 0777); mkdir(ENVDIR, 0777);
@@ -57,8 +55,8 @@ test_abort_close (void) {
r = stat(ENVDIR "/test.db", &statbuf); r = stat(ENVDIR "/test.db", &statbuf);
assert(r!=0); assert(r!=0);
} }
#endif
#endif
} }
int main(int UU(argc), char UU(*argv[])) { int main(int UU(argc), char UU(*argv[])) {

6
src/tests/test_txn_abort9.c
View File

@@ -16,9 +16,7 @@ test_abort_close (void) {
#if DB_VERSION_MAJOR==4 && DB_VERSION_MINOR==3 #if DB_VERSION_MAJOR==4 && DB_VERSION_MINOR==3
if (verbose) fprintf(stderr, "%s does not work for BDB %d.%d. Not running\n", __FILE__, DB_VERSION_MAJOR, DB_VERSION_MINOR); if (verbose) fprintf(stderr, "%s does not work for BDB %d.%d. Not running\n", __FILE__, DB_VERSION_MAJOR, DB_VERSION_MINOR);
return; return;
#endif #else
#endif
system("rm -rf " ENVDIR); system("rm -rf " ENVDIR);
mkdir(ENVDIR, 0777); mkdir(ENVDIR, 0777);
@@ -64,6 +62,8 @@ test_abort_close (void) {
r = env->close(env, 0); CKERR(r); r = env->close(env, 0); CKERR(r);
#endif
#endif
} }
int main(int UU(argc), char UU(*argv[])) { int main(int UU(argc), char UU(*argv[])) {

6
src/tests/test_txn_close_open_commit.c
View File

@@ -18,9 +18,7 @@ test_txn_close_open_commit (void) {
#if DB_VERSION_MAJOR==4 && DB_VERSION_MINOR==3 #if DB_VERSION_MAJOR==4 && DB_VERSION_MINOR==3
if (verbose) fprintf(stderr, "%s does not work for BDB %d.%d. Not running\n", __FILE__, DB_VERSION_MAJOR, DB_VERSION_MINOR); if (verbose) fprintf(stderr, "%s does not work for BDB %d.%d. Not running\n", __FILE__, DB_VERSION_MAJOR, DB_VERSION_MINOR);
return; return;
#endif #else
#endif
system("rm -rf " ENVDIR); system("rm -rf " ENVDIR);
mkdir(ENVDIR, 0777); mkdir(ENVDIR, 0777);
@@ -69,6 +67,8 @@ test_txn_close_open_commit (void) {
r = stat(ENVDIR "/test.db", &statbuf); r = stat(ENVDIR "/test.db", &statbuf);
assert(r==0); assert(r==0);
} }
#endif
#endif
} }
int main(int UU(argc), char UU(*argv[])) { int main(int UU(argc), char UU(*argv[])) {

8
src/tests/test_txn_commit8.c
View File

@@ -16,9 +16,7 @@ test_abort_close (void) {
#if DB_VERSION_MAJOR==4 && DB_VERSION_MINOR==3 #if DB_VERSION_MAJOR==4 && DB_VERSION_MINOR==3
if (verbose) fprintf(stderr, "%s does not work for BDB %d.%d. Not running\n", __FILE__, DB_VERSION_MAJOR, DB_VERSION_MINOR); if (verbose) fprintf(stderr, "%s does not work for BDB %d.%d. Not running\n", __FILE__, DB_VERSION_MAJOR, DB_VERSION_MINOR);
return; return;
#endif #else
#endif
system("rm -rf " ENVDIR); system("rm -rf " ENVDIR);
mkdir(ENVDIR, 0777); mkdir(ENVDIR, 0777);
@@ -57,8 +55,8 @@ test_abort_close (void) {
r = stat(ENVDIR "/test.db", &statbuf); r = stat(ENVDIR "/test.db", &statbuf);
assert(r==0); assert(r==0);
} }
#endif
#endif
} }
int main(int UU(argc), char UU(*argv[])) { int main(int UU(argc), char UU(*argv[])) {

6
src/ydb-internal.h
View File

@@ -87,8 +87,8 @@ struct __toku_dbc_internal {
Ephemeral locking Ephemeral locking
********************************************************* */ ********************************************************* */
void toku_ydb_lock(); void toku_ydb_lock(void);
void toku_ydb_unlock(); void toku_ydb_unlock(void);
/* ********************************************************* /* *********************************************************
@@ -123,7 +123,7 @@ void toku_ydb_error_all_cases(const DB_ENV * env,
int toku_ydb_do_error (const DB_ENV *, int, const char *, ...); int toku_ydb_do_error (const DB_ENV *, int, const char *, ...);
/* Location specific debug print-outs */ /* Location specific debug print-outs */
void toku_ydb_barf(); void toku_ydb_barf(void);
void toku_ydb_notef(const char *, ...); void toku_ydb_notef(const char *, ...);
/* Environment related errors */ /* Environment related errors */

40
src/ydb.c
View File

@@ -253,7 +253,8 @@ static int toku_c_close(DBC * c);
static char *construct_full_name(const char *dir, const char *fname); static char *construct_full_name(const char *dir, const char *fname);
static int do_associated_inserts (DB_TXN *txn, DBT *key, DBT *data, DB *secondary); static int do_associated_inserts (DB_TXN *txn, DBT *key, DBT *data, DB *secondary);
#if NEED_TEST #define DO_ENV_FILE 0
#if DO_ENV_FILE
static int env_parse_config_line(DB_ENV* dbenv, char *command, char *value) { static int env_parse_config_line(DB_ENV* dbenv, char *command, char *value) {
int r; int r;
@@ -466,7 +467,7 @@ static int toku_env_open(DB_ENV * env, const char *home, u_int32_t flags, int mo
env->i->dir = NULL; env->i->dir = NULL;
return r; return r;
} }
#if NEED_TEST #if DO_ENV_FILE
if ((r = env_read_config(env)) != 0) { if ((r = env_read_config(env)) != 0) {
goto died1; goto died1;
} }
@@ -512,7 +513,7 @@ static int toku_env_open(DB_ENV * env, const char *home, u_int32_t flags, int mo
if (unused_flags!=0) { if (unused_flags!=0) {
static char string[100]; static char string[100];
snprintf(string, 100, "Extra flags not understood by tokudb: %d\n", unused_flags); snprintf(string, 100, "Extra flags not understood by tokudb: %u\n", unused_flags);
return toku_ydb_do_error(env, EINVAL, string); return toku_ydb_do_error(env, EINVAL, string);
} }
@@ -1634,7 +1635,7 @@ static int toku_c_get_noassociate(DBC * c, DBT * key, DBT * val, u_int32_t flag)
g.flag = flag; g.flag = flag;
unsigned int brtflags; unsigned int brtflags;
toku_brt_get_flags(g.db->i->brt, &brtflags); toku_brt_get_flags(g.db->i->brt, &brtflags);
g.duplicates = (brtflags & TOKU_DB_DUPSORT) != 0; g.duplicates = (BOOL)((brtflags & TOKU_DB_DUPSORT) != 0);
/* Standardize the op flag. */ /* Standardize the op flag. */
toku_c_get_fix_flags(&g); toku_c_get_fix_flags(&g);
@@ -1666,7 +1667,7 @@ static int toku_c_get_noassociate(DBC * c, DBT * key, DBT * val, u_int32_t flag)
* 'first'. */ * 'first'. */
if (r!=0 && r!=DB_NOTFOUND) goto cleanup; if (r!=0 && r!=DB_NOTFOUND) goto cleanup;
/* If we have not yet locked, lock now. */ /* If we have not yet locked, lock now. */
BOOL found = r_cursor_op==0; BOOL found = (BOOL)(r_cursor_op==0);
r = toku_c_get_post_lock(&g, found, key, val, r = toku_c_get_post_lock(&g, found, key, val,
found ? brt_cursor_peek_prev_key(c->i->c) : brt_cursor_peek_current_key(c->i->c), found ? brt_cursor_peek_prev_key(c->i->c) : brt_cursor_peek_current_key(c->i->c),
found ? brt_cursor_peek_prev_val(c->i->c) : brt_cursor_peek_current_val(c->i->c)); found ? brt_cursor_peek_prev_val(c->i->c) : brt_cursor_peek_current_val(c->i->c));
@@ -1734,7 +1735,7 @@ static int toku_c_pget(DBC * c, DBT *key, DBT *pkey, DBT *data, u_int32_t flag)
g.db = c->dbp; g.db = c->dbp;
unsigned int brtflags; unsigned int brtflags;
toku_brt_get_flags(g.db->i->brt, &brtflags); toku_brt_get_flags(g.db->i->brt, &brtflags);
g.duplicates = (brtflags & TOKU_DB_DUPSORT) != 0; g.duplicates = (BOOL)((brtflags & TOKU_DB_DUPSORT) != 0);
/* The 'key' from C_GET_VARS is the secondary key, and the 'val' /* The 'key' from C_GET_VARS is the secondary key, and the 'val'
* from C_GET_VARS is the primary key. The 'data' parameter here * from C_GET_VARS is the primary key. The 'data' parameter here
@@ -1852,7 +1853,7 @@ static int toku_c_getf_first(DBC *c, u_int32_t flag, void(*f)(DBT const *key, DB
DB *db=c->dbp; DB *db=c->dbp;
toku_lock_tree* lt = db->i->lt; toku_lock_tree* lt = db->i->lt;
BOOL do_locking = lt!=NULL && !lock_flags; BOOL do_locking = (BOOL)(lt!=NULL && !lock_flags);
int c_get_result = toku_brt_cursor_get(c->i->c, NULL, NULL, DB_FIRST, txn); int c_get_result = toku_brt_cursor_get(c->i->c, NULL, NULL, DB_FIRST, txn);
if (c_get_result!=0 && c_get_result!=DB_NOTFOUND) { r = c_get_result; goto cleanup; } if (c_get_result!=0 && c_get_result!=DB_NOTFOUND) { r = c_get_result; goto cleanup; }
@@ -1887,7 +1888,7 @@ static int toku_c_getf_last(DBC *c, u_int32_t flag, void(*f)(DBT const *key, DBT
DB *db=c->dbp; DB *db=c->dbp;
toku_lock_tree* lt = db->i->lt; toku_lock_tree* lt = db->i->lt;
BOOL do_locking = lt!=NULL && !lock_flags; BOOL do_locking = (BOOL)(lt!=NULL && !lock_flags);
int c_get_result = toku_brt_cursor_get(c->i->c, NULL, NULL, DB_LAST, txn); int c_get_result = toku_brt_cursor_get(c->i->c, NULL, NULL, DB_LAST, txn);
if (c_get_result!=0 && c_get_result!=DB_NOTFOUND) { r = c_get_result; goto cleanup; } if (c_get_result!=0 && c_get_result!=DB_NOTFOUND) { r = c_get_result; goto cleanup; }
@@ -1923,7 +1924,7 @@ static int toku_c_getf_next(DBC *c, u_int32_t flag, void(*f)(DBT const *key, DBT
DB *db=c->dbp; DB *db=c->dbp;
toku_lock_tree* lt = db->i->lt; toku_lock_tree* lt = db->i->lt;
BOOL do_locking = lt!=NULL && !lock_flags; BOOL do_locking = (BOOL)(lt!=NULL && !lock_flags);
unsigned int brtflags; unsigned int brtflags;
toku_brt_get_flags(db->i->brt, &brtflags); toku_brt_get_flags(db->i->brt, &brtflags);
@@ -1968,7 +1969,7 @@ static int toku_c_getf_prev(DBC *c, u_int32_t flag, void(*f)(DBT const *key, DBT
DB *db=c->dbp; DB *db=c->dbp;
toku_lock_tree* lt = db->i->lt; toku_lock_tree* lt = db->i->lt;
BOOL do_locking = lt!=NULL && !lock_flags; BOOL do_locking = (BOOL)(lt!=NULL && !lock_flags);
unsigned int brtflags; unsigned int brtflags;
toku_brt_get_flags(db->i->brt, &brtflags); toku_brt_get_flags(db->i->brt, &brtflags);
@@ -2013,7 +2014,7 @@ static int toku_c_getf_next_dup(DBC *c, u_int32_t flag, void(*f)(DBT const *key,
DB *db=c->dbp; DB *db=c->dbp;
toku_lock_tree* lt = db->i->lt; toku_lock_tree* lt = db->i->lt;
BOOL do_locking = lt!=NULL && !lock_flags; BOOL do_locking = (BOOL)(lt!=NULL && !lock_flags);
int c_get_result = toku_brt_cursor_get(c->i->c, NULL, NULL, DB_NEXT_DUP, txn); int c_get_result = toku_brt_cursor_get(c->i->c, NULL, NULL, DB_NEXT_DUP, txn);
if (c_get_result!=0 && c_get_result!=DB_NOTFOUND) { r = c_get_result; goto cleanup; } if (c_get_result!=0 && c_get_result!=DB_NOTFOUND) { r = c_get_result; goto cleanup; }
@@ -2067,7 +2068,7 @@ static int toku_c_getf_heavi(DBC *c, u_int32_t flags,
TOKUTXN txn = c->i->txn ? c->i->txn->i->tokutxn : NULL; TOKUTXN txn = c->i->txn ? c->i->txn->i->tokutxn : NULL;
int c_get_result = toku_brt_cursor_get_heavi(c->i->c, NULL, NULL, txn, direction, &wrapper); int c_get_result = toku_brt_cursor_get_heavi(c->i->c, NULL, NULL, txn, direction, &wrapper);
if (c_get_result!=0 && c_get_result!=DB_NOTFOUND) { r = c_get_result; goto cleanup; } if (c_get_result!=0 && c_get_result!=DB_NOTFOUND) { r = c_get_result; goto cleanup; }
BOOL found = c_get_result==0; BOOL found = (BOOL)(c_get_result==0);
DB *db=c->dbp; DB *db=c->dbp;
toku_lock_tree* lt = db->i->lt; toku_lock_tree* lt = db->i->lt;
if (lt!=NULL && !lock_flags) { if (lt!=NULL && !lock_flags) {
@@ -2764,7 +2765,7 @@ static int toku_db_lt_panic(DB* db, int r) {
assert(db && db->i && db->dbenv && db->dbenv->i); assert(db && db->i && db->dbenv && db->dbenv->i);
DB_ENV* env = db->dbenv; DB_ENV* env = db->dbenv;
env->i->is_panicked = 1; env->i->is_panicked = 1;
if (r < 0) toku_ydb_do_error(env, 0, toku_lt_strerror(r)); if (r < 0) toku_ydb_do_error(env, 0, toku_lt_strerror((TOKU_LT_ERROR)r));
else toku_ydb_do_error(env, r, "Error in locktree.\n"); else toku_ydb_do_error(env, r, "Error in locktree.\n");
return EINVAL; return EINVAL;
} }
@@ -2801,8 +2802,8 @@ static toku_dbt_cmp toku_db_get_dup_compare(DB* db) {
static int toku_db_open(DB * db, DB_TXN * txn, const char *fname, const char *dbname, DBTYPE dbtype, u_int32_t flags, int mode) { static int toku_db_open(DB * db, DB_TXN * txn, const char *fname, const char *dbname, DBTYPE dbtype, u_int32_t flags, int mode) {
HANDLE_PANICKED_DB(db); HANDLE_PANICKED_DB(db);
// Warning. Should check arguments. Should check return codes on malloc and open and so forth. // Warning. Should check arguments. Should check return codes on malloc and open and so forth.
BOOL need_locktree = (db->dbenv->i->open_flags & DB_INIT_LOCK) && BOOL need_locktree = (BOOL)((db->dbenv->i->open_flags & DB_INIT_LOCK) &&
(db->dbenv->i->open_flags & DB_INIT_TXN); (db->dbenv->i->open_flags & DB_INIT_TXN));
int openflags = 0; int openflags = 0;
int r; int r;
@@ -2881,7 +2882,7 @@ static int toku_db_open(DB * db, DB_TXN * txn, const char *fname, const char *db
unsigned int brtflags; unsigned int brtflags;
BOOL dups; BOOL dups;
toku_brt_get_flags(db->i->brt, &brtflags); toku_brt_get_flags(db->i->brt, &brtflags);
dups = (brtflags & TOKU_DB_DUPSORT || brtflags & TOKU_DB_DUP); dups = (BOOL)((brtflags & TOKU_DB_DUPSORT || brtflags & TOKU_DB_DUP));
r = toku_db_id_create(&db->i->db_id, db->i->full_fname, r = toku_db_id_create(&db->i->db_id, db->i->full_fname,
db->i->database_name); db->i->database_name);
@@ -2957,6 +2958,9 @@ static int toku_db_put_noassociate(DB * db, DB_TXN * txn, DBT * key, DBT * data,
} else { } else {
assert(flags == 0); assert(flags == 0);
if (brtflags & TOKU_DB_DUPSORT) { if (brtflags & TOKU_DB_DUPSORT) {
#ifndef TDB_EQ_BDB
#define TDB_EQ_BDB 0
#endif
#if TDB_EQ_BDB #if TDB_EQ_BDB
r = toku_db_get_noassociate(db, txn, key, data, DB_GET_BOTH | lock_flags); r = toku_db_get_noassociate(db, txn, key, data, DB_GET_BOTH | lock_flags);
if (r == 0) if (r == 0)
@@ -3225,7 +3229,7 @@ static inline int toku_db_construct_autotxn(DB* db, DB_TXN **txn, BOOL* changed,
*changed = FALSE; *changed = FALSE;
return 0; return 0;
} }
BOOL nosync = !force_auto_commit && !(env->i->open_flags & DB_AUTO_COMMIT); BOOL nosync = (BOOL)(!force_auto_commit && !(env->i->open_flags & DB_AUTO_COMMIT));
u_int32_t txn_flags = DB_TXN_NOWAIT | (nosync ? DB_TXN_NOSYNC : 0); u_int32_t txn_flags = DB_TXN_NOWAIT | (nosync ? DB_TXN_NOSYNC : 0);
int r = toku_txn_begin(env, NULL, txn, txn_flags); int r = toku_txn_begin(env, NULL, txn, txn_flags);
if (r!=0) return r; if (r!=0) return r;
@@ -3383,7 +3387,7 @@ static int locked_db_pget (DB *db, DB_TXN *txn, DBT *key, DBT *pkey, DBT *data,
static inline int autotxn_db_open(DB* db, DB_TXN* txn, const char *fname, const char *dbname, DBTYPE dbtype, u_int32_t flags, int mode) { static inline int autotxn_db_open(DB* db, DB_TXN* txn, const char *fname, const char *dbname, DBTYPE dbtype, u_int32_t flags, int mode) {
BOOL changed; int r; BOOL changed; int r;
r = toku_db_construct_autotxn(db, &txn, &changed, flags & DB_AUTO_COMMIT); r = toku_db_construct_autotxn(db, &txn, &changed, (BOOL)((flags & DB_AUTO_COMMIT) != 0));
if (r!=0) return r; if (r!=0) return r;
r = toku_db_open(db, txn, fname, dbname, dbtype, flags & ~DB_AUTO_COMMIT, mode); r = toku_db_open(db, txn, fname, dbname, dbtype, flags & ~DB_AUTO_COMMIT, mode);
return toku_db_destruct_autotxn(txn, r, changed); return toku_db_destruct_autotxn(txn, r, changed);