Accept query options on Statement#execute #912

sodabrew · 2017-11-28T05:15:53Z

Instead of #640

sodabrew · 2017-11-28T06:27:18Z

Turns out this is Ruby 2.0 syntax. Supporting the extra arguments in Ruby 1.9.3 requires a different approach to parsing out a trailing Hash in the argument list.

tamird

👍 looks better than #640!

tamird · 2017-11-29T12:59:34Z

ext/mysql2/statement.c

@@ -416,10 +421,16 @@ static VALUE rb_mysql_stmt_execute(int argc, VALUE *argv, VALUE self) {
    return Qnil;
  }

+  // Important to duplicate the hash, will receive merge! if extra opts


Might be possible to duplicate only conditionally, or use merge instead?

It was duplicate previously - I should actually check if it gets duplicated again in rb_mysql_result_to_obj or if that method keeps the same options hash argument that was passed to it.

Confirmed that rb_mysql_result_to_obj uses what is passed to it, rather than duplicating its own query options hash, so the comment here (and in client.c) should reflect that.

tamird · 2017-11-29T13:00:06Z

lib/mysql2/statement.rb

@@ -7,12 +7,14 @@ class Statement
    if Thread.respond_to?(:handle_interrupt)
      def execute(*args)
        Thread.handle_interrupt(::Mysql2::Util::TIMEOUT_ERROR_CLASS => :never) do
-          _execute(*args)
+          options = args.last.is_a?(Hash) ? args.pop : {}


Consider leaving a TODO that this should change when 1.9 is dropped.

