add grn_ctx to ha_groonga. constructor and destructor handle this.

mroonga · Jun 18, 2009 · fb7c00a · fb7c00a
1 parent beaf8e9
commit fb7c00a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/driver.c b/driver.c
@@ -18,6 +18,7 @@ grn_obj *mrn_db_sys, *mrn_lexicon_sys;
 pthread_mutex_t *mrn_mutex_sys;
 const char *mrn_logfile_name=MRN_LOG_FILE_NAME;
 FILE *mrn_logfile = NULL;
+uint mrn_ctx_counter = 0;
 
 grn_logger_info mrn_logger_info = {
   GRN_LOG_DUMP,

diff --git a/driver.h b/driver.h
@@ -88,4 +88,6 @@ extern FILE *mrn_logfile;
 
 extern grn_logger_info mrn_logger_info;
 
+extern uint mrn_ctx_counter;
+
 #endif /* _mroonga_h */
diff --git a/ha_groonga.cc b/ha_groonga.cc
@@ -126,11 +126,16 @@ mysql_declare_plugin_end;
 ha_groonga::ha_groonga(handlerton *hton, TABLE_SHARE *share)
   :handler(hton, share)
 {
-  mrn_counter=0;
+  ctx = (grn_ctx*) malloc(sizeof(grn_ctx));
+  grn_ctx_init(ctx,0);
+  mrn_ctx_counter++;
 }
 
 ha_groonga::~ha_groonga()
 {
+  grn_ctx_fin(ctx);
+  free(ctx);
+  mrn_ctx_counter--;
 }
 
 const char *ha_groonga::table_type() const

diff --git a/ha_groonga.h b/ha_groonga.h
@@ -17,7 +17,8 @@ class ha_groonga: public handler
   grn_table_cursor *cursor;
   grn_id record_id;
   grn_obj *res;
-  int mrn_counter;
+
+  grn_ctx *ctx;
 
 public:
   ha_groonga(handlerton *hton, TABLE_SHARE *share);