extralite 2.6 → 2.7.1

data/Rakefile

@@ -48,4 +48,22 @@ end
 task :build_bundled do
   puts 'Building extralite-bundle...'
   `gem build extralite-bundle.gemspec`
+end
+
+test_config = lambda do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/test_*.rb"]
+end
+
+# Rake::TestTask.new(:test, &test_config)
+
+begin
+  require "ruby_memcheck"
+
+  namespace :test do
+    RubyMemcheck::TestTask.new(:valgrind, &test_config)
+  end
+rescue LoadError => e
+  warn("NOTE: ruby_memcheck is not available in this environment: #{e}")
 end

data/TODO.md

@@ -1,12 +1,3 @@
-- Transactions and savepoints:
-
-  - https://www.sqlite.org/lang_savepoint.html
-
-  - `DB#savepoint(name)` - creates a savepoint
-  - `DB#release(name)` - releases a savepoint
-  - `DB#rollback` - raises `Extralite::Rollback`, which is rescued by `DB#transaction`
-  - `DB#rollback_to(name)` - rolls back to a savepoint
-
 - More database methods:
 
   - `Database#quote`

data/examples/kv_store.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'bundler/inline'
+
+gemfile do
+  gem 'polyphony'
+  gem 'extralite', path: '.'
+end
+
+class KVStore
+  def initialize(db)
+    @db = db
+    setup_kv_tables
+    setup_queries
+  end
+
+  SETUP_SQL = <<~SQL
+    create table if not exists kv (key text primary key, value, expires float);
+    create index if not exists idx_kv_expires on kv (expires) where expires is not null;
+  SQL
+
+  def setup_kv_tables
+    @db.execute SETUP_SQL
+  end
+
+  def setup_queries
+    @q_get = @db.prepare_argv('select value from kv where key = ?')
+    @q_set = @db.prepare('insert into kv (key, value) values($1, $2) on conflict (key) do update set value = $2')
+  end
+
+  def get(key)
+    @q_get.bind(key).next
+  end
+
+  def set(key, value)
+    @q_set.bind(key, value).execute
+  end
+end
+
+db = Extralite::Database.new(':memory:')
+kv = KVStore.new(db)
+
+p get: kv.get('foo')
+p set: kv.set('foo', 42)
+p get: kv.get('foo')
+p set: kv.set('foo', 43)
+p get: kv.get('foo')
+
+p db.query('select * from kv order by key')

data/examples/multi_fiber.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require './lib/extralite'
+require 'fiber'
+
+f1 = Fiber.new do |f2|
+  while true
+    STDOUT << '.'
+    f2 = f2.transfer
+  end
+end
+
+db = Extralite::Database.new(':memory:')
+db.on_progress(1) { f1.transfer(Fiber.current) }
+
+p db.query('select 1, 2, 3')

data/examples/on_progress.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require './lib/extralite'
+
+db = Extralite::Database.new(':memory:')
+count = 0
+db.on_progress(10) { count += 1 }
+10000.times { db.query('select 1') }
+p count: count

data/examples/pubsub_store_polyphony.rb

