first part of 397158f

Author: justincase

ext/mysql2/client.c

@@ -236,26 +236,12 @@ static void rb_mysql_client_free(void *ptr) {
 
 void decr_mysql2_client(mysql_client_wrapper *wrapper)
 {
-
-  printf("decr_mysql2_client\n");
-  printf("  >> refcount before: %i\n", wrapper->refcount);
-
   wrapper->refcount--;
 
-  printf("  >> refcount after: %i\n", wrapper->refcount);
-
   if (wrapper->refcount == 0) {
-    printf("    -- wrapper->refcount == 0\n");
-
     nogvl_close(wrapper);
-    printf("    -- nogvl_close\n");
-
     xfree(wrapper->client);
-    printf("    -- xfree wrapper client\n");
-
     xfree(wrapper);
-    printf("    -- xfree wrapper\n");
-    printf("    -- refcount: %i\n\n", wrapper->refcount);
   }
 }
 
@@ -273,8 +259,6 @@ static VALUE allocate(VALUE klass) {
   wrapper->refcount = 1;
   wrapper->client = (MYSQL*)xmalloc(sizeof(MYSQL));
 
-  printf("init refcount: %i == 1\n", wrapper->refcount);
-
   return obj;
 }
 
@@ -705,7 +689,6 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
 
     rb_rescue2(do_query, (VALUE)&async_args, disconnect_and_raise, self, rb_eException, (VALUE)0);
 
-    printf("calling rb_mysql_client_async_result\n");
     return rb_mysql_client_async_result(self);
   } else {
     return Qnil;
@@ -1237,8 +1220,6 @@ static VALUE rb_mysql_client_prepare_statement(VALUE self, VALUE sql) {
   GET_CLIENT(self);
   REQUIRE_CONNECTED(wrapper);
 
-  printf("prepare refcount: %i\n", wrapper->refcount);
-
   return rb_mysql_stmt_new(self, sql);
 }
 

ext/mysql2/result.c

@@ -83,14 +83,11 @@ static void rb_mysql_result_free(void *ptr) {
   mysql2_result_wrapper *wrapper = ptr;
   rb_mysql_result_free_result(wrapper);
 
-  printf("rb_mysql_result_free\n");
-
   // If the GC gets to client first it will be nil
   if (wrapper->client != Qnil) {
     decr_mysql2_client(wrapper->client_wrapper);
   }
 
-  printf("result.c xfree wrapper\n");
   xfree(wrapper);
 }
 
@@ -615,13 +612,9 @@ VALUE rb_mysql_result_to_obj(VALUE client, VALUE encoding, VALUE options, MYSQL_
   wrapper->streamingComplete = 0;
   wrapper->client = client;
   wrapper->client_wrapper = DATA_PTR(client);
-
-  printf("refcount++ before: %i\n", wrapper->client_wrapper->refcount);
   wrapper->client_wrapper->refcount++;
-  printf("refcount++ after: %i\n", wrapper->client_wrapper->refcount);
 
   rb_obj_call_init(obj, 0, NULL);
-
   rb_iv_set(obj, "@query_options", options);
 
   /* Options that cannot be changed in results.each(...) { |row| }

ext/mysql2/statement.c

@@ -260,10 +260,6 @@ static VALUE execute(int argc, VALUE *argv, VALUE self) {
     FREE_BINDS;
   }
 
-
-  // ===============
-
-
   result = mysql_stmt_result_metadata(stmt);
   if(result == NULL) {
     if(mysql_stmt_errno(stmt) != 0) {
@@ -274,40 +270,21 @@ static VALUE execute(int argc, VALUE *argv, VALUE self) {
     return Qnil;
   }
 
-
   VALUE current;
   current = rb_hash_dup(rb_iv_get(stmt_wrapper->client, "@query_options"));
   GET_CLIENT(stmt_wrapper->client);
 
-  printf("in statement.c: %i\n", wrapper->refcount);
-
-
   resultObj = rb_mysql_result_to_obj(stmt_wrapper->client, wrapper->encoding, current, result, stmt);
 
-  // resultObj = rb_mysql_result_to_obj(result, stmt);
-  // rb_iv_set(resultObj, "@query_options", rb_funcall(rb_iv_get(stmt_wrapper->client, "@query_options"), rb_intern("dup"), 0));
-
-
-
-  //   mysql2_result_wrapper* result_wrapper;
-
-  //   GET_CLIENT(stmt_wrapper->client);
-  //   GetMysql2Result(resultObj, result_wrapper);
-  //   result_wrapper->encoding = wrapper->encoding;
-
-
-  // return self;
-  // return resultObj;
-
-  // ===============
-
-
-
-
-  // VALUE current;
-  // current = rb_hash_dup(rb_iv_get(stmt_wrapper->client, "@query_options"));
+#ifdef HAVE_RUBY_ENCODING_H
+  {
+    mysql2_result_wrapper *result_wrapper;
 
-  printf("exiting statement.c\n");
+    GET_CLIENT(stmt_wrapper->client);
+    GetMysql2Result(resultObj, result_wrapper);
+    result_wrapper->encoding = wrapper->encoding;
+  }
+#endif
 
   return resultObj;
 }
@@ -360,10 +337,10 @@ static VALUE fields(VALUE self) {
   return field_list;
 }
 
+#if 0
 // FIXME refactor into Mysql2::Result
 static VALUE each(VALUE self) {
   MYSQL_STMT *stmt;
-  MYSQL_RES *result;
   GET_STATEMENT(self);
   stmt = stmt_wrapper->stmt;
 
@@ -372,7 +349,6 @@ static VALUE each(VALUE self) {
     rb_raise(cMysql2Error, "FIXME: current limitation: each require block");
   }
 
-  result = mysql_stmt_result_metadata(stmt);
   if (result) {
     MYSQL_BIND *result_buffers;
     my_bool *is_null;
@@ -600,6 +576,7 @@ static VALUE each(VALUE self) {
 
   return self;
 }
+#endif
 
 void init_mysql2_statement() {
   cMysql2Statement = rb_define_class_under(mMysql2, "Statement", rb_cObject);
@@ -608,5 +585,5 @@ void init_mysql2_statement() {
   rb_define_method(cMysql2Statement, "field_count", field_count, 0);
   rb_define_method(cMysql2Statement, "execute", execute, -1);
   rb_define_method(cMysql2Statement, "fields", fields, 0);
-  rb_define_method(cMysql2Statement, "each", each, 0);
+  // rb_define_method(cMysql2Statement, "each", each, 0);
 }