io_shuten 0.1.0.dev7 → 0.1.1.dev1

data/benchmark/viiite-template-redis.rb

@@ -0,0 +1,75 @@
+# encoding: utf-8
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+require "rubygems"
+require "viiite"
+require "bundler/setup"
+require "io_shuten"
+require "logger"
+
+lorem_ipsum = <<LOREM
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
+tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
+At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,
+no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet,
+consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et
+dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo
+dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem
+ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed
+diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
+voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd
+gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+LOREM
+
+
+ioc = IO_shuten.const_get $CUR_IMPL
+ioc.redis = Redis::Namespace.new("io_shuten:benchmark", :redis => Redis.new)
+runs = 1..5
+outer_loops = 32
+internal_loops = 128
+
+Viiite.bench do |b|
+  b.variation_point :ruby, Viiite.which_ruby
+  b.variation_point :type, "#{$CUR_IMPL}:#{$CUR_BACKEND}:#{$CUR_TYPE}"
+
+  b.range_over(runs, :run) do |run|
+
+    ioc.purge_instances!
+    b.report :writes do
+      outer_loops.times do |o|
+        iob = ioc.new("rbuff-#{run}-#{o}",$CUR_BACKEND,$CUR_TYPE)
+
+        internal_loops.times do |i|
+          iob.write lorem_ipsum
+        end
+      end
+    end
+
+    ioc.purge_instances!
+    b.report :reads do
+      outer_loops.times do |o|
+        iob = ioc.new("rbuff-#{run}-#{o}",$CUR_BACKEND,$CUR_TYPE)
+
+        internal_loops.times do |i|
+          iob.read
+        end
+      end
+
+    ioc.purge_instances!
+    b.report :logging do
+      outer_loops.times do |o|
+        logdev = ioc.new("rlogdev-#{run}-#{o}",$CUR_BACKEND,$CUR_TYPE)
+        logger = Logger.new(logdev)
+
+        internal_loops.times do |i|
+          logger.info lorem_ipsum
+          logger.debug "counter: #{run}-#{o}"
+        end
+      end
+    end
+
+    end
+
+    ioc.redis_clear!
+  end
+
+end

data/benchmark/viiite-template.rb

@@ -20,12 +20,11 @@ voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita ka
 gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
 LOREM
 
-tmp_path = File.expand_path("../../tmp", __FILE__)
-Dir.mkdir(tmp_path) unless File.exists?(tmp_path)
 
 ioc = IO_shuten.const_get $CUR_IMPL
 runs = 1..5
-internal_loops = 1_024
+outer_loops = 32
+internal_loops = 128
 
 Viiite.bench do |b|
   b.variation_point :ruby, Viiite.which_ruby
@@ -35,45 +34,39 @@ Viiite.bench do |b|
 
     ioc.purge_instances!
     b.report :writes do
-      internal_loops.times do |i|
-        iob = ioc.new("wbuff-#{run}-#{i}")
-        iob.write lorem_ipsum
-      end
-    end
+      outer_loops.times do |o|
+        iob = ioc.new("wbuff-#{run}-#{o}")
 
-    ioc.purge_instances!
-    b.report :logging do
-      internal_loops.times do |i|
-        logdev = ioc.new("logdev-#{run}-#{i}")
-        logger = Logger.new(logdev)
-        logger.info lorem_ipsum
-        logger.debug "counter: #{run}-#{i}"
+        internal_loops.times do |i|
+          iob.write lorem_ipsum
+        end
       end
     end
 
-    ioc.purge_instances!
-    b.report :file_writes do
-      internal_loops.times do |i|
-        iob = ioc.new("#{tmp_path}/wbuff-#{run}-#{i}")
-        iob.write lorem_ipsum
-        iob.save_to_file
+    # no purging for reads!
+    b.report :reads do
+      outer_loops.times do |o|
+        iob = ioc.open("wbuff-#{run}-#{o}")
+
+        internal_loops.times do |i|
+          iob.read
+        end
       end
     end
 
     ioc.purge_instances!
-    b.report :file_reads do
-      internal_loops.times do |i|
-        iob = ioc.new("#{tmp_path}/wmem-#{run}-#{i}")
-        iob.write lorem_ipsum
-        iob.save_to_file
+    b.report :logging do
+      outer_loops.times do |o|
+        logdev = ioc.new("logdev-#{run}-#{o}")
+        logger = Logger.new(logdev)
+
+        internal_loops.times do |i|
+          logger.info lorem_ipsum
+          logger.debug "counter: #{run}-#{o}"
+        end
       end
     end
 
   end
 
-  # File cleaning …
-  Dir["#{tmp_path}/**/*"].each do |f|
-    File.unlink f
-  end
-
 end

data/benchmarks.sh

@@ -1,57 +1,18 @@
 #!/bin/bash
-echo "Loading RVM ..."
-[[ -s $rvm_path/scripts/rvm ]] && source $rvm_path/scripts/rvm >/dev/null 2>&1
-
-RUBIES="ruby-1.8.7-p357 ree ruby-1.9.2-p290 ruby-1.9.3-p0"
 GEMSET="io_shuten"
 BENCHMARKS=`ls benchmarks`
 BENCH_OUT="benchmark/out.rash"
 BENCH_REP="benchmark/report"
-BENCH_RUN=10
-CUR_RAKE_VER=`gem list rake | awk '$1~/rake/{print $2}'`
-
-[[ -e "$BENCH_OUT" ]] && rm $BENCH_OUT && touch $BENCH_OUT
-
-for ruby in $RUBIES; do
-
-  echo
-  echo "Switching to: $ruby@$GEMSET"
-  rvm use --create $ruby@$GEMSET >/dev/null 2>&1
-
-  ruby_rake_ver=`gem list rake | awk '$1~/rake/{print $2}'`
-
-  if [[ "$ruby_rake_ver" != "$CUR_RAKE_VER" ]]; then
-    echo "Installing rake $CUR_RAKE_VER ..."
-    gem install rake -v=$CUR_RAKE_VER >/dev/null 2>&1
-  else
-    echo "rake $CUR_RAKE_VER already installed."
-  fi
-
-  bundler_installed=`gem list bundler | awk '$1~/bundler/ { print $1 }'`
-
-  if [[ -z "$bundler_installed" ]]; then
-    echo "Installing bundler ..."
-    gem install bundler --pre >/dev/null 2>&1
-  else
-    echo "bundler already installed."
-  fi
-
-  echo "Installing gems ..."
-  bundle install >/dev/null 2>&1
-
-  echo "Running benchmarks ..."
-  for bench in $BENCHMARKS; do
-    viiite run --runs=$BENCH_RUN $bench >> $BENCH_OUT 2>/dev/null
-  done
+BENCH_RUN=1
 
+echo "Running benchmarks ..."
+for bench in $BENCHMARKS; do
+  echo "  - ${bench}"
+  viiite run --runs=$BENCH_RUN $bench >> $BENCH_OUT 2>/dev/null
 done
 
-viiite report $BENCH_OUT -h --regroup=bench,ruby,type > ${BENCH_REP}.bench-ruby-type.txt
-viiite report $BENCH_OUT -h --regroup=bench,type,ruby > ${BENCH_REP}.bench-type-ruby.txt
-viiite report $BENCH_OUT -h --regroup=ruby,bench,type > ${BENCH_REP}.ruby-bench-type.txt
-viiite report $BENCH_OUT -h --regroup=ruby,type,bench > ${BENCH_REP}.ruby-type-bench.txt
-viiite report $BENCH_OUT -h --regroup=type,bench,ruby > ${BENCH_REP}.type-bench-ruby.txt
-viiite report $BENCH_OUT -h --regroup=type,ruby,bench > ${BENCH_REP}.type-ruby-bench.txt
+viiite report $BENCH_OUT -h --regroup=bench,type > ${BENCH_REP}.bench-type.txt
+viiite report $BENCH_OUT -h --regroup=type,bench > ${BENCH_REP}.type-bench.txt
 
 [[ -e "$BENCH_OUT" ]] && rm $BENCH_OUT
 

data/benchmarks/redis.kvc.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+$LOAD_PATH.unshift File.expand_path("../../benchmark", __FILE__)
+
+$CUR_IMPL    = "Redis"
+$CUR_BACKEND = :key_value
+$CUR_TYPE    = :collection
+
+require "viiite-template-redis.rb"

data/benchmarks/redis.kvs.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+$LOAD_PATH.unshift File.expand_path("../../benchmark", __FILE__)
+
+$CUR_IMPL    = "Redis"
+$CUR_BACKEND = :key_value
+$CUR_TYPE    = :single
+
+require "viiite-template-redis.rb"

data/io_shuten.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "io_shuten"
-  s.version = "0.1.0.dev7"
+  s.version = "0.1.1.dev1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christoph Grabo"]
-  s.date = "2012-01-30"
+  s.date = "2012-11-04"
   s.description = "IO::shuten \u{2013} Use databases as IO handler like you would do with files and streams."
   s.email = ["chris@dinarrr.com"]
   s.extra_rdoc_files = [
@@ -19,67 +19,20 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".rspec",
-    ".rvmrc",
-    ".simplecov",
     ".travis.yml",
-    ".yardopts",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
     "LICENSE.de",
     "README.md",
     "Rakefile",
+    "benchmark/viiite-template-redis.rb",
     "benchmark/viiite-template.rb",
     "benchmarks.sh",
     "benchmarks/buffer.rb",
     "benchmarks/memory.rb",
-    "doc/IO_3A_3ABuffer.html",
-    "doc/IO_shuten.html",
-    "doc/IO_shuten/Base.html",
-    "doc/IO_shuten/Base/FileAccessError.html",
-    "doc/IO_shuten/Base/FileNotFoundError.html",
-    "doc/IO_shuten/Base/NodeNameError.html",
-    "doc/IO_shuten/Base/NodeNotFoundError.html",
-    "doc/IO_shuten/Base/NotYetImplemented.html",
-    "doc/IO_shuten/Buffer.html",
-    "doc/IO_shuten/Errors.html",
-    "doc/IO_shuten/Errors/FileAccessError.html",
-    "doc/IO_shuten/Errors/FileNotFoundError.html",
-    "doc/IO_shuten/Errors/NodeExistsError.html",
-    "doc/IO_shuten/Errors/NodeNameError.html",
-    "doc/IO_shuten/Errors/NodeNameExistsError.html",
-    "doc/IO_shuten/Errors/NodeNotFoundError.html",
-    "doc/IO_shuten/Errors/NotYetImplemented.html",
-    "doc/IO_shuten/Memory.html",
-    "doc/IO_shuten/Mongo.html",
-    "doc/IO_shuten/Redis.html",
-    "doc/IO_shuten/Stores.html",
-    "doc/IO_shuten/Stores/BaseContainer.html",
-    "doc/IO_shuten/Stores/Mongo.html",
-    "doc/IO_shuten/Stores/Mongo/Collection.html",
-    "doc/IO_shuten/Stores/Mongo/GridFS.html",
-    "doc/IO_shuten/Stores/Redis.html",
-    "doc/IO_shuten/Stores/Redis/Container.html",
-    "doc/IO_shuten/Stores/Redis/KeyValue.html",
-    "doc/IO_shuten/Stores/Redis/KeyValue/Collection.html",
-    "doc/IO_shuten/Stores/Redis/KeyValue/Single.html",
-    "doc/IO_shuten/Stores/Redis/PubSub.html",
-    "doc/IO_shuten/Zmq.html",
-    "doc/_index.html",
-    "doc/class_list.html",
-    "doc/css/blame.css",
-    "doc/css/common.css",
-    "doc/css/full_list.css",
-    "doc/css/style.css",
-    "doc/file.README.html",
-    "doc/file_list.html",
-    "doc/frames.html",
-    "doc/index.html",
-    "doc/js/app.js",
-    "doc/js/full_list.js",
-    "doc/js/jquery.js",
-    "doc/method_list.html",
-    "doc/top-level-namespace.html",
+    "benchmarks/redis.kvc.rb",
+    "benchmarks/redis.kvs.rb",
     "io_shuten.gemspec",
     "lib/io_shuten.rb",
     "lib/io_shuten/base.rb",
@@ -121,76 +74,61 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/asaaki/io_shuten"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.23"
   s.summary = "IO::shuten \u{2013} Use databases as IO handler. (NOT YET READY FOR PRODUCTION!)"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<iobuffer>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<hiredis>, ["~> 0.4.4"])
-      s.add_runtime_dependency(%q<redis>, ["~> 2.2.2"])
-      s.add_runtime_dependency(%q<redis-namespace>, [">= 0"])
+      s.add_runtime_dependency(%q<iobuffer>, ["~> 1.1.2"])
+      s.add_runtime_dependency(%q<hiredis>, ["~> 0.4.5"])
+      s.add_runtime_dependency(%q<redis>, ["~> 3.0.2"])
+      s.add_runtime_dependency(%q<redis-namespace>, ["~> 1.2.1"])
       s.add_runtime_dependency(%q<bson_ext>, ["~> 1.5.2"])
       s.add_runtime_dependency(%q<mongo>, ["~> 1.5.2"])
-      s.add_runtime_dependency(%q<ffi>, [">= 0"])
-      s.add_runtime_dependency(%q<ffi-rzmq>, [">= 0"])
+      s.add_runtime_dependency(%q<ffi>, ["~> 1.1.5"])
+      s.add_runtime_dependency(%q<ffi-rzmq>, ["~> 0.9.6"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<simplecov-rcov>, [">= 0"])
-      s.add_development_dependency(%q<simplecov-csv>, [">= 0"])
-      s.add_development_dependency(%q<redcarpet>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<yard-blame>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
+      s.add_development_dependency(%q<pry-doc>, [">= 0"])
       s.add_development_dependency(%q<alf>, [">= 0"])
       s.add_development_dependency(%q<fastercsv>, [">= 0"])
       s.add_development_dependency(%q<viiite>, [">= 0"])
     else
-      s.add_dependency(%q<iobuffer>, ["~> 1.0.0"])
-      s.add_dependency(%q<hiredis>, ["~> 0.4.4"])
-      s.add_dependency(%q<redis>, ["~> 2.2.2"])
-      s.add_dependency(%q<redis-namespace>, [">= 0"])
+      s.add_dependency(%q<iobuffer>, ["~> 1.1.2"])
+      s.add_dependency(%q<hiredis>, ["~> 0.4.5"])
+      s.add_dependency(%q<redis>, ["~> 3.0.2"])
+      s.add_dependency(%q<redis-namespace>, ["~> 1.2.1"])
       s.add_dependency(%q<bson_ext>, ["~> 1.5.2"])
       s.add_dependency(%q<mongo>, ["~> 1.5.2"])
-      s.add_dependency(%q<ffi>, [">= 0"])
-      s.add_dependency(%q<ffi-rzmq>, [">= 0"])
+      s.add_dependency(%q<ffi>, ["~> 1.1.5"])
+      s.add_dependency(%q<ffi-rzmq>, ["~> 0.9.6"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<simplecov-rcov>, [">= 0"])
-      s.add_dependency(%q<simplecov-csv>, [">= 0"])
-      s.add_dependency(%q<redcarpet>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<yard-blame>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_dependency(%q<pry>, [">= 0"])
+      s.add_dependency(%q<pry-doc>, [">= 0"])
       s.add_dependency(%q<alf>, [">= 0"])
       s.add_dependency(%q<fastercsv>, [">= 0"])
       s.add_dependency(%q<viiite>, [">= 0"])
     end
   else
-    s.add_dependency(%q<iobuffer>, ["~> 1.0.0"])
-    s.add_dependency(%q<hiredis>, ["~> 0.4.4"])
-    s.add_dependency(%q<redis>, ["~> 2.2.2"])
-    s.add_dependency(%q<redis-namespace>, [">= 0"])
+    s.add_dependency(%q<iobuffer>, ["~> 1.1.2"])
+    s.add_dependency(%q<hiredis>, ["~> 0.4.5"])
+    s.add_dependency(%q<redis>, ["~> 3.0.2"])
+    s.add_dependency(%q<redis-namespace>, ["~> 1.2.1"])
     s.add_dependency(%q<bson_ext>, ["~> 1.5.2"])
     s.add_dependency(%q<mongo>, ["~> 1.5.2"])
-    s.add_dependency(%q<ffi>, [">= 0"])
-    s.add_dependency(%q<ffi-rzmq>, [">= 0"])
+    s.add_dependency(%q<ffi>, ["~> 1.1.5"])
+    s.add_dependency(%q<ffi-rzmq>, ["~> 0.9.6"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<simplecov-rcov>, [">= 0"])
-    s.add_dependency(%q<simplecov-csv>, [">= 0"])
-    s.add_dependency(%q<redcarpet>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<yard-blame>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.11.0"])
     s.add_dependency(%q<pry>, [">= 0"])
+    s.add_dependency(%q<pry-doc>, [">= 0"])
     s.add_dependency(%q<alf>, [">= 0"])
     s.add_dependency(%q<fastercsv>, [">= 0"])
     s.add_dependency(%q<viiite>, [">= 0"])

data/lib/io_shuten/redis.rb

@@ -24,7 +24,7 @@ module IO_shuten
 
     # Global redis client instance for the pool
     # @return [Object] Redis instance
-    @@redis = ::Redis.new
+    @@redis = ::Redis::Namespace.new(:io_shuten, :redis => ::Redis.new)
 
     # @param [String] node_name
     # @param [Symbol] node_name

data/lib/io_shuten/stores/redis/key_value/collection.rb

@@ -4,6 +4,10 @@ module IO_shuten::Stores::Redis::KeyValue
   # Redis Backend type for storing every data piece into its own key (namespace)
   module Collection
 
+    def counter_name
+      "#{@node_name}:#{"%016d" % '0'}"
+    end
+
     def read
       result = read_collection
       result.join
@@ -12,14 +16,22 @@ module IO_shuten::Stores::Redis::KeyValue
     def read_collection
       coll = @redis.keys("#{@node_name}:*").sort
       coll.inject([]) do |store, key|
-        store << (@redis.get(key))
+        store << (@redis.get(key)) unless key == counter_name
         store
       end
     end
 
     def write data
-      counter = @redis.keys("#{@node_name}:*").size + 1
-      @redis.set "#{@node_name}:#{counter}", data
+      counter = self.size + 1
+      key     = "#{@node_name}:#{"%016d" % counter}"
+      @redis.multi do
+        @redis.set key, data
+        @redis.incr counter_name
+      end
+    end
+
+    def size
+      @redis.get(counter_name).to_i || 0
     end
 
     def clear!