libcouchbase 0.2.0 → 0.3.1

data/ext/libcouchbase/include/libcouchbase/n1ql.h

@@ -261,15 +261,6 @@ lcb_n1p_mkcmd(lcb_N1QLPARAMS *params, lcb_CMDN1QL *cmd);
 /** @private The lcb_CMDN1QL::query member is an internal JSON structure */
 #define LCB_CMDN1QL_F_JSONQUERY 1<<17
 
-/**
- * This is an analytics query. Use the `host` field to specify the host/port
- * to target. When this flag is set, things like prepared queries and
- * parametrized statements will not work.
- *
- * @uncommited
- */
-#define LCB_CMDN1QL_F_CBASQUERY 1<<18
-
 /**
  * Command structure for N1QL queries. Typically an application will use the
  * lcb_N1QLPARAMS structure to populate the #query and #content_type fields.
@@ -296,10 +287,7 @@ struct lcb_CMDN1QL {
     /** Length of the query data */
     size_t nquery;
 
-    /**
-     * Ignored since version 2.5.3.
-     * Starting from version 2.7.3, is used for experimental CBAS support
-     */
+    /** Ignored since version 2.5.3 */
     const char *host;
 
     /** Ignored since version 2.5.3 */

data/ext/libcouchbase/include/libcouchbase/plugins/io/bsdio-inl.c

