extralite 2.4 → 2.6

data/test/perf_hash.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# Run on Ruby 3.3 with YJIT enabled
+
 require 'bundler/inline'
 
 gemfile do
@@ -15,40 +17,40 @@ require 'fileutils'
 DB_PATH = "/tmp/extralite_sqlite3_perf-#{Time.now.to_i}-#{rand(10000)}.db"
 puts "DB_PATH = #{DB_PATH.inspect}"
 
+$sqlite3_db = SQLite3::Database.new(DB_PATH, results_as_hash: true)
+$extralite_db = Extralite::Database.new(DB_PATH, gvl_release_threshold: -1)
+
 def prepare_database(count)
-  db = Extralite::Database.new(DB_PATH)
-  db.query('create table if not exists foo ( a integer primary key, b text )')
-  db.query('delete from foo')
-  db.query('begin')
-  count.times { db.query('insert into foo (b) values (?)', "hello#{rand(1000)}" )}
-  db.query('commit')
-  db.close
+  $extralite_db.query('create table if not exists foo ( a integer primary key, b text )')
+  $extralite_db.query('delete from foo')
+  $extralite_db.query('begin')
+  count.times { $extralite_db.query('insert into foo (b) values (?)', "hello#{rand(1000)}" )}
+  $extralite_db.query('commit')
 end
 
 def sqlite3_run(count)
-  db = SQLite3::Database.new(DB_PATH, :results_as_hash => true)
-  results = db.execute('select * from foo')
+  results = $sqlite3_db.execute('select * from foo')
   raise unless results.size == count
 end
 
 def extralite_run(count)
-  db = Extralite::Database.new(DB_PATH)
-  results = db.query('select * from foo')
+  results = $extralite_db.query('select * from foo')
   raise unless results.size == count
 end
 
 [10, 1000, 100000].each do |c|
   puts "Record count: #{c}"
-
   prepare_database(c)
 
-  Benchmark.ips do |x|
-    x.config(:time => 3, :warmup => 1)
+  bm = Benchmark.ips do |x|
+    x.config(:time => 5, :warmup => 2)
 
     x.report("sqlite3") { sqlite3_run(c) }
     x.report("extralite") { extralite_run(c) }
 
     x.compare!
   end
-  puts; puts; 
+  puts;
+  bm.entries.each { |e| puts "#{e.label}: #{(e.ips * c).round.to_i} rows/s" }
+  puts;
 end

data/test/perf_hash_prepared.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'bundler/inline'
+
+gemfile do
+  source 'https://rubygems.org'
+  gem 'extralite', path: '..'
+  gem 'sqlite3'
+  gem 'benchmark-ips'
+end
+
+require 'benchmark/ips'
+require 'fileutils'
+
+DB_PATH = "/tmp/extralite_sqlite3_perf-#{Time.now.to_i}-#{rand(10000)}.db"
+puts "DB_PATH = #{DB_PATH.inspect}"
+
+def prepare_database(count)
+  $sqlite3_db = SQLite3::Database.new(DB_PATH, results_as_hash: true)
+  $extralite_db = Extralite::Database.new(DB_PATH, gvl_release_threshold: -1)
+    
+  $extralite_db.query('create table if not exists foo ( a integer primary key, b text )')
+  $extralite_db.query('delete from foo')
+  $extralite_db.query('begin')
+  count.times { $extralite_db.query('insert into foo (b) values (?)', "hello#{rand(1000)}" )}
+  $extralite_db.query('commit')
+
+  $sqlite3_stmt = $sqlite3_db.prepare('select * from foo')
+  $extralite_q = $extralite_db.prepare('select * from foo')
+end
+
+def sqlite3_run(count)
+  results = $sqlite3_stmt.execute
+  raise unless results.to_a.size == count
+end
+
+def extralite_run(count)
+  results = $extralite_q.to_a
+  raise unless results.size == count
+end
+
+[10, 1000, 100000].each do |c|
+  puts "Record count: #{c}"
+
+  prepare_database(c)
+
+  bm = Benchmark.ips do |x|
+    x.config(:time => 5, :warmup => 2)
+
+    x.report("sqlite3") { sqlite3_run(c) }
+    x.report("extralite") { extralite_run(c) }
+
+    x.compare!
+  end
+  puts;
+  bm.entries.each { |e| puts "#{e.label}: #{(e.ips * c).round.to_i} rows/s" }
+  puts;
+end

data/test/test_changeset.rb

