From fb8e345e5597813815ced7f161428b4c023ced35 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Sat, 10 May 2008 19:40:34 +0300 Subject: [PATCH 1/2] Renamed ViewStorage to MemoryViewStorage --- lib/strokedb/views/view.rb | 2 +- lib/strokedb/views/view_storage.rb | 2 +- spec/lib/strokedb/views/view_storage_spec.rb | 24 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/strokedb/views/view.rb b/lib/strokedb/views/view.rb index 5471aa63..18eb21f9 100644 --- a/lib/strokedb/views/view.rb +++ b/lib/strokedb/views/view.rb @@ -237,7 +237,7 @@ def map_with_encoding(key, value) def storage # @storage ||= store.view_storages[self.uuid] - VIEW_STORAGES[uuid] ||= ViewStorage.new + VIEW_STORAGES[uuid] ||= MemoryViewStorage.new end private :storage diff --git a/lib/strokedb/views/view_storage.rb b/lib/strokedb/views/view_storage.rb index a868dfcd..996ddb05 100644 --- a/lib/strokedb/views/view_storage.rb +++ b/lib/strokedb/views/view_storage.rb @@ -1,5 +1,5 @@ module StrokeDB - class ViewStorage + class MemoryViewStorage attr_reader :storage, :options, :exists def initialize(options = {}) diff --git a/spec/lib/strokedb/views/view_storage_spec.rb b/spec/lib/strokedb/views/view_storage_spec.rb index 4cfa5c0f..29b9aba9 100644 --- a/spec/lib/strokedb/views/view_storage_spec.rb +++ b/spec/lib/strokedb/views/view_storage_spec.rb @@ -1,9 +1,9 @@ require File.dirname(__FILE__) + '/spec_helper' -describe "New", ViewStorage do +describe "New", MemoryViewStorage do before(:each) do - @view_storage = ViewStorage.new + @view_storage = MemoryViewStorage.new end it "should be empty" do @@ -11,11 +11,11 @@ end end -describe "Inserting single pair into", ViewStorage do +describe "Inserting single pair into", MemoryViewStorage do before(:each) do setup_default_store - @view_storage = ViewStorage.new + @view_storage = MemoryViewStorage.new @insertion = lambda {|key, val| @view_storage.insert([[key, val]]) } end @@ -27,11 +27,11 @@ end -describe "Inserting multiple pairs into", ViewStorage do +describe "Inserting multiple pairs into", MemoryViewStorage do before(:each) do setup_default_store - @view_storage = ViewStorage.new + @view_storage = MemoryViewStorage.new @insertion = lambda do |keys, vals| pairs = [] keys.each_with_index {|key, i| pairs << [key, vals[i]]} @@ -49,11 +49,11 @@ end -describe "Replacing single pair in", ViewStorage do +describe "Replacing single pair in", MemoryViewStorage do before(:each) do setup_default_store - @view_storage = ViewStorage.new + @view_storage = MemoryViewStorage.new @insertion = lambda {|key, val| @view_storage.insert([[key, val]]) } @replacement = lambda {|oldkey, oldval, key, val| @view_storage.replace([[oldkey, oldval]],[[key, val]]) } end @@ -70,11 +70,11 @@ end -describe "Replacing multiple pairs in", ViewStorage do +describe "Replacing multiple pairs in", MemoryViewStorage do before(:each) do setup_default_store - @view_storage = ViewStorage.new + @view_storage = MemoryViewStorage.new @insertion = lambda do |keys, vals| pairs = [] keys.each_with_index {|key, i| pairs << [key, vals[i]]} @@ -105,11 +105,11 @@ end -describe ViewStorage, "with some pairs inserted" do +describe MemoryViewStorage, "with some pairs inserted" do before(:each) do setup_default_store - @view_storage = ViewStorage.new + @view_storage = MemoryViewStorage.new @view_storage.insert((1..100).to_a.map {|i| [DefaultKeyEncoder.encode(i),i]}) end From d228dd74eda1d4fb3d1238e372989b7955869f63 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Sat, 10 May 2008 19:44:42 +0300 Subject: [PATCH 2/2] Renamed ViewStorage to MemoryViewStorage: file names are updated --- lib/strokedb/views.rb | 2 +- lib/strokedb/views/{view_storage.rb => memory_view_storage.rb} | 0 .../views/{view_storage_spec.rb => memory_view_storage.rb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename lib/strokedb/views/{view_storage.rb => memory_view_storage.rb} (100%) rename spec/lib/strokedb/views/{view_storage_spec.rb => memory_view_storage.rb} (100%) diff --git a/lib/strokedb/views.rb b/lib/strokedb/views.rb index 919e234d..a4dfa4e9 100644 --- a/lib/strokedb/views.rb +++ b/lib/strokedb/views.rb @@ -1,5 +1,5 @@ require 'views/store_ext' require 'views/default_key_encoder' require 'views/raw_data_meta' -require 'views/view_storage' +require 'views/memory_view_storage' require 'views/view' diff --git a/lib/strokedb/views/view_storage.rb b/lib/strokedb/views/memory_view_storage.rb similarity index 100% rename from lib/strokedb/views/view_storage.rb rename to lib/strokedb/views/memory_view_storage.rb diff --git a/spec/lib/strokedb/views/view_storage_spec.rb b/spec/lib/strokedb/views/memory_view_storage.rb similarity index 100% rename from spec/lib/strokedb/views/view_storage_spec.rb rename to spec/lib/strokedb/views/memory_view_storage.rb