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

Make it work better with icc. Addresses #1185.

Browse source 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6467 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Bradley C. Kuszmaul 2013-04-16 23:57:21 -04:00 • committed by Yoni Fogel
parent cd8840f04d
commit 5398661a9e
6 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
newbrt/brt.c
View file

@ -145,7 +145,7 @@ static int brt_compare_pivot(BRT brt, DBT *key, DBT *data, bytevec ck) {
return cmp;
}
void toku_brtnode_flush_callback (CACHEFILE cachefile, BLOCKNUM nodename, void *brtnode_v, void *extraargs, long size __attribute((unused)), BOOL write_me, BOOL keep_me, LSN modified_lsn __attribute__((__unused__)) , BOOL rename_p __attribute__((__unused__))) {
void toku_brtnode_flush_callback (CACHEFILE cachefile, BLOCKNUM nodename, void *brtnode_v, void *extraargs, long size __attribute__((unused)), BOOL write_me, BOOL keep_me, LSN modified_lsn __attribute__((__unused__)) , BOOL rename_p __attribute__((__unused__))) {
struct brt_header *h = extraargs;
BRTNODE brtnode = brtnode_v;
// if ((write_me || keep_me) && (brtnode->height==0)) {
@ -1216,6 +1216,7 @@ int toku_cmd_leafval_bessel (OMTVALUE lev, void *extra) {
LEAFENTRY le=lev;
struct cmd_leafval_bessel_extra *be = extra;
LESWITCHCALL(le, leafval_bessel, be);
abort(); return 0; // make certain compilers happy
}
// Whenever anything provisional is happening, it's XID must match the cmd's.
@ -1438,7 +1439,7 @@ static int apply_cmd_to_leaf (BRT_CMD cmd,
LESWITCHCALL(stored_data, apply_cmd_to, cmd,
newlen, disksize, new_data);
}
abort(); return 0; // make certain compilers happy
}
static int
@ -2456,7 +2457,7 @@ CACHEKEY* toku_calculate_root_offset_pointer (BRT brt, u_int32_t *roothash) {
}
}
}
abort();
abort(); return 0; // make certain compilers happy
}
static int brt_init_new_root(BRT brt, BRTNODE nodea, BRTNODE nodeb, DBT splitk, CACHEKEY *rootp, TOKULOGGER logger, BRTNODE *newrootp) {
@ -2906,6 +2907,7 @@ static int bessel_from_search_t (OMTVALUE lev, void *extra) {
LEAFENTRY leafval=lev;
brt_search_t *search = extra;
LESWITCHCALL(leafval, pair_leafval_bessel, search);
abort(); return 0;
}
static int brt_search_leaf_node(BRT brt, BRTNODE node, brt_search_t *search, DBT *newkey, DBT *newval, TOKULOGGER logger, OMTCURSOR omtcursor) {

12
newbrt/leafentry.c
View file

@ -97,6 +97,7 @@ static u_int32_t memsize_le_provpair (TXNID txnid __attribute__((__unused__)),
u_int32_t leafentry_memsize (LEAFENTRY le) {
LESWITCHCALL(le, memsize);
abort(); return 0; // make certain compilers happy
}
static u_int32_t disksize_le_committed (u_int32_t keylen, void *key __attribute__((__unused__)),
@ -127,6 +128,7 @@ static u_int32_t disksize_le_provpair (TXNID txnid __attribute__((__unused__)),
static u_int32_t
leafentry_disksize_internal (LEAFENTRY le) {
LESWITCHCALL(le, disksize);
abort(); return 0; // make certain compilers happy
}
u_int32_t leafentry_disksize (LEAFENTRY le) {
@ -234,6 +236,7 @@ static int print_le_provpair (TXNID xid, u_int32_t klen, void *kval, u_int32_t p
int print_leafentry (FILE *outf, LEAFENTRY v) {
if (!v) { printf("NULL"); return 0; }
LESWITCHCALL(v, print, outf);
abort(); return 0; // make certain compilers happy
}
int toku_logprint_LEAFENTRY (FILE *outf, FILE *inf, const char *fieldname, struct x1764 *checksum, u_int32_t *len, const char *format __attribute__((__unused__))) {
@ -286,6 +289,7 @@ inline void* latest_key_le_provpair (TXNID UU(xid), u_int32_t UU(klen), void *kv
}
inline void* le_latest_key (LEAFENTRY le) {
LESWITCHCALL(le, latest_key);
abort(); return 0; // make certain compilers happy
}
inline u_int32_t latest_keylen_le_committed (u_int32_t keylen, void *UU(key), u_int32_t UU(vallen), void *UU(val)) {
@ -302,6 +306,7 @@ inline u_int32_t latest_keylen_le_provpair (TXNID UU(xid), u_int32_t klen, void
}
inline u_int32_t le_latest_keylen (LEAFENTRY le) {
LESWITCHCALL(le, latest_keylen);
abort(); return 0; // make certain compilers happy
}
inline void* latest_val_le_committed (u_int32_t UU(keylen), void *UU(key), u_int32_t UU(vallen), void *UU(val)) {
@ -318,6 +323,7 @@ inline void* latest_val_le_provpair (TXNID UU(xid), u_int32_t UU(klen), void *UU
}
inline void* le_latest_val (LEAFENTRY le) {
LESWITCHCALL(le, latest_val);
abort(); return 0; // make certain compilers happy
}
inline u_int32_t latest_vallen_le_committed (u_int32_t UU(keylen), void *UU(key), u_int32_t vallen, void *UU(val)) {
@ -334,6 +340,7 @@ inline u_int32_t latest_vallen_le_provpair (TXNID UU(xid), u_int32_t UU(klen), v
}
inline u_int32_t le_latest_vallen (LEAFENTRY le) {
LESWITCHCALL(le, latest_vallen);
abort(); return 0; // make certain compilers happy
}
inline void* any_key_le_committed (u_int32_t UU(keylen), void *key, u_int32_t UU(vallen), void *UU(val)) {
@ -350,6 +357,7 @@ inline void* any_key_le_provpair (TXNID UU(xid), u_int32_t UU(klen), void *kval,
}
inline void* le_any_key (LEAFENTRY le) {
LESWITCHCALL(le, any_key);
abort(); return 0; // make certain compilers happy
}
inline u_int32_t any_keylen_le_committed (u_int32_t keylen, void *UU(key), u_int32_t UU(vallen), void *UU(val)) {
@ -366,6 +374,7 @@ inline u_int32_t any_keylen_le_provpair (TXNID UU(xid), u_int32_t klen, void *UU
}
inline u_int32_t le_any_keylen (LEAFENTRY le) {
LESWITCHCALL(le, any_keylen);
abort(); return 0; // make certain compilers happy
}
inline void* any_val_le_committed (u_int32_t UU(keylen), void *UU(key), u_int32_t UU(vallen), void *UU(val)) {
@ -382,6 +391,7 @@ inline void* any_val_le_provpair (TXNID UU(xid), u_int32_t UU(klen), void *UU(kv
}
inline void* le_any_val (LEAFENTRY le) {
LESWITCHCALL(le, any_val);
abort(); return 0; // make certain compilers happy
}
inline u_int32_t any_vallen_le_committed (u_int32_t UU(keylen), void *UU(key), u_int32_t vallen, void *UU(val)) {
@ -398,6 +408,7 @@ inline u_int32_t any_vallen_le_provpair (TXNID UU(xid), u_int32_t UU(klen), void
}
inline u_int32_t le_any_vallen (LEAFENTRY le) {
LESWITCHCALL(le, any_vallen);
abort(); return 0; // make certain compilers happy
}
@ -419,4 +430,5 @@ inline u_int64_t any_xid_le_provpair (TXNID xid, u_int32_t UU(klen), void *UU(kv
inline u_int64_t le_any_xid (LEAFENTRY le) {
LESWITCHCALL(le, any_xid);
abort(); return 0; // make certain compilers happy
}

1
newbrt/log.h
View file

@ -3,6 +3,7 @@
#ident "Copyright (c) 2007, 2008 Tokutek Inc. All rights reserved."
#include "portability.h"
#include <errno.h>
#include "../include/db.h"

11
newbrt/tests/benchmark-test.c
View file

@ -2,16 +2,7 @@
#ident "Copyright (c) 2007, 2008 Tokutek Inc. All rights reserved."
/* Insert a bunch of stuff */
#include "brt.h"
#include "key.h"
#include "memory.h"
#include "toku_assert.h"
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/time.h>
#include <unistd.h>
#include "includes.h"
static const char fname[]="sinsert.brt";

4
newbrt/tests/block_allocator_test.c
View file

@ -1,8 +1,6 @@
/* -*- mode: C; c-basic-offset: 4 -*- */
#include "block_allocator.h"
#include "toku_assert.h"
#include <stdlib.h>
#include "includes.h"
static void ba_alloc_at (BLOCK_ALLOCATOR ba, u_int64_t size, u_int64_t offset) {
block_allocator_validate(ba);

2
newbrt/trace_mem.c
View file

@ -1,4 +1,4 @@
#include <stdio.h>
#include "portability.h"
#include "../include/rdtsc.h"
#include "trace_mem.h"