trifle-stats 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64e5b8835413e4d664240d8b3bcb30f66bc886c139870c5849a1ef0d48ddcdc6
-  data.tar.gz: 8e499def09294e6b76ec07ea8f906d1b210145a305a82ffabf65665d777786d9
+  metadata.gz: 7b1fd5555bb22a06ff4dd05f400d307c5207ee75b2619ed59686ae65ec1d2a35
+  data.tar.gz: eaada71f020e696c42d0c89a6e7ce917f7d4377a94b65fe777f8337f747af4e2
 SHA512:
-  metadata.gz: e4e9c33a1921fed870c398370e1fc0eeeb1c4f1d33ad1e030ef8a1555cdc5930a4541e2aeae2409ef0738c4b76437a16c195a019cdc8e73752e8e5ae9fda8a78
-  data.tar.gz: 7b76bf3d1900c3db9c5038ec6c6a4245cfb0ea056385f3dc77f552f6b08f5f0f90816692b21c0763fa91d9ad85c44c0820e85f7824c9b895ed6ecbb54f2adc24
+  metadata.gz: 4024c70b822b07415a10e1ae86921d1a0672d4d6ad142205251a4b9d83776362d2c3d2121dbe64a8342fec2421e7521cda1fab8192ecc1370a332b1ee8090d80
+  data.tar.gz: 8c05ef417762a1a1bb6919465695301c803d643fd355308a3dbdb74422225942015a89d73fa4f37dd662b38ba018475c9f426b3b8447cc191cebd02885b4aa2c

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    trifle-stats (0.2.1)
+    trifle-stats (0.3.0)
+      pg (>= 1.2)
       redis (>= 4.2)
       tzinfo (~> 2.0)
 
@@ -16,6 +17,7 @@ GEM
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
+    pg (1.2.3)
     rainbow (3.0.0)
     rake (12.3.3)
     redis (4.2.5)

data/lib/trifle/stats.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'trifle/stats/driver/redis'
+require 'trifle/stats/driver/postgres'
 require 'trifle/stats/driver/process'
 require 'trifle/stats/mixins/packer'
 require 'trifle/stats/nocturnal'

data/lib/trifle/stats/configuration.rb

@@ -6,11 +6,9 @@ module Trifle
   module Stats
     class Configuration
       attr_writer :driver
-      attr_accessor :track_ranges, :separator, :time_zone,
-                    :beginning_of_week
+      attr_accessor :track_ranges, :time_zone, :beginning_of_week
 
       def initialize
-        @separator = '::'
         @ranges = %i[minute hour day week month quarter year]
         @beginning_of_week = :monday
         @time_zone = 'GMT'

data/lib/trifle/stats/driver/postgres.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'pg'
+require_relative '../mixins/packer'
+
+module Trifle
+  module Stats
+    module Driver
+      class Postgres
+        include Mixins::Packer
+        attr_accessor :client, :table_name, :separator
+
+        def initialize(client = PG::Connection.new, table_name: 'trifle_stats')
+          @client = client
+          @table_name = table_name
+          @separator = '::'
+        end
+
+        def inc(key:, **values)
+          pkey = key.join(separator)
+
+          self.class.pack(hash: values).each do |k, c|
+            _inc_one(key: pkey, name: k, value: c)
+          end
+        end
+
+        def _inc_one(key:, name:, value:)
+          data = { name => value }
+          query = "INSERT INTO trifle_stats(key, data) VALUES ('#{key}', '#{data.to_json}') ON CONFLICT (key) DO UPDATE SET data = jsonb_set(to_jsonb(trifle_stats.data), '{#{name}}', (COALESCE(trifle_stats.data->>'#{name}','0')::int + #{value})::text::jsonb)" # rubocop:disable Metric/LineLength
+
+          client.exec(query)
+        end
+
+        def set(key:, **values)
+          pkey = key.join(separator)
+
+          _set_all(key: pkey, **values)
+        end
+
+        def _set_all(key:, **values)
+          data = self.class.pack(hash: values)
+          query = "INSERT INTO trifle_stats(key, data) VALUES ('#{key}', '#{values.to_json}') ON CONFLICT (key) DO UPDATE SET data = '#{data.to_json}'" # rubocop:disable Metric/LineLength
+
+          client.exec(query)
+        end
+
+        def get(key:)
+          pkey = key.join(separator)
+
+          data = _get(key: pkey)
+          return nil if data.nil?
+
+          self.class.unpack(hash: data)
+        end
+
+        def _get(key:)
+          result = client.exec_params(
+            "SELECT * FROM #{table_name} WHERE key = $1 LIMIT 1;", [key]
+          ).to_a.first
+          return nil if result.nil?
+
+          JSON.parse(result.try(:fetch, 'data'))
+        rescue JSON::ParserError
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/trifle/stats/driver/process.rb

@@ -9,27 +9,28 @@ module Trifle
         include Mixins::Packer
         def initialize
           @data = {}
+          @separator = '::'
         end
 
         def inc(key:, **values)
           self.class.pack(hash: values).each do |k, c|
-            d = @data.fetch(key, {})
+            d = @data.fetch(key.join(@separator), {})
             d[k] = d[k].to_i + c
-            @data[key] = d
+            @data[key.join(@separator)] = d
           end
         end
 
         def set(key:, **values)
           self.class.pack(hash: values).each do |k, c|
-            d = @data.fetch(key, {})
+            d = @data.fetch(key.join(@separator), {})
             d[k] = c
-            @data[key] = d
+            @data[key.join(@separator)] = d
           end
         end
 
         def get(key:)
           self.class.unpack(
-            hash: @data.fetch(key, {})
+            hash: @data.fetch(key.join(@separator), {})
           )
         end
       end

data/lib/trifle/stats/driver/redis.rb

@@ -8,32 +8,33 @@ module Trifle
     module Driver
       class Redis
         include Mixins::Packer
-        attr_accessor :prefix
+        attr_accessor :client, :prefix, :separator
 
         def initialize(client = ::Redis.current, prefix: 'trfl')
           @client = client
           @prefix = prefix
+          @separator = '::'
         end
 
         def inc(key:, **values)
-          pkey = [@prefix, key].join('::')
+          pkey = ([prefix] + key).join(separator)
 
           self.class.pack(hash: values).each do |k, c|
-            @client.hincrby(pkey, k, c)
+            client.hincrby(pkey, k, c)
           end
         end
 
         def set(key:, **values)
-          pkey = [@prefix, key].join('::')
+          pkey = ([prefix] + key).join(separator)
 
-          @client.hmset(pkey, *self.class.pack(hash: values))
+          client.hmset(pkey, *self.class.pack(hash: values))
         end
 
         def get(key:)
-          pkey = [@prefix, key].join('::')
+          pkey = ([prefix] + key).join(separator)
 
           self.class.unpack(
-            hash: @client.hgetall(pkey)
+            hash: client.hgetall(pkey)
           )
         end
       end

data/lib/trifle/stats/operations/timeseries/increment.rb

@@ -22,7 +22,7 @@ module Trifle
             config.ranges.map do |range|
               at = Nocturnal.new(@at, config: config).send(range)
               config.driver.inc(
-                key: [key, range, at.to_i].join(config.separator),
+                key: [key, range, at.to_i],
                 **values
               )
             end

data/lib/trifle/stats/operations/timeseries/set.rb

@@ -22,7 +22,7 @@ module Trifle
             config.ranges.map do |range|
               at = Nocturnal.new(@at, config: config).send(range)
               config.driver.set(
-                key: [key, range, at.to_i].join(config.separator),
+                key: [key, range, at.to_i],
                 **values
               )
             end

data/lib/trifle/stats/operations/timeseries/values.rb

@@ -27,7 +27,7 @@ module Trifle
             timeline.map do |at|
               {
                 at => config.driver.get(
-                  key: [key, range, at.to_i].join(config.separator)
+                  key: [key, range, at.to_i]
                 )
               }
             end

data/lib/trifle/stats/version.rb

@@ -2,6 +2,6 @@
 
 module Trifle
   module Stats
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end

data/trifle-stats.gemspec

@@ -34,5 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('rspec', '~> 3.2')
   spec.add_development_dependency('rubocop', '1.0.0')
   spec.add_runtime_dependency('redis', '>= 4.2')
+  spec.add_runtime_dependency('pg', '>= 1.2')
   spec.add_runtime_dependency('tzinfo', '~> 2.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trifle-stats
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Jozef Vaclavik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,7 @@ files:
 - lib/trifle/stats.rb
 - lib/trifle/stats/configuration.rb
 - lib/trifle/stats/driver/README.md
+- lib/trifle/stats/driver/postgres.rb
 - lib/trifle/stats/driver/process.rb
 - lib/trifle/stats/driver/redis.rb
 - lib/trifle/stats/mixins/packer.rb