svnno****@sourc*****
svnno****@sourc*****
2008年 6月 12日 (木) 15:20:52 JST
Revision: 142
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=tritonn&view=rev&rev=142
Author: mir
Date: 2008-06-12 15:20:52 +0900 (Thu, 12 Jun 2008)
Log Message:
-----------
redefined handlerton and plugin init/deinit
Modified Paths:
--------------
trunk/src/ha_tritonn.cc
-------------- next part --------------
Modified: trunk/src/ha_tritonn.cc
===================================================================
--- trunk/src/ha_tritonn.cc 2008-06-11 06:17:38 UTC (rev 141)
+++ trunk/src/ha_tritonn.cc 2008-06-12 06:20:52 UTC (rev 142)
@@ -29,7 +29,6 @@
static handler *create_handler(handlerton *hton,
TABLE_SHARE *table,
MEM_ROOT *mem_root);
-static int init_tritonn_func();
/* Variables for tritonn share methods */
static HASH tritonn_open_tables; ///< Hash used to track the number of open tables; variable for tritonn share methods
@@ -42,9 +41,9 @@
return (uchar*) share->table_name;
}
-static int init_tritonn_engine(void *p)
+static int tritonn_init_hton(void *p)
{
- DBUG_ENTER("init_func");
+ DBUG_ENTER("tritonn_init_hton");
handlerton *hton;
@@ -53,33 +52,27 @@
(void) hash_init(&tritonn_open_tables, system_charset_info, 32, 0, 0,
(hash_get_key) get_key, 0, 0);
- hton->state= SHOW_OPTION_YES;
- hton->create= create_handler;
- hton->flags= HTON_CAN_RECREATE;
+ hton->state = SHOW_OPTION_YES;
+ hton->create = tritonn_create_handler;
+ hton->drop_database = tritonn_drop_database;
+ hton->flush_logs = tritonn_flush_logs;
+ hton->show_status = tritonn_show_status;
+ hton->flags = HTON_ALTER_NOT_SUPPORTED | HTON_CAN_RECREATE |
+ HTON_TEMPORARY_NOT_SUPPORTED | HTON_NO_PARTITION;
- sen_init();
-
- db = sen_db_open(dbpath);
- if (!db) {
- db = sen_db_create(dbpath,dbcreate_flag,db_encoding);
- }
-
DBUG_RETURN(0);
}
-static int deinit_tritonn_engine(void *p)
+static int tritonn_deinit_hton(void *p)
{
int error= 0;
- DBUG_ENTER("deinit_func");
+ DBUG_ENTER("tritonn_deinit_hton");
if (tritonn_open_tables.records)
error= 1;
hash_free(&tritonn_open_tables);
pthread_mutex_destroy(&tritonn_mutex);
- sen_db_close(db);
- sen_fin();
-
DBUG_RETURN(0);
}
@@ -250,8 +243,8 @@
"Tritonn Project",
"Tritonn storage engine",
PLUGIN_LICENSE_BSD,
- init_tritonn_engine, /* Plugin Init */
- deinit_tritonn_engine, /* Plugin Deinit */
+ tritonn_init_hton, /* Plugin Init */
+ tritonn_deinit_hton, /* Plugin Deinit */
0x0001 /* 0.1 */,
NULL, /* status variables */
NULL, /* system variables */