mini_sql 0.2.4 → 1.1.0

data/bench/topic_perf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/inline'
 
 gemfile do
@@ -11,7 +13,9 @@ gemfile do
   gem 'benchmark-ips'
   gem 'sequel', github: 'jeremyevans/sequel'
   gem 'sequel_pg', github: 'jeremyevans/sequel_pg', require: 'sequel'
-  gem 'swift-db-postgres', github: 'deepfryed/swift-db-postgres'
+  gem 'swift-db-postgres', github: 'deepfryed/swift-db-postgres' # sudo apt-get install uuid-dev
+  gem 'draper'
+  gem 'pry'
 end
 
 require 'sequel'
@@ -20,68 +24,14 @@ require 'memory_profiler'
 require 'benchmark/ips'
 require 'mini_sql'
 
-ActiveRecord::Base.establish_connection(
-  :adapter => "postgresql",
-  :database => "test_db"
-)
-
-DB = Sequel.postgres('test_db')
-
-pg = ActiveRecord::Base.connection.raw_connection
-
-pg.async_exec <<SQL
-drop table if exists topics
-SQL
+require '../mini_sql/bench/shared/generate_data'
 
-pg.async_exec <<SQL
-CREATE TABLE topics (
-    id integer NOT NULL PRIMARY KEY,
-    title character varying NOT NULL,
-    last_posted_at timestamp without time zone,
-    created_at timestamp without time zone NOT NULL,
-    updated_at timestamp without time zone NOT NULL,
-    views integer DEFAULT 0 NOT NULL,
-    posts_count integer DEFAULT 0 NOT NULL,
-    user_id integer,
-    last_post_user_id integer NOT NULL,
-    reply_count integer DEFAULT 0 NOT NULL,
-    featured_user1_id integer,
-    featured_user2_id integer,
-    featured_user3_id integer,
-    avg_time integer,
-    deleted_at timestamp without time zone,
-    highest_post_number integer DEFAULT 0 NOT NULL,
-    image_url character varying,
-    like_count integer DEFAULT 0 NOT NULL,
-    incoming_link_count integer DEFAULT 0 NOT NULL,
-    category_id integer,
-    visible boolean DEFAULT true NOT NULL,
-    moderator_posts_count integer DEFAULT 0 NOT NULL,
-    closed boolean DEFAULT false NOT NULL,
-    archived boolean DEFAULT false NOT NULL,
-    bumped_at timestamp without time zone NOT NULL,
-    has_summary boolean DEFAULT false NOT NULL,
-    vote_count integer DEFAULT 0 NOT NULL,
-    archetype character varying DEFAULT 'regular'::character varying NOT NULL,
-    featured_user4_id integer,
-    notify_moderators_count integer DEFAULT 0 NOT NULL,
-    spam_count integer DEFAULT 0 NOT NULL,
-    pinned_at timestamp without time zone,
-    score double precision,
-    percent_rank double precision DEFAULT 1.0 NOT NULL,
-    subtype character varying,
-    slug character varying,
-    deleted_by_id integer,
-    participant_count integer DEFAULT 1,
-    word_count integer,
-    excerpt character varying(1000),
-    pinned_globally boolean DEFAULT false NOT NULL,
-    pinned_until timestamp without time zone,
-    fancy_title character varying(400),
-    highest_staff_post_number integer DEFAULT 0 NOT NULL,
-    featured_link character varying
-)
-SQL
+ar_connection, conn_config = GenerateData.new(count_records: 1_000).call
+PG_CONN = ar_connection.raw_connection
+MINI_SQL = MiniSql::Connection.get(PG_CONN)
+DB = Sequel.connect(ar_connection.instance_variable_get(:@config).slice(:database, :user, :password, :host, :adapter))
+# connects over unix socket
+SWIFT = Swift::DB::Postgres.new(db: conn_config[:database], user: conn_config[:user], password: conn_config[:password], host: conn_config[:host])
 
 class Topic < ActiveRecord::Base
 end
@@ -89,27 +39,6 @@ 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
-                           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|
@@ -131,7 +60,7 @@ end
 def pg_title_id
   s = +""
   # use the safe pattern here
-  r = $conn.async_exec(-"select id, title from topics order by id limit 1000")
+  r = PG_CONN.async_exec(-"select id, title from topics order by id limit 1000")
 
   # this seems fastest despite extra arrays, cause array of arrays is generated
   # in c code
@@ -148,11 +77,9 @@ def pg_title_id
   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|
+  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
@@ -181,22 +108,19 @@ end
 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")
+  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]
+    s << r[i + 1]
     i += 2
   end
   s
 end
 
