Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source 'https://rubygems.org'
source "https://rubygems.org"

gemspec
4 changes: 2 additions & 2 deletions init.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require_relative 'load_path'
require_relative "load_path"

require 'message_store/postgres'
require "message_store/postgres"
36 changes: 18 additions & 18 deletions lib/message_store/postgres.rb
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
require 'pg'
require "pg"

require 'message_store'
require "message_store"

require 'log'
require 'telemetry'
require 'settings'
require "log"
require "telemetry"
require "settings"

require 'message_store/postgres/log'
require "message_store/postgres/log"

require 'message_store/postgres/settings'
require 'message_store/postgres/session'
require "message_store/postgres/settings"
require "message_store/postgres/session"

require 'message_store/postgres/put'
require 'message_store/postgres/write'
require "message_store/postgres/put"
require "message_store/postgres/write"

require 'message_store/postgres/get'
require 'message_store/postgres/get/condition'
require 'message_store/postgres/get/stream'
require 'message_store/postgres/get/stream/last'
require 'message_store/postgres/get/category'
require 'message_store/postgres/get/category/correlation'
require 'message_store/postgres/get/category/consumer_group'
require 'message_store/postgres/read'
require "message_store/postgres/get"
require "message_store/postgres/get/condition"
require "message_store/postgres/get/stream"
require "message_store/postgres/get/stream/last"
require "message_store/postgres/get/category"
require "message_store/postgres/get/category/correlation"
require "message_store/postgres/get/category/consumer_group"
require "message_store/postgres/read"
14 changes: 7 additions & 7 deletions lib/message_store/postgres/controls.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
require 'message_store/controls'
require "message_store/controls"

require 'message_store/postgres/controls/time'
require 'message_store/postgres/controls/position'
require 'message_store/postgres/controls/category'
require 'message_store/postgres/controls/stream_name'
require 'message_store/postgres/controls/message_data'
require 'message_store/postgres/controls/put'
require "message_store/postgres/controls/time"
require "message_store/postgres/controls/position"
require "message_store/postgres/controls/category"
require "message_store/postgres/controls/stream_name"
require "message_store/postgres/controls/message_data"
require "message_store/postgres/controls/put"
8 changes: 4 additions & 4 deletions lib/message_store/postgres/get.rb
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ def convert(result)
end

def self.message_data(record)
record['data'] = Get::Deserialize.data(record['data'])
record['metadata'] = Get::Deserialize.metadata(record['metadata'])
record['time'] = Get::Time.utc_coerced(record['time'])
record["data"] = Get::Deserialize.data(record["data"])
record["metadata"] = Get::Deserialize.metadata(record["metadata"])
record["time"] = Get::Time.utc_coerced(record["time"])

MessageData::Read.build(record)
end
Expand All @@ -126,7 +126,7 @@ def raise_error(pg_error)
end

def self.error_message(pg_error)
pg_error.message.gsub('ERROR:', '').strip
pg_error.message.gsub("ERROR:", "").strip
end

def self.specialization(stream_name)
Expand Down
2 changes: 1 addition & 1 deletion lib/message_store/postgres/get/category.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def sql_command
end

def parameters
'$1::varchar, $2::bigint, $3::bigint, $4::varchar, $5::bigint, $6::bigint, $7::varchar'
"$1::varchar, $2::bigint, $3::bigint, $4::varchar, $5::bigint, $6::bigint, $7::varchar"
end

def parameter_values(category, position)
Expand Down
8 changes: 4 additions & 4 deletions lib/message_store/postgres/get/category/consumer_group.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ module ConsumerGroup
Error = Class.new(RuntimeError)

def self.error(error_message)
if error_message.start_with?('Consumer group size must not be less than 1') ||
error_message.start_with?('Consumer group member must be less than the group size') ||
error_message.start_with?('Consumer group member must not be less than 0') ||
error_message.start_with?('Consumer group member and size must be specified')
if error_message.start_with?("Consumer group size must not be less than 1") ||
error_message.start_with?("Consumer group member must be less than the group size") ||
error_message.start_with?("Consumer group member must not be less than 0") ||
error_message.start_with?("Consumer group member and size must be specified")
Error.new(error_message)
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/message_store/postgres/get/category/correlation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module Correlation
Error = Class.new(RuntimeError)

