set active_thread for statement.execute

Author: nyaxt

ext/mysql2/client.c

@@ -36,9 +36,6 @@ static VALUE rb_hash_dup(VALUE other) {
     rb_raise(cMysql2Error, "MySQL connection is already open"); \
   }
 
-#define MARK_CONN_INACTIVE(conn) \
-  wrapper->active_thread = Qnil;
-
 /*
  * compatability with mysql-connector-c, where LIBMYSQL_VERSION is the correct
  * variable to use, but MYSQL_SERVER_VERSION gives the correct numbers when
@@ -407,7 +404,7 @@ static VALUE do_send_query(void *args) {
   mysql_client_wrapper *wrapper = query_args->wrapper;
   if ((VALUE)rb_thread_call_without_gvl(nogvl_send_query, args, RUBY_UBF_IO, 0) == Qfalse) {
     /* an error occurred, we're not active anymore */
-    MARK_CONN_INACTIVE(self);
+    wrapper->active_thread = Qnil;
     return rb_raise_mysql2_error(wrapper);
   }
   return Qnil;
@@ -590,6 +587,25 @@ static VALUE finish_and_mark_inactive(void *args) {
 }
 #endif
 
+void rb_mysql_client_set_active_thread(VALUE self) {
+  VALUE thread_current = rb_thread_current();
+  GET_CLIENT(self);
+
+  // see if this connection is still waiting on a result from a previous query
+  if (NIL_P(wrapper->active_thread)) {
+    // mark this connection active
+    wrapper->active_thread = thread_current;
+  } else if (wrapper->active_thread == thread_current) {
+    rb_raise(cMysql2Error, "This connection is still waiting for a result, try again once you have the result");
+  } else {
+    VALUE inspect = rb_inspect(wrapper->active_thread);
+    const char *thr = StringValueCStr(inspect);
+
+    rb_raise(cMysql2Error, "This connection is in use by: %s", thr);
+    RB_GC_GUARD(inspect);
+  }
+}
+
 /* call-seq:
  *    client.abandon_results!
  *
@@ -633,7 +649,6 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
   struct nogvl_send_query_args args;
   int async = 0;
   VALUE opts, current;
-  VALUE thread_current = rb_thread_current();
 #ifdef HAVE_RUBY_ENCODING_H
   rb_encoding *conn_enc;
 #endif
@@ -663,23 +678,10 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
 #endif
   args.sql_ptr = StringValuePtr(args.sql);
   args.sql_len = RSTRING_LEN(args.sql);
-
-  /* see if this connection is still waiting on a result from a previous query */
-  if (NIL_P(wrapper->active_thread)) {
-    /* mark this connection active */
-    wrapper->active_thread = thread_current;
-  } else if (wrapper->active_thread == thread_current) {
-    rb_raise(cMysql2Error, "This connection is still waiting for a result, try again once you have the result");
-  } else {
-    VALUE inspect = rb_inspect(wrapper->active_thread);
-    const char *thr = StringValueCStr(inspect);
-
-    rb_raise(cMysql2Error, "This connection is in use by: %s", thr);
-    RB_GC_GUARD(inspect);
-  }
-
   args.wrapper = wrapper;
 
+  rb_mysql_client_set_active_thread(self);
+
 #ifndef _WIN32
   rb_rescue2(do_send_query, (VALUE)&args, disconnect_and_raise, self, rb_eException, (VALUE)0);
 

ext/mysql2/client.h

@@ -56,6 +56,13 @@ typedef struct {
     rb_raise(cMysql2Error, "closed MySQL connection"); \
   }
 
+void rb_mysql_client_set_active_thread(VALUE self);
+
+#define MARK_CONN_INACTIVE(conn) do {\
+    GET_CLIENT(conn); \
+    wrapper->active_thread = Qnil; \
+  } while(0)
+
 #define GET_CLIENT(self) \
   mysql_client_wrapper *wrapper; \
   Data_Get_Struct(self, mysql_client_wrapper, wrapper);

ext/mysql2/result.c

@@ -211,7 +211,6 @@ static unsigned int msec_char_to_uint(char *msec_char, size_t len)
 
 static void rb_mysql_result_alloc_result_buffers(VALUE self, MYSQL_FIELD *fields) {
   unsigned int i;
-  VALUE rowVal;
   mysql2_result_wrapper * wrapper;
   GetMysql2Result(self, wrapper);
 

ext/mysql2/statement.c

@@ -135,7 +135,7 @@ static void *nogvl_execute(void *ptr) {
       xfree(bind_buffers[i].buffer);                        \
     }                                                       \
   }                                                         \
-  xfree(bind_buffers);
+  if (argc > 0) xfree(bind_buffers);
 
 /* call-seq: stmt.execute
  *
@@ -266,15 +266,15 @@ static VALUE execute(int argc, VALUE *argv, VALUE self) {
     rb_raise(cMysql2Error, "%s", mysql_stmt_error(stmt));
   }
 
-  if (bind_count > 0) {
-    FREE_BINDS;
-  }
+  FREE_BINDS;
 
   metadata = mysql_stmt_result_metadata(stmt);
   if(metadata == NULL) {
     if(mysql_stmt_errno(stmt) != 0) {
-      // FIXME: MARK_CONN_INACTIVE(wrapper->client);
-      // FIXME: rb_raise_mysql2_stmt_error(self);
+      // either CR_OUT_OF_MEMORY or CR_UNKNOWN_ERROR. both fatal.
+
+      MARK_CONN_INACTIVE(stmt_wrapper->client);
+      rb_raise(cMysql2Error, "%s", mysql_stmt_error(stmt));
     }
     // no data and no error, so query was not a SELECT
     return Qnil;
@@ -288,6 +288,7 @@ static VALUE execute(int argc, VALUE *argv, VALUE self) {
   if (mysql_stmt_store_result(stmt)) {
     rb_raise(cMysql2Error, "%s", mysql_stmt_error(stmt));
   }
+  MARK_CONN_INACTIVE(stmt_wrapper->client);
 
   resultObj = rb_mysql_result_to_obj(stmt_wrapper->client, wrapper->encoding, current, metadata, stmt);