haj 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 219dc1783cac1e87594e1cb9c035ebe1a9ece7636a35511d4184aca468e9e3f0
-  data.tar.gz: b560ac65c1cb1d7b262c9a73801038740edf4b0d3461166fbdfd9b5ae85ce8d0
+  metadata.gz: fed2d88ded1291360ede531814dc84cef8159984320b3e9823df64d06c16425d
+  data.tar.gz: fb05436a1d0f67219622d53bc0f22bad1d6f9e0f175d4cf90b283bc0d0bd06b3
 SHA512:
-  metadata.gz: 509ec3899d10345067f6a54dde60aec8a837ca7fbb91f8a9990c97495fe862d3c7eed1ac3d39d447238090f3bec5abc9ede818cb10833ba405d79c1417b7ceff
-  data.tar.gz: a42dcddc1b23cf7f0f2417f1cd835b023f9218a9a77a8ed5d824f5764b58a1989ceee4c07730abcf720cf2e7a4e375bd4f8eb0d4bed7f58a206649a915aaa21c
+  metadata.gz: 3831d13ef82ca2de322c2343ec1baf5460afa7e83374891bdf0ead1fa07268c6f43f386390a607f0dd6abf679f9eb403d9ad1e4ec86ca32a06b64ded714e0cd1
+  data.tar.gz: d1ba78111cae734bb23f41b13400ee864711fe6508bc2823697805fd19c5bbe7a0afe47abfb3483e8a95e3aff9d7419903e379369aa8cbfeadbcdce5fcfd03ee

data/Rakefile

@@ -6,7 +6,7 @@ RSpec::Core::RakeTask.new(:spec)
 require 'jars/installer'
 
 desc 'Download and vendor the jars needed'
-task :setup do
+task :vendor_jars do
   Jars::Installer.vendor_jars!
 end
 

data/bin/{benchmark → bench}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
-# require 'haj'
+require 'haj'
 
 require 'faker'
 require 'benchmark/ips'
@@ -16,7 +16,8 @@ Jdbc::Postgres.load_driver
 redis = Redis.new(host: 'redis')
 redis.flushall
 
-pool = JedisRb::Pool.new(host: 'redis')
+jedis = JedisRb::Pool.new(host: 'redis')
+haj = HAJ::Client.new(host: 'redis')
 
 conn = Sequel.connect('jdbc:postgresql://pg/hajrb', user: 'hajrb', password: 'hajrb')
 
@@ -48,16 +49,25 @@ Benchmark.ips do |x|
       conn.fetch("select v from things where k='#{random_keys[i]}'")
     end
   end
+
   x.report('Redis') do
     n.times do |i|
       redis.get(random_keys[i])
     end
   end
+
   x.report('Jedis') do
     n.times do |i|
-      pool.execute(:get, random_keys[i].to_s)
+      jedis.execute(:get, random_keys[i].to_s)
     end
   end
+
+  x.report('HAJ') do
+    n.times do |i|
+      haj.get random_keys[i].to_s
+    end
+  end
+
   x.report('Ruby hash') do
     n.times do |i|
       memory[random_keys[i]]

data/lib/haj.rb

@@ -1,10 +1,31 @@
+# Standard library
 require 'singleton'
 
+# All the Java jars that need to be loaded
 require 'haj_jars'
 
 require 'haj/version'
-require 'haj/pool'
+
+# Application files
+require 'haj/client'
+require 'haj/pool/generic'
+require 'haj/pool/config'
 
 module HAJ
+  # Make the Jedis Java classes a bit more accessible.
+  #
+  # Normally this might make inspection a bit weird because inspecting a
+  # `HAJ::Jedis::Client` object will actually return a
+  # `Java::RedisClientsJedis::Jedis` object.
+  #
+  # However, since we're obviously working with Jedis, this convention will
+  # probably look a lot better when reading the code so the previous point
+  # will be probably less annoying.
+  module Jedis
 
+    Client = Java::RedisClientsJedis::Jedis
+    # The Jedis default pool.
+    Pool = Java::RedisClientsJedis::JedisPool
+    Protocol = Java::RedisClientsJedis::Protocol
+  end
 end

data/lib/haj/client.rb

