Check in WL #6218 Support multiple table access through InnoDB Memcached

rb://1048 approved by Sunny Bains

Author: Jimmy Yang

plugin/innodb_memcached/daemon_memcached/daemon/memcached.c

@@ -4413,6 +4413,52 @@ static char *process_delete_command(conn *c, token_t *tokens,
     return NULL;
 }
 
+static char *process_bind_command(conn *c, token_t *tokens,
+                                  const size_t ntokens) {
+    char *name;
+    size_t name_len;
+
+    assert(c != NULL);
+
+    if (ntokens > 3) {
+        out_string(c, "CLIENT_ERROR bad command line format.  "
+                      "Usage: bind <table_id_name>");
+        return NULL;
+    }
+
+    name = tokens[KEY_TOKEN].value;
+    name_len = tokens[KEY_TOKEN].length;
+
+    if (name_len > KEY_MAX_LENGTH || name_len == 0) {
+        out_string(c, "CLIENT_ERROR bad command line format");
+        return NULL;
+    }
+
+    ENGINE_ERROR_CODE ret = c->aiostat;
+    c->aiostat = ENGINE_SUCCESS;
+    c->ewouldblock = false;
+    if (ret == ENGINE_SUCCESS) {
+        ret = settings.engine.v1->bind(settings.engine.v0, c,
+                                       name, name_len);
+    }
+
+    /* For some reason the SLAB_INCR tries to access this... */
+    item_info info = { .nvalue = 1 };
+    switch (ret) {
+    case ENGINE_SUCCESS:
+        out_string(c, "SUCCEED");
+        break;
+    case ENGINE_EWOULDBLOCK:
+        c->ewouldblock = true;
+        return name;
+    case ENGINE_TMPFAIL:
+    default:
+        out_string(c, "NOT_FOUND");
+    }
+
+    return NULL;
+}
+
 static void process_verbosity_command(conn *c, token_t *tokens, const size_t ntokens) {
     unsigned int level;
 
@@ -4508,6 +4554,10 @@ static char* process_command(conn *c, char *command) {
 
         ret = process_delete_command(c, tokens, ntokens);
 
+    } else if (ntokens == 3 && (strcmp(tokens[COMMAND_TOKEN].value, "bind") == 0)) {
+
+        ret = process_bind_command(c, tokens, ntokens);
+
     } else if (ntokens >= 2 && (strcmp(tokens[COMMAND_TOKEN].value, "stats") == 0)) {
 
         ret = process_stat(c, tokens, ntokens);

plugin/innodb_memcached/daemon_memcached/include/memcached/engine.h

@@ -288,6 +288,10 @@ extern "C" {
                                     uint64_t cas,
                                     uint16_t vbucket);
 
+        ENGINE_ERROR_CODE (*bind)(ENGINE_HANDLE* handle,
+                                    const void* cookie,
+                                    const void* name,
+                                    const size_t name_len);
         /**
          * Indicate that a caller who received an item no longer needs
          * it.

plugin/innodb_memcached/innodb_memcache/CMakeLists.txt

@@ -39,6 +39,7 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_SHARED_LIBRARY_C_FLAGS} -std=gnu99")
 
 SET(INNODB_ENGINE_SOURCES
 		src/innodb_config.c
+		src/innodb_utility.c
 		src/hash_item_util.c
 		src/innodb_engine.c
 		src/innodb_api.c

plugin/innodb_memcached/innodb_memcache/include/innodb_api.h

@@ -80,13 +80,14 @@ column values. And "extra_col_value" and "n_extra_col" is used to support
 multiple value columns */
 typedef struct mci_item {
 	mci_column_t	col_value[MCI_COL_TO_GET]; /*!< columns in a row */
-	mci_column_t*	extra_col_value;		/*!< whether there will be
+	mci_column_t*	extra_col_value;	/*!< whether there will be
 						additional/multiple "values"
 						to be stored */
 	int		n_extra_col;		/*!< number of additional
 						"value" columns */
 } mci_item_t;
 
+
 /*************************************************************//**
 Register InnoDB Callback functions */
 void
@@ -116,7 +117,6 @@ Position a row accord to key, and fetch value if needed
 ib_err_t
 innodb_api_search(
 /*==============*/
-	innodb_engine_t*	engine,	/*!< in: InnoDB Memcached engine */
 	innodb_conn_data_t*	cursor_data,/*!< in/out: cursor info */
 	ib_crsr_t*		crsr,	/*!< in/out: cursor used to seacrh */
 	const char*		key,	/*!< in: key to search */

plugin/innodb_memcached/innodb_memcache/include/innodb_cb_api.h

@@ -283,6 +283,13 @@ char*
 	ib_crsr_t	ib_crsr,
 	ib_ulint_t	i);
 
+typedef
+char*
+(*cb_get_idx_field_name)(
+/*=====================*/
+	ib_crsr_t	ib_crsr,
+	ib_ulint_t	i);
+
 typedef
 ib_err_t
 (*cb_table_truncate_t)(
@@ -296,6 +303,12 @@ ib_err_t
 /*=================*/
         ib_crsr_t       ib_crsr);
 
+typedef
+ib_err_t
+(*cb_cursor_next_t)(
+/*================*/
+        ib_crsr_t       ib_crsr);
+
 typedef
 ib_err_t
 (*cb_cursor_last_t)(
@@ -389,8 +402,10 @@ cb_cursor_new_trx_t		ib_cb_cursor_new_trx;
 cb_open_table_by_name_t		ib_cb_open_table_by_name;
 cb_cursor_reset_t		ib_cb_cursor_reset;
 cb_col_get_name_t		ib_cb_col_get_name;
+cb_get_idx_field_name		ib_cb_get_idx_field_name;
 cb_table_truncate_t		ib_cb_table_truncate;
 cb_cursor_first_t		ib_cb_cursor_first;
+cb_cursor_next_t		ib_cb_cursor_next;
 cb_cursor_last_t		ib_cb_cursor_last;
 cb_cursor_open_index_using_name_t	ib_cb_cursor_open_index_using_name;
 cb_close_thd_t			ib_cb_close_thd;

plugin/innodb_memcached/innodb_memcache/include/innodb_config.h

@@ -26,7 +26,9 @@ Created 03/15/2011      Jimmy Yang
 #define innodb_config_h
 
 #include "api0api.h"
+#include "innodb_utility.h"
 
+typedef void*   hash_node_t;
 
 /* Database name and table name for our metadata "system" tables for
 InnoDB memcache. The table names are the same as those for the
@@ -52,7 +54,7 @@ There are 3 "system tables":
 /** structure describes each column's basic info (name, field_id etc.) */
 typedef struct meta_column {
 	char*		col_name;		/*!< column name */
-	int		col_name_len;		/*!< column name length */
+	size_t		col_name_len;		/*!< column name length */
 	int		field_id;		/*!< column field id in
 						the table */
 	ib_col_meta_t	col_meta;		/*!< column  meta info */
@@ -138,6 +140,66 @@ typedef enum meta_cache_opt {
 	META_CACHE_NUM_OPT		/*!< Number of options */
 } meta_cache_opt_t;
 
+/** The "names" in the "config_option" table to identify possible
+config options. Both are optional.
+"COLUMN_SEPARATOR" is the delimiter that separates multiple columns and
+"TABLE_MAP_SEPARATOR" is the delimiter that separates table map name
+and key value */
+#define COLUMN_SEPARATOR        "separator"
+#define TABLE_MAP_SEPARATOR     "table_map_delimiter"
+
+/* list of configure options we support */
+typedef enum option_id {
+	OPTION_ID_COL_SEP,		/*!< ID for character(s) separating
+					multiple column mapping */
+	OPTION_ID_TBL_MAP_SEP,		/*!< ID for character(s) separating
+					table map name and key */
+	OPTION_ID_NUM_OPTIONS		/*!< number of options */
+} option_id_t;
+
+/** Maximum delimiter length */
+#define MAX_DELIMITER_LEN	32
+
+typedef struct option_value {
+	char		value[MAX_DELIMITER_LEN + 1];
+					/* option value */
+	int		value_len;	/* value length */
+} option_value_t;
+
+/** structure to define some default "config_option" option settings */
+typedef struct option {
+	option_id_t	id;		/*!< option id as in enum option_id */
+	const char*	name;		/*!< option name for above option ID,
+					currently they can be "COLUMN_SEPARATOR"
+					and "TABLE_MAP_SEPARATOR" */
+	option_value_t	default_value;	/*!< default value */
+} option_t;
+
+/** Configure options enum IDs, their "names" and their default value */
+static option_t	config_option_names[] =
+{
+        {OPTION_ID_COL_SEP, COLUMN_SEPARATOR, {"|", 1}},
+        {OPTION_ID_TBL_MAP_SEP, TABLE_MAP_SEPARATOR, {".", 1}}
+};
+
+/** Get configure option value. If the value is not configured by
+user, obtain its default value from "config_option_names"
+@param meta_info	metadata structure contains configure options
+@param option		option whose value to get
+@param val		value to fetch
+@param val_len		value length */
+#define GET_OPTION(meta_info, option, val, val_len)			\
+do {									\
+	val_len = meta_info->options[option].value_len;			\
+									\
+	if (val_len == 0) {						\
+		val = config_option_names[option].default_value.value;	\
+		val_len = config_option_names[option].default_value.value_len;\
+	} else {							\
+		val = meta_info->options[option].value;			\
+	}								\
+} while (0)
+
 /** In memory structure contains most necessary metadata info
 to configure an InnoDB Memcached engine */
 typedef struct meta_cfg_info {
@@ -150,27 +212,34 @@ typedef struct meta_cfg_info {
 	bool		flag_enabled;		/*!< whether flag is enabled */
 	bool		cas_enabled;		/*!< whether cas is enabled */
 	bool		exp_enabled;		/*!< whether exp is enabled */
-	char*		separator;		/*!< separator that separates
-						incoming "value" string for
-						multiple columns */
-	int		sep_len;		/*!< separator length */
+	option_value_t	options[OPTION_ID_NUM_OPTIONS];
+						/*!< configure options, mostly
+						are configured delimiters */
 	meta_cache_opt_t set_option;		/*!< cache option for "set" */
 	meta_cache_opt_t get_option;		/*!< cache option for "get" */
 	meta_cache_opt_t del_option;		/*!< cache option for
 						"delete" */
 	meta_cache_opt_t flush_option;		/*!< cache option for
 						"delete" */
+	hash_node_t	name_hash;		/*!< name hash chain node */
 } meta_cfg_info_t;
 
+
 /**********************************************************************//**
 This function opens the default configuration table, and find the
 table and column info that used for InnoDB Memcached, and set up
-InnoDB Memcached's meta_cfg_info_t structure
-@return true if everything works out fine */
-bool
+InnoDB Memcached's meta_cfg_info_t structure. If the "name" parameter
+is not NULL, it will find the specified setting in the "container" table.
+If "name" field is NULL, it will then look for setting with the name of
+"default". Otherwise, it returns the setting corresponding to the
+first row of the configure table.
+@return meta_cfg_info_t* structure if configure option found, otherwise NULL */
+meta_cfg_info_t*
 innodb_config(
 /*==========*/
-	meta_cfg_info_t*	item);		/*!< out: meta info structure */
+	const char*		name,		/*!< in: config option name */
+	size_t			name_len,	/*!< in: option name length */
+	hash_table_t**		meta_hash);	/*!< in: engine hash table */
 
 /**********************************************************************//**
 This function verifies the table configuration information, and fills
@@ -189,4 +258,13 @@ innodb_config_free(
         meta_cfg_info_t*	item);		/*!< in/own: meta info
 						structure */
 
+/**********************************************************************//**
+This function opens the "containers" table, reads in all rows
+and instantiates the metadata hash table.
+@return the default configuration setting (whose mapping name is "default") */
+meta_cfg_info_t*
+innodb_config_meta_hash_init(
+/*=========================*/
+	hash_table_t*		meta_hash);	/*!< in/out: InnoDB Memcached
+						engine */
 #endif

plugin/innodb_memcached/innodb_memcache/include/innodb_engine.h

@@ -32,7 +32,7 @@ Created 03/15/2011      Jimmy Yang
 #include <memcached/engine.h>
 #include <memcached/util.h>
 #include <memcached/visibility.h>
-#include <innodb_list.h>
+#include <innodb_utility.h>
 #include <innodb_config.h>
 
 /** Default settings that determine the number of write operation for
@@ -68,6 +68,8 @@ struct innodb_conn_data_struct {
 					last commit */
 	void*		thd;		/*!< MySQL THD, used for binlog */
 	void*		mysql_tbl;	/*!< MySQL TABLE, used for binlog */
+	meta_cfg_info_t*conn_meta;	/*!< metadata info for this
+					connection */
 	UT_LIST_NODE_T(innodb_conn_data_t)
 			conn_list;	/*!< list ptr */
 };
@@ -112,7 +114,7 @@ typedef struct innodb_engine {
 	ib_trx_level_t		trx_level;	/*!< transaction isolation
 						level */
 	int			cfg_status;	/*!< configure status */
-	meta_cfg_info_t		meta_info;	/*!< metadata info from
+	meta_cfg_info_t*	meta_info;	/*!< default metadata info from
 						configuration */
 	conn_list_t		conn_data;	/*!< list of data specific for
 						connections */
@@ -126,6 +128,7 @@ typedef struct innodb_engine {
 						size */
 	uint64_t		write_batch_size;/*!< configured write batch
 						size */
+	hash_table_t*		meta_hash;	/*!< hash table for metadata */
 } innodb_engine_t;
 
 #endif /* INNODB_ENGINE_H */