@@ -284,7 +284,7 @@ cntl_getset_impl(lcb_io_opt_t io, lcb_socket_t sock, int mode, int oslevel,
     #ifndef _WIN32
     socklen_t dummy = optsize;
     #else
-    char dummy = optsize;
+    int dummy = optsize;
     #endif
 
     if (mode == LCB_IO_CNTL_GET) {

data/ext/libcouchbase/include/libcouchbase/subdoc.h

@@ -180,15 +180,6 @@ typedef struct {
 /** Create document if it does not exist */
 #define LCB_SDSPEC_F_MKDOCUMENT (1<<17)
 
-/** Access document XATTR path */
-#define LCB_SDSPEC_F_XATTRPATH (1<<18)
-
-/** Access document virtual/materialized path. Implies F_XATTRPATH */
-#define LCB_SDSPEC_F_XATTR_MACROVALUES (1<<19)
-
-/** Access Xattrs of deleted documents */
-#define LCB_SDSPEC_F_XATTR_DELETED_OK (1<<20)
-
 /**
  * Set the path for an @ref lcb_SDSPEC structure
  * @param s pointer to spec

data/ext/libcouchbase/include/libcouchbase/views.h

@@ -33,14 +33,8 @@ extern "C" {
  * @addtogroup lcb-view-api
  * @{
  */
-#ifdef __cplusplus
-namespace lcb { namespace views { struct ViewRequest; } }
-typedef lcb::views::ViewRequest* lcb_VIEWHANDLE;
-#else
-typedef struct lcbview_REQUEST_st *lcb_VIEWHANDLE;
-#endif
-
 typedef struct lcb_RESPVIEW_st lcb_RESPVIEWQUERY;
+typedef struct lcbview_REQUEST_st *lcb_VIEWHANDLE;
 
 /**
  * Callback function invoked for each row returned from the view

data/ext/libcouchbase/include/libcouchbase/visibility.h

@@ -20,7 +20,6 @@
 #ifdef LIBCOUCHBASE_STATIC
 #define LIBCOUCHBASE_API
 #define LCB_EXTERN_VAR extern
-#define LCB_CLASS_EXPORT
 #else
 
 #ifdef LIBCOUCHBASE_INTERNAL

data/ext/libcouchbase/include/memcached/protocol_binary.h

@@ -33,12 +33,6 @@
  * Author: Trond Norbye <trond.norbye@sun.com>
  */
 
-/**
- * THIS IS A SLIMMED DOWN VERSION FOR LIBCOUCHBASE!
- * It only contains constants used by the library. The header in the
- * memcached source code contains all of the commands actually used.
- */
-
 #ifndef PROTOCOL_BINARY_H
 #define PROTOCOL_BINARY_H
 
@@ -47,6 +41,7 @@
 #else
 # include <stdint.h>
 #endif
+#include <memcached/vbucket.h>
 
 /**
  * \addtogroup Protocol
@@ -99,7 +94,10 @@ extern "C"
         PROTOCOL_BINARY_RESPONSE_DELTA_BADVAL = 0x06,
         /** The server is not responsible for the requested vbucket */
         PROTOCOL_BINARY_RESPONSE_NOT_MY_VBUCKET = 0x07,
-
+        /** Not connected to a bucket */
+        PROTOCOL_BINARY_RESPONSE_NO_BUCKET = 0x08,
+        /** The authentication context is stale. You should reauthenticate*/
+        PROTOCOL_BINARY_RESPONSE_AUTH_STALE = 0x1f,
         /** Authentication failure (invalid user/password combination,
          * OR an internal error in the authentication library. Could
          * be a misconfigured SASL configuration. See server logs for
@@ -110,10 +108,16 @@ extern "C"
         /** The requested value is outside the legal range
          * (similar to EINVAL, but more specific) */
         PROTOCOL_BINARY_RESPONSE_ERANGE = 0x22,
-
+        /** Roll back to an earlier version of the vbucket UUID
+         * (_currently_ only used by DCP for agreeing on selecting a
+         * starting point) */
+        PROTOCOL_BINARY_RESPONSE_ROLLBACK = 0x23,
         /** No access (could be opcode, value, bucket etc) */
         PROTOCOL_BINARY_RESPONSE_EACCESS = 0x24,
-
+        /** The Couchbase cluster is currently initializing this
+         * node, and the Cluster manager has not yet granted all
+         * users access to the cluster. */
+        PROTOCOL_BINARY_RESPONSE_NOT_INITIALIZED = 0x25,
         /** The server have no idea what this command is for */
         PROTOCOL_BINARY_RESPONSE_UNKNOWN_COMMAND = 0x81,
         /** Not enough memory */
@@ -207,32 +211,210 @@ extern "C"
         PROTOCOL_BINARY_CMD_DELETE = 0x04,
         PROTOCOL_BINARY_CMD_INCREMENT = 0x05,
         PROTOCOL_BINARY_CMD_DECREMENT = 0x06,
+        PROTOCOL_BINARY_CMD_QUIT = 0x07,
         PROTOCOL_BINARY_CMD_FLUSH = 0x08,
-        PROTOCOL_BINARY_CMD_GETQ = 0x09 /* Used in tests */,
+        PROTOCOL_BINARY_CMD_GETQ = 0x09,
+        PROTOCOL_BINARY_CMD_NOOP = 0x0a,
         PROTOCOL_BINARY_CMD_VERSION = 0x0b,
+        PROTOCOL_BINARY_CMD_GETK = 0x0c,
+        PROTOCOL_BINARY_CMD_GETKQ = 0x0d,
         PROTOCOL_BINARY_CMD_APPEND = 0x0e,
         PROTOCOL_BINARY_CMD_PREPEND = 0x0f,
         PROTOCOL_BINARY_CMD_STAT = 0x10,
+        PROTOCOL_BINARY_CMD_SETQ = 0x11,
+        PROTOCOL_BINARY_CMD_ADDQ = 0x12,
+        PROTOCOL_BINARY_CMD_REPLACEQ = 0x13,
+        PROTOCOL_BINARY_CMD_DELETEQ = 0x14,
+        PROTOCOL_BINARY_CMD_INCREMENTQ = 0x15,
+        PROTOCOL_BINARY_CMD_DECREMENTQ = 0x16,
+        PROTOCOL_BINARY_CMD_QUITQ = 0x17,
+        PROTOCOL_BINARY_CMD_FLUSHQ = 0x18,
+        PROTOCOL_BINARY_CMD_APPENDQ = 0x19,
+        PROTOCOL_BINARY_CMD_PREPENDQ = 0x1a,
         PROTOCOL_BINARY_CMD_VERBOSITY = 0x1b,
         PROTOCOL_BINARY_CMD_TOUCH = 0x1c,
         PROTOCOL_BINARY_CMD_GAT = 0x1d,
+        PROTOCOL_BINARY_CMD_GATQ = 0x1e,
         PROTOCOL_BINARY_CMD_HELLO = 0x1f,
 
         PROTOCOL_BINARY_CMD_SASL_LIST_MECHS = 0x20,
         PROTOCOL_BINARY_CMD_SASL_AUTH = 0x21,
         PROTOCOL_BINARY_CMD_SASL_STEP = 0x22,
 
+        /* Control */
+        PROTOCOL_BINARY_CMD_IOCTL_GET = 0x23,
+        PROTOCOL_BINARY_CMD_IOCTL_SET = 0x24,
+
+        /* Config */
+        PROTOCOL_BINARY_CMD_CONFIG_VALIDATE = 0x25,
+        PROTOCOL_BINARY_CMD_CONFIG_RELOAD = 0x26,
+
+        /* Audit */
+        PROTOCOL_BINARY_CMD_AUDIT_PUT = 0x27,
+        PROTOCOL_BINARY_CMD_AUDIT_CONFIG_RELOAD = 0x28,
+
+        /* Shutdown the server */
+        PROTOCOL_BINARY_CMD_SHUTDOWN = 0x29,
+
+        /* These commands are used for range operations and exist within
+         * this header for use in other projects.  Range operations are
+         * not expected to be implemented in the memcached server itself.
+         */
+        PROTOCOL_BINARY_CMD_RGET      = 0x30,
+        PROTOCOL_BINARY_CMD_RSET      = 0x31,
+        PROTOCOL_BINARY_CMD_RSETQ     = 0x32,
+        PROTOCOL_BINARY_CMD_RAPPEND   = 0x33,
+        PROTOCOL_BINARY_CMD_RAPPENDQ  = 0x34,
+        PROTOCOL_BINARY_CMD_RPREPEND  = 0x35,
+        PROTOCOL_BINARY_CMD_RPREPENDQ = 0x36,
+        PROTOCOL_BINARY_CMD_RDELETE   = 0x37,
+        PROTOCOL_BINARY_CMD_RDELETEQ  = 0x38,
+        PROTOCOL_BINARY_CMD_RINCR     = 0x39,
+        PROTOCOL_BINARY_CMD_RINCRQ    = 0x3a,
+        PROTOCOL_BINARY_CMD_RDECR     = 0x3b,
+        PROTOCOL_BINARY_CMD_RDECRQ    = 0x3c,
+        /* End Range operations */
+
+        /* VBucket commands */
+        PROTOCOL_BINARY_CMD_SET_VBUCKET = 0x3d,
+        PROTOCOL_BINARY_CMD_GET_VBUCKET = 0x3e,
+        PROTOCOL_BINARY_CMD_DEL_VBUCKET = 0x3f,
+        /* End VBucket commands */
+
+        /* TAP commands */
+        PROTOCOL_BINARY_CMD_TAP_CONNECT = 0x40,
+        PROTOCOL_BINARY_CMD_TAP_MUTATION = 0x41,
+        PROTOCOL_BINARY_CMD_TAP_DELETE = 0x42,
+        PROTOCOL_BINARY_CMD_TAP_FLUSH = 0x43,
+        PROTOCOL_BINARY_CMD_TAP_OPAQUE = 0x44,
+        PROTOCOL_BINARY_CMD_TAP_VBUCKET_SET = 0x45,
+        PROTOCOL_BINARY_CMD_TAP_CHECKPOINT_START = 0x46,
+        PROTOCOL_BINARY_CMD_TAP_CHECKPOINT_END = 0x47,
+        /* End TAP */
+
+        /* Vbucket command to get the VBUCKET sequence numbers for all
+         * vbuckets on the node */
+        PROTOCOL_BINARY_CMD_GET_ALL_VB_SEQNOS = 0x48,
+
+        /* DCP */
+        PROTOCOL_BINARY_CMD_DCP_OPEN = 0x50,
+        PROTOCOL_BINARY_CMD_DCP_ADD_STREAM = 0x51,
+        PROTOCOL_BINARY_CMD_DCP_CLOSE_STREAM = 0x52,
+        PROTOCOL_BINARY_CMD_DCP_STREAM_REQ = 0x53,
+        PROTOCOL_BINARY_CMD_DCP_GET_FAILOVER_LOG = 0x54,
+        PROTOCOL_BINARY_CMD_DCP_STREAM_END = 0x55,
+        PROTOCOL_BINARY_CMD_DCP_SNAPSHOT_MARKER = 0x56,
+        PROTOCOL_BINARY_CMD_DCP_MUTATION = 0x57,
+        PROTOCOL_BINARY_CMD_DCP_DELETION = 0x58,
+        PROTOCOL_BINARY_CMD_DCP_EXPIRATION = 0x59,
+        PROTOCOL_BINARY_CMD_DCP_FLUSH = 0x5a,
+        PROTOCOL_BINARY_CMD_DCP_SET_VBUCKET_STATE = 0x5b,
+        PROTOCOL_BINARY_CMD_DCP_NOOP = 0x5c,
+        PROTOCOL_BINARY_CMD_DCP_BUFFER_ACKNOWLEDGEMENT = 0x5d,
+        PROTOCOL_BINARY_CMD_DCP_CONTROL = 0x5e,
+        PROTOCOL_BINARY_CMD_DCP_RESERVED4 = 0x5f,
+        /* End DCP */
+
+        PROTOCOL_BINARY_CMD_STOP_PERSISTENCE = 0x80,
+        PROTOCOL_BINARY_CMD_START_PERSISTENCE = 0x81,
+        PROTOCOL_BINARY_CMD_SET_PARAM = 0x82,
         PROTOCOL_BINARY_CMD_GET_REPLICA = 0x83,
 
-        PROTOCOL_BINARY_CMD_SELECT_BUCKET = 0x89,
+        /* Bucket engine */
+        PROTOCOL_BINARY_CMD_CREATE_BUCKET = 0x85,
+        PROTOCOL_BINARY_CMD_DELETE_BUCKET = 0x86,
+        PROTOCOL_BINARY_CMD_LIST_BUCKETS = 0x87,
+        PROTOCOL_BINARY_CMD_SELECT_BUCKET= 0x89,
+
+        PROTOCOL_BINARY_CMD_ASSUME_ROLE = 0x8a,
 
         PROTOCOL_BINARY_CMD_OBSERVE_SEQNO = 0x91,
         PROTOCOL_BINARY_CMD_OBSERVE = 0x92,
 
+        PROTOCOL_BINARY_CMD_EVICT_KEY = 0x93,
         PROTOCOL_BINARY_CMD_GET_LOCKED = 0x94,
         PROTOCOL_BINARY_CMD_UNLOCK_KEY = 0x95,
 
+        /**
+         * Return the last closed checkpoint Id for a given VBucket.
+         */
+        PROTOCOL_BINARY_CMD_LAST_CLOSED_CHECKPOINT = 0x97,
+        /**
+         * Close the TAP connection for the registered TAP client and
+         * remove the checkpoint cursors from its registered vbuckets.
+         */
+        PROTOCOL_BINARY_CMD_DEREGISTER_TAP_CLIENT = 0x9e,
+
+        /**
+         * Reset the replication chain from the node that receives
+         * this command. For example, given the replication chain,
+         * A->B->C, if A receives this command, it will reset all the
+         * replica vbuckets on B and C, which are replicated from A.
+         */
+        PROTOCOL_BINARY_CMD_RESET_REPLICATION_CHAIN =  0x9f,
+
+        /**
+         * CMD_GET_META is used to retrieve the meta section for an item.
+         */
+        PROTOCOL_BINARY_CMD_GET_META = 0xa0,
+        PROTOCOL_BINARY_CMD_GETQ_META = 0xa1,
+        PROTOCOL_BINARY_CMD_SET_WITH_META = 0xa2,
+        PROTOCOL_BINARY_CMD_SETQ_WITH_META = 0xa3,
+        PROTOCOL_BINARY_CMD_ADD_WITH_META = 0xa4,
+        PROTOCOL_BINARY_CMD_ADDQ_WITH_META = 0xa5,
+        PROTOCOL_BINARY_CMD_SNAPSHOT_VB_STATES = 0xa6,
+        PROTOCOL_BINARY_CMD_VBUCKET_BATCH_COUNT = 0xa7,
+        PROTOCOL_BINARY_CMD_DEL_WITH_META = 0xa8,
+        PROTOCOL_BINARY_CMD_DELQ_WITH_META = 0xa9,
+
+        /**
+         * Command to create a new checkpoint on a given vbucket by force
+         */
+        PROTOCOL_BINARY_CMD_CREATE_CHECKPOINT = 0xaa,
+        PROTOCOL_BINARY_CMD_NOTIFY_VBUCKET_UPDATE = 0xac,
+        /**
+         * Command to enable data traffic after completion of warm
+         */
+        PROTOCOL_BINARY_CMD_ENABLE_TRAFFIC = 0xad,
+        /**
+         * Command to disable data traffic temporarily
+         */
+        PROTOCOL_BINARY_CMD_DISABLE_TRAFFIC = 0xae,
+        /**
+         * Command to change the vbucket filter for a given TAP producer.
+         */
+        PROTOCOL_BINARY_CMD_CHANGE_VB_FILTER = 0xb0,
+        /**
+         * Command to wait for the checkpoint persistence
+         */
+        PROTOCOL_BINARY_CMD_CHECKPOINT_PERSISTENCE = 0xb1,
+        /**
+         * Command that returns meta data for typical memcached ops
+         */
+        PROTOCOL_BINARY_CMD_RETURN_META = 0xb2,
+        /**
+         * Command to trigger compaction of a vbucket
+         */
+        PROTOCOL_BINARY_CMD_COMPACT_DB = 0xb3,
+        /**
+         * Command to set cluster configuration
+         */
+        PROTOCOL_BINARY_CMD_SET_CLUSTER_CONFIG = 0xb4,
+        /**
+         * Command that returns cluster configuration
+         */
         PROTOCOL_BINARY_CMD_GET_CLUSTER_CONFIG = 0xb5,
+        PROTOCOL_BINARY_CMD_GET_RANDOM_KEY = 0xb6,
+        /**
+         * Command to wait for the dcp sequence number persistence
+         */
+        PROTOCOL_BINARY_CMD_SEQNO_PERSISTENCE = 0xb7,
+
+        /**
+         * Commands for GO-XDCR
+         */
+        PROTOCOL_BINARY_CMD_SET_DRIFT_COUNTER_STATE = 0xc1,
+        PROTOCOL_BINARY_CMD_GET_ADJUSTED_TIME = 0xc2,
 
         /**
          * Commands for the Sub-document API.
@@ -266,8 +448,20 @@ extern "C"
         /* Subdoc additions for Spock: */
         PROTOCOL_BINARY_CMD_SUBDOC_GET_COUNT = 0xd2,
 
-        /* get error code mappings */
-        PROTOCOL_BINARY_CMD_GET_ERROR_MAP = 0xfe,
+        /* Scrub the data */
+        PROTOCOL_BINARY_CMD_SCRUB = 0xf0,
+        /* Refresh the ISASL data */
+        PROTOCOL_BINARY_CMD_ISASL_REFRESH = 0xf1,
+        /* Refresh the SSL certificates */
+        PROTOCOL_BINARY_CMD_SSL_CERTS_REFRESH = 0xf2,
+        /* Internal timer ioctl */
+        PROTOCOL_BINARY_CMD_GET_CMD_TIMER = 0xf3,
+        /* ns_server - memcached session validation */
+        PROTOCOL_BINARY_CMD_SET_CTRL_TOKEN = 0xf4,
+        PROTOCOL_BINARY_CMD_GET_CTRL_TOKEN = 0xf5,
+
+        /* ns_server - memcached internal communication */
+        PROTOCOL_BINARY_CMD_INIT_COMPLETE = 0xf6,
 
         /* Reserved for being able to signal invalid opcode */
         PROTOCOL_BINARY_CMD_INVALID = 0xff
@@ -280,9 +474,25 @@ extern "C"
     typedef enum {
         PROTOCOL_BINARY_RAW_BYTES = 0x00,
         PROTOCOL_BINARY_DATATYPE_JSON = 0x01,
-        PROTOCOL_BINARY_DATATYPE_COMPRESSED = 0x02
+        /* Compressed == snappy compression */
+        PROTOCOL_BINARY_DATATYPE_COMPRESSED = 0x02,
+        /* Compressed == snappy compression */
+        PROTOCOL_BINARY_DATATYPE_COMPRESSED_JSON = 0x03
     } protocol_binary_datatypes;
 
+    /**
+     * Definitions for extended (flexible) metadata
+     *
+     * @1: Flex Code to identify the number of extended metadata fields
+     * @2: Size of the Flex Code, set to 1 byte
+     * @3: Current size of extended metadata
+     */
+    typedef enum {
+        FLEX_META_CODE = 0x01,
+        FLEX_DATA_OFFSET = 1,
+        EXT_META_LEN = 1
+    } protocol_binary_flexmeta;
+
     /**
      * Definitions of sub-document flags.
      */
@@ -296,11 +506,7 @@ extern "C"
         /* (Mutation) Create the document if it does not exist. Implies
          * SUBDOC_FLAG_MKDIR_P.
          */
-        SUBDOC_FLAG_MKDOC = 0x02,
-
-        SUBDOC_FLAG_XATTR_PATH = 0x04,
-        SUBDOC_FLAG_ACCESS_DELETED = 0x8,
-        SUBDOC_FLAG_EXPAND_MACROS = 0x010
+        SUBDOC_FLAG_MKDOC = 0x02
     } protocol_binary_subdoc_flag;
 
     /**
@@ -361,6 +567,14 @@ extern "C"
         uint8_t bytes[sizeof(protocol_binary_response_header)];
     } protocol_binary_response_no_extras;
 
+    /**
+     * Definition of the packet used by the get, getq, getk and getkq command.
+     * See section 4
+     */
+    typedef protocol_binary_request_no_extras protocol_binary_request_get;
+    typedef protocol_binary_request_no_extras protocol_binary_request_getq;
+    typedef protocol_binary_request_no_extras protocol_binary_request_getk;
+    typedef protocol_binary_request_no_extras protocol_binary_request_getkq;
 
     /**
      * Definition of the packet returned from a successful get, getq, getk and
@@ -377,8 +591,9 @@ extern "C"
         uint8_t bytes[sizeof(protocol_binary_response_header) + 4];
     } protocol_binary_response_get;
 
-    /* used by tests */
     typedef protocol_binary_response_get protocol_binary_response_getq;
+    typedef protocol_binary_response_get protocol_binary_response_getk;
+    typedef protocol_binary_response_get protocol_binary_response_getkq;
 
     /**
      * Definition of the packet used by the delete command
@@ -400,6 +615,32 @@ extern "C"
      */
     typedef protocol_binary_response_no_extras protocol_binary_response_delete;
 
+    /**
+     * Definition of the packet used by the flush command
+     * See section 4
+     * Please note that the expiration field is optional, so remember to see
+     * check the header.bodysize to see if it is present.
+     */
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                /*
+                 * Specifying a non-null expiration time is no longer
+                 * supported
+                 */
+                uint32_t expiration;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 4];
+    } protocol_binary_request_flush;
+
+    /**
+     * Definition of the packet returned by the flush command
+     * See section 4
+     */
+    typedef protocol_binary_response_no_extras protocol_binary_response_flush;
+
     /**
      * Definition of the packet used by set, add and replace
      * See section 4
@@ -414,6 +655,28 @@ extern "C"
         } message;
         uint8_t bytes[sizeof(protocol_binary_request_header) + 8];
     } protocol_binary_request_set;
+    typedef protocol_binary_request_set protocol_binary_request_add;
+    typedef protocol_binary_request_set protocol_binary_request_replace;
+
+    /**
+     * Definition of the packet returned by set, add and replace
+     * See section 4
+     */
+    typedef protocol_binary_response_no_extras protocol_binary_response_set;
+    typedef protocol_binary_response_no_extras protocol_binary_response_add;
+    typedef protocol_binary_response_no_extras protocol_binary_response_replace;
+
+    /**
+     * Definition of the noop packet
+     * See section 4
+     */
+    typedef protocol_binary_request_no_extras protocol_binary_request_noop;
+
+    /**
+     * Definition of the packet returned by the noop command
+     * See section 4
+     */
+    typedef protocol_binary_response_no_extras protocol_binary_response_noop;
 
     /**
      * Definition of the structure used by the increment and decrement
@@ -452,6 +715,38 @@ extern "C"
     typedef protocol_binary_response_no_extras protocol_binary_response_incr;
     typedef protocol_binary_response_no_extras protocol_binary_response_decr;
 
+    /**
+     * Definition of the quit
+     * See section 4
+     */
+    typedef protocol_binary_request_no_extras protocol_binary_request_quit;
+
+    /**
+     * Definition of the packet returned by the quit command
+     * See section 4
+     */
+    typedef protocol_binary_response_no_extras protocol_binary_response_quit;
+
+    /**
+     * Definition of the packet used by append and prepend command
+     * See section 4
+     */
+    typedef protocol_binary_request_no_extras protocol_binary_request_append;
+    typedef protocol_binary_request_no_extras protocol_binary_request_prepend;
+
+    /**
+     * Definition of the packet returned from a successful append or prepend
+     * See section 4
+     */
+    typedef protocol_binary_response_no_extras protocol_binary_response_append;
+    typedef protocol_binary_response_no_extras protocol_binary_response_prepend;
+
+    /**
+     * Definition of the packet used by the version command
+     * See section 4
+     */
+    typedef protocol_binary_request_no_extras protocol_binary_request_version;
+
     /**
      * Definition of the packet returned from a successful version command
      * See section 4
@@ -520,6 +815,13 @@ extern "C"
         uint8_t bytes[sizeof(protocol_binary_request_header) + 4];
     } protocol_binary_request_gat;
 
+    typedef protocol_binary_request_gat protocol_binary_request_gatq;
+
+    /**
+     * Definition of the packet returned from the GAT(Q)
+     */
+    typedef protocol_binary_response_get protocol_binary_response_gat;
+    typedef protocol_binary_response_get protocol_binary_response_gatq;
 
     /**
      * Definition of the packet used by SUBDOCUMENT single-path commands.
@@ -661,6 +963,269 @@ extern "C"
         uint8_t bytes[sizeof(protocol_binary_response_header)];
     } protocol_binary_response_subdoc_multi_mutation;
 
+
+    /**
+     * Definition of a request for a range operation.
+     * See http://code.google.com/p/memcached/wiki/RangeOps
+     *
+     * These types are used for range operations and exist within
+     * this header for use in other projects.  Range operations are
+     * not expected to be implemented in the memcached server itself.
+     */
+    typedef union {
+        struct {
+            protocol_binary_response_header header;
+            struct {
+                uint16_t size;
+                uint8_t  reserved;
+                uint8_t  flags;
+                uint32_t max_results;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 4];
+    } protocol_binary_request_rangeop;
+
+    typedef protocol_binary_request_rangeop protocol_binary_request_rget;
+    typedef protocol_binary_request_rangeop protocol_binary_request_rset;
+    typedef protocol_binary_request_rangeop protocol_binary_request_rsetq;
+    typedef protocol_binary_request_rangeop protocol_binary_request_rappend;
+    typedef protocol_binary_request_rangeop protocol_binary_request_rappendq;
+    typedef protocol_binary_request_rangeop protocol_binary_request_rprepend;
+    typedef protocol_binary_request_rangeop protocol_binary_request_rprependq;
+    typedef protocol_binary_request_rangeop protocol_binary_request_rdelete;
+    typedef protocol_binary_request_rangeop protocol_binary_request_rdeleteq;
+    typedef protocol_binary_request_rangeop protocol_binary_request_rincr;
+    typedef protocol_binary_request_rangeop protocol_binary_request_rincrq;
+    typedef protocol_binary_request_rangeop protocol_binary_request_rdecr;
+    typedef protocol_binary_request_rangeop protocol_binary_request_rdecrq;
+
+
+    /**
+     * Definition of tap commands
+     * See To be written
+     *
+     */
+
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                /**
+                 * flags is a bitmask used to set properties for the
+                 * the connection. Please In order to be forward compatible
+                 * you should set all undefined bits to 0.
+                 *
+                 * If the bit require extra userdata, it will be stored
+                 * in the user-data field of the body (passed to the engine
+                 * as enginespeciffic). That means that when you parse the
+                 * flags and the engine-specific data, you have to work your
+                 * way from bit 0 and upwards to find the correct offset for
+                 * the data.
+                 *
+                 */
+                uint32_t flags;
+
+                /**
+                 * Backfill age
+                 *
+                 * By using this flag you can limit the amount of data being
+                 * transmitted. If you don't specify a backfill age, the
+                 * server will transmit everything it contains.
+                 *
+                 * The first 8 bytes in the engine specific data contains
+                 * the oldest entry (from epoc) you're interested in.
+                 * Specifying a time in the future (for the server you are
+                 * connecting to), will cause it to start streaming current
+                 * changes.
+                 */
+#define TAP_CONNECT_FLAG_BACKFILL 0x01
+                /**
+                 * Dump will cause the server to send the data stored on the
+                 * server, but disconnect when the keys stored in the server
+                 * are transmitted.
+                 */
+#define TAP_CONNECT_FLAG_DUMP 0x02
+                /**
+                 * The body contains a list of 16 bits words in network byte
+                 * order specifying the vbucket ids to monitor. The first 16
+                 * bit word contains the number of buckets. The number of 0
+                 * means "all buckets"
+                 */
+#define TAP_CONNECT_FLAG_LIST_VBUCKETS 0x04
+                /**
+                 * The responsibility of the vbuckets is to be transferred
+                 * over to the caller when all items are transferred.
+                 */
+#define TAP_CONNECT_FLAG_TAKEOVER_VBUCKETS 0x08
+                /**
+                 * The tap consumer supports ack'ing of tap messages
+                 */
+#define TAP_CONNECT_SUPPORT_ACK 0x10
+                /**
+                 * The tap consumer would prefer to just get the keys
+                 * back. If the engine supports this it will set
+                 * the TAP_FLAG_NO_VALUE flag in each of the
+                 * tap packets returned.
+                 */
+#define TAP_CONNECT_REQUEST_KEYS_ONLY 0x20
+                /**
+                 * The body contains a list of (vbucket_id, last_checkpoint_id)
+                 * pairs. This provides the checkpoint support in TAP streams.
+                 * The last checkpoint id represents the last checkpoint that
+                 * was successfully persisted.
+                 */
+#define TAP_CONNECT_CHECKPOINT 0x40
+                /**
+                 * The tap consumer is a registered tap client, which means that
+                 * the tap server will maintain its checkpoint cursor permanently.
+                 */
+#define TAP_CONNECT_REGISTERED_CLIENT 0x80
+
+                /**
+                 * The initial TAP implementation convert flags to/from network
+                 * byte order, but the values isn't stored in host local order
+                 * causing them to change if you mix platforms..
+                 */
+#define TAP_CONNECT_TAP_FIX_FLAG_BYTEORDER 0x100
+
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 4];
+    } protocol_binary_request_tap_connect;
+
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                struct {
+                    uint16_t enginespecific_length;
+                    /*
+                     * The flag section support the following flags
+                     */
+                    /**
+                     * Request that the consumer send a response packet
+                     * for this packet. The opaque field must be preserved
+                     * in the response.
+                     */
+#define TAP_FLAG_ACK 0x01
+                    /**
+                     * The value for the key is not included in the packet
+                     */
+#define TAP_FLAG_NO_VALUE 0x02
+                    /**
+                     * The flags are in network byte order
+                     */
+#define TAP_FLAG_NETWORK_BYTE_ORDER 0x04
+
+                    uint16_t flags;
+                    uint8_t  ttl;
+                    uint8_t  res1;
+                    uint8_t  res2;
+                    uint8_t  res3;
+                } tap;
+                struct {
+                    uint32_t flags;
+                    uint32_t expiration;
+                } item;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 16];
+    } protocol_binary_request_tap_mutation;
+
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                struct {
+                    uint16_t enginespecific_length;
+                    /**
+                     * See the definition of the flags for
+                     * protocol_binary_request_tap_mutation for a description
+                     * of the available flags.
+                     */
+                    uint16_t flags;
+                    uint8_t  ttl;
+                    uint8_t  res1;
+                    uint8_t  res2;
+                    uint8_t  res3;
+                } tap;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 8];
+    } protocol_binary_request_tap_no_extras;
+
+    typedef protocol_binary_request_tap_no_extras protocol_binary_request_tap_delete;
+    typedef protocol_binary_request_tap_no_extras protocol_binary_request_tap_flush;
+
+/**
+ * TAP OPAQUE command list
+ */
+#define TAP_OPAQUE_ENABLE_AUTO_NACK 0
+#define TAP_OPAQUE_INITIAL_VBUCKET_STREAM 1
+#define TAP_OPAQUE_ENABLE_CHECKPOINT_SYNC 2
+#define TAP_OPAQUE_OPEN_CHECKPOINT 3
+#define TAP_OPAQUE_COMPLETE_VB_FILTER_CHANGE 4
+#define TAP_OPAQUE_CLOSE_TAP_STREAM 7
+#define TAP_OPAQUE_CLOSE_BACKFILL 8
+
+    typedef protocol_binary_request_tap_no_extras protocol_binary_request_tap_opaque;
+    typedef protocol_binary_request_tap_no_extras protocol_binary_request_tap_vbucket_set;
+
+
+    /**
+     * Definition of the packet used by the scrub.
+     */
+    typedef protocol_binary_request_no_extras protocol_binary_request_scrub;
+
+    /**
+     * Definition of the packet returned from scrub.
+     */
+    typedef protocol_binary_response_no_extras protocol_binary_response_scrub;
+
+
+    /**
+     * Definition of the packet used by set vbucket
+     */
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                vbucket_state_t state;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + sizeof(vbucket_state_t)];
+    } protocol_binary_request_set_vbucket;
+    /**
+     * Definition of the packet returned from set vbucket
+     */
+    typedef protocol_binary_response_no_extras protocol_binary_response_set_vbucket;
+    /**
+     * Definition of the packet used by del vbucket
+     */
+    typedef protocol_binary_request_no_extras protocol_binary_request_del_vbucket;
+    /**
+     * Definition of the packet returned from del vbucket
+     */
+    typedef protocol_binary_response_no_extras protocol_binary_response_del_vbucket;
+
+    /**
+     * Definition of the packet used by get vbucket
+     */
+    typedef protocol_binary_request_no_extras protocol_binary_request_get_vbucket;
+
+    /**
+     * Definition of the packet returned from get vbucket
+     */
+    typedef union {
+        struct {
+            protocol_binary_response_header header;
+            struct {
+                vbucket_state_t state;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_response_header) + sizeof(vbucket_state_t)];
+    } protocol_binary_response_get_vbucket;
+
     /**
      * Definition of hello's features.
      */
