From 4e2f8659fb36a5cb6e047323e4e31c961cc01c22 Mon Sep 17 00:00:00 2001
From: Archivist <qnekomata@gmail.com>
Date: Sat, 11 Aug 2018 12:17:12 +0200
Subject: [PATCH] Slicing confiremed to work in tests

---
 spec/crystal-scatter_spec.cr    | 15 +++++++++++++++
 src/crystal-scatter/metaring.cr | 12 ++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/spec/crystal-scatter_spec.cr b/spec/crystal-scatter_spec.cr
index e759233..3ae5c40 100644
--- a/spec/crystal-scatter_spec.cr
+++ b/spec/crystal-scatter_spec.cr
@@ -3,6 +3,21 @@ require "./spec_helper"
 describe Crystal::Scatter do
   # TODO: Write tests
 
+    it "slices data into multiple pods" do
+        mr = Crystal::Scatter::MetaRing.new(3)
+        mr.add Crystal::Scatter::Daemon.new(1,[0,0,0,0,0,0],"OSD0")
+        mr.add [Crystal::Scatter::Daemon.new(1,[0,0,0,0,0,1],"OSD1"),Crystal::Scatter::Daemon.new(1,[0,0,0,0,0,2],"OSD2")]
+        
+        (1..1000).each do |numb|
+            slices = mr.get_slices_for(numb.to_s) 
+            set = Set(String).new
+            slices.each do |sl|
+                set<<sl.url
+            end
+            set.size.should eq(3)
+        end
+    end
+
     it "add elements to RingGraphs" do
         rg = Crystal::Scatter::RingGraph.new 
         rg.add(UInt64.new(1),[0,0,0,0,0,0],"OSD0")
diff --git a/src/crystal-scatter/metaring.cr b/src/crystal-scatter/metaring.cr
index aa7ba27..a6832e5 100644
--- a/src/crystal-scatter/metaring.cr
+++ b/src/crystal-scatter/metaring.cr
@@ -16,7 +16,7 @@ module Crystal::Scatter
         getter rings : Array(Ring)
         getter ring_graph : RingGraph
 
-        def initialize(@shards : UInt32)
+        def initialize(@shards : UInt32, @split_ratio : BigRational = BigRational.new(1,2))
             @rings = Array(Ring).new
             @ring_graph = RingGraph.new
             @lock = Mutex.new
@@ -27,10 +27,10 @@ module Crystal::Scatter
         end
 
         private def update_impl
-            @ring_graph.generate_ring
+            @ring_graph.generate_ring @split_ratio
             ring = Ring.new
             @ring_graph.snapshot do |daemon|
-                ring.push RingSlice.new(daemon.range_effector.not_nil!.[0],daemon.range_effector.not_nil!.[1],daemon.react_at)
+                ring.push Slice.new(daemon.range_effector.not_nil!.[0],daemon.range_effector.not_nil!.[1],daemon.reach_at)
             end
             @rings.push ring
         end
@@ -69,8 +69,8 @@ module Crystal::Scatter
         end
 
         def get_slices_for(data : String)
-            ret = Array.new(@shards)
-            ring? : Ring | Nil
+            ret = Array(Slice).new(@shards)
+            ring? = nil : Ring | Nil
             @lock.synchronize do
                 ring? = @rings.last
             end
@@ -78,7 +78,7 @@ module Crystal::Scatter
             h = hash_impl data
             space=UInt64::MAX/@shards
             targets = Array(UInt64).new
-            (1..shards).each do ||
+            (1..@shards).each do
                 targets << h
                 h+=space
             end