Bug#18815992 REMOVE UNUSED CODE FROM THE INNODB/MEMCACHED API

Remove some unused function definitions and declarations.

Correct the return types of cb_trx_release_t, ib_cfg_trx_level and
cb_cfg_trx_level_t.

rb#5480 approved by Jimmy Yang

Author: Marko Mäkelä

plugin/innodb_memcached/innodb_memcache/include/innodb_cb_api.h

@@ -1,6 +1,6 @@
 /***********************************************************************
 
-Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -94,13 +94,6 @@ void
 /*=================*/
 	ib_tpl_t	ib_tpl);
 
-typedef
-ib_err_t
-(*cb_tuple_copy_t)(
-/*===============*/
-	ib_tpl_t	ib_dst_tpl,
-	const ib_tpl_t	ib_src_tpl);
-
 typedef
 ib_err_t
 (*cb_tuple_read_u8_t)(
@@ -133,38 +126,6 @@ ib_err_t
 	ib_ulint_t	i,
 	ib_u64_t*	ival) ;
 
-typedef
-ib_err_t
-(*cb_tuple_write_u8_t)(
-/*===================*/
-	ib_tpl_t	ib_tpl,
-	int		col_no,
-	ib_u8_t		val) ;
-
-typedef
-ib_err_t
-(*cb_tuple_write_u16_t)(
-/*====================*/
-	ib_tpl_t	ib_tpl,
-	int		col_no,
-	ib_u16_t	val) ;
-
-typedef
-ib_err_t
-(*cb_tuple_write_u32_t)(
-/*====================*/
-	ib_tpl_t	ib_tpl,
-	int		col_no,
-	ib_u32_t	val) ;
-
-typedef
-ib_err_t
-(*cb_tuple_write_u64_t)(
-/*====================*/
-	ib_tpl_t	ib_tpl,
-	int		col_no,
-	ib_u64_t	val);
-
 typedef
 ib_err_t
 (*cb_tuple_read_i8_t)(
@@ -197,38 +158,6 @@ ib_err_t
 	ib_ulint_t	i,
 	ib_i64_t*	ival);
 
-typedef
-ib_err_t
-(*cb_tuple_write_i8_t)(
-/*===================*/
-	ib_tpl_t	ib_tpl,
-	int		col_no,
-	ib_i8_t		val);
-
-typedef
-ib_err_t
-(*cb_tuple_write_i16_t)(
-/*====================*/
-	ib_tpl_t	ib_tpl,
-	int		col_no,
-	ib_i16_t	val);
-
-typedef
-ib_err_t
-(*cb_tuple_write_i32_t)(
-/*====================*/
-	ib_tpl_t	ib_tpl,
-	int		col_no,
-	ib_i32_t	val);
-
-typedef
-ib_err_t
-(*cb_tuple_write_i64_t)(
-/*====================*/
-	ib_tpl_t	ib_tpl,
-	int		col_no,
-	ib_i64_t	val);
-
 typedef
 ib_err_t
 (*cb_col_set_value_t)(
@@ -285,13 +214,7 @@ ib_err_t
 	void*		thd);
 
 typedef
-ib_trx_state_t
-(*cb_trx_state_t)(
-/*==============*/
-	ib_trx_t	ib_trx);
-
-typedef
-ib_trx_state_t
+ib_err_t
 (*cb_trx_release_t)(
 /*================*/
 	ib_trx_t	ib_trx);
@@ -329,12 +252,6 @@ ib_err_t
 /*=================*/
 	ib_crsr_t	ib_crsr);
 
-typedef
-void*
-(*cb_open_table_by_name_t)(
-/*=======================*/
-	const char*	name);
-
 typedef
 ib_err_t
 (*cb_cursor_new_trx_t)(
@@ -381,18 +298,6 @@ ib_err_t
 /*================*/
         ib_crsr_t       ib_crsr);
 
-typedef
-ib_err_t
-(*cb_cursor_last_t)(
-/*================*/
-        ib_crsr_t       ib_crsr);
-
-typedef
-void
-(*cb_cursor_clear_trx_t)(
-/*=====================*/
-        ib_crsr_t       ib_crsr);
-
 typedef
 ib_err_t
 (*cb_close_thd_t)(
@@ -435,7 +340,7 @@ ib_err_t
 	ib_trx_t	ib_trx);
 
 typedef
-int
+ib_trx_level_t
 (*cb_cfg_trx_level_t)();
 /*===================*/
 
@@ -478,45 +383,33 @@ cb_cursor_moveto_t		ib_cb_moveto;
 cb_sec_search_tuple_create_t	ib_cb_search_tuple_create;
 cb_sec_read_tuple_create_t	ib_cb_read_tuple_create;
 cb_tuple_delete_t		ib_cb_tuple_delete;
-cb_tuple_copy_t			ib_cb_tuple_copy;
 cb_tuple_read_u8_t		ib_cb_tuple_read_u8;
 cb_tuple_read_u16_t		ib_cb_tuple_read_u16;
 cb_tuple_read_u32_t		ib_cb_tuple_read_u32;
 cb_tuple_read_u64_t		ib_cb_tuple_read_u64;
-cb_tuple_write_u8_t		ib_cb_tuple_write_u8;
-cb_tuple_write_u16_t		ib_cb_tuple_write_u16;
-cb_tuple_write_u32_t		ib_cb_tuple_write_u32;
-cb_tuple_write_u64_t		ib_cb_tuple_write_u64;
 cb_tuple_read_i8_t		ib_cb_tuple_read_i8;
 cb_tuple_read_i16_t		ib_cb_tuple_read_i16;
 cb_tuple_read_i32_t		ib_cb_tuple_read_i32;
 cb_tuple_read_i64_t		ib_cb_tuple_read_i64;