@@ -669,24 +1234,18 @@ extern "C"
         PROTOCOL_BINARY_FEATURE_TLS = 0x2,
         PROTOCOL_BINARY_FEATURE_TCPNODELAY = 0x03,
         PROTOCOL_BINARY_FEATURE_MUTATION_SEQNO = 0x04,
-        PROTOCOL_BINARY_FEATURE_TCPDELAY = 0x05,
-        PROTOCOL_BINARY_FEATURE_XATTR = 0x06,
-        PROTOCOL_BINARY_FEATURE_XERROR = 0x07,
-        PROTOCOL_BINARY_FEATURE_SELECT_BUCKET = 0x08
+        PROTOCOL_BINARY_FEATURE_TCPDELAY = 0x05
     } protocol_binary_hello_features;
 
     #define MEMCACHED_FIRST_HELLO_FEATURE 0x01
-    #define MEMCACHED_TOTAL_HELLO_FEATURES 10
+    #define MEMCACHED_TOTAL_HELLO_FEATURES 0x05
 
 #define protocol_feature_2_text(a) \
     (a == PROTOCOL_BINARY_FEATURE_DATATYPE) ? "Datatype" : \
     (a == PROTOCOL_BINARY_FEATURE_TLS) ? "TLS" : \
     (a == PROTOCOL_BINARY_FEATURE_TCPNODELAY) ? "TCP NODELAY" : \
     (a == PROTOCOL_BINARY_FEATURE_MUTATION_SEQNO) ? "Mutation seqno" : \
