do_mysql 0.9.5 → 0.9.6

data/Rakefile

@@ -42,7 +42,44 @@ end
 # Specs
 
 desc 'Run specifications'
-Spec::Rake::SpecTask.new(:spec => [ :compile ]) do |t|
-  t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-  t.spec_files = Pathname.glob(Pathname.new(__FILE__).dirname + 'spec/**/*_spec.rb')
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.spec_opts << '--format' << 'specdoc' << '--colour'
+  t.spec_opts << '--loadby' << 'random'
+  t.spec_files = Pathname.glob(ENV['FILES'] || 'spec/**/*_spec.rb')
+
+  begin
+    t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
+    t.rcov_opts << '--exclude' << 'spec'
+    t.rcov_opts << '--text-summary'
+    t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+  rescue Exception
+    # rcov not installed
+  end
 end
+
+namespace :ci do
+
+  task :prepare do
+    rm_rf ROOT + "ci"
+    mkdir_p ROOT + "ci"
+    mkdir_p ROOT + "ci/doc"
+    mkdir_p ROOT + "ci/cyclomatic"
+    mkdir_p ROOT + "ci/token"
+  end
+
+  task :publish do
+    out = ENV['CC_BUILD_ARTIFACTS'] || "out"
+    mkdir_p out unless File.directory? out
+
+    mv "ci/rspec_report.html", "#{out}/rspec_report.html"
+    mv "ci/coverage", "#{out}/coverage"
+  end
+
+  task :spec => :prepare do
+    Rake::Task[:spec].invoke
+    mv ROOT + "coverage", ROOT + "ci/coverage"
+  end
+
+end
+
+task :ci => ["ci:spec"]

data/buildfile

@@ -18,7 +18,7 @@ define 'do_mysql' do
   define 'ext-java' do
     package :jar
         
-    jdbc_support_jar = file('../../do_jdbc-support/lib/do_jdbc_internal.jar')
+    jdbc_support_jar = file('../../do_jdbc/lib/do_jdbc_internal.jar')
     jdbc_support = artifact('data_objects:jdbc:jar:1.0').from(jdbc_support_jar)
     
     compile.with JDBC_SUPPORT

data/ext/do_mysql_ext.c

@@ -4,6 +4,7 @@
 #include <math.h>
 #include <ctype.h>
 #include <time.h>
+#include <my_global.h>
 #include <mysql.h>
 #include <errmsg.h>
 #include <mysqld_error.h>
@@ -16,6 +17,14 @@
 #define CHECK_AND_RAISE(mysql_result_value) if (0 != mysql_result_value) { raise_mysql_error(connection, db, mysql_result_value); }
 #define PUTS(string) rb_funcall(rb_mKernel, rb_intern("puts"), 1, RUBY_STRING(string))
 
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+
 #ifdef _WIN32
 #define do_int64 signed __int64
 #else