@@ -0,0 +1,15 @@
+module HAJ
+  class Client
+
+
+    # @param opts [Hash] Options to connect to the Redis database
+    def initialize(opts = {})
+      @pool = HAJ::Pool::Generic.new(opts)
+    end
+
+    def execute(method, *args)
+      @pool.hold { |conn| conn.send(method, *args) }
+    end
+
+  end
+end

data/lib/haj/pool/config.rb

@@ -0,0 +1,39 @@
+module HAJ
+  module Pool
+    class Config < Java::org.apache.commons.pool2.impl.GenericObjectPoolConfig
+
+      # Default values taken from the Jedis PoolConfig
+      DEFAULT_TESTS_WHILE_IDLE            = true
+      DEFAULT_MIN_EVICTABLE_IDLE_TIME     = 60_000
+      DEFAULT_TIME_BETWEEN_EVICTIONS_RUNS = 30_000
+      DEFAULT_TESTS_PER_EVICTION_RUN      = -1
+
+      # Supplemental default values that allow more fine-tuned configuration
+      # of the connection pool
+      DEFAULT_MAX_TOTAL = 8
+      DEFAULT_MAX_IDLE  = 8
+
+      def initialize(options = {})
+        # Make sure that we're not forwarding the arguments to the parent class
+        # as there are no constructors defined that accept a Hash/java.util.Map
+        # as an argument
+        super()
+
+        self.max_total = options.fetch(:max_total) { DEFAULT_MAX_TOTAL }
+        self.max_idle  = options.fetch(:max_idle) { DEFAULT_MAX_IDLE }
+
+        self.test_while_idle =
+          options.fetch(:test_while_idle) { DEFAULT_TESTS_WHILE_IDLE }
+
+        self.min_evictable_idle_time_millis =
+          options.fetch(:min_evictable_idle_time) { DEFAULT_MIN_EVICTABLE_IDLE_TIME }
+
+        self.time_between_eviction_runs_millis =
+          options.fetch(:time_between_eviction_runs) { DEFAULT_TIME_BETWEEN_EVICTIONS_RUNS }
+
+        self.num_tests_per_eviction_run =
+          options.fetch(:tests_per_eviction_run) { DEFAULT_TESTS_PER_EVICTION_RUN }
+      end
+    end
+  end
+end

data/lib/haj/pool/generic.rb

@@ -0,0 +1,44 @@
+module HAJ
+
+  module Pool
+    # Class to provide a POC for better pooling.
+    class Generic
+
+      DEFAULT_HOST     = 'localhost'.freeze
+      DEFAULT_PORT     = 6379
+      DEFAULT_TIMEOUT  = 2000
+      DEFAULT_DATABASE = 0
+
+      def initialize(opts = {})
+        config = HAJ::Pool::Config.new(opts)
+
+        host     = opts.fetch(:host) { DEFAULT_HOST }
+        port     = opts.fetch(:port) { DEFAULT_PORT }
+        timeout  = opts.fetch(:timeout) { DEFAULT_TIMEOUT }
+        password = opts.fetch(:password) { nil }
+        database = opts.fetch(:database) { DEFAULT_DATABASE }
+        name     = opts.fetch(:name) { nil }
+
+        @inner_pool = HAJ::Jedis::Pool.new(
+          config,
+          host,
+          port,
+          timeout,
+          password,
+          database,
+          name
+        )
+      end
+
+      def hold
+        connection = @inner_pool.resource
+
+        yield connection
+      ensure
+        connection.close if connection
+      end
+
+    end
+
+  end
+end

data/lib/haj/version.rb

@@ -1,3 +1,3 @@
 module HAJ
-    VERSION = '0.0.1'.freeze
+    VERSION = '0.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haj
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andrei Maxim
@@ -96,16 +96,17 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/benchmark
+- bin/bench
 - bin/console
 - bin/rake
 - bin/rspec
-- bin/setup
 - data/redis/.gitkeep
 - docker-compose.yml
 - haj.gemspec
 - lib/haj.rb
-- lib/haj/pool.rb
+- lib/haj/client.rb
+- lib/haj/pool/config.rb
+- lib/haj/pool/generic.rb
 - lib/haj/version.rb
 - lib/haj_jars.rb
 - lib/org/apache/commons/commons-pool2/2.4.2/commons-pool2-2.4.2.jar

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/lib/haj/pool.rb

@@ -1,6 +0,0 @@
-module HAJ
-  # Class to provide a POC for better pooling.
-  class Pool
-
-  end
-end