-    (a == PROTOCOL_BINARY_FEATURE_TCPDELAY) ? "TCP DELAY" : \
-    (a == PROTOCOL_BINARY_FEATURE_XATTR) ? "XATTR" : \
-    (a == PROTOCOL_BINARY_FEATURE_XERROR) ? "Error Map": \
-    (a == PROTOCOL_BINARY_FEATURE_SELECT_BUCKET) ? "Select Bucket": "Unknown"
+    (a == PROTOCOL_BINARY_FEATURE_TCPDELAY) ? "TCP DELAY" : "Unknown"
 
     /**
      * The HELLO command is used by the client and the server to agree
@@ -723,21 +1282,518 @@ extern "C"
      */
     typedef protocol_binary_response_no_extras protocol_binary_response_hello;
 
+    /**
+     * The SET_CTRL_TOKEN command will be used by ns_server and ns_server alone
+     * to set the session cas token in memcached which will be used to
+     * recognize the particular instance on ns_server. The previous token will
+     * be passed in the cas section of the request header for the CAS operation,
+     * and the new token will be part of ext (8B).
+     *
+     * The response to this request will include the cas as it were set,
+     * and a SUCCESS as status, or a KEY_EEXISTS with the existing token in
+     * memcached if the CAS operation were to fail.
+     */
+
+    /**
+     * Definition of the request packet for SET_CTRL_TOKEN.
+     * Body: new session_cas_token of uint64_t type.
+     */
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                uint64_t new_cas;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 8];
+    } protocol_binary_request_set_ctrl_token;
+
+    /**
+     * Definition of the response packet for SET_CTRL_TOKEN
+     */
+    typedef protocol_binary_response_no_extras protocol_binary_response_set_ctrl_token;
+
+    /**
+     * The GET_CTRL_TOKEN command will be used by ns_server to fetch the current
+     * session cas token held in memcached.
+     *
+     * The response to this request will include the token currently held in
+     * memcached in the cas field of the header.
+     */
+
+    /**
+     * Definition of the request packet for GET_CTRL_TOKEN.
+     */
+    typedef protocol_binary_request_no_extras protocol_binary_request_get_ctrl_token;
+
+
+    /**
+     * Definition of the response packet for GET_CTRL_TOKEN
+     */
+    typedef protocol_binary_response_no_extras protocol_binary_response_get_ctrl_token;
+
+    /* DCP related stuff */
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                uint32_t seqno;
+                /*
+                 * The following flags are defined
+                 */
+#define DCP_OPEN_PRODUCER 1
+#define DCP_OPEN_NOTIFIER 2
+                uint32_t flags;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 8];
+    } protocol_binary_request_dcp_open;
+
+    typedef protocol_binary_response_no_extras protocol_binary_response_dcp_open;
+
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                /*
+                 * The following flags are defined
+                 */
+#define DCP_ADD_STREAM_FLAG_TAKEOVER 1
+#define DCP_ADD_STREAM_FLAG_DISKONLY 2
+#define DCP_ADD_STREAM_FLAG_LATEST   4
+                uint32_t flags;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 4];
+    } protocol_binary_request_dcp_add_stream;
+
+    typedef union {
+        struct {
+            protocol_binary_response_header header;
+            struct {
+                uint32_t opaque;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_response_header) + 4];
+    } protocol_binary_response_dcp_add_stream;
+
+    typedef protocol_binary_request_no_extras protocol_binary_request_dcp_close_stream;
+    typedef protocol_binary_response_no_extras protocol_binary_response_dcp_close_stream;
+
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                uint32_t flags;
+                uint32_t reserved;
+                uint64_t start_seqno;
+                uint64_t end_seqno;
+                uint64_t vbucket_uuid;
+                uint64_t snap_start_seqno;
+                uint64_t snap_end_seqno;
+            } body;
+            /* Group ID is specified in the key */
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 48];
+    } protocol_binary_request_dcp_stream_req;
+
+    typedef union {
+        struct {
+            protocol_binary_response_header header;
+        } message;
+        /*
+        ** In case of PROTOCOL_BINARY_RESPONSE_ROLLBACK the body contains
+        ** the rollback sequence number (uint64_t)
+        */
+        uint8_t bytes[sizeof(protocol_binary_request_header)];
+    } protocol_binary_response_dcp_stream_req;
+
+    typedef protocol_binary_request_no_extras protocol_binary_request_dcp_get_failover_log;
+
+    /* The body of the message contains UUID/SEQNO pairs */
+    typedef protocol_binary_response_no_extras protocol_binary_response_dcp_get_failover_log;
+
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                /**
+                 * All flags set to 0 == OK,
+                 * 1: state changed
+                 */
+                uint32_t flags;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 4];
+    } protocol_binary_request_dcp_stream_end;
+    typedef protocol_binary_response_no_extras protocol_binary_response_dcp_stream_end;
+
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                uint64_t start_seqno;
+                uint64_t end_seqno;
+                uint32_t flags;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 20];
+    } protocol_binary_request_dcp_snapshot_marker;
+
+    typedef protocol_binary_response_no_extras protocol_binary_response_dcp_snapshot_marker;
+
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                uint64_t by_seqno;
+                uint64_t rev_seqno;
+                uint32_t flags;
+                uint32_t expiration;
+                uint32_t lock_time;
+                uint16_t nmeta;
+                uint8_t nru;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 31];
+    } protocol_binary_request_dcp_mutation;
+
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                uint64_t by_seqno;
+                uint64_t rev_seqno;
+                uint16_t nmeta;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 18];
+    } protocol_binary_request_dcp_deletion;
+
+    typedef protocol_binary_request_dcp_deletion protocol_binary_request_dcp_expiration;
+    typedef protocol_binary_request_no_extras protocol_binary_request_dcp_flush;
+
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                /**
+                 * 0x01 - Active
+                 * 0x02 - Replica
+                 * 0x03 - Pending
+                 * 0x04 - Dead
+                 */
+                uint8_t state;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 1];
+    } protocol_binary_request_dcp_set_vbucket_state;
+    typedef protocol_binary_response_no_extras protocol_binary_response_dcp_set_vbucket_state;
+
+    typedef protocol_binary_request_no_extras protocol_binary_request_dcp_noop;
+    typedef protocol_binary_response_no_extras protocol_binary_response_dcp_noop;
+
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                uint32_t buffer_bytes;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 4];
+    } protocol_binary_request_dcp_buffer_acknowledgement;
+    typedef protocol_binary_response_no_extras protocol_binary_response_dcp_buffer_acknowledgement;
+
+    typedef protocol_binary_request_no_extras protocol_binary_request_dcp_control;
+    typedef protocol_binary_response_no_extras protocol_binary_response_dcp_control;
+
+
+    /**
+     * IOCTL_GET command message to get/set control parameters.
+     */
+    typedef protocol_binary_request_no_extras protocol_binary_request_ioctl_get;
+    typedef protocol_binary_request_no_extras protocol_binary_request_ioctl_set;
+
+    typedef protocol_binary_request_no_extras protocol_binary_request_config_validate;
+    typedef protocol_binary_request_no_extras protocol_binary_request_config_reload;
+
+    typedef protocol_binary_request_no_extras protocol_binary_request_ssl_refresh;
+    typedef protocol_binary_response_no_extras protocol_binary_response_ssl_refresh;
+
+    /**
+     * Request command timings for a bucket from memcached. Privileged
+     * connections may specify the name of the bucket in the "key" field,
+     * or the aggregated timings for the entire server by using the
+     * special name <code>/all/</code>.
+     *
+     * The returned payload is a json document of the following format:
+     *    { "us" : [ x, x, x, x, ... ],
+     *      "ms" : [ y, y, y, ...],
+     *      "500ms" : [ z, z, z, ...],
+     *      "wayout" : nnn
+     *    }
+     */
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                uint8_t opcode;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 1];
+    } protocol_binary_request_get_cmd_timer;
+
+    typedef protocol_binary_response_no_extras protocol_binary_response_get_cmd_timer;
+
+    typedef protocol_binary_request_no_extras protocol_binary_request_create_bucket;
+    typedef protocol_binary_request_no_extras protocol_binary_request_delete_bucket;
+    typedef protocol_binary_request_no_extras protocol_binary_request_list_buckets;
+    typedef protocol_binary_request_no_extras protocol_binary_request_select_bucket;
+    typedef protocol_binary_request_no_extras protocol_binary_request_assume_role;
+
+    /*
+     * Parameter types of CMD_SET_PARAM command.
+     */
+    typedef enum {
+        protocol_binary_engine_param_flush = 1,  /* flusher-related param type */
+        protocol_binary_engine_param_tap,        /* tap-related param type */
+        protocol_binary_engine_param_checkpoint  /* checkpoint-related param type */
+    } protocol_binary_engine_param_t;
+
+    /**
+     * CMD_SET_PARAM command message to set engine parameters.
+     * flush, tap, and checkpoint parameter types are currently supported.
+     */
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                protocol_binary_engine_param_t param_type;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + sizeof(protocol_binary_engine_param_t)];
+    } protocol_binary_request_set_param;
+
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                uint32_t size;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 4];
+    } protocol_binary_request_set_batch_count;
+
+
+    /**
+     * This flag is used by the setWithMeta/addWithMeta/deleteWithMeta packets
+     * to specify that the conflict resolution mechanism should be skipped for
+     * this operation.
+     */
+#define SKIP_CONFLICT_RESOLUTION_FLAG 0x01
+
+#define SET_RET_META 1
+#define ADD_RET_META 2
+#define DEL_RET_META 3
+
+/**
+ * This flag is used with the get meta response packet. If set it
+ * specifies that the item recieved has been deleted, but that the
+ * items meta data is still contained in ep-engine. Eg. the item
+ * has been soft deleted.
+ */
+#define GET_META_ITEM_DELETED_FLAG 0x01
+
+
+    /**
+     * The physical layout for the CMD_SET_WITH_META looks like the the normal
+     * set request with the addition of a bulk of extra meta data stored
+     * at the <b>end</b> of the package.
+     */
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                uint32_t flags;
+                uint32_t expiration;
+                uint64_t seqno;
+                uint64_t cas;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 24];
+    } protocol_binary_request_set_with_meta;
+
+    /**
+     * The message format for delete with meta
+     */
+    typedef protocol_binary_request_set_with_meta protocol_binary_request_delete_with_meta;
+
     /**
      * The message format for getLocked engine API
      */
     typedef protocol_binary_request_gat protocol_binary_request_getl;
 
