sequel-schema-sharding 0.0.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72d8c926196bde281cfb5dba3a6227639c1c3cdb
-  data.tar.gz: 51db28a22be25d6796a4287c7c3886e50d8f92df
+  metadata.gz: 9259594ee38417f3162a7b250722bb2f6d784b4b
+  data.tar.gz: 7ab7c107c400e6ec46d3cd612bda9097c82e8243
 SHA512:
-  metadata.gz: 9b39019d3b9ff7f93cf9c1810ea87a2835b89e44c0d7bd279f931ace4600b296cb26a2ab88ec73acb1a2f1536f9a96c930f64cfeb6206f09806ca9228bb2e590
-  data.tar.gz: 813908ccaa7724a9cf5974c51047060dd585a04f8beefe80ef0c28e9d7c5e569d9249334197f874a0b4f5891a2c2da9ec5b9ed2346458696a76ff9c9c3a99578
+  metadata.gz: e1c5b3345a5ce05accb17231d8981a61b077cfe30f653992dbcfefb71c52689b31c1d9248ac831a2d857fb30fa326bbf383535b2ae5615600e7cc0e734316e2b
+  data.tar.gz: 47367a85fe138b51f66a8a60368ef2faf960d4c539117cc972abfc32770562cbab770a29b07cf697892d61d9d3eb07f48c3c422eca68975fa90a021bb6e61b9b

data/lib/sequel/schema-sharding.rb

@@ -7,6 +7,7 @@ require 'sequel/schema-sharding/finder'
 require 'sequel/schema-sharding/sequel_ext'
 require 'sequel/schema-sharding/model'
 require 'logger'
+require 'sequel/schema-sharding/logger_proxy'
 
 module Sequel
   module SchemaSharding
@@ -19,7 +20,7 @@ module Sequel
     end
 
     def self.logger
-      @logger ||= Logger.new($stdout)
+      @logger ||= Logger.new(StringIO.new)
     end
 
     def self.logger=(logger)

data/lib/sequel/schema-sharding/connection_manager.rb

@@ -11,11 +11,11 @@ module Sequel
 
       def [](name)
         config = db_config_for(name)
-        @connections[name.to_s] ||= Sequel.postgres(:user => config['username'],
-                                                    :password => config['password'],
-                                                    :host => config['host'],
-                                                    :database => config['database'],
-                                                    :port => config['port'])
+        @connections[name.to_s] ||= Sequel.postgres(master_config_for(config).merge!(replica_hash_for(config)))
+      end
+
+      def master(name)
+        @connections["master_#{name}"] ||= Sequel.postgres(master_config_for(db_config_for(name)))
       end
 
       def disconnect
@@ -37,6 +37,27 @@ module Sequel
 
       private
 
+      def master_config_for(config)
+        {
+          :user => config['username'],
+          :password => config['password'],
+          :host => config['host'],
+          :database => config['database'],
+          :port => config['port'],
+          :single_threaded => true,
+          :loggers => [Sequel::SchemaSharding::LoggerProxy.new]
+        }
+      end
+
+      def replica_hash_for(config)
+        return {} if config['replicas'].nil?
+        {
+          :servers => {
+            :read_only => ->(db) { {:host => config['replicas'].sample} }
+          }
+        }
+      end
+
       def db_config_for(name)
         config.physical_shard_configs[name]
       end

data/lib/sequel/schema-sharding/database_manager.rb

@@ -59,7 +59,7 @@ module Sequel
           config.logical_shard_configs(table_name).each_pair do |shard_number, physical_shard|
             schema_name = connection_manager.schema_for(table_name, env, shard_number)
             Sequel::SchemaSharding.logger.info "Creating schema #{schema_name} on #{physical_shard}.."
-            connection = connection_manager[physical_shard]
+            connection = connection_manager.master(physical_shard)
 
             begin
               connection.run("CREATE SCHEMA #{schema_name}")

data/lib/sequel/schema-sharding/logger_proxy.rb

@@ -0,0 +1,14 @@
+require 'logger'
+
+module Sequel
+  module SchemaSharding
+    class LoggerProxy < ::Logger
+      def initialize
+      end
+
+      def add(severity, message = nil, progname = nil, &block)
+        Sequel::SchemaSharding.logger.add(severity, message, progname, &block)
+      end
+    end
+  end
+end

data/lib/sequel/schema-sharding/model.rb

@@ -19,6 +19,7 @@ module Sequel
       klass = Sequel::Model(Sequel::SchemaSharding.connection_manager.default_dataset_for(source))
 
       klass.include(SchemaSharding::ShardedModel)
+      klass.send(:simple_table=, false)
 
       klass
     end
@@ -85,7 +86,6 @@ module Sequel
       def _insert_dataset
         this_server
       end
-
     end
   end
 end

data/lib/sequel/schema-sharding/version.rb

@@ -1,5 +1,5 @@
 module Sequel
   module SchemaSharding
-    VERSION = "0.0.4"
+    VERSION = "0.2.0"
   end
 end

data/spec/fixtures/test_db_config.yml

@@ -17,6 +17,8 @@ test:
     shard2:
       host: 127.0.0.1
       database: sequel_test_shard2
+      replicas:
+        - 127.0.0.1
   common:
     username: postgres
     password: boomboomkaboom
