mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Turn on -O2 again

Browse source 
git-svn-id: file:///svn/tokudb@851 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Bradley C. Kuszmaul 2007-11-30 07:14:26 +00:00
parent 4c0534950b
commit 8783de7c3d
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Makefile
View file

@ -3,7 +3,7 @@
LIBNAME=libdb
# OPTFLAGS = -O2
OPTFLAGS = -O2
CFLAGS = -W -Wall -Werror -g -fPIC $(OPTFLAGS)
CPPFLAGS = -I../include -I../newbrt
CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE

24
src/ydb.c
View file

@ -616,21 +616,37 @@ static int toku_db_del(DB * db, DB_TXN * txn, DBT * key, u_int32_t flags) {
return r;
}
static int toku_db_get(DB * db, DB_TXN * txn __attribute__ ((unused)), DBT * key, DBT * data, u_int32_t flags) {
static int toku_db_get(DB * db, DB_TXN * txn, DBT * key, DBT * data, u_int32_t flags) {
assert(flags == 0);
int r;
unsigned int brtflags;
DBT primary_key;
DBT *sdata;
DB *primary = db->i->primary;
int is_secondary = primary!=0;
if (is_secondary) {
memset(&primary_key, 0, sizeof(primary_key));
sdata=&primary_key;
} else {
sdata=data;
}
toku_brt_get_flags(db->i->brt, &brtflags);
if (brtflags & TOKU_DB_DUPSORT) {
DBC *dbc;
r = db->cursor(db, txn, &dbc, 0);
if (r == 0) {
r = dbc->c_get(dbc, key, data, DB_SET);
r = dbc->c_get(dbc, key, sdata, DB_SET);
dbc->c_close(dbc);
}
} else
r = toku_brt_lookup(db->i->brt, key, data);
return r;
r = toku_brt_lookup(db->i->brt, key, sdata);
if (r!=0) return r;
if (is_secondary) {
// Time to do a get on the primary
return primary->get(primary, txn, &primary_key, data, 0);
} else {
return r;
}
}
static int toku_db_key_range(DB * db, DB_TXN * txn, DBT * dbt, DB_KEY_RANGE * kr, u_int32_t flags) {