@@ -0,0 +1,161 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+require 'date'
+require 'tempfile'
+
+class ChangesetTest < MiniTest::Test
+  def setup
+    @db = Extralite::Database.new(':memory:')
+    skip if !@db.respond_to?(:track_changes)
+
+    @db.execute('create table if not exists t (x integer primary key, y, z)')
+  end
+
+  def test_each
+    changeset = Extralite::Changeset.new
+
+    changeset.track(@db, [nil]) do
+      @db.execute('insert into t values (1, 2, 3)')
+    end
+    changes = []
+    changeset.each { |*o| changes << o }
+    assert_equal [
+      [:insert, 't', nil, [1, 2, 3]]
+    ], changes
+
+
+    changeset.track(@db, [nil]) do
+      @db.execute('update t set y = 22 where x = 1')
+    end
+    changes = []
+    changeset.each { |*o| changes << o }
+    assert_equal [
+      [:update, 't', [1, 2, nil], [nil, 22, nil]]
+    ], changes
+
+
+    changeset.track(@db, [nil]) do
+      @db.execute('delete from t where x = 1')
+    end
+    changes = []
+    changeset.each { |*o| changes << o }
+    assert_equal [
+      [:delete, 't', [1, 22, 3], nil]
+    ], changes
+  end
+
+  def test_to_a
+    changeset = Extralite::Changeset.new
+
+    changeset.track(@db, [nil]) do
+      @db.execute('insert into t values (1, 2, 3)')
+      @db.execute('insert into t values (4, 5, 6)')
+    end
+    assert_equal [
+      [:insert, 't', nil, [1, 2, 3]],
+      [:insert, 't', nil, [4, 5, 6]]
+    ], changeset.to_a
+
+
+    changeset.track(@db, [nil]) do
+      @db.execute('update t set y = 22.22 where z < 10')
+    end
+    assert_equal [
+      [:update, 't', [1, 2, nil], [nil, 22.22, nil]],
+      [:update, 't', [4, 5, nil], [nil, 22.22, nil]]
+    ], changeset.to_a
+
+
+    changeset.track(@db, [nil]) do
+      @db.execute('delete from t where x = 1')
+    end
+    assert_equal [
+      [:delete, 't', [1, 22.22, 3], nil]
+    ], changeset.to_a
+  end
+
+  def test_apply
+    changeset = Extralite::Changeset.new
+
+    changeset.track(@db, [:t]) do
+      @db.execute('insert into t values (1, 2, 3)')
+      @db.execute('insert into t values (4, 5, 6)')
+    end
+
+    db2 = Extralite::Database.new(':memory:')
+    db2.execute('create table if not exists t (x integer primary key, y, z)')
+
+    changeset.apply(db2)
+
+    assert_equal [
+      { x: 1, y: 2, z: 3 },
+      { x: 4, y: 5, z: 6 }
+    ], db2.query('select * from t')
+  end
+
+  def test_invert
+    changeset = Extralite::Changeset.new
+
+    changeset.track(@db, [:t]) do
+      @db.execute('insert into t values (1, 2, 3)')
+      @db.execute('insert into t values (4, 5, 6)')
+    end
+
+    db2 = Extralite::Database.new(':memory:')
+    db2.execute('create table if not exists t (x integer primary key, y, z)')
+
+    changeset.apply(db2)
+
+    assert_equal [
+      { x: 1, y: 2, z: 3 },
+      { x: 4, y: 5, z: 6 }
+    ], db2.query('select * from t')
+
+    db2.execute('insert into t values (7, 8, 9)')
+    inverted = changeset.invert
+
+    assert_kind_of Extralite::Changeset, inverted
+    refute_equal inverted, changeset
+
+    assert_equal [
+      [:delete, 't', [1, 2, 3], nil],
+      [:delete, 't', [4, 5, 6], nil],
+    ], inverted.to_a
+
+    inverted.apply(@db)
+    assert_equal [], @db.query('select * from t')
+  end
+
+  def test_blob
+    changeset = Extralite::Changeset.new
+    assert_equal "", changeset.to_blob
+
+    changeset.track(@db, [:t]) do
+      @db.execute('insert into t values (1, 2, 3)')
+      @db.execute('insert into t values (4, 5, 6)')
+    end
+
+    blob = changeset.to_blob
+    assert_kind_of String, blob
+    assert_equal Encoding::ASCII_8BIT, blob.encoding
+    assert !blob.empty?
+
+    c2 = Extralite::Changeset.new
+    c2.load(blob)
+    assert_equal c2.to_blob, blob
+
+    assert_equal [
+      [:insert, 't', nil, [1, 2, 3]],
+      [:insert, 't', nil, [4, 5, 6]]
+    ], c2.to_a
+  end
+
+  def test_empty_blob
+    changeset = Extralite::Changeset.new
+    changeset.load('')
+
+    assert_raises(Extralite::Error) { changeset.to_a }
+  end
+end