+    /**
+     * The physical layout for a CMD_GET_META command returns the meta-data
+     * section for an item:
+     */
+    typedef protocol_binary_request_no_extras protocol_binary_request_get_meta;
+
+    /**
+     * The response for CMD_SET_WITH_META does not carry any user-data and the
+     * status of the operation is signalled in the status bits.
+     */
+    typedef protocol_binary_response_no_extras protocol_binary_response_set_with_meta;
+
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                uint64_t file_version;
+                uint64_t header_offset;
+                uint32_t vbucket_state_updated;
+                uint32_t state;
+                uint64_t checkpoint;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 32];
+    } protocol_binary_request_notify_vbucket_update;
+    typedef protocol_binary_response_no_extras protocol_binary_response_notify_vbucket_update;
+
+    /**
+     * The physical layout for the CMD_RETURN_META
+     */
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                uint32_t mutation_type;
+                uint32_t flags;
+                uint32_t expiration;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 12];
+    } protocol_binary_request_return_meta;
+
+
+    /**
+     * Message format for CMD_INIT_COMPLETE
+     */
+    typedef protocol_binary_request_no_extras protocol_binary_request_init_complete;
+    typedef protocol_binary_response_no_extras protocol_binary_response_init_complete;
+
+    /**
+     * Message format for CMD_SET_CONFIG
+     */
+    typedef protocol_binary_request_no_extras protocol_binary_request_set_cluster_config;
+
     /**
      * Message format for CMD_GET_CONFIG
      */
     typedef protocol_binary_request_no_extras protocol_binary_request_get_cluster_config;
 
