[t:3193] Closes #3193 Delete obsolete fifo_msg code.

git-svn-id: file:///svn/toku/tokudb@29573 c7de825b-a66e-492c-adef-691d508d4ae1

newbrt/brt_msg.c

@@ -8,38 +8,6 @@
 #include "xids.h"
 #include "brt_msg.h"
 
-#if 0
-
-//BRT_MSG internals are in host order
-//XIDS are not 'internal' to BRT_MSG
-
-void
-brt_msg_from_dbts(BRT_MSG brt_msg,
-                  DBT *key, DBT *val,
-                  XIDS xids, enum brt_msg_type type) {
-    brt_msg->u.id.key = key;
-    brt_msg->u.id.val = val;
-    brt_msg->xids   = xids;
-    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);
-    brt_msg->vallen = fifo_msg_get_vallen(fifo_msg);
-    brt_msg->vallen = fifo_msg_get_vallen(fifo_msg);
-    brt_msg->key    = fifo_msg_get_key(fifo_msg);
-    brt_msg->val    = fifo_msg_get_val(fifo_msg);
-    brt_msg->xids   = fifo_msg_get_xids(fifo_msg);
-    brt_msg->type   = fifo_msg_get_type(fifo_msg);
-}
-#endif
 
 u_int32_t 
 brt_msg_get_keylen(BRT_MSG brt_msg) {

newbrt/fifo_msg.c

-/* -*- mode: C; c-basic-offset: 4 -*- */
-#ident "$Id$"
-#ident "Copyright (c) 2007-2010 Tokutek Inc.  All rights reserved."
-
-
-/* Purpose of this file is to define and handle the fifo_msg, which
- * is the stored format of a brt_msg.
- *
- * Note, when translating from fifo_msg to brt_msg, the brt_msg
- * will be created with a pointer into the xids in the fifo_msg.
- * (The xids will not be embedded in the brt_msg.)  This means
- * that a valid xids struct must be embedded in the fifo_msg.
- *
- * NOTE: fifo_msg is stored in memory and on disk in same format.
- *       fifo_msg is stored in same byte order both in-memory
- *       and on-disk.  Accessors are responsible for tranposition
- *       to host order.
- */
-
-
-#include <string.h>
-
-#include <toku_portability.h>
-#include "brttypes.h"
-#include "xids.h"
-#include "xids-internal.h"
-#include "brt_msg.h"
-#include "fifo_msg.h"
-#include <toku_htod.h>
-
-
-// xids_and_key_and_val field is XIDS_S followed by key
-// followed by value.
-
-struct fifo_msg_t {
-    u_int32_t keylen;
-    u_int32_t vallen;
-    u_int8_t  type;
-    // u_int8_t pad[7]; // force 64-bit alignment if needed ???
-    u_int8_t  xids_and_key_and_val[];	// undifferentiated bytes
-};
-
-
-u_int32_t 
-fifo_msg_get_keylen(FIFO_MSG fifo_msg) {
-    u_int32_t rval = fifo_msg->keylen;
-    rval = toku_dtoh32(rval);
-    return rval;
-}
-
-u_int32_t 
-fifo_msg_get_vallen(FIFO_MSG fifo_msg) {
-    u_int32_t rval = fifo_msg->vallen;
-    rval = toku_dtoh32(rval);
-    return rval;
-}
-
-XIDS
-fifo_msg_get_xids(FIFO_MSG fifo_msg) {
-    XIDS rval = (XIDS) &fifo_msg->xids_and_key_and_val;
-    return rval;
-}
-
-
-static u_int32_t
-fifo_msg_get_xids_size(FIFO_MSG fifo_msg) {
-    u_int32_t rval;
-    XIDS xids = fifo_msg_get_xids(fifo_msg);
-    rval      = xids_get_size(xids);
-    return rval;
-}
-
-
-void *
-fifo_msg_get_key(FIFO_MSG fifo_msg) {
-    void * rval;
-    u_int32_t xidslen = fifo_msg_get_xids_size(fifo_msg);
-    rval = (u_int8_t*)fifo_msg->xids_and_key_and_val + xidslen;
-    return rval;
-}
-
-void *
-fifo_msg_get_val(FIFO_MSG fifo_msg) {
-    void * rval;
-    void * key = fifo_msg_get_key(fifo_msg);
-    u_int32_t keylen  = fifo_msg_get_keylen(fifo_msg);
-    rval = (u_int8_t*)key + keylen;
-    return rval;
-}
-
-enum brt_msg_type
-fifo_msg_get_type(FIFO_MSG fifo_msg) {
-    enum brt_msg_type rval = (enum brt_msg_type) fifo_msg->type;
-    return rval;
-}
-
-
-// Finds size of a fifo msg.
-u_int32_t 
-fifo_msg_get_size(FIFO_MSG fifo_msg) {
-    u_int32_t rval;
-    u_int32_t keylen  = fifo_msg_get_keylen(fifo_msg);
-    u_int32_t vallen  = fifo_msg_get_vallen(fifo_msg);
-    u_int32_t xidslen = fifo_msg_get_xids_size(fifo_msg);
-    rval = keylen + vallen + xidslen + sizeof(*fifo_msg);
-    return rval;
-}
-
-// Return number of bytes required for a fifo_msg created from
-// the given brt_msg
-u_int32_t 
-fifo_msg_get_size_required(BRT_MSG brt_msg) {
-    u_int32_t rval;
-    u_int32_t keylen  = brt_msg_get_keylen(brt_msg);
-    u_int32_t vallen  = brt_msg_get_vallen(brt_msg);
-    XIDS      xids    = brt_msg_get_xids(brt_msg);
-    u_int32_t xidslen = xids_get_size(xids);
-    rval = keylen + vallen + xidslen + sizeof(struct fifo_msg_t);
-    return rval;
-}
-

newbrt/fifo_msg.h

-/* -*- mode: C; c-basic-offset: 4 -*- */
-
-/* The purpose of this file is to provide access to the fifo_msg,
- * which is the stored representation of the brt_msg.
- * 
- * NOTE: Accessor functions return all values in host byte order.
- */
-
-#ifndef TOKU_FIFO_MSG_H
-#define TOKU_FIFO_MSG_H
-
-#ident "$Id$"
-#ident "Copyright (c) 2007-2010 Tokutek Inc.  All rights reserved."
-#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
-
-#if defined(__cplusplus) || defined(__cilkplusplus)
-extern "C" {
-#endif
-
-u_int32_t fifo_msg_get_keylen(FIFO_MSG fifo_msg);
-
-u_int32_t fifo_msg_get_vallen(FIFO_MSG fifo_msg);
-
-XIDS fifo_msg_get_xids(FIFO_MSG fifo_msg);
-
-void * fifo_msg_get_key(FIFO_MSG fifo_msg);
-
-void * fifo_msg_get_val(FIFO_MSG fifo_msg);
-
-enum brt_msg_type fifo_msg_get_type(FIFO_MSG fifo_msg);
-
-u_int32_t fifo_msg_get_size(FIFO_MSG fifo_msg);
-
-// Return number of bytes required for a fifo_msg created from
-// the given brt_msg
-u_int32_t fifo_msg_get_size_required(BRT_MSG brt_msg);
-
-#if defined(__cplusplus) || defined(__cilkplusplus)
-};
-#endif
-
-#endif
-