litestack 0.2.6 → 0.3.0

data/lib/litestack/litemetric.sql.yml

@@ -13,13 +13,13 @@ schema:
         name TEXT DEFAULT('___') NOT NULL ON CONFLICT REPLACE, 
         key TEXT DEFAULT('___') NOT NULL ON CONFLICT REPLACE, 
         count INTEGER DEFAULT(0) NOT NULL ON CONFLICT REPLACE, 
-        value INTEGER, 
-        minimum INTEGER, 
-        maximum INTEGER, 
+        value REAL, 
+        minimum REAL, 
+        maximum REAL, 
         created_at INTEGER DEFAULT((unixepoch()/300*300)) NOT NULL, 
         resolution TEXT DEFAULT('minute') NOT NULL, 
         PRIMARY KEY(resolution, created_at, topic, name, key)
-      );        
+      ) STRICT;        
 
     create_topic_index_on_events: CREATE INDEX events_topic_index ON events (resolution, created_at, topic) WHERE name = '___';
     create_event_index_on_events: CREATE INDEX events_event_index ON events (resolution, created_at , topic, name) WHERE key = '___';
@@ -226,7 +226,7 @@ stmts:
     FROM events 
     WHERE topic = ?1 AND name = ?2 AND resolution = ?3 
     AND created_at <= unixepoch()
-    AND created_at >= unixepoch() -?6 
+    AND created_at >= unixepoch() - ?6 
     AND key != '___'
     AND iif(length(?5) > 0, rowid IN (SELECT rowid FROM events_search WHERE key LIKE ?5), TRUE)
     GROUP BY key
@@ -251,7 +251,7 @@ stmts:
     FROM events 
     WHERE topic = ?1 AND name = ?2 AND resolution = ?3 
     AND created_at <= unixepoch()
-    AND created_at >= unixepoch() -?6 
+    AND created_at >= unixepoch() - ?6 
     AND key != '___'
     AND iif(length(?5) > 0, rowid IN (SELECT rowid FROM events_search WHERE key LIKE ?5), TRUE)
     GROUP BY key
@@ -272,8 +272,8 @@ stmts:
     SELECT 
       datetime(ts.slot, 'unixepoch') AS rtime, 
       ts.slot AS unixtime, 