@@ -0,0 +1,194 @@
+# frozen_string_literal: true
+
+require 'bundler/inline'
+
+gemfile do
+  gem 'polyphony'
+  gem 'extralite', path: '.'
+  gem 'benchmark-ips'
+end
+
+require 'tempfile'
+
+class PubSub
+  def initialize(db)
+    @db = db
+  end
+
+  def attach
+    @db.execute('insert into subscribers (stamp) values (?)', Time.now.to_i)
+    @id = @db.last_insert_rowid
+  end
+
+  def detach
+    @db.execute('delete from subscribers where id = ?', @id)
+  end
+
+  def subscribe(*topics)
+    @db.transaction do
+      topics.each do |t|
+        @db.execute('insert into subscriber_topics (subscriber_id, topic) values (?, ?)', @id, t)
+      end
+    end
+  end
+
+  def unsubscribe(*topics)
+    @db.transaction do
+      topics.each do |t|
+        @db.execute('delete from subscriber_topics where subscriber_id = ? and topic = ?', @id, t)
+      end
+    end
+  end
+
+  def get_messages(&block)
+    #   @db.execute('update subscribers set stamp = ? where id = ?', Time.now.to_i, @id)
+      @db.query_argv('delete from messages where subscriber_id = ? returning topic, message', @id, &block)
+  end
+
+  SCHEMA = <<~SQL
+    PRAGMA foreign_keys = ON;
+
+    create table if not exists subscribers (
+      id integer primary key,
+      stamp float
+    );
+    create index if not exists idx_subscribers_stamp on subscribers (stamp);
+
+    create table if not exists subscriber_topics (
+      subscriber_id integer references subscribers(id) on delete cascade,
+      topic text
+    );
+
+    create table if not exists messages(
+      subscriber_id integer,
+      topic text,
+      message text, 
+      foreign key (subscriber_id, topic)
+        references subscriber_topics(subscriber_id, topic)
+        on delete cascade
+    );
+    create index if not exists idx_messages_subscriber_id_topic on messages (subscriber_id, topic);
+  SQL
+
+  def setup
+    @db.transaction do
+      @db.execute(SCHEMA)
+    end
+  end
+
+  def publish(topic, message)
+    @db.execute("
+      with subscribed as (
+        select subscriber_id
+        from subscriber_topics
+        where topic = $1
+      )
+      insert into messages
+      select subscriber_id, $1, $2
+      from subscribed
+    ", topic, message)
+  end
+
+  def prune_subscribers
+    @db.execute('delete from subscribers where stamp < ?', Time.now.to_i - 3600)
+  end
+end
+
+fn = Tempfile.new('pubsub_store').path
+p fn: fn
+db1 = Extralite::Database.new(fn)
+db1.pragma(journal_mode: :wal, synchronous: 1)
+db2 = Extralite::Database.new(fn)
+db2.pragma(journal_mode: :wal, synchronous: 1)
+db3 = Extralite::Database.new(fn)
+db3.pragma(journal_mode: :wal, synchronous: 1)
+
+db1.on_progress(1000) { |b| b ? sleep(0.0001) : snooze }
+db2.on_progress(1000) { |b| b ? sleep(0.0001) : snooze }
+db3.on_progress(1000) { |b| b ? sleep(0.0001) : snooze }
+
+producer = PubSub.new(db1)
+producer.setup
+
+consumer1 = PubSub.new(db2)
+consumer1.setup
+consumer1.attach
+consumer1.subscribe('foo', 'bar')
+
+consumer2 = PubSub.new(db3)
+consumer2.setup
+consumer2.attach
+consumer2.subscribe('foo', 'baz')
+
+
+# producer.publish('foo', 'foo1')
+# producer.publish('bar', 'bar1')
+# producer.publish('baz', 'baz1')
+
+# puts "- get messages"
+# consumer1.get_messages { |t, m| p consumer: 1, topic: t, message: m }
+# consumer2.get_messages { |t, m| p consumer: 2, topic: t, message: m }
+
+# puts "- get messages again"
+# consumer1.get_messages { |t, m| p consumer: 1, topic: t, message: m }
+# consumer2.get_messages { |t, m| p consumer: 2, topic: t, message: m }
+
+topics = %w{bar baz}
+
+publish_count = 0
+f1 = spin do
+  while true
+    message = "message#{rand(1000)}"
+    producer.publish(topics.sample, message)
+
+    publish_count += 1
+    snooze
+  end
+end
+
+receive_count = 0
+f2 = spin do
+  while true
+    consumer1.get_messages { |t, m| receive_count += 1 }
+    sleep 0.1
+  end
+end
+
+f3 = spin do
+  while true
+    consumer2.get_messages { |t, m| receive_count += 1 }
+    sleep 0.1
+  end
+end
+
+db4 = Extralite::Database.new(fn)
+db4.pragma(journal_mode: :wal, synchronous: 1)
+db4.on_progress(1000) { |busy| busy ? sleep(0.05) : snooze }
+
+last_t = Time.now
+last_publish_count = 0
+last_receive_count = 0
+while true
+  sleep 1
+  now = Time.now
+  elapsed = now - last_t
+  d_publish = publish_count - last_publish_count
+  d_receive = receive_count - last_receive_count
+  pending = db4.query_single_argv('select count(*) from messages')
+  puts "#{Time.now} publish: #{d_publish/elapsed}/s receive: #{d_receive/elapsed}/s pending: #{pending}"
+  last_t = now
+  last_publish_count = publish_count
+  last_receive_count = receive_count
+end
+
+# bm = Benchmark.ips do |x|
+#   x.config(:time => 10, :warmup => 2)
+
+#   x.report("pubsub") do
+#     db.transaction { 10.times { |i| producer.publish('foo', "foo#{i}") } }
+#     consumer1.get_messages
+#     consumer2.get_messages
+#   end
+
+#   x.compare!
+# end

data/examples/pubsub_store_threads.rb

@@ -0,0 +1,204 @@
+# frozen_string_literal: true
+
+require './lib/extralite'
+require 'tempfile'
+
+class PubSub
+  def initialize(db)
+    @db = db
+  end
+
+  def attach
+    @db.execute('insert into subscribers (stamp) values (?)', Time.now.to_i)
+    @id = @db.last_insert_rowid
+  end
+
+  def detach
+    @db.execute('delete from subscribers where id = ?', @id)
+  end
+
+  def subscribe(*topics)
+    @db.transaction do
+      topics.each do |t|
+        @db.execute('insert into subscriber_topics (subscriber_id, topic) values (?, ?)', @id, t)
+      end
+    end
+  end
+
+  def unsubscribe(*topics)
+    @db.transaction do
+      topics.each do |t|
+        @db.execute('delete from subscriber_topics where subscriber_id = ? and topic = ?', @id, t)
+      end
+    end
+  end
+
+  def get_messages(&block)
+    @db.transaction(:deferred) do
+      results = @db.query_ary('select topic, message from messages where subscriber_id = ?', @id)
+      return [] if results.empty?
+
+      @db.execute('delete from messages where subscriber_id = ?', @id)
+      results
+    end
+
+      # messages = @db.query_ary('delete from messages where subscriber_id = ? returning topic, message', @id)
+      # if block
+      #   messages.each(&block)
+      #   nil
+      # else
+      #   messages
+      # end
+  rescue Extralite::BusyError
+    p busy: :get_message
+    block_given? ? nil : []
+  end
+
+  SCHEMA = <<~SQL
+    PRAGMA foreign_keys = ON;
+
+    create table if not exists subscribers (
+      id integer primary key,
+      stamp float
+    );
+    create index if not exists idx_subscribers_stamp on subscribers (stamp);
+
+    create table if not exists subscriber_topics (
+      subscriber_id integer references subscribers(id) on delete cascade,
+      topic text
+    );
+
+    create table if not exists messages(
+      subscriber_id integer,
+      topic text,
+      message text,
+      foreign key (subscriber_id, topic)
+        references subscriber_topics(subscriber_id, topic)
+        on delete cascade
+    );
+    create index if not exists idx_messages_subscriber_id_topic on messages (subscriber_id, topic);
+  SQL
+
+  def setup
+    @db.transaction do
+      @db.execute(SCHEMA)
+    end
+  end
+
+  def publish(topic, message)
+    # @db.transaction do
+      @db.execute("
+        with subscribed as (
+          select subscriber_id
+          from subscriber_topics
+          where topic = $1
+        )
+        insert into messages
+        select subscriber_id, $1, $2
+        from subscribed
+      ", topic, message)
+    # end
+  rescue Extralite::BusyError
+    p busy: :publish
+    retry
+  end
+
+  def prune_subscribers
+    @db.execute('delete from subscribers where stamp < ?', Time.now.to_i - 3600)
+  end
+end
+
+fn = Tempfile.new('pubsub_store').path
+p fn
+db1 = Extralite::Database.new(fn)
+db1.busy_timeout = 0.1
+db1.pragma(journal_mode: :wal, synchronous: 1)
+db1.gvl_release_threshold = -1
+db2 = Extralite::Database.new(fn)
+db2.pragma(journal_mode: :wal, synchronous: 1)
+db2.busy_timeout = 0.1
+db2.gvl_release_threshold = -1
+db3 = Extralite::Database.new(fn)
+db3.pragma(journal_mode: :wal, synchronous: 1)
+db3.busy_timeout = 0.1
+db3.gvl_release_threshold = -1
+
+# db1.on_progress(100) { Thread.pass }
+# db2.on_progress(100) { Thread.pass }
+# db3.on_progress(100) { Thread.pass }
+
+producer = PubSub.new(db1)
+producer.setup
+
+consumer1 = PubSub.new(db2)
+consumer1.setup
+consumer1.attach
+consumer1.subscribe('foo', 'bar')
+
+consumer2 = PubSub.new(db3)
+consumer2.setup
+consumer2.attach
+consumer2.subscribe('foo', 'baz')
+
+# producer.publish('foo', 'foo1')
+# producer.publish('bar', 'bar1')
+# producer.publish('baz', 'baz1')
+
+# puts "- get messages"
+# consumer1.get_messages { |t, m| p consumer: 1, topic: t, message: m }
+# consumer2.get_messages { |t, m| p consumer: 2, topic: t, message: m }
+
+# puts "- get messages again"
+# consumer1.get_messages { |t, m| p consumer: 1, topic: t, message: m }
+# consumer2.get_messages { |t, m| p consumer: 2, topic: t, message: m }
+
+topics = %w{bar baz}
+
+publish_count = 0
+t1 = Thread.new do
+  while true
+    message = "message#{rand(1000)}"
+    producer.publish(topics.sample, message)
+
+    publish_count += 1
+    Thread.pass
+  end
+end
+
+receive_count = 0
+
+t2 = Thread.new do
+  while true
+    consumer1.get_messages { |t, m| receive_count += 1 }
+    sleep(0.1)
+  end
+end
+
+t3 = Thread.new do
+  while true
+    consumer2.get_messages { |t, m| receive_count += 1 }
+    sleep(0.1)
+  end
+end
+
+db4 = Extralite::Database.new(fn)
+db4.pragma(journal_mode: :wal, synchronous: 1)
+db4.gvl_release_threshold = -1
+db4.busy_timeout = 3
+
+last_t = Time.now
+last_publish_count = 0
+last_receive_count = 0
+while true
+  sleep 1
+  now = Time.now
+  elapsed = now - last_t
+  d_publish = publish_count - last_publish_count
+  d_receive = receive_count - last_receive_count
+
+  count = db4.query_single_argv('select count(*) from messages')
+  puts "#{Time.now} publish: #{d_publish/elapsed}/s receive: #{d_receive/elapsed}/s pending: #{count}"
+  last_t = now
+  last_publish_count = publish_count
+  last_receive_count = receive_count
+end

data/ext/extralite/changeset.c

@@ -186,13 +186,13 @@ static inline VALUE convert_value(sqlite3_value *value) {
     case SQLITE_BLOB:
       {
         int len = sqlite3_value_bytes(value);
-        void *blob = sqlite3_value_blob(value);
+        const void *blob = sqlite3_value_blob(value);
         return rb_str_new(blob, len);
       }
     case SQLITE_TEXT:
       {
         int len = sqlite3_value_bytes(value);
-        void *text = sqlite3_value_text(value);
+        const void *text = sqlite3_value_text(value);
         return rb_enc_str_new(text, len, UTF8_ENCODING);
       }
     default:
@@ -339,7 +339,7 @@ VALUE Changeset_to_a(VALUE self) {
 
 // copied from: https://sqlite.org/sessionintro.html
 static int xConflict(void *pCtx, int eConflict, sqlite3_changeset_iter *pIter){
-  int ret = (long)pCtx;
+  int ret = (int)pCtx;
   return ret;
 }