diff --git a/newbrt/Makefile b/newbrt/Makefile index 7fb49e41fbdbbc5b71d2493859eddf5dfa57eb4b..0e0af0006ea9fb8f52f648ee209118a791602848 100644 --- a/newbrt/Makefile +++ b/newbrt/Makefile @@ -47,7 +47,6 @@ BRT_SOURCES = \ cachetable \ checkpoint \ fifo \ - fifo_msg \ fingerprint \ key \ leafentry \ diff --git a/newbrt/brt_msg.c b/newbrt/brt_msg.c index 5c4c468dd98e99d722b4b389840290e1cb47a60d..a4b3988d9b70c880011a0864eebc365438bd201d 100644 --- a/newbrt/brt_msg.c +++ b/newbrt/brt_msg.c @@ -5,9 +5,10 @@ #include <toku_portability.h> #include "brttypes.h" #include "xids.h" -#include "fifo_msg.h" #include "brt_msg.h" +#if 0 + //BRT_MSG internals are in host order //XIDS are not 'internal' to BRT_MSG @@ -21,9 +22,12 @@ brt_msg_from_dbts(BRT_MSG brt_msg, brt_msg->type = type; } +#endif + //No conversion (from disk to host) is necessary //Accessor functions for fifo return host order bytes. #if 0 +#include "fifo_msg.h" void brt_msg_from_fifo_msg(BRT_MSG brt_msg, FIFO_MSG fifo_msg) { brt_msg->keylen = fifo_msg_get_keylen(fifo_msg); diff --git a/newbrt/brt_msg.h b/newbrt/brt_msg.h index 999c7320e627224499a96921c922f7327810dee1..d132061c6bf7ac13efe44c9460b0f2cdd6e8aa84 100644 --- a/newbrt/brt_msg.h +++ b/newbrt/brt_msg.h @@ -27,7 +27,11 @@ enum brt_msg_type brt_msg_get_type(BRT_MSG brt_msg); void brt_msg_from_fifo_msg(BRT_MSG brt_msg, FIFO_MSG fifo_msg); +#if 0 + void brt_msg_from_dbts(BRT_MSG brt_msg, DBT *key, DBT *val, XIDS xids, enum brt_msg_type type); #endif +#endif +