def self.error(error_message)
if error_message.start_with?('Correlation must be a category')
if error_message.start_with?("Correlation must be a category")
Error.new(error_message)
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/message_store/postgres/get/condition.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module Condition
Error = Class.new(RuntimeError)

def self.error(error_message)
if error_message.start_with?('Retrieval with SQL condition is not activated')
if error_message.start_with?("Retrieval with SQL condition is not activated")
Get::Condition::Error.new(error_message)
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/message_store/postgres/get/stream.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def sql_command
end

def parameters
'$1::varchar, $2::bigint, $3::bigint, $4::varchar'
"$1::varchar, $2::bigint, $3::bigint, $4::varchar"
end

def parameter_values(stream_name, position)
Expand Down
4 changes: 2 additions & 2 deletions lib/message_store/postgres/put.rb
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ def position(records)

def raise_error(pg_error)
error_message = pg_error.message
if error_message.include? 'Wrong expected version'
error_message.gsub!('ERROR:', '').strip!
if error_message.include? "Wrong expected version"
error_message.gsub!("ERROR:", "").strip!
logger.error { error_message }
raise ExpectedVersion::Error, error_message
end
Expand Down
2 changes: 1 addition & 1 deletion lib/message_store/postgres/session.rb
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def self.settings(settings)
s = settings.dup

if s.has_key?(:password)
s[:password] = '*' * 8
s[:password] = "*" * 8
end

s
Expand Down
2 changes: 1 addition & 1 deletion lib/message_store/postgres/settings.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def self.names

class Defaults
def self.data_source
ENV['MESSAGE_STORE_SETTINGS_PATH'] || 'settings/message_store_postgres.json'
ENV["MESSAGE_STORE_SETTINGS_PATH"] || "settings/message_store_postgres.json"
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions lib/message_store/postgres/write.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def configure(session: nil)

def write(batch, stream_name, expected_version: nil)
logger.trace(tag: :write) do
message_types = batch.map {|message_data| message_data.type }.uniq.join(', ')
message_types = batch.map {|message_data| message_data.type }.uniq.join(", ")
"Writing batch (Stream Name: #{stream_name}, Types: #{message_types}, Number of Messages: #{batch.length}, Expected Version: #{expected_version.inspect})"
end

Expand All @@ -31,7 +31,7 @@ def write(batch, stream_name, expected_version: nil)
end

logger.debug(tag: :write) do
message_types = batch.map {|message_data| message_data.type }.uniq.join(', ')
message_types = batch.map {|message_data| message_data.type }.uniq.join(", ")
"Wrote batch (Stream Name: #{stream_name}, Types: #{message_types}, Number of Messages: #{batch.length}, Expected Version: #{expected_version.inspect})"
end

Expand Down
6 changes: 3 additions & 3 deletions load_path.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
bundler_standalone_loader = 'gems/bundler/setup'
bundler_standalone_loader = "gems/bundler/setup"

begin
require_relative bundler_standalone_loader
Expand All @@ -8,10 +8,10 @@
Bundler.require
end

lib_dir = File.expand_path('lib', __dir__)
lib_dir = File.expand_path("lib", __dir__)
$LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)

libraries_dir = ENV['LIBRARIES_HOME']
libraries_dir = ENV["LIBRARIES_HOME"]
unless libraries_dir.nil?
libraries_dir = File.expand_path(libraries_dir)
$LOAD_PATH.unshift libraries_dir unless $LOAD_PATH.include?(libraries_dir)
Expand Down
42 changes: 21 additions & 21 deletions message_store-postgres.gemspec
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
# -*- encoding: utf-8 -*-
Gem::Specification.new do |s|
s.name = 'evt-message_store-postgres'
s.version = '2.5.1.1'
s.summary = 'Message store implementation for PostgreSQL'
s.description = ' '
s.name = "evt-message_store-postgres"
s.version = "2.5.1.1"
s.summary = "Message store implementation for PostgreSQL"
s.description = " "

s.authors = ['The Eventide Project']
s.email = 'opensource@eventide-project.org'
s.homepage = 'https://github.com/eventide-project/message-store-postgres'
s.licenses = ['MIT']
s.authors = ["The Eventide Project"]
s.email = "opensource@eventide-project.org"
s.homepage = "https://github.com/eventide-project/message-store-postgres"
s.licenses = ["MIT"]

