Skip to content

M
MariaDB
Commit 657c57b4 authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul
Browse files
Options

Do subtransactions properly (without an fsync) 

git-svn-id: file:///svn/tokudb@499 c7de825b-a66e-492c-adef-691d508d4ae1
parent 70d7c7a3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 159 additions and 115 deletions
buildheader/db.h_4_1
View file @ 657c57b4
...@@ -13,7 +13,7 @@ extern "C" { ...@@ -13,7 +13,7 @@ extern "C" {
#ifndef _TOKUDB_WRAP_H #ifndef _TOKUDB_WRAP_H
#define DB_VERSION_STRING "Tokutek: TokuDB 4.1.24" #define DB_VERSION_STRING "Tokutek: TokuDB 4.1.24"
#else #else
#define DB_VERSION_STRING "Tokutek: TokuDB (wrapped bdb)" #define DB_VERSION_STRING_ydb "Tokutek: TokuDB (wrapped bdb)"
#endif #endif
typedef struct __toku_db_btree_stat DB_BTREE_STAT; typedef struct __toku_db_btree_stat DB_BTREE_STAT;
typedef struct __toku_db_env DB_ENV; typedef struct __toku_db_env DB_ENV;
...@@ -28,6 +28,7 @@ typedef struct __toku_dbt DBT; ...@@ -28,6 +28,7 @@ typedef struct __toku_dbt DBT;
typedef enum { typedef enum {
DB_BTREE=1 DB_BTREE=1
} DBTYPE; } DBTYPE;
#ifndef _TOKUDB_WRAP_H
#define DB_VERB_DEADLOCK 2 #define DB_VERB_DEADLOCK 2
#define DB_VERB_RECOVERY 4 #define DB_VERB_RECOVERY 4
#define DB_VERB_REPLICATION 8 #define DB_VERB_REPLICATION 8
...@@ -67,6 +68,7 @@ typedef enum { ...@@ -67,6 +68,7 @@ typedef enum {
#define DB_SET 30 #define DB_SET 30
#define DB_SET_RANGE 32 #define DB_SET_RANGE 32
#define DB_RMW 1073741824 #define DB_RMW 1073741824
#endif
/* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/ /* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/
#ifdef _TOKUDB_WRAP_H #ifdef _TOKUDB_WRAP_H
#undef txn_begin #undef txn_begin
......
buildheader/make_db_h.c
View file @ 657c57b4
...@@ -24,6 +24,7 @@ void print_db_notices (void) { ...@@ -24,6 +24,7 @@ void print_db_notices (void) {
#define dodefine(name) printf("#define %s %d\n", #name, name) #define dodefine(name) printf("#define %s %d\n", #name, name)
void print_defines (void) { void print_defines (void) {
printf("#ifndef _TOKUDB_WRAP_H\n");
dodefine(DB_VERB_DEADLOCK); dodefine(DB_VERB_DEADLOCK);
dodefine(DB_VERB_RECOVERY); dodefine(DB_VERB_RECOVERY);
dodefine(DB_VERB_REPLICATION); dodefine(DB_VERB_REPLICATION);
...@@ -73,6 +74,7 @@ void print_defines (void) { ...@@ -73,6 +74,7 @@ void print_defines (void) {
dodefine(DB_SET); dodefine(DB_SET);
dodefine(DB_SET_RANGE); dodefine(DB_SET_RANGE);
dodefine(DB_RMW); dodefine(DB_RMW);
printf("#endif\n");
} }
//#define DECL_LIMIT 100 //#define DECL_LIMIT 100
...@@ -183,7 +185,7 @@ int main (int argc __attribute__((__unused__)), char *argv[] __attribute__((__un ...@@ -183,7 +185,7 @@ int main (int argc __attribute__((__unused__)), char *argv[] __attribute__((__un
printf("#ifndef _TOKUDB_WRAP_H\n"); printf("#ifndef _TOKUDB_WRAP_H\n");
printf("#define DB_VERSION_STRING \"Tokutek: TokuDB %d.%d.%d\"\n", DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH); printf("#define DB_VERSION_STRING \"Tokutek: TokuDB %d.%d.%d\"\n", DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH);
printf("#else\n"); printf("#else\n");
printf("#define DB_VERSION_STRING \"Tokutek: TokuDB (wrapped bdb)\"\n"); printf("#define DB_VERSION_STRING_ydb \"Tokutek: TokuDB (wrapped bdb)\"\n");
printf("#endif\n"); printf("#endif\n");
if (0) { if (0) {
......
include/db.h
View file @ 657c57b4
...@@ -12,9 +12,8 @@ extern "C" { ...@@ -12,9 +12,8 @@ extern "C" {
#define DB_VERSION_PATCH 24 #define DB_VERSION_PATCH 24
#ifndef _TOKUDB_WRAP_H #ifndef _TOKUDB_WRAP_H
#define DB_VERSION_STRING "Tokutek: TokuDB 4.1.24" #define DB_VERSION_STRING "Tokutek: TokuDB 4.1.24"
#else
#define DB_VERSION_STRING "Tokutek: TokuDB (wrapped bdb)"
#endif #endif
#ifndef _TOKUDB_WRAP_H
typedef struct __toku_db_btree_stat DB_BTREE_STAT; typedef struct __toku_db_btree_stat DB_BTREE_STAT;
typedef struct __toku_db_env DB_ENV; typedef struct __toku_db_env DB_ENV;
typedef struct __toku_db_key_range DB_KEY_RANGE; typedef struct __toku_db_key_range DB_KEY_RANGE;
...@@ -67,6 +66,7 @@ typedef enum { ...@@ -67,6 +66,7 @@ typedef enum {
#define DB_SET 30 #define DB_SET 30
#define DB_SET_RANGE 32 #define DB_SET_RANGE 32
#define DB_RMW 1073741824 #define DB_RMW 1073741824
#endif
/* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/ /* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/
#ifdef _TOKUDB_WRAP_H #ifdef _TOKUDB_WRAP_H
#undef txn_begin #undef txn_begin
......
newbrt/Makefile
View file @ 657c57b4
...@@ -14,6 +14,7 @@ endif ...@@ -14,6 +14,7 @@ endif
CFLAGS = -Wall -W $(OPTFLAGS) -g $(GCOV_FLAGS) $(PROF_FLAGS) -Werror $(FPICFLAGS) CFLAGS = -Wall -W $(OPTFLAGS) -g $(GCOV_FLAGS) $(PROF_FLAGS) -Werror $(FPICFLAGS)
LDFLAGS = $(OPTFLAGS) -g $(GCOV_FLAGS) $(PROF_FLAGS) LDFLAGS = $(OPTFLAGS) -g $(GCOV_FLAGS) $(PROF_FLAGS)
CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
ifdef BRT_FANOUT ifdef BRT_FANOUT
CPPFLAGS += -DBRT_FANOUT=$(BRT_FANOUT) CPPFLAGS += -DBRT_FANOUT=$(BRT_FANOUT)
...@@ -66,12 +67,13 @@ check-fanout: ...@@ -66,12 +67,13 @@ check-fanout:
key.o: brttypes.h key.h key.o: brttypes.h key.h
pma-test.o: pma-internal.h pma.h yerror.h memory.h ../include/db.h list.h kv-pair.h brttypes.h ybt.h yerror.h pma-test.o: pma-internal.h pma.h yerror.h memory.h ../include/db.h list.h kv-pair.h brttypes.h ybt.h yerror.h
pma-test: pma.o memory.o key.o ybt.o log.o mempool.o pma-test: pma.o memory.o key.o ybt.o log.o mempool.o
pma.o: pma.h yerror.h pma-internal.h memory.h key.h ybt.h brttypes.h ../include/db.h pma.o: pma.h yerror.h pma-internal.h memory.h key.h ybt.h brttypes.h log.h ../include/db.h
ybt.o: ybt.h brttypes.h ../include/db.h ybt.o: ybt.h brttypes.h ../include/db.h
ybt-test: ybt-test.o ybt.o memory.o ybt-test: ybt-test.o ybt.o memory.o
ybt-test.o: ybt.h ../include/db.h ybt-test.o: ybt.h ../include/db.h
cachetable.o: cachetable.h hashfun.h cachetable.o: cachetable.h hashfun.h
brt-test: ybt.o brt.o hashtable.o pma.o memory.o brt-serialize.o cachetable.o header-io.o ybt.o key.o primes.o log.o mempool.o brt-test: ybt.o brt.o hashtable.o pma.o memory.o brt-serialize.o cachetable.o header-io.o ybt.o key.o primes.o log.o mempool.o
log.o: log-internal.h log.h
brt-test.o brt.o: brt.h ../include/db.h hashtable.h pma.h brttypes.h cachetable.h brt-test.o brt.o: brt.h ../include/db.h hashtable.h pma.h brttypes.h cachetable.h
brt-serialize-test.o: pma.h yerror.h brt.h ../include/db.h memory.h hashtable.h brttypes.h brt-internal.h brt-serialize-test.o: pma.h yerror.h brt.h ../include/db.h memory.h hashtable.h brttypes.h brt-internal.h
brt.o: brt.h ../include/db.h mdict.h pma.h brttypes.h memory.h brt-internal.h cachetable.h hashtable.h brt.o: brt.h ../include/db.h mdict.h pma.h brttypes.h memory.h brt-internal.h cachetable.h hashtable.h
......
newbrt/log-internal.h
View file @ 657c57b4
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <sys/types.h> #include <sys/types.h>
#define LOGGER_BUF_SIZE (1<<20) #define LOGGER_BUF_SIZE (1<<24)
struct tokulogger { struct tokulogger {
enum typ_tag tag; enum typ_tag tag;
char *directory; char *directory;
...@@ -22,4 +22,5 @@ enum { LT_INSERT_WITH_NO_OVERWRITE = 'I', LT_DELETE = 'D', LT_COMMIT = 'C' }; ...@@ -22,4 +22,5 @@ enum { LT_INSERT_WITH_NO_OVERWRITE = 'I', LT_DELETE = 'D', LT_COMMIT = 'C' };
struct tokutxn { struct tokutxn {
u_int64_t txnid64; u_int64_t txnid64;
TOKULOGGER logger; TOKULOGGER logger;
TOKUTXN parent;
}; };
newbrt/log.c
View file @ 657c57b4
...@@ -50,12 +50,12 @@ int tokulogger_create_and_open_logger (const char *directory, TOKULOGGER *result ...@@ -50,12 +50,12 @@ int tokulogger_create_and_open_logger (const char *directory, TOKULOGGER *result
int tokulogger_log_bytes(TOKULOGGER logger, int nbytes, void *bytes) { int tokulogger_log_bytes(TOKULOGGER logger, int nbytes, void *bytes) {
int r; int r;
//printf("%s:%d logging %d bytes\n", __FILE__, __LINE__, nbytes); //fprintf(stderr, "%s:%d logging %d bytes\n", __FILE__, __LINE__, nbytes);
if (logger->fd==-1) { if (logger->fd==-1) {
int fnamelen = strlen(logger->directory)+50; int fnamelen = strlen(logger->directory)+50;
char fname[fnamelen]; char fname[fnamelen];
snprintf(fname, fnamelen, "%s/log%012llu.tokulog", logger->directory, logger->next_log_file_number); snprintf(fname, fnamelen, "%s/log%012llu.tokulog", logger->directory, logger->next_log_file_number);
printf("%s:%d creat(%s, ...)\n", __FILE__, __LINE__, fname); fprintf(stderr, "%s:%d creat(%s, ...)\n", __FILE__, __LINE__, fname);
logger->fd = creat(fname, O_EXCL | 0700); logger->fd = creat(fname, O_EXCL | 0700);
if (logger->fd==-1) return errno; if (logger->fd==-1) return errno;
logger->next_log_file_number++; logger->next_log_file_number++;
...@@ -66,11 +66,13 @@ int tokulogger_log_bytes(TOKULOGGER logger, int nbytes, void *bytes) { ...@@ -66,11 +66,13 @@ int tokulogger_log_bytes(TOKULOGGER logger, int nbytes, void *bytes) {
v[0].iov_len = logger->n_in_buf; v[0].iov_len = logger->n_in_buf;
v[1].iov_base = bytes; v[1].iov_base = bytes;
v[1].iov_len = nbytes; v[1].iov_len = nbytes;
//fprintf(stderr, "%s:%d flushing log due to buffer overflow\n", __FILE__, __LINE__);
r=writev(logger->fd, v, 2); r=writev(logger->fd, v, 2);
if (r!=logger->n_in_buf + nbytes) return errno; if (r!=logger->n_in_buf + nbytes) return errno;
logger->n_in_file += logger->n_in_buf+nbytes; logger->n_in_file += logger->n_in_buf+nbytes;
logger->n_in_buf=0; logger->n_in_buf=0;
if (logger->n_in_file > 100<<20) { if (logger->n_in_file > 100<<20) {
fprintf(stderr, "%s:%d closing logfile\n", __FILE__, __LINE__);
r = close(logger->fd); r = close(logger->fd);
if (r!=0) return errno; if (r!=0) return errno;
logger->fd=-1; logger->fd=-1;
...@@ -107,7 +109,7 @@ int tokulogger_log_close(TOKULOGGER *loggerp) { ...@@ -107,7 +109,7 @@ int tokulogger_log_close(TOKULOGGER *loggerp) {
TOKULOGGER logger = *loggerp; TOKULOGGER logger = *loggerp;
int r = 0; int r = 0;
if (logger->fd!=-1) { if (logger->fd!=-1) {
printf("%s:%d n_in_buf=%d\n", __FILE__, __LINE__, logger->n_in_buf); printf("%s:%d closing log: n_in_buf=%d\n", __FILE__, __LINE__, logger->n_in_buf);
if (logger->n_in_buf>0) { if (logger->n_in_buf>0) {
r = write(logger->fd, logger->buf, logger->n_in_buf); r = write(logger->fd, logger->buf, logger->n_in_buf);
if (r==-1) return errno; if (r==-1) return errno;
...@@ -156,6 +158,7 @@ int tokulogger_log_phys_add_or_delete_in_leaf (DB *db, TOKUTXN txn, diskoff disk ...@@ -156,6 +158,7 @@ int tokulogger_log_phys_add_or_delete_in_leaf (DB *db, TOKUTXN txn, diskoff disk
int tokulogger_fsync (TOKULOGGER logger) { int tokulogger_fsync (TOKULOGGER logger) {
//return 0;/// NO TXN //return 0;/// NO TXN
//fprintf(stderr, "%s:%d syncing log\n", __FILE__, __LINE__);
if (logger->n_in_buf>0) { if (logger->n_in_buf>0) {
int r = write(logger->fd, logger->buf, logger->n_in_buf); int r = write(logger->fd, logger->buf, logger->n_in_buf);
if (r==-1) return errno; if (r==-1) return errno;
...@@ -177,14 +180,16 @@ int tokulogger_log_commit (TOKUTXN txn) { ...@@ -177,14 +180,16 @@ int tokulogger_log_commit (TOKUTXN txn) {
wbuf_txnid(&wbuf, txn->txnid64); wbuf_txnid(&wbuf, txn->txnid64);
int r = tokulogger_log_bytes(txn->logger, wbuf.ndone, wbuf.buf); int r = tokulogger_log_bytes(txn->logger, wbuf.ndone, wbuf.buf);
if (r!=0) return r; if (r!=0) return r;
return tokulogger_fsync(txn->logger); if (txn->parent) return 0;
else return tokulogger_fsync(txn->logger);
} }
int tokutxn_begin (TOKUTXN *tokutxn, TXNID txnid64, TOKULOGGER logger) { int tokutxn_begin (TOKUTXN parent_tokutxn, TOKUTXN *tokutxn, TXNID txnid64, TOKULOGGER logger) {
TAGMALLOC(TOKUTXN, result); TAGMALLOC(TOKUTXN, result);
if (result==0) return errno; if (result==0) return errno;
result->txnid64 = txnid64; result->txnid64 = txnid64;
result->logger = logger; result->logger = logger;
result->parent = parent_tokutxn;
*tokutxn = result; *tokutxn = result;
return 0; return 0;
} }
......
newbrt/log.h
View file @ 657c57b4
...@@ -13,6 +13,6 @@ int tokulogger_log_phys_add_or_delete_in_leaf (DB *db, TOKUTXN txn, diskoff d ...@@ -13,6 +13,6 @@ int tokulogger_log_phys_add_or_delete_in_leaf (DB *db, TOKUTXN txn, diskoff d
int tokulogger_log_commit (TOKUTXN txn); int tokulogger_log_commit (TOKUTXN txn);
int tokutxn_begin (TOKUTXN *, TXNID txnid64, TOKULOGGER logger); int tokutxn_begin (TOKUTXN /*parent*/,TOKUTXN *, TXNID txnid64, TOKULOGGER logger);
#endif #endif
src-bdbwrap/Makefile
View file @ 657c57b4
...@@ -45,3 +45,6 @@ ydb.lo: bdbw.h ...@@ -45,3 +45,6 @@ ydb.lo: bdbw.h
bdbw.lo: CPPFLAGS=-I/home/bradley/mysql/build-bdb-with-uniquename/bdb/build_unix bdbw.lo: CPPFLAGS=-I/home/bradley/mysql/build-bdb-with-uniquename/bdb/build_unix
%.lo: %.c %.lo: %.c
cc $(CPPFLAGS) $< -c -fPIC -o $@ $(CFLAGS) cc $(CPPFLAGS) $< -c -fPIC -o $@ $(CFLAGS)
bdbw.lo: bdbw.h ydb-uniq.h
src-bdbwrap/bdbw.c
View file @ 657c57b4
This diff is collapsed.
src-bdbwrap/bdbw.h
View file @ 657c57b4
...@@ -8,11 +8,11 @@ extern "C" { ...@@ -8,11 +8,11 @@ extern "C" {
#endif #endif
#endif #endif
int db_env_create_bdbw (struct yobi_db_env **, u_int32_t); int db_env_create_bdbw (struct __toku_db_env **, u_int32_t);
int txn_abort_bdbw (struct yobi_db_txn *); int txn_abort_bdbw (struct __toku_db_txn *);
int txn_begin_bdbw (struct yobi_db_env *env, struct yobi_db_txn *stxn, struct yobi_db_txn **txn, u_int32_t flags); int txn_begin_bdbw (struct __toku_db_env *env, struct __toku_db_txn *stxn, struct __toku_db_txn **txn, u_int32_t flags);
int txn_commit_bdbw (struct yobi_db_txn *, u_int32_t); int txn_commit_bdbw (struct __toku_db_txn *, u_int32_t);
int db_create_bdbw (struct yobi_db **, struct yobi_db_env *, u_int32_t); int db_create_bdbw (struct __toku_db **, struct __toku_db_env *, u_int32_t);
#if 0 #if 0
...@@ -35,18 +35,18 @@ enum { ...@@ -35,18 +35,18 @@ enum {
}; };
typedef struct yobi_db DB; typedef struct __toku_db DB;
typedef struct yobi_db_btree_stat DB_BTREE_STAT; typedef struct yobi_db_btree_stat DB_BTREE_STAT;
typedef struct yobi_db_env DB_ENV; typedef struct __toku_db_env DB_ENV;
typedef struct yobi_db_key_range DB_KEY_RANGE; typedef struct yobi_db_key_range DB_KEY_RANGE;
typedef struct yobi_db_lsn DB_LSN; typedef struct yobi_db_lsn DB_LSN;
typedef struct yobi_db_txn DB_TXN; typedef struct __toku_db_txn DB_TXN;
typedef struct yobi_db_txn_active DB_TXN_ACTIVE; typedef struct __toku_db_txn_active DB_TXN_ACTIVE;
typedef struct yobi_db_txn_stat DB_TXN_STAT; typedef struct __toku_db_txn_stat DB_TXN_STAT;
typedef struct yobi_dbc DBC; typedef struct yobi_dbc DBC;
typedef struct yobi_dbt DBT; typedef struct yobi_dbt DBT;
struct yobi_db { struct __toku_db {
void *app_private; void *app_private;
int (*close) (DB *, u_int32_t); int (*close) (DB *, u_int32_t);
int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t); int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t);
...@@ -63,7 +63,7 @@ struct yobi_db { ...@@ -63,7 +63,7 @@ struct yobi_db {
int (*set_flags) (DB *, u_int32_t); int (*set_flags) (DB *, u_int32_t);
int (*stat) (DB *, void *, u_int32_t); int (*stat) (DB *, void *, u_int32_t);
struct ydb_db_internal *i; struct __toku_db_internal *i;
}; };
enum { enum {
DB_DBT_MALLOC = 0x002, DB_DBT_MALLOC = 0x002,
...@@ -78,7 +78,7 @@ struct yobi_dbt { ...@@ -78,7 +78,7 @@ struct yobi_dbt {
u_int32_t size; u_int32_t size;
u_int32_t ulen; u_int32_t ulen;
}; };
struct yobi_db_txn { struct __toku_db_txn {
int (*commit) (DB_TXN*, u_int32_t); int (*commit) (DB_TXN*, u_int32_t);
u_int32_t (*id) (DB_TXN *); u_int32_t (*id) (DB_TXN *);
}; };
...@@ -87,7 +87,7 @@ struct yobi_dbc { ...@@ -87,7 +87,7 @@ struct yobi_dbc {
int (*c_close) (DBC *); int (*c_close) (DBC *);
int (*c_del) (DBC *, u_int32_t); int (*c_del) (DBC *, u_int32_t);
}; };
struct yobi_db_env { struct __toku_db_env {
// Methods used by MYSQL // Methods used by MYSQL
void (*err) (const DB_ENV *, int, const char *, ...); void (*err) (const DB_ENV *, int, const char *, ...);
int (*open) (DB_ENV *, const char *, u_int32_t, int); int (*open) (DB_ENV *, const char *, u_int32_t, int);
...@@ -123,14 +123,14 @@ struct yobi_db_btree_stat { ...@@ -123,14 +123,14 @@ struct yobi_db_btree_stat {
u_int32_t bt_ndata; u_int32_t bt_ndata;
u_int32_t bt_nkeys; u_int32_t bt_nkeys;
}; };
struct yobi_db_txn_stat { struct __toku_db_txn_stat {
u_int32_t st_nactive; u_int32_t st_nactive;
DB_TXN_ACTIVE *st_txnarray; DB_TXN_ACTIVE *st_txnarray;
}; };
struct yobi_db_lsn { struct yobi_db_lsn {
int hello; int hello;
}; };
struct yobi_db_txn_active { struct __toku_db_txn_active {
DB_LSN lsn; DB_LSN lsn;
u_int32_t txnid; u_int32_t txnid;
}; };
......
src-bdbwrap/ydb-uniq.h
View file @ 657c57b4
#ifndef _YDB_WRAP_H #ifndef _TOKUDB_WRAP_H
#define _YDB_WRAP_H #define _TOKUDB_WRAP_H
#define DB_BTREE DB_BTREE_ydb #define DB_BTREE DB_BTREE_ydb
#define DB_NOTICE_LOGFILE_CHANGED DB_NOTICE_LOGFILE_CHANGED_ydb #define DB_NOTICE_LOGFILE_CHANGED DB_NOTICE_LOGFILE_CHANGED_ydb
#define DBTYPE DBTYPE_ydb #define DBTYPE DBTYPE_ydb
...@@ -9,8 +8,8 @@ ...@@ -9,8 +8,8 @@
#define txn_begin txn_begin_ydb #define txn_begin txn_begin_ydb
#define txn_commit txn_commit_ydb #define txn_commit txn_commit_ydb
#define DB_VERB_CHKPOINT DB_VERB_CHKPOINT_ydb #define DB_VERB_CHKPOINT DB_VERB_CHKPOINT_ydb
#define DB_VERB_DEADLOCK DB_VERB_DEADLOCK_ydb //#define DB_VERB_DEADLOCK DB_VERB_DEADLOCK_ydb
#define DB_VERB_RECOVERY DB_VERB_RECOVERY_ydb //#define DB_VERB_RECOVERY DB_VERB_RECOVERY_ydb
#define DB DB_ydb #define DB DB_ydb
#define DB_BTREE_STAT DB_BTREE_STAT_ydb #define DB_BTREE_STAT DB_BTREE_STAT_ydb
#define DB_ENV DB_ENV_ydb #define DB_ENV DB_ENV_ydb
...@@ -25,7 +24,6 @@ ...@@ -25,7 +24,6 @@
#define DB_DBT_REALLOC DB_DBT_REALLOC_ydb #define DB_DBT_REALLOC DB_DBT_REALLOC_ydb
#define DB_DBT_USERMEM DB_DBT_USERMEM_ydb #define DB_DBT_USERMEM DB_DBT_USERMEM_ydb
#define DB_DBT_DUPOK DB_DBT_DUPOK_ydb #define DB_DBT_DUPOK DB_DBT_DUPOK_ydb
#define DB_VERSION_STRING DB_VERSION_STRING_ydb
#define DB_ARCH_ABS DB_ARCH_ABS_ydb #define DB_ARCH_ABS DB_ARCH_ABS_ydb
#define DB_ARCH_LOG DB_ARCH_LOG_ydb #define DB_ARCH_LOG DB_ARCH_LOG_ydb
#define DB_FIRST DB_FIRST_ydb #define DB_FIRST DB_FIRST_ydb
...@@ -88,7 +86,6 @@ ...@@ -88,7 +86,6 @@
#undef DB_DBT_REALLOC #undef DB_DBT_REALLOC
#undef DB_DBT_USERMEM #undef DB_DBT_USERMEM
#undef DB_DBT_DUPOK #undef DB_DBT_DUPOK
#undef DB_VERSION_STRING
#undef DB_ARCH_ABS #undef DB_ARCH_ABS
#undef DB_ARCH_LOG #undef DB_ARCH_LOG
#undef DB_FIRST #undef DB_FIRST
......
src/Makefile
View file @ 657c57b4
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
CFLAGS = -W -Wall -Wno-unused -g -fPIC -O2 CFLAGS = -W -Wall -Wno-unused -g -fPIC -O2
CPPFLAGS = -I../include -I../newbrt CPPFLAGS = -I../include -I../newbrt
CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
ifeq ($(OSX),OSX) ifeq ($(OSX),OSX)
...@@ -21,7 +22,7 @@ install: $(LIBNAME) ...@@ -21,7 +22,7 @@ install: $(LIBNAME)
clean: clean:
rm -rf *.$(LIBEXT) *.o rm -rf *.$(LIBEXT) *.o
ydb.o: ../include/db.h ../newbrt/cachetable.h ../newbrt/brt.h ydb.o: ../include/db.h ../newbrt/cachetable.h ../newbrt/brt.h ../newbrt/log.c
DBBINS = ydb.o ../newbrt/brt.o ../newbrt/brt-serialize.o ../newbrt/cachetable.o ../newbrt/hashtable.o ../newbrt/header-io.o ../newbrt/key.o ../newbrt/memory.o ../newbrt/pma.o ../newbrt/ybt.o ../newbrt/primes.o ../newbrt/log.o ../newbrt/mempool.o DBBINS = ydb.o ../newbrt/brt.o ../newbrt/brt-serialize.o ../newbrt/cachetable.o ../newbrt/hashtable.o ../newbrt/header-io.o ../newbrt/key.o ../newbrt/memory.o ../newbrt/pma.o ../newbrt/ybt.o ../newbrt/primes.o ../newbrt/log.o ../newbrt/mempool.o
$(LIBNAME): $(DBBINS) $(LIBNAME): $(DBBINS)
cc $(CPPFLAGS) $(DBBINS) $(SHARED) -o $@ $(CFLAGS) cc $(CPPFLAGS) $(DBBINS) $(SHARED) -o $@ $(CFLAGS)
......
src/ydb.c
View file @ 657c57b4
...@@ -28,6 +28,7 @@ static inline void *malloc_zero(size_t size) { ...@@ -28,6 +28,7 @@ static inline void *malloc_zero(size_t size) {
struct __toku_db_txn_internal { struct __toku_db_txn_internal {
//TXNID txnid64; /* A sixty-four bit txn id. */ //TXNID txnid64; /* A sixty-four bit txn id. */
TOKUTXN tokutxn; TOKUTXN tokutxn;
DB_TXN *parent;
}; };
void __toku_db_env_err (const DB_ENV *env __attribute__((__unused__)), int error, const char *fmt, ...) { void __toku_db_env_err (const DB_ENV *env __attribute__((__unused__)), int error, const char *fmt, ...) {
...@@ -243,7 +244,8 @@ int txn_begin (DB_ENV *env, DB_TXN *stxn, DB_TXN **txn, u_int32_t flags) { ...@@ -243,7 +244,8 @@ int txn_begin (DB_ENV *env, DB_TXN *stxn, DB_TXN **txn, u_int32_t flags) {
result->commit = __toku_db_txn_commit; result->commit = __toku_db_txn_commit;
result->id = __toku_db_txn_id; result->id = __toku_db_txn_id;
result->i = malloc(sizeof(*result->i)); result->i = malloc(sizeof(*result->i));
int r = tokutxn_begin(&result->i->tokutxn, next_txn++, env->i->logger); result->i->parent = stxn;
int r = tokutxn_begin(stxn ? stxn->i->tokutxn : 0, &result->i->tokutxn, next_txn++, env->i->logger);
if (r!=0) return r; if (r!=0) return r;
*txn = result; *txn = result;
return 0; return 0;
...@@ -400,12 +402,9 @@ int __toku_db_open (DB *db, DB_TXN *txn, const char *fname, const char *dbname, ...@@ -400,12 +402,9 @@ int __toku_db_open (DB *db, DB_TXN *txn, const char *fname, const char *dbname,
db->i->open_flags = flags; db->i->open_flags = flags;
db->i->open_mode = mode; db->i->open_mode = mode;
// Warning: new_brt has deficienceis:
// Each tree has its own cache, instead of a big shared cache.
// It doesn't do error checking on insert.
// It's tough to do cursors.
r=open_brt(db->i->full_fname, dbname, (flags&DB_CREATE), &db->i->brt, 1<<20, db->i->env->i->cachetable, r=open_brt(db->i->full_fname, dbname, (flags&DB_CREATE), &db->i->brt, 1<<20, db->i->env->i->cachetable,
db->i->bt_compare); db->i->bt_compare);
printf("r=%d\n", r);
assert(r==0); assert(r==0);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7