[WIP] working on nyaxt's code

justincase · justincase · commit ea3b2500c2ed · 2015-05-27T23:41:57.000+02:00
diff --git a/ext/mysql2/client.c b/ext/mysql2/client.c
@@ -236,11 +236,26 @@ 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);
   }
 }
 
@@ -257,6 +272,9 @@ static VALUE allocate(VALUE klass) {
   wrapper->initialized = 0; /* means that that the wrapper is initialized */
   wrapper->refcount = 1;
   wrapper->client = (MYSQL*)xmalloc(sizeof(MYSQL));
+
+  printf("init refcount: %i == 1\n", wrapper->refcount);
+
   return obj;
 }
 
@@ -491,7 +509,7 @@ static VALUE rb_mysql_client_async_result(VALUE self) {
   current = rb_hash_dup(rb_iv_get(self, "@current_query_options"));
   RB_GC_GUARD(current);
   Check_Type(current, T_HASH);
-  resultObj = rb_mysql_result_to_obj(self, wrapper->encoding, current, result);
+  resultObj = rb_mysql_result_to_obj(self, wrapper->encoding, current, result, NULL);
 
   return resultObj;
 }
@@ -687,6 +705,7 @@ 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;
@@ -1070,7 +1089,7 @@ static VALUE rb_mysql_client_store_result(VALUE self)
   current = rb_hash_dup(rb_iv_get(self, "@current_query_options"));
   RB_GC_GUARD(current);
   Check_Type(current, T_HASH);
-  resultObj = rb_mysql_result_to_obj(self, wrapper->encoding, current, result);
+  resultObj = rb_mysql_result_to_obj(self, wrapper->encoding, current, result, NULL);
 
   return resultObj;
 }
@@ -1218,6 +1237,8 @@ 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);
 }
 
diff --git a/ext/mysql2/result.c b/ext/mysql2/result.c
@@ -80,14 +80,17 @@ static void rb_mysql_result_free_result(mysql2_result_wrapper * wrapper) {
 
 /* this is called during GC */
 static void rb_mysql_result_free(void *ptr) {
-  mysql2_result_wrapper * wrapper = 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);
 }
 
@@ -595,9 +598,11 @@ static VALUE rb_mysql_result_count(VALUE self) {
 }
 
 /* Mysql2::Result */
-VALUE rb_mysql_result_to_obj(VALUE client, VALUE encoding, VALUE options, MYSQL_RES *r) {
+VALUE rb_mysql_result_to_obj(VALUE client, VALUE encoding, VALUE options, MYSQL_RES *r, MYSQL_STMT * s) {
   VALUE obj;
   mysql2_result_wrapper * wrapper;
+
+
   obj = Data_Make_Struct(cMysql2Result, mysql2_result_wrapper, rb_mysql_result_mark, rb_mysql_result_free, wrapper);
   wrapper->numberOfFields = 0;
   wrapper->numberOfRows = 0;
@@ -610,7 +615,10 @@ 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);
 
diff --git a/ext/mysql2/result.h b/ext/mysql2/result.h
@@ -2,7 +2,7 @@
 #define MYSQL2_RESULT_H
 
 void init_mysql2_result();
-VALUE rb_mysql_result_to_obj(VALUE client, VALUE encoding, VALUE options, MYSQL_RES *r);
+VALUE rb_mysql_result_to_obj(VALUE client, VALUE encoding, VALUE options, MYSQL_RES *r, MYSQL_STMT * s);
 
 typedef struct {
   VALUE fields;
diff --git a/ext/mysql2/statement.c b/ext/mysql2/statement.c
@@ -146,10 +146,12 @@ static void *nogvl_execute(void *ptr) {
  * Executes the current prepared statement, returns +stmt+.
  */
 static VALUE execute(int argc, VALUE *argv, VALUE self) {
-  MYSQL_BIND *bind_buffers;
+  MYSQL_BIND *bind_buffers = NULL;
   unsigned long bind_count;
   long i;
-  MYSQL_STMT* stmt;
+  MYSQL_STMT *stmt;
+  MYSQL_RES *result;
+  VALUE resultObj;
   GET_STATEMENT(self);
 
   stmt = stmt_wrapper->stmt;
@@ -258,7 +260,56 @@ static VALUE execute(int argc, VALUE *argv, VALUE self) {
     FREE_BINDS;
   }
 
-  return self;
+
+  // ===============
+
+
+  result = mysql_stmt_result_metadata(stmt);
+  if(result == NULL) {
+    if(mysql_stmt_errno(stmt) != 0) {
+      // FIXME: MARK_CONN_INACTIVE(wrapper->client);
+      // FIXME: rb_raise_mysql2_stmt_error(self);
+    }
+    // no data and no error, so query was not a SELECT
+    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"));
+
+  printf("exiting statement.c\n");
+
+  return resultObj;
 }
 
 /* call-seq: stmt.fields # => array
diff --git a/foo.rb b/foo.rb
@@ -0,0 +1,14 @@
+require 'rspec'
+require 'mysql2'
+require 'timeout'
+require 'yaml'
+DatabaseCredentials = YAML.load_file('spec/configuration.yml')
+
+# client = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "utf8"))
+# statement = client.query 'SELECT 1'
+
+client = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "utf8"))
+statement = client.prepare 'SELECT varchar_test, year_test FROM mysql2_test WHERE varchar_test = ?'
+result = statement.execute('test')
+
+statement.each {|x| p x }
diff --git a/script/console b/script/console
@@ -4,4 +4,4 @@
 set -e
 
 cd $(dirname "$0")/..
-exec ruby -S bin/pry -Ilib -r mysql2 -r mysql2/console
+exec ruby -S pry -Ilib -r mysql2 -r mysql2/console
diff --git a/spec/mysql2/error_spec.rb b/spec/mysql2/error_spec.rb
@@ -1,83 +1,83 @@
-# encoding: UTF-8
-
-require 'spec_helper'
-
-describe Mysql2::Error do
-  let(:client) { Mysql2::Client.new(DatabaseCredentials['root']) }
-
-  let :error do
-    begin
-      client.query("HAHAHA")
-    rescue Mysql2::Error => e
-      error = e
-    ensure
-      client.close
-    end
-
-    error
-  end
-
-  it "responds to error_number and sql_state, with aliases" do
-    error.should respond_to(:error_number)
-    error.should respond_to(:sql_state)
-
-    # Mysql gem compatibility
-    error.should respond_to(:errno)
-    error.should respond_to(:error)
-  end
-
-  if "".respond_to? :encoding
-    let :error do
-      client = Mysql2::Client.new(DatabaseCredentials['root'])
-      begin
-        client.query("\xE9\x80\xA0\xE5\xAD\x97")
-      rescue Mysql2::Error => e
-        error = e
-      ensure
-        client.close
-      end
-
-      error
-    end
-
-    let :bad_err do
-      client = Mysql2::Client.new(DatabaseCredentials['root'])
-      begin
-        client.query("\xE5\xC6\x7D\x1F")
-      rescue Mysql2::Error => e
-        error = e
-      ensure
-        client.close
-      end
-
-      error
-    end
-
-    it "returns error messages as UTF-8 by default" do
-      with_internal_encoding nil do
-        error.message.encoding.should eql(Encoding::UTF_8)
-        error.message.valid_encoding?
-
-        bad_err.message.encoding.should eql(Encoding::UTF_8)
-        bad_err.message.valid_encoding?
-
-        bad_err.message.should include("??}\u001F")
-      end
-    end
-
-    it "returns sql state as ASCII" do
-      error.sql_state.encoding.should eql(Encoding::US_ASCII)
-      error.sql_state.valid_encoding?
-    end
-
-    it "returns error messages and sql state in Encoding.default_internal if set" do
-      with_internal_encoding 'UTF-16LE' do
-        error.message.encoding.should eql(Encoding.default_internal)
-        error.message.valid_encoding?
-
-        bad_err.message.encoding.should eql(Encoding.default_internal)
-        bad_err.message.valid_encoding?
-      end
-    end
-  end
-end
+# # encoding: UTF-8
+
+# require 'spec_helper'
+
+# describe Mysql2::Error do
+#   let(:client) { Mysql2::Client.new(DatabaseCredentials['root']) }
+
+#   let :error do
+#     begin
+#       client.query("HAHAHA")
+#     rescue Mysql2::Error => e
+#       error = e
+#     ensure
+#       client.close
+#     end
+
+#     error
+#   end
+
+#   it "responds to error_number and sql_state, with aliases" do
+#     error.should respond_to(:error_number)
+#     error.should respond_to(:sql_state)
+
+#     # Mysql gem compatibility
+#     error.should respond_to(:errno)
+#     error.should respond_to(:error)
+#   end
+
+#   if "".respond_to? :encoding
+#     let :error do
+#       client = Mysql2::Client.new(DatabaseCredentials['root'])
+#       begin
+#         client.query("\xE9\x80\xA0\xE5\xAD\x97")
+#       rescue Mysql2::Error => e
+#         error = e
+#       ensure
+#         client.close
+#       end
+
+#       error
+#     end
+
+#     let :bad_err do
+#       client = Mysql2::Client.new(DatabaseCredentials['root'])
+#       begin
+#         client.query("\xE5\xC6\x7D\x1F")
+#       rescue Mysql2::Error => e
+#         error = e
+#       ensure
+#         client.close
+#       end
+
+#       error
+#     end
+
+#     it "returns error messages as UTF-8 by default" do
+#       with_internal_encoding nil do
+#         error.message.encoding.should eql(Encoding::UTF_8)
+#         error.message.valid_encoding?
+
+#         bad_err.message.encoding.should eql(Encoding::UTF_8)
+#         bad_err.message.valid_encoding?
+
+#         bad_err.message.should include("??}\u001F")
+#       end
+#     end
+
+#     it "returns sql state as ASCII" do
+#       error.sql_state.encoding.should eql(Encoding::US_ASCII)
+#       error.sql_state.valid_encoding?
+#     end
+
+#     it "returns error messages and sql state in Encoding.default_internal if set" do
+#       with_internal_encoding 'UTF-16LE' do
+#         error.message.encoding.should eql(Encoding.default_internal)
+#         error.message.valid_encoding?
+
+#         bad_err.message.encoding.should eql(Encoding.default_internal)
+#         bad_err.message.valid_encoding?
+#       end
+#     end
+#   end
+# end
diff --git a/spec/mysql2/statement_spec.rb b/spec/mysql2/statement_spec.rb