-# connects over unix socket
-$swift = Swift::DB::Postgres.new(db: "test_db")
-
-def swift_select_title_id(l=1000)
-  s = ""
+def swift_select_title_id(l = 1000)
+  s = +''
   i = 0
-  r = $swift.execute("select id, title from topics order by id limit 1000")
+  r = SWIFT.execute("select id, title from topics order by id limit 1000")
   while i < r.selected_rows
     s << r.get(i, 0).to_s
     s << r.get(i, 1)
@@ -218,7 +142,6 @@ results = [
 
 exit(-1) unless results.uniq.length == 1
 
-
 Benchmark.ips do |r|
   r.report("ar select title id") do |n|
     while n > 0
@@ -271,77 +194,12 @@ Benchmark.ips do |r|
   r.compare!
 end
 
-
-
-def wide_topic_ar
-  Topic.first
-end
-
-def wide_topic_pg
-  r = $conn.async_exec("select * from topics limit 1")
-  row = r.first
-  r.clear
-  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 pg") do |n|
-    while n > 0
-      wide_topic_pg
-      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:
-#   pg select title id:     1519.7 i/s
-# mini_sql query_single title id:     1335.0 i/s - 1.14x  slower
-# sequel title id pluck:     1261.6 i/s - 1.20x  slower
-# mini_sql select title id:     1188.6 i/s - 1.28x  slower
-#       swift title id:     1077.5 i/s - 1.41x  slower
-# sequel title id select:      969.7 i/s - 1.57x  slower
-# ar select title id pluck:      738.7 i/s - 2.06x  slower
-#   ar select title id:      149.6 i/s - 10.16x  slower
-#
-#
 # Comparison:
-#        wide topic pg:     7474.0 i/s
-#  wide topic mini sql:     7355.2 i/s - same-ish: difference falls within error
-#    wide topic sequel:     5696.8 i/s - 1.31x  slower
-#        wide topic ar:     2515.0 i/s - 2.97x  slower
-
-
-
-# to run deep analysis run
-# MemoryProfiler.report do
-#   ar
-# end.pretty_print
-
+#   pg select title id:               1315.1 i/s
+#       swift title id:               1268.4 i/s - same-ish: difference falls within error
+# mini_sql query_single title id:     1206.3 i/s - same-ish: difference falls within error
+# mini_sql select title id:           1063.8 i/s - 1.24x  (± 0.00) slower
+# sequel title id pluck:              1054.5 i/s - 1.25x  (± 0.00) slower
+# sequel title id select:              814.1 i/s - 1.62x  (± 0.00) slower
+# ar select title id pluck:            667.7 i/s - 1.97x  (± 0.00) slower
+#   ar select title id:                215.8 i/s - 6.09x  (± 0.00) slower

data/bench/topic_wide_perf.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require 'bundler/inline'
+
+gemfile do
+  source 'https://rubygems.org'
+  gem 'pg', github: 'ged/ruby-pg'
+  gem 'mini_sql', path: '../'
+  gem 'activesupport'
+  gem 'activerecord'
+  gem 'activemodel'
+  gem 'memory_profiler'
+  gem 'benchmark-ips'
+  gem 'sequel', github: 'jeremyevans/sequel'
+  gem 'sequel_pg', github: 'jeremyevans/sequel_pg', require: 'sequel'
+  gem 'draper'
+  gem 'pry'
+end
+
+require 'sequel'
+require 'active_record'
+require 'memory_profiler'
+require 'benchmark/ips'
+require 'mini_sql'
+
+require '../mini_sql/bench/shared/generate_data'
+
+ar_connection, conn_config = GenerateData.new(count_records: 1_000).call
+PG_CONN = ar_connection.raw_connection
+MINI_SQL = MiniSql::Connection.get(PG_CONN)
+DB = Sequel.connect(ar_connection.instance_variable_get(:@config).slice(:database, :user, :password, :host, :adapter))
+
+class Topic < ActiveRecord::Base
+end
+
+class TopicSequel < Sequel::Model(:topics)
+end
+
+def wide_topic_ar
+  Topic.first
+end
+
+def wide_topic_pg
+  r = PG_CONN.async_exec("select * from topics limit 1")
+  row = r.first
+  r.clear
+  row
+end
+
+def wide_topic_sequel
+  TopicSequel.first
+end
+
+def wide_topic_mini_sql
+  PG_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 pg") do |n|
+    while n > 0
+      wide_topic_pg
+      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:
+#        wide topic pg:     6974.6 i/s
+#  wide topic mini sql:     6760.9 i/s - same-ish: difference falls within error
+#    wide topic sequel:     5050.5 i/s - 1.38x  (± 0.00) slower
+#        wide topic ar:     1565.4 i/s - 4.46x  (± 0.00) slower

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "mini_sql"

data/lib/mini_sql.rb

@@ -8,28 +8,40 @@ require_relative "mini_sql/connection"
 require_relative "mini_sql/deserializer_cache"
 require_relative "mini_sql/builder"
 require_relative "mini_sql/inline_param_encoder"
+require_relative "mini_sql/decoratable"
+require_relative "mini_sql/serializer"
+require_relative "mini_sql/result"
 
 module MiniSql
   if RUBY_ENGINE == 'jruby'
     module Postgres
-      autoload :Connection, "mini_sql/postgres_jdbc/connection"
+      autoload :Connection,        "mini_sql/postgres_jdbc/connection"
       autoload :DeserializerCache, "mini_sql/postgres_jdbc/deserializer_cache"
     end
   else
     module Postgres
-      autoload :Coders, "mini_sql/postgres/coders"
-      autoload :Connection, "mini_sql/postgres/connection"
-      autoload :DeserializerCache, "mini_sql/postgres/deserializer_cache"
+      autoload :Coders,             "mini_sql/postgres/coders"
+      autoload :Connection,         "mini_sql/postgres/connection"
+      autoload :DeserializerCache,  "mini_sql/postgres/deserializer_cache"
+      autoload :PreparedConnection, "mini_sql/postgres/prepared_connection"
+      autoload :PreparedCache,      "mini_sql/postgres/prepared_cache"
+      autoload :PreparedBinds,      "mini_sql/postgres/prepared_binds"
     end
 
     module Sqlite
-      autoload :Connection, "mini_sql/sqlite/connection"
-      autoload :DeserializerCache, "mini_sql/sqlite/deserializer_cache"
+      autoload :Connection,         "mini_sql/sqlite/connection"
+      autoload :DeserializerCache,  "mini_sql/sqlite/deserializer_cache"
+      autoload :PreparedCache,      "mini_sql/sqlite/prepared_cache"
+      autoload :PreparedBinds,      "mini_sql/sqlite/prepared_binds"
+      autoload :PreparedConnection, "mini_sql/sqlite/prepared_connection"
     end
 
     module Mysql
-      autoload :Connection, "mini_sql/mysql/connection"
-      autoload :DeserializerCache, "mini_sql/mysql/deserializer_cache"
+      autoload :Connection,         "mini_sql/mysql/connection"
+      autoload :DeserializerCache,  "mini_sql/mysql/deserializer_cache"
+      autoload :PreparedCache,      "mini_sql/mysql/prepared_cache"
+      autoload :PreparedBinds,      "mini_sql/mysql/prepared_binds"
+      autoload :PreparedConnection, "mini_sql/mysql/prepared_connection"
     end
   end
 end

data/lib/mini_sql/abstract/prepared_binds.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module MiniSql
+  module Abstract
+    class PreparedBinds
+
+      # For compatibility with Active Record
+      BindName = Struct.new(:name)
+
+      def bind(sql, *params)
+        if Hash === (hash = params[0])
+          bind_hash(sql, hash)
+        else
+          bind_array(sql, params)
+        end
+      end
+
+      def bind_hash(sql, hash)
+        sql = sql.dup
+        binds = []
+        bind_names = []
+        i = 0
+
+        hash.each do |k, v|
+          sql.gsub!(":#{k}") do
+            # ignore ::int and stuff like that
+            # $` is previous to match
+            if $` && $`[-1] != ":"
+              array_wrap(v).map do |vv|
+                binds << vv
+                bind_names << [BindName.new(k)]
+                bind_output(i += 1)
+              end.join(', ')
+            else
+              ":#{k}"
+            end
+          end
+        end
+        [sql, binds, bind_names]
+      end
+
+      def bind_array(sql, array)
+        sql = sql.dup
+        param_i = 0
+        i = 0
+        binds = []
+        bind_names = []
+        sql.gsub!("?") do
+          param_i += 1
+          array_wrap(array[param_i - 1]).map do |vv|
+            binds << vv
+            i += 1
+            bind_names << [BindName.new("$#{i}")]
+            bind_output(i)
+          end.join(', ')
+        end
+        [sql, binds, bind_names]
+      end
+
+      def array_wrap(object)
+        if object.respond_to?(:to_ary)
+          object.to_ary || [object]
+        else
+          [object]
+        end
+      end
+
+      def bind_output(_)
+        raise NotImplementedError, "must be implemented by specific database driver"
+      end
+
+    end
+  end
+end