@@ -39,6 +41,8 @@ boom:
     shard2:
       host: 127.0.0.1
       database: sequel_boom_shard2
+      replicas:
+        - 127.0.0.1
   common:
     username: postgres
     password: boomboomkaboom

data/spec/schema-sharding/configuration_spec.rb

@@ -34,6 +34,7 @@ describe Sequel::SchemaSharding::Configuration do
         expect(value['username']).to eq('postgres')
         expect(value['password']).to eq('boomboomkaboom')
         expect(value['port']).to eq(5432)
+        expect(value['replicas']).to eq(['127.0.0.1']) if key == 'shard2'
 
         i += 1
       end

data/spec/schema-sharding/connection_manager_spec.rb

@@ -2,22 +2,40 @@ require 'spec_helper'
 require 'sequel/schema-sharding/connection_manager'
 
 describe Sequel::SchemaSharding::ConnectionManager do
-  let(:config) { Sequel::SchemaSharding::Configuration.new('boom', 'spec/fixtures/test_db_config.yml') }
+  let(:config) { Sequel::SchemaSharding::Configuration.new('test', 'spec/fixtures/test_db_config.yml') }
 
   subject { Sequel::SchemaSharding::ConnectionManager.new }
 
   before { subject.stubs(:config).returns(config) }
+  after do
+    subject.disconnect
+  end
 
   describe '#[]' do
     it 'returns a valid connection instance for the specified physical shard' do
       expect(subject['shard1']).to be_a(Sequel::Postgres::Database)
+      subject['shard1'].execute("SELECT 1")
       expect(subject['shard2']).to be_a(Sequel::Postgres::Database)
     end
+
+    context 'read/write splitting' do
+      it 'has a replica for shard2' do
+        expect(subject['shard2'].servers).to include(:read_only)
+        expect(subject['shard1'].servers).to_not include(:read_only)
+      end
+
+      #it 'executes a select against a replica' do
+      #  shard = subject['shard2']
+      #  Sequel::ShardedThreadedConnectionPool.any_instance.expects(:hold).with(:read_only).at_least_once
+      #  Sequel::ShardedThreadedConnectionPool.any_instance.expects(:hold).with(:default).at_least_once
+      #  shard[:"sequel_explosions_boof_pickles_3__artists"].first
+      #end
+    end
   end
 
   describe "#schema_for" do
     it "returns the schema name based on env and shard number" do
-      subject.schema_for('boof', 'pickles', 3).should eq 'sequel_explosions_boof_pickles_3'
+      subject.schema_for('boof', 'pickles', 3).should eq 'sequel_logical_boof_pickles_3'
     end
   end
 
@@ -27,7 +45,7 @@ describe Sequel::SchemaSharding::ConnectionManager do
       #      This should be deconstructed to allow for injection of a mock config for testing.
       dataset = subject.default_dataset_for("artists")
       expect(dataset).to be_a(Sequel::Dataset)
-      expect(dataset.first_source_table).to eql(:'sequel_explosions_artists_test_1__artists')
+      expect(dataset.first_source_table).to eql(:'sequel_logical_artists_test_1__artists')
     end
   end
 end

data/spec/schema-sharding/model_spec.rb

@@ -16,6 +16,12 @@ describe Sequel::SchemaSharding, 'Model' do
         'artists'
       end
     end
+
+    klass.class_eval do
+      def this
+        @this ||= model.by_id(artist_id).limit(1)
+      end
+    end
     klass
   end
 
@@ -26,6 +32,9 @@ describe Sequel::SchemaSharding, 'Model' do
       read_back_artist = model.by_id(14).first
       expect(read_back_artist).to be_a(model)
       expect(read_back_artist.name).to eql('Paul')
+      read_back_artist.destroy
+      read_back_artist = model.by_id(14).first
+      expect(read_back_artist).to be_nil
     end
   end
 
@@ -34,6 +43,7 @@ describe Sequel::SchemaSharding, 'Model' do
       artist = model.create(artist_id: 234, name: 'Paul')
       expect(artist).to be_a(model)
       expect(artist.name).to eql('Paul')
+      artist.destroy
     end
   end
 

data/spec/spec_helper.rb

@@ -27,7 +27,7 @@ RSpec.configure do |config|
     Sequel::SchemaSharding.migration_path = "spec/fixtures/db/migrate"
   end
 
-  config.around :each do |ex|
+  config.around :each, type: :transactional do |ex|
     #Sequel::SchemaSharding.config = Sequel::SchemaSharding::Configuration.new('boom', 'spec/fixtures/test_db_config.yml')
 
     # Start transactions in each connection to the physical shards

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-schema-sharding
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Paul Henry
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -94,6 +94,7 @@ files:
 - lib/sequel/schema-sharding/connection_manager.rb
 - lib/sequel/schema-sharding/database_manager.rb
 - lib/sequel/schema-sharding/finder.rb
+- lib/sequel/schema-sharding/logger_proxy.rb
 - lib/sequel/schema-sharding/model.rb
 - lib/sequel/schema-sharding/ring.rb
 - lib/sequel/schema-sharding/sequel_ext.rb
@@ -131,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Create horizontally sharded Sequel models with Postgres