+    /**
+     * Message format for CMD_GET_ADJUSTED_TIME
+     *
+     * The PROTOCOL_BINARY_CMD_GET_ADJUSTED_TIME command will be
+     * used by XDCR to retrieve the vbucket's latest adjusted_time
+     * which is calculated based on the driftCounter if timeSync
+     * has been enabled.
+     *
+     * Request:-
+     *
+     * Header: Contains a vbucket id.
+     *
+     * Response:-
+     *
+     * The response will contain the adjusted_time (type: int64_t)
+     * as part of the body if in case of a SUCCESS, or else a NOTSUP
+     * in case of timeSync not being enabled.
+     *
+     * The request packet's header will contain the vbucket_id.
+     */
+    typedef protocol_binary_request_no_extras protocol_binary_request_get_adjusted_time;
+
+    /**
+     * Message format for CMD_SET_DRIFT_COUNTER_STATE
+     *
+     * The PROTOCOL_BINARY_CMD_SET_DRIFT_COUNTER_STATE command will be
+     * used by GO-XDCR to set the initial drift counter and enable/disable
+     * the time synchronization for the vbucket.
+     *
+     * Request:-
+     *
+     * Header: Contains a vbucket id.
+     * Extras: Contains the initial drift value which is of type int64_t and
+     * the time sync state (0x00 for disable, 0x01 for enable),
+     *
+     * Response:-
+     *
+     * The response will return a SUCCESS after saving the settings and
+     * a NOT_MY_VBUCKET (along with cluster config) if the vbucket isn't
+     * found.
+     */
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                int64_t initial_drift;
+                uint8_t time_sync;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 9];
+    } protocol_binary_request_set_drift_counter_state;
+
+    /**
+     * The physical layout for the CMD_COMPACT_DB
+     */
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                uint64_t purge_before_ts;
+                uint64_t purge_before_seq;
+                uint8_t  drop_deletes;
+                uint8_t  align_pad1;
+                uint16_t align_pad2;
+                uint32_t align_pad3;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 24];
+    } protocol_binary_request_compact_db;
+
+    typedef protocol_binary_request_get protocol_binary_request_get_random;
+
 #define OBS_STATE_NOT_PERSISTED 0x00
 #define OBS_STATE_PERSISTED     0x01
 #define OBS_STATE_NOT_FOUND     0x80
 #define OBS_STATE_LOGICAL_DEL   0x81
 
