Merge branch 'new-views' into index-slots

yrashk · May 11, 2008 · 23dceb6 · 23dceb6
2 parents 0a58c00 + d228dd7
commit 23dceb6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git 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 → lib/strokedb/views/memory_view_storage.rb b/lib/strokedb/views/view_storage.rb → lib/strokedb/views/memory_view_storage.rb
@@ -1,5 +1,5 @@
 module StrokeDB
-  class ViewStorage
+  class MemoryViewStorage
     attr_reader :storage, :options, :exists
 
     def initialize(options = {})

diff --git 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/spec/lib/strokedb/views/view_storage_spec.rb → ...lib/strokedb/views/memory_view_storage.rb b/spec/lib/strokedb/views/view_storage_spec.rb → ...lib/strokedb/views/memory_view_storage.rb
@@ -1,21 +1,21 @@
 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
     @view_storage.should be_empty
   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