-cb_tuple_write_i8_t		ib_cb_tuple_write_i8;
-cb_tuple_write_i16_t		ib_cb_tuple_write_i16;
-cb_tuple_write_i32_t		ib_cb_tuple_write_i32;
-cb_tuple_write_i64_t		ib_cb_tuple_write_i64;
 cb_col_set_value_t		ib_cb_col_set_value;
 cb_col_get_value_t		ib_cb_col_get_value;
 cb_col_get_meta_t		ib_cb_col_get_meta;
 cb_trx_begin_t			ib_cb_trx_begin;
 cb_trx_commit_t			ib_cb_trx_commit;
 cb_trx_rollback_t		ib_cb_trx_rollback;
 cb_trx_start_t			ib_cb_trx_start;
-cb_trx_state_t			ib_cb_trx_state;
 cb_trx_release_t		ib_cb_trx_release;
 cb_tuple_get_n_cols_t		ib_cb_tuple_get_n_cols;
 cb_cursor_set_match_mode_t	ib_cb_cursor_set_match_mode;
 cb_cursor_lock_t		ib_cb_cursor_lock;
 cb_cursor_close_t		ib_cb_cursor_close;
 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;
 cb_get_cfg_t			ib_cb_get_cfg;
@@ -526,7 +419,6 @@ cb_cursor_commit_trx_t		ib_cb_cursor_commit_trx;
 cb_cfg_trx_level_t		ib_cb_cfg_trx_level;
 cb_get_n_user_cols		ib_cb_get_n_user_cols;
 cb_cursor_set_lock_t		ib_cb_cursor_set_lock;
-cb_cursor_clear_trx_t		ib_cb_cursor_clear_trx;
 cb_trx_get_start_time		ib_cb_trx_get_start_time;
 cb_bk_commit_interval		ib_cb_cfg_bk_commit_interval;
 cb_ut_strerr			ib_cb_ut_strerr;

plugin/innodb_memcached/innodb_memcache/src/innodb_api.c

@@ -1,5 +1,5 @@
 /***********************************************************************
-Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -48,28 +48,18 @@ static ib_cb_t* innodb_memcached_api[] = {
 	(ib_cb_t*) &ib_cb_moveto,
 	(ib_cb_t*) &ib_cb_cursor_first,
 	(ib_cb_t*) &ib_cb_cursor_next,
-	(ib_cb_t*) &ib_cb_cursor_last,
 	(ib_cb_t*) &ib_cb_cursor_set_match_mode,
 	(ib_cb_t*) &ib_cb_search_tuple_create,
 	(ib_cb_t*) &ib_cb_read_tuple_create,
 	(ib_cb_t*) &ib_cb_tuple_delete,
-	(ib_cb_t*) &ib_cb_tuple_copy,
 	(ib_cb_t*) &ib_cb_tuple_read_u8,
-	(ib_cb_t*) &ib_cb_tuple_write_u8,
 	(ib_cb_t*) &ib_cb_tuple_read_u16,
-	(ib_cb_t*) &ib_cb_tuple_write_u16,
 	(ib_cb_t*) &ib_cb_tuple_read_u32,
-	(ib_cb_t*) &ib_cb_tuple_write_u32,
 	(ib_cb_t*) &ib_cb_tuple_read_u64,
-	(ib_cb_t*) &ib_cb_tuple_write_u64,
 	(ib_cb_t*) &ib_cb_tuple_read_i8,
-	(ib_cb_t*) &ib_cb_tuple_write_i8,
 	(ib_cb_t*) &ib_cb_tuple_read_i16,
-	(ib_cb_t*) &ib_cb_tuple_write_i16,
 	(ib_cb_t*) &ib_cb_tuple_read_i32,
-	(ib_cb_t*) &ib_cb_tuple_write_i32,
 	(ib_cb_t*) &ib_cb_tuple_read_i64,
-	(ib_cb_t*) &ib_cb_tuple_write_i64,
 	(ib_cb_t*) &ib_cb_tuple_get_n_cols,
 	(ib_cb_t*) &ib_cb_col_set_value,
 	(ib_cb_t*) &ib_cb_col_get_value,
@@ -79,12 +69,10 @@ static ib_cb_t* innodb_memcached_api[] = {
 	(ib_cb_t*) &ib_cb_trx_rollback,
 	(ib_cb_t*) &ib_cb_trx_start,
 	(ib_cb_t*) &ib_cb_trx_release,
-	(ib_cb_t*) &ib_cb_trx_state,
 	(ib_cb_t*) &ib_cb_cursor_lock,
 	(ib_cb_t*) &ib_cb_cursor_close,
 	(ib_cb_t*) &ib_cb_cursor_new_trx,
 	(ib_cb_t*) &ib_cb_cursor_reset,
-	(ib_cb_t*) &ib_cb_open_table_by_name,
 	(ib_cb_t*) &ib_cb_col_get_name,
 	(ib_cb_t*) &ib_cb_table_truncate,
 	(ib_cb_t*) &ib_cb_cursor_open_index_using_name,
@@ -96,7 +84,6 @@ static ib_cb_t* innodb_memcached_api[] = {
 	(ib_cb_t*) &ib_cb_cfg_trx_level,
 	(ib_cb_t*) &ib_cb_get_n_user_cols,
 	(ib_cb_t*) &ib_cb_cursor_set_lock,
-	(ib_cb_t*) &ib_cb_cursor_clear_trx,
 	(ib_cb_t*) &ib_cb_get_idx_field_name,
 	(ib_cb_t*) &ib_cb_trx_get_start_time,
 	(ib_cb_t*) &ib_cb_cfg_bk_commit_interval,