* master: GitHub is HTTPS by default (brianmario#922) Fix wrong value of type YEAR on big endian environment. (brianmario#921) Avoid 0 byte allocation call when statement takes no parameters Small spec improvement for RSpec style Travis CI for Mac OS X builds use the same steps again More specific exception classes (brianmario#911) Travis CI matrix add Ruby 2.5 and switch Mac OS X to Ruby 2.3 (ala High Sierra) README text for query options on Statement#execute Accept query options on Statement#execute (brianmario#912) Drop 1.9.3 support (brianmario#913)

This fixes a regression caused by brianmario#912 due to calling `rb_funcall` between `mysql_stmt_execute` and `mysql_stmt_store_result`, it will cause `mysql_stmt_close` to be called in wrong order. Fixes brianmario#956.

@kamipo

Thanks to @kamipo for diagnosing the problem and drafting the first PR. This fixes a regression caused by brianmario#912 due to calling `rb_funcall` between `mysql_stmt_execute` and `mysql_stmt_store_result`, it will cause `mysql_stmt_close` to be called in wrong order. In further testing, `rb_hash_aref` can also call `rb_funcall` if the query_options hash has a `default_proc` set, so adding a stronger comment to remind future maintainers. Fixes brianmario#956.

@kamipo

This commit fixes two error scenarios. The first is to avoid GC runs between `mysql_stmt_execute` and `mysql_stmt_store_result`. This fixes a regression caused by brianmario#912 due to calling `rb_funcall` between `mysql_stmt_execute` and `mysql_stmt_store_result`. The error in this case is: Commands out of sync; you can't run this command now Thanks to @kamipo for diagnosing the problem and drafting the first PR. The second problem is that in streaming mode, rows are returned to Ruby space one at a time, so garbage collection will naturally occur at any time. By requesting a cursor into the result set, other MySQL commands can be sent on the wire between row fetches. The error in this case is: Row retrieval was canceled by mysql_stmt_close Fixes brianmario#956, updates brianmario#957.

@kamipo

This commit fixes two error scenarios. The first is to avoid GC runs between `mysql_stmt_execute` and `mysql_stmt_store_result`. This fixes a regression caused by brianmario#912 due to calling `rb_funcall` between `mysql_stmt_execute` and `mysql_stmt_store_result`. The error in this case is: Commands out of sync; you can't run this command now Thanks to @kamipo for diagnosing the problem and drafting the first PR. The second problem is that in streaming mode, rows are returned to Ruby space one at a time, so garbage collection will naturally occur at any time. By requesting a cursor into the result set, other MySQL commands can be sent on the wire between row fetches. The error in this case is: Row retrieval was canceled by mysql_stmt_close Fixes brianmario#956, updates brianmario#957.

@kamipo

This commit fixes two error scenarios. The first is to avoid GC runs between `mysql_stmt_execute` and `mysql_stmt_store_result`. This fixes a regression caused by brianmario#912 due to calling `rb_funcall` between `mysql_stmt_execute` and `mysql_stmt_store_result`. The error in this case is: Commands out of sync; you can't run this command now Thanks to @kamipo for diagnosing the problem and drafting the first PR. The second problem is that in streaming mode, rows are returned to Ruby space one at a time, so garbage collection will naturally occur at any time. By requesting a cursor into the result set, other MySQL commands can be sent on the wire between row fetches. The error in this case is: Row retrieval was canceled by mysql_stmt_close Fixes brianmario#956, updates brianmario#957.

@kamipo

This commit fixes two error scenarios. The first is to avoid GC runs between `mysql_stmt_execute` and `mysql_stmt_store_result`. This fixes a regression caused by #912 due to calling `rb_funcall` between `mysql_stmt_execute` and `mysql_stmt_store_result`. The error in this case is: Commands out of sync; you can't run this command now Thanks to @kamipo for diagnosing the problem and drafting the first PR. The second problem is that in streaming mode, rows are returned to Ruby space one at a time, so garbage collection will naturally occur at any time. By requesting a cursor into the result set, other MySQL commands can be sent on the wire between row fetches. The error in this case is: Row retrieval was canceled by mysql_stmt_close Fixes #956, updates #957.

sodabrew mentioned this pull request Nov 28, 2017

Add support for per prepared statement query options #774

Closed

sodabrew force-pushed the stmt_execute_options branch from 076bec1 to 6709b2b Compare November 28, 2017 05:21

sodabrew added this to the 0.5.0 milestone Nov 28, 2017

tamird approved these changes Nov 29, 2017

View reviewed changes

sodabrew mentioned this pull request Nov 29, 2017

Allow query options to be set on each Statement object #640

Closed

sodabrew force-pushed the stmt_execute_options branch from 8627a1e to b65c3a2 Compare November 30, 2017 01:40

Accept query options on Statement#execute

45cc574

sodabrew force-pushed the stmt_execute_options branch from b65c3a2 to 45cc574 Compare November 30, 2017 01:41

sodabrew merged commit d203086 into brianmario:master Nov 30, 2017

sodabrew deleted the stmt_execute_options branch November 30, 2017 01:53

This was referenced Mar 21, 2018

Bump mysql2 from 0.4.10 to 0.5.0 in /WcaOnRails thewca/worldcubeassociation.org#2703

Merged

Bump mysql2 from 0.3.21 to 0.5.0 theodi/open-data-certificate#1655

Closed

kamipo mentioned this pull request Apr 4, 2018

Avoid GC run between mysql_stmt_execute and mysql_stmt_store_result #957

Closed

sodabrew mentioned this pull request Apr 4, 2018

Prevent command out of sync errors with Prepared Statements #958

Merged

This was referenced Apr 11, 2018

async prepared statements #829

Closed

:stream with prepared statements #884

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Accept query options on Statement#execute #912

Accept query options on Statement#execute #912

sodabrew commented Nov 28, 2017

sodabrew commented Nov 28, 2017

tamird left a comment

tamird Nov 29, 2017

sodabrew Nov 29, 2017

sodabrew Nov 29, 2017

tamird Nov 29, 2017

Accept query options on Statement#execute #912

Accept query options on Statement#execute #912

Conversation

sodabrew commented Nov 28, 2017

sodabrew commented Nov 28, 2017

tamird left a comment

Choose a reason for hiding this comment

tamird Nov 29, 2017

Choose a reason for hiding this comment

sodabrew Nov 29, 2017

Choose a reason for hiding this comment

sodabrew Nov 29, 2017

Choose a reason for hiding this comment

tamird Nov 29, 2017

Choose a reason for hiding this comment