@@ -451,6 +460,9 @@ static VALUE cConnection_initialize(VALUE self, VALUE uri) {
   //   mysql_ssl_set(db, key, cert, ca, capath, cipher)
   // }
 
+  my_bool reconnect = 1;
+  mysql_options(db, MYSQL_OPT_RECONNECT, &reconnect);
+
   result = (MYSQL *)mysql_real_connect(
     db,
     host,
@@ -590,11 +602,50 @@ static VALUE build_query_from_args(VALUE klass, int count, VALUE *args) {
   return query;
 }
 
+static MYSQL_RES* cCommand_execute_async(VALUE self, MYSQL* db, VALUE query) {
+  int socket_fd;
+  int retval;
+  fd_set rset;
+  char* str = RSTRING_PTR(query);
+  int len   = RSTRING_LEN(query);
+
+  VALUE connection = rb_iv_get(self, "@connection");
+
+  retval = mysql_send_query(db, str, len);
+  data_objects_debug(query);
+  CHECK_AND_RAISE(retval);
+
+  socket_fd = db->net.fd;
+
+  for(;;) {
+    FD_ZERO(&rset);
+    FD_SET(socket_fd, &rset);
+
+    retval = rb_thread_select(socket_fd + 1, &rset, NULL, NULL, NULL);
+
+    if (retval < 0) {
+        rb_sys_fail(0);
+    }
+
+    if (retval == 0) {
+        continue;
+    }
+
+    if (db->status == MYSQL_STATUS_READY) {
+      break;
+    }
+  }
+
+  retval = mysql_read_query_result(db);
+  CHECK_AND_RAISE(retval);
+
+  return mysql_store_result(db);
+}
+
 static VALUE cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
   VALUE query;
 
   MYSQL_RES *response = 0;
-  int query_result = 0;
 
   my_ulonglong affected_rows;
   VALUE connection = rb_iv_get(self, "@connection");
@@ -605,12 +656,8 @@ static VALUE cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
   MYSQL *db = DATA_PTR(mysql_connection);
   query = build_query_from_args(self, argc, argv);
 
-  data_objects_debug(query);
+  response = cCommand_execute_async(self, db, query);
 
-  query_result = mysql_query(db, StringValuePtr(query));
-  CHECK_AND_RAISE(query_result);
-
-  response = (MYSQL_RES *)mysql_store_result(db);
   affected_rows = mysql_affected_rows(db);
   mysql_free_result(response);
 
@@ -624,7 +671,6 @@ static VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
   VALUE query, reader;
   VALUE field_names, field_types;
 
-  int query_result = 0;
   int field_count;
   int i;
 
@@ -640,12 +686,8 @@ static VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
   MYSQL_FIELD *field;
 
   query = build_query_from_args(self, argc, argv);
-  data_objects_debug(query);
-
-  query_result = mysql_query(db, StringValuePtr(query));
-  CHECK_AND_RAISE(query_result);
 
-  response = (MYSQL_RES *)mysql_use_result(db);
+  response = cCommand_execute_async(self, db, query);
 
   if (!response) {
     return Qnil;

data/lib/do_mysql.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'data_objects'
-require 'do_jdbc-support' if RUBY_PLATFORM =~ /java/  # generic, shared JDBC support code
 require 'do_mysql_ext'                                # the C/Java extension for this DO driver
 require 'do_mysql/transaction'
 

data/lib/do_mysql/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Mysql
-    VERSION = "0.9.5"
+    VERSION = "0.9.6"
   end
 end

data/spec/integration/do_mysql_spec.rb

@@ -26,6 +26,23 @@ describe DataObjects::Mysql do
     connection.close
   end
 
+  it "should be able to send querues asynchronuously in parallel" do
+    threads = []
+
+    start = Time.now
+    4.times do |i|
+      threads << Thread.new do
+        connection = DataObjects::Connection.new("mysql://root@127.0.0.1:3306/do_mysql_test")
+        command = connection.create_command("SELECT sleep(1)")
+        result = command.execute_non_query
+      end
+    end
+
+    threads.each{|t| t.join }
+    finish = Time.now
+    (finish - start).should < 2
+  end
+
 #
 #  I comment this out partly to raise the issue for discussion. Socket files are afaik not supported under windows. Does this
 #  mean that we should test for it on unix boxes but not on windows boxes? Or does it mean that it should not be speced at all?
@@ -115,9 +132,9 @@ describe DataObjects::Mysql::Connection do
 
   it "should delete itself from the pool" do
     pool = @connection.instance_variable_get(:@__pool)
-    count = pool.reserved_count
+    count = pool.size
     lambda { @connection.create_command("INSERT INTO non_exista (tester) VALUES (1)").execute_non_query }.should raise_error(MysqlError)
-    Extlib::Pooling.pools.detect { |p| p == pool }.instance_variable_get(:@reserved_count).should == count-1
+    Extlib::Pooling.pools.detect { |p| p == pool }.size.should == count-1
   end
 
   it "should not raise an error error executing a non query on a closed connection" do

data/spec/spec_helper.rb

@@ -16,8 +16,8 @@ $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'data_
 require 'data_objects'
 
 if JRUBY
-  $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'do_jdbc-support', 'lib'))
-  require 'do_jdbc-support'
+  $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'do_jdbc', 'lib'))
+  require 'do_jdbc'
 end
 
 # put the pre-compiled extension in the path to be found

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: do_mysql
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Scott Bauer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-26 00:00:00 -05:00
+date: 2008-10-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe