mini_sql 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45fd7b2a7b68f3186fa88a3387188312f926128f3dcb24f9fee3e8d9b695683d
-  data.tar.gz: c9ed648c9ef6976ef774863b509c63901b1c94629561b9fce63425155248b046
+  metadata.gz: 12406a36df764fd0c71ddb38a845d59099665dd081e0c6f6e125d396d7ec20de
+  data.tar.gz: 738d7ce83ff247695d8f4270f5c31f347d3c2e9af807449004b41cde03a33ec4
 SHA512:
-  metadata.gz: 37d82773bbae9390c7c68852734b713a863df638510326a1022a8fe675b4aa3eb597b64ccb1adaef5067bbb808f6995e4f90c691f7b4276512708967d154f3cf
-  data.tar.gz: 81523394fe465e59ab60f8d895f1cff17c4e4006b88792dd1bc5b536b17d00b8ab2c2180f5a1e7150e53dcd4d3bac5759397f7d76870d7ce92965b3f277493b6
+  metadata.gz: 1e510becc31ccd32edd41dc54d0ce4f85d38a47d4e3503e017edc5068bcd346e2912eaba290120c43686c4d6f06c2860fe7bf9e7a2d9c9a695d6c560e395f66c
+  data.tar.gz: 1bf82c5f43bda47ba1cdb8bfb9e72360e7c1ce70d65c38de6f851cfaad901d46b3e7dae2fce2e584d46601d5c1f72fed078e689452ad87574948ee6b1e556ae5

data/.travis.yml

@@ -9,11 +9,16 @@ before_install:
 cache: bundler
 sudo: false
 
+services:
+  - mysql
+
 addons:
   postgresql: 9.6
+  mysql: 5.7
 
 install:
   - createdb test_mini_sql
+  - mysql -e 'CREATE DATABASE test_mini_sql;'
   - bundle install
 
 matrix:

data/CHANGELOG

@@ -1,3 +1,7 @@
+2019-12-20 - 0.2.3
+
+- Added support for MySQL
+
 2019-11-04 - 0.2.2
 
 - Added adapters for JRuby postgres support thanks to @enebo

data/README.md

@@ -109,7 +109,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/SamSaffron/mini_sql. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/discourse/mini_sql. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/bench/topic_mysql_perf.rb