+    /**
+     * The physical layout for the PROTOCOL_BINARY_CMD_AUDIT_PUT
+     */
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                uint32_t id;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) + 4];
+    } protocol_binary_request_audit_put;
+
+    typedef protocol_binary_response_no_extras protocol_binary_response_audit_put;
+
+    /**
+     * The shutdown message is sent from ns_server to memcached to tell
+     * memcached to initiate a clean shutdown. This is a privileged
+     * command and carries no payload, but the CAS field needs to be
+     * set to the current session token (see GET/SET_CTRL_TOKEN)
+     */
+    typedef protocol_binary_request_no_extras protocol_binary_request_shutdown;
+    typedef protocol_binary_response_no_extras protocol_binary_response_shutdown;
+
+
     /**
      * The PROTOCOL_BINARY_CMD_OBSERVE_SEQNO command is used by the
      * client to retrieve information about the vbucket in order to
@@ -805,6 +1861,52 @@ extern "C"
      */
     typedef protocol_binary_response_no_extras protocol_binary_response_observe_seqno;
 
+    /**
+     * Definition of the request packet for the command
+     * PROTOCOL_BINARY_CMD_GET_ALL_VB_SEQNOS
+     *
+     * Header: Only opcode field is used.
+     *
+     * Body: Contains the vbucket state for which the vb sequence numbers are
+     *       requested.
+     *       Please note that this field is optional, header.request.extlen is
+     *       checked to see if it is present. If not present, it implies request
+     *       is for all vbucket states.
+     */
+    typedef union {
+        struct {
+            protocol_binary_request_header header;
+            struct {
+                vbucket_state_t state;
+            } body;
+        } message;
+        uint8_t bytes[sizeof(protocol_binary_request_header) +
+                      sizeof(vbucket_state_t)];
+    } protocol_binary_request_get_all_vb_seqnos;
+
+    /**
+     * Definition of the payload in the PROTOCOL_BINARY_CMD_GET_ALL_VB_SEQNOS
+     * response.
+     *
+     * The body contains a "list" of "vbucket id - seqno pairs" for all
+     * active and replica buckets on the node in network byte order.
+     *
+     *
+     *    Byte/     0       |       1       |       2       |       3       |
+     *       /              |               |               |               |
+     *      |0 1 2 3 4 5 6 7|0 1 2 3 4 5 6 7|0 1 2 3 4 5 6 7|0 1 2 3 4 5 6 7|
+     *      +---------------+---------------+---------------+---------------+
+     *     0| VBID          | VBID          | SEQNO         | SEQNO         |
+     *      +---------------+---------------+---------------+---------------+
+     *     4| SEQNO         | SEQNO         | SEQNO         | SEQNO         |
+     *      +---------------+---------------+---------------+---------------+
+     *     4| SEQNO         | SEQNO         |
+     *      +---------------+---------------+
+     */
+    typedef protocol_binary_response_no_extras protocol_binary_response_get_all_vb_seqnos;
+
+
+
     /**
      * @}
      */