s.require_paths = ['lib']
s.files = Dir.glob('{lib,database}/**/*')
s.require_paths = ["lib"]
s.files = Dir.glob("{lib,database}/**/*")
s.platform = Gem::Platform::RUBY
s.required_ruby_version = '>= 2.4.0'
s.required_ruby_version = ">= 2.4.0"

s.executables = Dir.glob('scripts/evt-*').map(&File.method(:basename))
s.bindir = 'scripts'
s.executables = Dir.glob("scripts/evt-*").map(&File.method(:basename))
s.bindir = "scripts"

s.add_runtime_dependency 'evt-message_store'
s.add_runtime_dependency 'evt-log'
s.add_runtime_dependency 'evt-settings'
s.add_runtime_dependency "evt-message_store"
s.add_runtime_dependency "evt-log"
s.add_runtime_dependency "evt-settings"

s.add_runtime_dependency 'message-db'
s.add_runtime_dependency 'pg'
s.add_runtime_dependency "message-db"
s.add_runtime_dependency "pg"

s.add_development_dependency 'test_bench'
s.add_development_dependency 'evt-diagnostics-sample'
s.add_development_dependency 'ntl-actor'
s.add_development_dependency "test_bench"
s.add_development_dependency "evt-diagnostics-sample"
s.add_development_dependency "ntl-actor"
end
2 changes: 1 addition & 1 deletion test.rb
Original file line number Diff line number Diff line change
@@ -1 +1 @@
require_relative 'test/automated'
require_relative "test/automated"
6 changes: 3 additions & 3 deletions test/automated.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require_relative './test_init'
require_relative "./test_init"

TestBench::Run.(
'test/automated',
exclude: '{_*,*sketch*,*_init,*_tests}.rb'
"test/automated",
exclude: "{_*,*sketch*,*_init,*_tests}.rb"
) or exit(false)
2 changes: 1 addition & 1 deletion test/automated/automated_init.rb
Original file line number Diff line number Diff line change
@@ -1 +1 @@
require_relative '../test_init'
require_relative "../test_init"
2 changes: 1 addition & 1 deletion test/automated/get/category/generalized/get_messages.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative '../../../automated_init'
require_relative "../../../automated_init"

context "Get" do
context "Category" do
Expand Down
6 changes: 3 additions & 3 deletions test/automated/get/category/generalized/specialization.rb
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
require_relative '../../../automated_init'
require_relative "../../../automated_init"

context "Get" do
context "Category" do
context "Generalized" do
context "Specialization" do
category = Controls::Category.example
batch_size = 1
correlation = 'someCorrelation'
correlation = "someCorrelation"
consumer_group_member = 0
consumer_group_size = 1
condition = 'global_position >= 1'
condition = "global_position >= 1"
session = Session.build

get = Get.build(category, batch_size: batch_size, correlation: correlation, consumer_group_member: consumer_group_member, consumer_group_size: consumer_group_size, condition: condition, session: session)
Expand Down
2 changes: 1 addition & 1 deletion test/automated/get/category/specialized/batch_size.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative '../../../automated_init'
require_relative "../../../automated_init"

context "Get" do
context "Category" do
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative '../../../../automated_init'
require_relative "../../../../automated_init"

context "Get" do
context "Category" do
Expand All @@ -8,12 +8,12 @@

stream_name, _ = Controls::Put.(instances: 3, category: category)

condition = 'position = 0 OR position = 2'
condition = "position = 0 OR position = 2"

settings = Postgres::Settings.build
session = Session.new
settings.set(session)
session.options = '-c message_store.sql_condition=on'
session.options = "-c message_store.sql_condition=on"

messages = Get::Category.(category, batch_size: 3, condition: condition, session: session)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative '../../../../automated_init'
require_relative "../../../../automated_init"

context "Get" do
context "Category" do
Expand All @@ -7,7 +7,7 @@
context "Condition Is Not Activated" do
category = Controls::Category.example

condition = 'some condition'
condition = "some condition"

settings = Postgres::Settings.build
session = Session.new
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative '../../../../automated_init'
require_relative "../../../../automated_init"

context "Get" do
context "Category" do
Expand Down
Loading