sequel-schema-sharding 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c3fdaa18a8bee064030a25babedc4e261c3e160
-  data.tar.gz: 5b40cc67b014aa243ae76ef915a53cafcfc82c16
+  metadata.gz: f7c70c9f4005f27bb6c64ab8f666d8d6238aee84
+  data.tar.gz: 9c867fc8fdf0e585579c184aeb6c77ce85b90b07
 SHA512:
-  metadata.gz: c8bd4a45ea47e496a888abceda16c09c482402f6561c0c4e52053e8e36c1b3618af268cd8a406ac47ba86a414391b7ab42b0e2144dc8c6a8406fa4a877172877
-  data.tar.gz: d2c4673374e061cc9d9466f4f06709e8d5518daaa85a7d88465904121a78ebb5e190549ed26cda47248b4adefdcb634eeb3841201837a01dd5bb3fd82c58228e
+  metadata.gz: 257e3ea91ff1851bad52e02b57c546a9897ea7d8a6ba46d5d865a638aa796a26e90be4e207270dcac16291727218e85a27916ba24bc2b1b62d9e5ab9cad334b3
+  data.tar.gz: 39efe5f19987104abac8f8688306c38821a0d751e2bc04df65b7f8f74f1db8971d74dcb882daf94f77f554c102be173852efa7d4a8c16c8f14f0a3facc9d3d03

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

@@ -10,114 +10,23 @@ module Sequel
     # This implementation is borrowed from Dali memcached library.
     class Ring
       POINTS_PER_SERVER = 1
+      PRODUCTION_SHARDS = 8192
 
       attr_accessor :shards, :continuum
 
       def initialize(shards)
-        @shards = shards
-        @continuum = nil
-        if shards.size > 1
-          continuum = []
-          shards.each do |shard|
-            hash = Digest::SHA1.hexdigest("#{shard}")
-            value = Integer("0x#{hash[0..7]}")
-            continuum << Entry.new(value, shard)
-          end
-          @continuum = continuum.sort { |a, b| a.value <=> b.value }
+        @number_of_shards = shards.size
+        if ENV['RACK_ENV'] == "production"
+          raise "Expecting production shards to be #{PRODUCTION_SHARDS}, got #{@number_of_shards}" \
+            if @number_of_shards != PRODUCTION_SHARDS
         end
       end
 
       def shard_for_id(id)
-        if @continuum
-          hkey = hash_for(id)
-          entryidx = binary_search(@continuum, hkey)
-          return @continuum[entryidx].server
-        else
-          server = @servers.first
-          return server if server
-        end
-
-        raise StandardError, "No server available"
-      end
-
-      private
-
-      def hash_for(key)
-        Zlib.crc32(key.to_s)
-      end
-
-      def entry_count
-        ((shards.size * POINTS_PER_SERVER)).floor
-      end
-
-      # Native extension to perform the binary search within the continuum
-      # space.  Fallback to a pure Ruby version if the compilation doesn't work.
-      # optional for performance and only necessary if you are using multiple
-      # memcached servers.
-      begin
-        require 'inline'
-        inline do |builder|
-          builder.c <<-EOM
-              int binary_search(VALUE ary, unsigned int r) {
-                  long upper = RARRAY_LEN(ary) - 1;
-                  long lower = 0;
-                  long idx = 0;
-                  ID value = rb_intern("value");
-                  VALUE continuumValue;
-                  unsigned int l;
-
-                  while (lower <= upper) {
-                      idx = (lower + upper) / 2;
-
-                      continuumValue = rb_funcall(RARRAY_PTR(ary)[idx], value, 0);
-                      l = NUM2UINT(continuumValue);
-                      if (l == r) {
-                          return idx;
-                      }
-                      else if (l > r) {
-                          upper = idx - 1;
-                      }
-                      else {
-                          lower = idx + 1;
-                      }
-                  }
-                  return upper;
-              }
-          EOM
-        end
-      rescue LoadError
-        # Find the closest index in the Ring with value <= the given value
-        def binary_search(ary, value)
-          upper = ary.size - 1
-          lower = 0
-          idx = 0
-
-          while (lower <= upper) do
-            idx = (lower + upper) / 2
-            comp = ary[idx].value <=> value
-
-            if comp == 0
-              return idx
-            elsif comp > 0
-              upper = idx - 1
-            else
-              lower = idx + 1
-            end
-          end
-          return upper
-        end
+        id = id.to_i
+        raise "id is passed as zero" if id == 0
+        id % @number_of_shards + 1
       end
-
-      class Entry
-        attr_reader :value
-        attr_reader :server
-
-        def initialize(val, srv)
-          @value = val
-          @server = srv
-        end
-      end
-
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Sequel
   module SchemaSharding
-    VERSION = "0.3.0"
+    VERSION = "0.4.1"
   end
 end

data/lib/sequel/schema-sharding.rb

@@ -20,7 +20,7 @@ module Sequel
     end
 
     def self.logger
-      @logger ||= Logger.new(StringIO.new)
+      @logger ||= Logger.new(nil)
     end
 
     def self.logger=(logger)

data/spec/schema-sharding/finder_spec.rb

@@ -8,7 +8,7 @@ describe Sequel::SchemaSharding::Finder do
     it 'returns an object with a valid connection and schema' do
       result = Sequel::SchemaSharding::Finder.instance.lookup('boof', 60)
       expect(result.connection).to be_a(Sequel::Postgres::Database)
-      expect(result.schema).to eq('sequel_logical_boof_02')
+      expect(result.schema).to eq('sequel_logical_boof_01')
     end
 
     xit 'is fast' do

data/spec/schema-sharding/ring_spec.rb

@@ -2,24 +2,38 @@ require 'spec_helper'
 require 'sequel/schema-sharding'
 
 describe Sequel::SchemaSharding::Ring do
-
-  describe 'a ring of servers' do
-    it 'have the continuum sorted by value' do
-      shards = [1, 2, 3, 4, 5, 6, 7, 8]
+  describe '#shard_for_id' do
+    it 'returns a server for a given id' do
+      @shards = 16
+      shards = (1..@shards).to_a
       ring = Sequel::SchemaSharding::Ring.new(shards)
-      previous_value = 0
-      ring.continuum.each do |entry|
-        expect(entry.value).to be > previous_value
-        previous_value = entry.value
+
+      hash = {}
+      (1..10_000).to_a.each do |i|
+        shard = ring.shard_for_id(i)
+        hash[shard] ||= 0;
+        hash[shard] += 1;
+      end
+
+      expect(hash.size).to eq(@shards)
+      hash.values.each do |value|
+        expect(value).to eq(10_000 / @shards)
       end
     end
   end
 
-  describe '#shard_for_id' do
-    it 'returns a server for a given id' do
-      shards = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
-      ring = Sequel::SchemaSharding::Ring.new(shards)
-      expect(ring.shard_for_id(3489409)).to eq(4)
+  describe "#initialize" do
+    context "production" do
+      it "raises an exception if the number of shards is not 8192" do
+        env = ENV['RACK_ENV']
+        ENV['RACK_ENV'] = 'production'
+
+        expect do
+          Sequel::SchemaSharding::Ring.new((1..10).to_a)
+        end.to raise_error(RuntimeError)
+
+        ENV['RACK_ENV'] = env
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-schema-sharding
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Paul Henry
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel