lib/strokedb/data_structures/skiplist.rb spec/lib/strokedb/data_structures/skiplist_spec.rb @@ -1 +1 @@ -require 'data_structures/simple_skiplist' +require 'data_structures/skiplist' lib/strokedb/data_structures.rb @@ -58,7 +58,7 @@ module StrokeDB end def clear! - @container = SimpleSkiplist.new + @container = Skiplist.new end def close! lib/strokedb/stores/memory_storage.rb @@ -2,11 +2,11 @@ module StrokeDB class MemoryViewStorage < ViewStorage def initialize(options = {}) - @list = SimpleSkiplist.new + @list = Skiplist.new end def clear! - @list = SimpleSkiplist.new + @list = Skiplist.new end end lib/strokedb/views/memory_view_storage.rb @@ -85,10 +85,10 @@ module StrokeDB end if File.exists?(@list_path) - @list = SimpleSkiplist.load(File.read(@list_path)) + @list = Skiplist.load(File.read(@list_path)) else info "List file (#{@list_path}) was not found, creating a brand new skiplist." - @list = SimpleSkiplist.new(@params) + @list = Skiplist.new(@params) end if File.exists?(@log_path) lib/strokedb/volumes/skiplist_volume.rb @@ -7,7 +7,7 @@ include Benchmark @path = File.dirname(__FILE__) + "/../../spec/temp/storages/archive_volume" -SimpleSkiplist.optimize!(:C) +Skiplist.optimize!(:C) [2000].each do |n| meta/benchmarks/archive_volume.rb @@ -23,7 +23,7 @@ N = 1_000 # # end -SimpleSkiplist.optimize!(:C) +Skiplist.optimize!(:C) # FileUtils.rm_rf "../../spec/temp/storages/bigstore" # StrokeDB::Config.build :default => true, :base_path => "../../spec/temp/storages/bigstore" meta/benchmarks/big_database.rb @@ -7,13 +7,13 @@ puts "Serialization techniques" len = 2_000 array = (1..len).map{ [rand(len).to_s]*2 } -biglist = SimpleSkiplist.from_a(array) +biglist = Skiplist.from_a(array) dumped = biglist.marshal_dump Benchmark.bm(17) do |x| # First technique: to_a/from_a GC.start - x.report("SimpleSkiplist#to_a ") do + x.report("Skiplist#to_a ") do biglist.to_a biglist.to_a biglist.to_a @@ -21,17 +21,17 @@ Benchmark.bm(17) do |x| biglist.to_a end GC.start - x.report("SimpleSkiplist.from_a ") do - SimpleSkiplist.from_a(array) - SimpleSkiplist.from_a(array) - SimpleSkiplist.from_a(array) - SimpleSkiplist.from_a(array) - SimpleSkiplist.from_a(array) + x.report("Skiplist.from_a ") do + Skiplist.from_a(array) + Skiplist.from_a(array) + Skiplist.from_a(array) + Skiplist.from_a(array) + Skiplist.from_a(array) end # Another technique: Marshal.dump GC.start - x.report("SimpleSkiplist#marshal_dump ") do + x.report("Skiplist#marshal_dump ") do biglist.marshal_dump biglist.marshal_dump biglist.marshal_dump @@ -39,12 +39,12 @@ Benchmark.bm(17) do |x| biglist.marshal_dump end GC.start - x.report("SimpleSkiplist#marshal_load ") do - SimpleSkiplist.allocate.marshal_load(dumped.dup) - SimpleSkiplist.allocate.marshal_load(dumped.dup) - SimpleSkiplist.allocate.marshal_load(dumped.dup) - SimpleSkiplist.allocate.marshal_load(dumped.dup) - SimpleSkiplist.allocate.marshal_load(dumped.dup) + x.report("Skiplist#marshal_load ") do + Skiplist.allocate.marshal_load(dumped.dup) + Skiplist.allocate.marshal_load(dumped.dup) + Skiplist.allocate.marshal_load(dumped.dup) + Skiplist.allocate.marshal_load(dumped.dup) + Skiplist.allocate.marshal_load(dumped.dup) end end @@ -53,9 +53,9 @@ puts "Find/insert techniques" Benchmark.bm(42) do |x| langs = [:C] if RUBY_PLATFORM !~ /java/ langs = [:Java] if RUBY_PLATFORM =~ /java/ - SimpleSkiplist.with_optimizations(langs) do |lang| + Skiplist.with_optimizations(langs) do |lang| GC.start - x.report("SimpleSkiplist#find 5000 #{lang}".ljust(32)) do + x.report("Skiplist#find 5000 #{lang}".ljust(32)) do 1000.times do key = rand(len).to_s biglist.find(key) @@ -66,7 +66,7 @@ Benchmark.bm(42) do |x| end end GC.start - x.report("SimpleSkiplist#insert 5000 #{lang}".ljust(32)) do + x.report("Skiplist#insert 5000 #{lang}".ljust(32)) do 1000.times do key = rand(len).to_s biglist.insert(key, key) meta/benchmarks/simple_skiplist.rb @@ -38,7 +38,7 @@ end benchmark!("Ruby") -SimpleSkiplist.optimize!(:C) +Skiplist.optimize!(:C) benchmark!("C") meta/benchmarks/skiplist_volume.rb @@ -14,7 +14,7 @@ describe "SkiplistVolume inserts and finds", :shared => true do end end -#SimpleSkiplist.with_optimizations(OPTIMIZATIONS) do |lang| +#Skiplist.with_optimizations(OPTIMIZATIONS) do |lang| lang = "Ruby {FIXME: with_optimizations is irreversible operation for now}" describe "Brand new SkiplistVolume [#{lang}]" do before(:each) do spec/lib/strokedb/volumes/skiplist_volume_spec.rb lib/strokedb/data_structures/simple_skiplist.rb spec/lib/strokedb/data_structures/simple_skiplist_spec.rb ff4c04e1f3e2f65f3984ce9d75166278c1391118 Oleg Andreev oleganza@idbns.com http://github.com/yrashk/strokedb/commit/9785ab9c6245d9c23e95a0a1f04bb8c300984323 9785ab9c6245d9c23e95a0a1f04bb8c300984323 2008-06-08T14:05:26-07:00 2008-06-08T14:05:26-07:00 renamed SimpleSkiplist to Skiplist bdf4d03182ec4efeb86d64cb1a95ee887eee9256 Oleg Andreev oleganza@idbns.com