@@ -0,0 +1,310 @@
+require 'bundler/inline'
+
+gemfile do
+  source 'https://rubygems.org'
+  gem 'mysql2'
+  gem 'mini_sql', path: '../'
+  gem 'activesupport'
+  gem 'activerecord'
+  gem 'activemodel'
+  gem 'memory_profiler'
+  gem 'benchmark-ips'
+  gem 'sequel', github: 'jeremyevans/sequel'
+end
+
+require 'mysql2'
+require 'sequel'
+require 'active_record'
+require 'memory_profiler'
+require 'benchmark/ips'
+require 'mini_sql'
+
+ActiveRecord::Base.establish_connection(
+  :adapter => "mysql2",
+  :database => "test_db",
+  :username => "root",
+  :password => ''
+)
+
+DB = Sequel.connect("mysql2://root:@localhost/test_db")
+
+mysql = ActiveRecord::Base.connection.raw_connection
+
+mysql.query <<SQL
+drop table if exists topics
+SQL
+
+mysql.query <<~SQL
+  CREATE TABLE `topics` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT,
+    `title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+    `last_posted_at` datetime DEFAULT NULL,
+    `created_at` datetime NOT NULL,
+    `updated_at` datetime NOT NULL,
+    `views` int(11) NOT NULL DEFAULT '0',
+    `posts_count` int(11) NOT NULL DEFAULT '0',
+    `user_id` int(11) DEFAULT NULL,
+    `last_post_user_id` int(11) NOT NULL,
+    `reply_count` int(11) NOT NULL DEFAULT '0',
+    `featured_user1_id` int(11) DEFAULT NULL,
+    `featured_user2_id` int(11) DEFAULT NULL,
+    `featured_user3_id` int(11) DEFAULT NULL,
+    `avg_time` int(11) DEFAULT NULL,
+    `deleted_at` datetime DEFAULT NULL,
+    `highest_post_number` int(11) NOT NULL DEFAULT '0',
+    `image_url` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+    `like_count` int(11) NOT NULL DEFAULT '0',
+    `incoming_link_count` int(11) NOT NULL DEFAULT '0',
+    `category_id` int(11) DEFAULT NULL,
+    `visible` tinyint(1) NOT NULL DEFAULT '1',
+    `moderator_posts_count` int(11) NOT NULL DEFAULT '0',
+    `closed` tinyint(1) NOT NULL DEFAULT '0',
+    `archived` tinyint(1) NOT NULL DEFAULT '0',
+    `bumped_at` datetime NOT NULL,
+    `has_summary` tinyint(1) NOT NULL DEFAULT '0',
+    `archetype` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'regular',
+    `featured_user4_id` int(11) DEFAULT NULL,
+    `notify_moderators_count` int(11) NOT NULL DEFAULT '0',
+    `spam_count` int(11) NOT NULL DEFAULT '0',
+    `pinned_at` datetime DEFAULT NULL,
+    `score` float DEFAULT NULL,
+    `percent_rank` float NOT NULL DEFAULT '1',
+    `subtype` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+    `slug` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+    `deleted_by_id` int(11) DEFAULT NULL,
+    `participant_count` int(11) DEFAULT '1',
+    `word_count` int(11) DEFAULT NULL,
+    `excerpt` varchar(1000) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+    `pinned_globally` tinyint(1) NOT NULL DEFAULT '0',
+    `pinned_until` datetime DEFAULT NULL,
+    `fancy_title` varchar(400) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+    `highest_staff_post_number` int(11) NOT NULL DEFAULT '0',
+    `featured_link` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+    `reviewable_score` float NOT NULL DEFAULT '0',
+    PRIMARY KEY (`id`)
+  )
+SQL
+
+class Topic < ActiveRecord::Base
+end
+
+class TopicSequel < Sequel::Model(:topics)
+end
+
+
+Topic.transaction do
+  topic = {
+  }
+  Topic.columns.each do |c|
+    topic[c.name.to_sym] = case c.type
+                           when :integer then 1
+                           when :datetime then Time.now
+                           when :boolean then false
+                           when :float then 1.0
+                           else "HELLO WORLD" * 2
+                           end
+  end
+
+  1000.times do |id|
+    topic[:id] = id
+    Topic.create!(topic)
+  end
+end
+
+$conn = ActiveRecord::Base.connection.raw_connection
+
+def ar_title_id_pluck
+  s = +""
+  Topic.limit(1000).order(:id).pluck(:id, :title).each do |id, title|
+    s << id.to_s
+    s << title
+  end
+  s
+end
+
+def ar_title_id
+  s = +""
+  Topic.limit(1000).order(:id).select(:id, :title).each do |t|
+    s << t.id.to_s
+    s << t.title
+  end
+  s
+end
+
+def mysql_title_id
+  s = +""
+  # use the safe pattern here
+  r = $conn.query(-"select id, title from topics order by id limit 1000", as: :array)
+
+  r.each do |row|
+    s << row[0].to_s
+    s << row[1]
+  end
+  s
+end
+
+$mini_sql = MiniSql::Connection.get($conn)
+
+def mini_sql_title_id
+  s = +""
+  $mini_sql.query(-"select id, title from topics order by id limit 1000").each do |t|
+    s << t.id.to_s
+    s << t.title
+  end
+  s
+end
+
+def sequel_select_title_id
+  s = +""
+  TopicSequel.limit(1000).order(:id).select(:id, :title).each do |t|
+    s << t.id.to_s
+    s << t.title
+  end
+  s
+end
+
+def sequel_pluck_title_id
+  s = +""
+  TopicSequel.limit(1000).order(:id).select_map([:id, :title]).each do |t|
+    s << t[0].to_s
+    s << t[1]
+  end
+  s
+end
+
+# usage is not really recommended but just to compare to pluck lets have it
+def mini_sql_title_id_query_single
+  s = +""
+  i = 0
+  r = $mini_sql.query_single(-"select id, title from topics order by id limit 1000")
+  while i < r.length
+    s << r[i].to_s
+    s << r[i+1]
+    i += 2
+  end
+  s
+end
+
+results = [
+  ar_title_id,
+  ar_title_id_pluck,
+  mysql_title_id,
+  mini_sql_title_id,
+  sequel_pluck_title_id,
+  sequel_select_title_id,
+  mini_sql_title_id_query_single
+]
+
+exit(-1) unless results.uniq.length == 1
+
+
+Benchmark.ips do |r|
+  r.report("ar select title id") do |n|
+    while n > 0
+      ar_title_id
+      n -= 1
+    end
+  end
+  r.report("ar select title id pluck") do |n|
+    while n > 0
+      ar_title_id_pluck
+      n -= 1
+    end
+  end
+  r.report("sequel title id select") do |n|
+    while n > 0
+      sequel_select_title_id
+      n -= 1
+    end
+  end
+  r.report("mysql select title id") do |n|
+    while n > 0
+      mysql_title_id
+      n -= 1
+    end
+  end
+  r.report("mini_sql select title id") do |n|
+    while n > 0
+      mini_sql_title_id
+      n -= 1
+    end
+  end
+  r.report("sequel title id pluck") do |n|
+    while n > 0
+      sequel_pluck_title_id
+      n -= 1
+    end
+  end
+  r.report("mini_sql query_single title id") do |n|
+    while n > 0
+      mini_sql_title_id_query_single
+      n -= 1
+    end
+  end
+  r.compare!
+end
+
+
+
+def wide_topic_ar
+  Topic.first
+end
+
+def wide_topic_mysql
+  r = $conn.query("select * from topics limit 1", as: :hash)
+  row = r.first
+  row
+end
+
+def wide_topic_sequel
+  TopicSequel.first
+end
+
+def wide_topic_mini_sql
+  $conn.query("select * from topics limit 1").first
+end
+
+Benchmark.ips do |r|
+  r.report("wide topic ar") do |n|
+    while n > 0
+      wide_topic_ar
+      n -= 1
+    end
+  end
+  r.report("wide topic sequel") do |n|
+    while n > 0
+      wide_topic_sequel
+      n -= 1
+    end
+  end
+  r.report("wide topic mysql") do |n|
+    while n > 0
+      wide_topic_mysql
+      n -= 1
+    end
+  end
+  r.report("wide topic mini sql") do |n|
+    while n > 0
+      wide_topic_mini_sql
+      n -= 1
+    end
+  end
+  r.compare!
+end
+
+# Comparison:
+# mysql select title id:      485.0 i/s
+# mini_sql query_single title id:      447.2 i/s - same-ish: difference falls within error
+# mini_sql select title id:      417.4 i/s - 1.16x  slower
+# sequel title id pluck:      370.2 i/s - 1.31x  slower
+# sequel title id select:      351.0 i/s - 1.38x  slower
+# ar select title id pluck:      317.1 i/s - 1.53x  slower
+#   ar select title id:      102.3 i/s - 4.74x  slower
+
+
+# Comparison:
+#  wide topic mini sql:     6768.7 i/s
+#     wide topic mysql:     6063.9 i/s - same-ish: difference falls within error
+#    wide topic sequel:     4908.6 i/s - same-ish: difference falls within error
+#        wide topic ar:     2630.2 i/s - 2.57x  slower
+

data/bench/topic_perf.rb

@@ -148,7 +148,7 @@ def pg_title_id
   s
 end
 
-$mini_sql = MiniSql::Connection.new($conn)
+$mini_sql = MiniSql::Connection.get($conn)
 
 def mini_sql_title_id
   s = +""

data/lib/mini_sql.rb

@@ -26,5 +26,10 @@ module MiniSql
       autoload :Connection, "mini_sql/sqlite/connection"
       autoload :DeserializerCache, "mini_sql/sqlite/deserializer_cache"
     end
+
+    module Mysql
+      autoload :Connection, "mini_sql/mysql/connection"
+      autoload :DeserializerCache, "mini_sql/mysql/deserializer_cache"
+    end
   end
 end

data/lib/mini_sql/builder.rb

@@ -57,7 +57,6 @@ class MiniSql::Builder
       def #{m}(hash_args = nil)
         hash_args = @args.merge(hash_args) if hash_args && @args
         hash_args ||= @args
-
         if hash_args
           @connection.#{m}(to_sql, hash_args)
         else

data/lib/mini_sql/connection.rb

@@ -10,6 +10,8 @@ module MiniSql
         Postgres::Connection.new(raw_connection, options)
       elsif (defined? ::SQLite3::Database) && (SQLite3::Database === raw_connection)
         Sqlite::Connection.new(raw_connection, options)
+      elsif (defined? ::Mysql2::Client) && (Mysql2::Client === raw_connection)
+        Mysql::Connection.new(raw_connection, options)
       else
         raise ArgumentError, 'unknown connection type!'
       end

data/lib/mini_sql/mysql/connection.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module MiniSql
+  module Mysql
+    class Connection < MiniSql::Connection
+      attr_reader :param_encoder, :raw_connection, :deserializer_cache
+
+      def initialize(raw_connection, args = nil)
+        @raw_connection = raw_connection
+        @param_encoder = (args && args[:param_encoder]) || InlineParamEncoder.new(self)
+        @deserializer_cache = (args && args[:deserializer_cache]) || DeserializerCache.new
+      end
+
+      def query_single(sql, *params)
+        run(sql, :array, params).to_a.flatten!
+      end
+
+      def query_hash(sql, *params)
+        result = run(sql, :hash, params)
+        result.to_a
+      end
+
+      def exec(sql, *params)
+        run(sql, :array, params)
+        raw_connection.affected_rows
+      end
+
+      def query(sql, *params)
+        result = run(sql, :array, params)
+        @deserializer_cache.materialize(result)
+      end
+
+      def escape_string(str)
+        raw_connection.escape(str)
+      end
+
+      def build(sql)
+        Builder.new(self, sql)
+      end
+
+      private
+
+      def run(sql, as, params)
+        if params && params.length > 0
+          sql = param_encoder.encode(sql, *params)
+        end
+        raw_connection.query(
+          sql, 
+          as: as, 
+          database_timezone: :utc, 
+          application_timezone: :utc,
+          cast_booleans: true,
+          cast: true,
+          cache_rows: true,
+          symbolize_keys: false
+        )
+      end
+    end
+  end
+end

data/lib/mini_sql/mysql/deserializer_cache.rb

@@ -0,0 +1,59 @@
+module MiniSql
+  module Mysql
+    class DeserializerCache
+
+      DEFAULT_MAX_SIZE = 500
+
+      def initialize(max_size = nil)
+        @cache = {}
+        @max_size = max_size || DEFAULT_MAX_SIZE
+      end
+
+      def materialize(result)
+        key = result.fields
+
+        # trivial fast LRU implementation
+        materializer = @cache.delete(key)
+        if materializer
+          @cache[key] = materializer
+        else
+          materializer = @cache[key] = new_row_matrializer(result)
+          @cache.shift if @cache.length > @max_size
+        end
+
+        result.map do |data|
+          materializer.materialize(data)
+        end
+      end
+
+      private
+
+      def new_row_matrializer(result)
+        fields = result.fields
+
+        Class.new do
+          attr_accessor(*fields)
+
+          # AM serializer support
+          alias :read_attribute_for_serialization :send
+
+          def to_h
+            r = {}
+            instance_variables.each do |f|
+              r[f.to_s.sub('@','').to_sym] = instance_variable_get(f)
+            end
+            r
+          end
+
+          instance_eval <<~RUBY
+            def materialize(data)
+              r = self.new
+              #{col=-1; fields.map{|f| "r.#{f} = data[#{col+=1}]"}.join("; ")}
+              r
+            end
+          RUBY
+        end
+      end
+    end
+  end
+end

data/lib/mini_sql/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module MiniSql
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/mini_sql.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency "activerecord-jdbcpostgresql-adapter", "~> 52.2"
   else
     spec.add_development_dependency "pg", "> 1"
+    spec.add_development_dependency "mysql2"
     spec.add_development_dependency "sqlite3", "~> 1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_sql
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2019-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +153,7 @@ files:
 - README.md
 - Rakefile
 - bench/timestamp_perf.rb
+- bench/topic_mysql_perf.rb
 - bench/topic_perf.rb
 - bin/console
 - bin/setup
@@ -147,6 +162,8 @@ files:
 - lib/mini_sql/connection.rb
 - lib/mini_sql/deserializer_cache.rb
 - lib/mini_sql/inline_param_encoder.rb
+- lib/mini_sql/mysql/connection.rb
+- lib/mini_sql/mysql/deserializer_cache.rb
 - lib/mini_sql/postgres/coders.rb
 - lib/mini_sql/postgres/connection.rb
 - lib/mini_sql/postgres/deserializer_cache.rb