-      format('%.2f', sum(events.count)) AS rcount, 
-      format('%.2f', avg(events.value/events.count)) AS ravg 
+      sum(events.count) AS rcount, 
+      avg(events.value/events.count) AS ravg 
     FROM (
       WITH RECURSIVE timeslot(x) AS ( 
         SELECT (unixepoch()/(?1))*(?1) 
@@ -294,8 +294,9 @@ stmts:
     SELECT 
       datetime(ts.slot, 'unixepoch') AS rtime, 
       ts.slot AS unixtime, 
-      format('%.2f', sum(events.count)) AS rcount, 
-      format('%.2f', avg(events.value/events.count)) AS ravg 
+      events.count AS rcount, 
+      events.value / events.count AS ravg, 
+      events.value AS rtotal 
     FROM (
       WITH RECURSIVE timeslot(x) AS ( 
         SELECT (unixepoch()/(?1))*(?1) 
@@ -317,8 +318,9 @@ stmts:
     SELECT 
       datetime(ts.slot, 'unixepoch') AS rtime, 
       ts.slot AS unixtime, 
-      format('%.2f', sum(events.count)) AS rcount, 
-      format('%.2f', avg(events.value/events.count)) AS ravg 
+      events.count AS rcount, 
+      events.value / events.count AS ravg, 
+      events.value AS rtotal 
     FROM (
       WITH RECURSIVE timeslot(x) AS ( 
         SELECT (unixepoch()/(?1))*(?1) 

data/lib/litestack/litemetric_collector.sql.yml

@@ -7,13 +7,13 @@ schema:
         name TEXT DEFAULT('___') NOT NULL ON CONFLICT REPLACE, 
         key TEXT DEFAULT('___') NOT NULL ON CONFLICT REPLACE, 
         count INTEGER DEFAULT(0) NOT NULL ON CONFLICT REPLACE, 
-        value INTEGER, 
-        minimum INTEGER, 
-        maximum INTEGER, 
+        value REAL, 
+        minimum REAL, 
+        maximum REAL, 
         created_at INTEGER DEFAULT((unixepoch()/300*300)) NOT NULL ON CONFLICT REPLACE, 
         resolution TEXT DEFAULT('minute') NOT NULL, 
         PRIMARY KEY(resolution, created_at, topic, name, key)
-      );        
+      ) STRICT;        
 
 stmts:
       

data/lib/litestack/litequeue.rb

@@ -78,12 +78,12 @@ class Litequeue
   
   # deletes all the entries in all queues, or if a queue name is given, deletes all entries in that specific queue
   def clear(queue=nil)
-    run_sql("DELETE FROM queue WHERE iif(?, name = ?,  1)", queue)
+    run_sql("DELETE FROM queue WHERE iif(?1 IS NOT NULL, name = ?1,  TRUE)", queue)
   end
 
   # returns a count of entries in all queues, or if a queue name is given, reutrns the count of entries in that queue
   def count(queue=nil)
-    run_sql("SELECT count(*) FROM queue WHERE iif(?, name = ?, 1)", queue)[0][0]
+    run_sql("SELECT count(*) FROM queue WHERE iif(?1 IS NOT NULL, name = ?1, TRUE)", queue)[0][0]
   end
   
   # return the size of the queue file on disk
@@ -116,27 +116,16 @@ class Litequeue
   private  
       
   def create_connection
-    conn = super
-    conn.wal_autocheckpoint = 10000 
-    sql = YAML.load_file("#{__dir__}/litequeue.sql.yml")
-    version = conn.get_first_value("PRAGMA user_version")
-    sql["schema"].each_pair do |v, obj|
-      if v > version
-        conn.transaction(:immediate) do 
-          obj.each{|k, s| conn.execute(s)}
-          conn.user_version = v
+    super("#{__dir__}/litequeue.sql.yml") do |conn|
+      conn.wal_autocheckpoint = 10000 
+      # check if there is an old database and convert entries to the new format
+      if conn.get_first_value("select count(*) from sqlite_master where name = '_ul_queue_'") == 1
+        conn.transaction(:immediate) do
+          conn.execute("INSERT INTO queue(fire_at, name, value, created_at) SELECT fire_at, queue, value, created_at FROM _ul_queue_")
+          conn.execute("DROP TABLE _ul_queue_")
         end
       end
-    end 
-    sql["stmts"].each { |k, v| conn.stmts[k.to_sym] = conn.prepare(v) }
-    # check if there is an old database and convert entries to the new format
-    if conn.get_first_value("select count(*) from sqlite_master where name = '_ul_queue_'") == 1
-      conn.transaction(:immediate) do
-        conn.execute("INSERT INTO queue(fire_at, name, value, created_at) SELECT fire_at, queue, value, created_at FROM _ul_queue_")
-        conn.execute("DROP TABLE _ul_queue_")
-      end
     end
-    conn
   end
 
 end  

data/lib/litestack/litesupport.rb

@@ -23,7 +23,7 @@ module Litesupport
     elsif ENV["RACK_ENV"]
       ENV["RACK_ENV"]
     elsif ENV["APP_ENV"]
-      ENV["RACK_ENV"]
+      ENV["APP_ENV"]
     else
       "development"
     end
@@ -99,8 +99,8 @@ module Litesupport
     @@mutex ||= Mutex.new
   end
   
-  # bold assumption, we will only synchronize threaded code
-  # if some code explicitly wants to synchronize a fiber
+  # bold assumption, we will only synchronize threaded code!
+  # If some code explicitly wants to synchronize a fiber
   # they must send (true) as a parameter to this method
   # else it is a no-op for fibers
   def self.synchronize(fiber_sync = false, &block)
@@ -162,21 +162,6 @@ module Litesupport
   
   end
    
-  module Forkable
-    
-    def _fork(*args)
-      ppid = Process.pid
-      result = super      
-      if Process.pid != ppid
-        # trigger a restart of all connections owned by Litesupport::Pool
-      end
-      result
-    end
-    
-  end
-
-  #::Process.singleton_class.prepend(::Litesupport::Forkable)
-  
   class Pool
   
     def initialize(count, &block)
@@ -333,13 +318,18 @@ module Litesupport
     def run_method(method, *args)
       @conn.acquire{|q| q.send(method, *args)}
     end
+
+    def run_stmt_method(stmt, method, *args)
+      @conn.acquire{|q| q.stmts[stmt].send(method, *args)}
+    end
+
     
     def create_pooled_connection(count = 1)
       Litesupport::Pool.new(1){create_connection}  
     end
 
     # common db object options
-    def create_connection
+    def create_connection(path_to_sql_file = nil)
       conn = SQLite3::Database.new(@options[:path])
       conn.busy_handler{ Litesupport.switch || sleep(rand * 0.002) }
       conn.journal_mode = "WAL"
@@ -349,9 +339,40 @@ module Litesupport
       class << conn
         attr_reader :stmts
       end
+      yield conn if block_given?
+      # use the <client>.sql.yml file to define the schema and compile prepared statements
+      unless path_to_sql_file.nil?
+        sql = YAML.load_file(path_to_sql_file)
+        version = conn.get_first_value("PRAGMA user_version")
+        sql["schema"].each_pair do |v, obj| 
+          if v > version
+            conn.transaction do 
+              obj.each do |k, s| 
+                begin
+                  conn.execute(s)
+                rescue Exception => e
+                  STDERR.puts "Error parsing #{k}"
+                  STDERR.puts s
+                  raise e               
+                end
+              end
+              conn.user_version = v
+            end
+          end
+        end 
+        sql["stmts"].each do |k, v| 
+          begin
+            conn.stmts[k.to_sym] = conn.prepare(v)
+          rescue Exception => e
+            STDERR.puts "Error parsing #{k}"
+            STDERR.puts v
+            raise e               
+          end
+        end
+      end
       conn
     end
-    
+        
   end
       
 end  

data/lib/litestack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Litestack
-  VERSION = "0.2.6"
+  VERSION = "0.3.0"
 end       

data/lib/litestack.rb

@@ -16,7 +16,7 @@ require_relative "./railties/rails/commands/dbconsole" if defined? Rails && defi
 require_relative "./active_support/cache/litecache" if defined? ActiveSupport
 require_relative "./active_job/queue_adapters/litejob_adapter" if defined? ActiveJob
 require_relative "./action_cable/subscription_adapter/litecable" if defined? ActionCable
-require_relative "./litestack/railtie" if defined? Rails
+require_relative "./litestack/railtie" if defined? Rails::Railtie
 
 module Litestack
   class NotImplementedError < Exception; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: litestack
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Mohamed Hassan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-16 00:00:00.000000000 Z
+date: 2023-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -109,12 +109,15 @@ files:
 - README.md
 - Rakefile
 - WHYLITESTACK.md
+- assets/event_page.png
+- assets/index_page.png
 - assets/litecable_logo_teal.png
 - assets/litecache_logo_teal.png
 - assets/litedb_logo_teal.png
 - assets/litejob_logo_teal.png
 - assets/litestack_logo_teal.png
 - assets/litestack_logo_teal_large.png
+- assets/topic_page.png
 - bench/bench.rb
 - bench/bench_cache_rails.rb
 - bench/bench_cache_raw.rb
@@ -138,6 +141,10 @@ files:
 - lib/litestack/liteboard/views/event.erb
 - lib/litestack/liteboard/views/index.erb
 - lib/litestack/liteboard/views/layout.erb
+- lib/litestack/liteboard/views/litecable.erb
+- lib/litestack/liteboard/views/litecache.erb
+- lib/litestack/liteboard/views/litedb.erb
+- lib/litestack/liteboard/views/litejob.erb
 - lib/litestack/liteboard/views/topic.erb
 - lib/litestack/litecable.rb
 - lib/litestack/litecable.sql.yml