From 51d43461adca99482154ddbd337658a70d5ffc3d Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Tue, 23 Nov 2010 18:05:18 +0000
Subject: rename @hdb* to @db*

This will allow easier code sharing between backends.
---
 lib/metropolis/tokyocabinet/hdb.rb    | 8 ++++----
 lib/metropolis/tokyocabinet/hdb/ro.rb | 6 +++---
 test/test_tokyocabinet_hdb.rb         | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/metropolis/tokyocabinet/hdb.rb b/lib/metropolis/tokyocabinet/hdb.rb
index ac8d58f..513d215 100644
--- a/lib/metropolis/tokyocabinet/hdb.rb
+++ b/lib/metropolis/tokyocabinet/hdb.rb
@@ -45,7 +45,7 @@ module Metropolis::TokyoCabinet::HDB
       end
       @optimize << flags
     end
-    @hdbv = (0...@nr_slots).to_a.map do |slot|
+    @dbv = (0...@nr_slots).to_a.map do |slot|
       path = sprintf(path_pattern, slot)
       hdb = TCHDB.new
       unless opts[:read_only]
@@ -89,7 +89,7 @@ module Metropolis::TokyoCabinet::HDB
   end
 
   def writer(key, &block)
-    hdb, path = @hdbv[key.hash % @nr_slots]
+    hdb, path = @dbv[key.hash % @nr_slots]
     hdb.open(path, @wr_flags) or ex!(:open, hdb)
     yield hdb
     ensure
@@ -97,7 +97,7 @@ module Metropolis::TokyoCabinet::HDB
   end
 
   def reader(key)
-    hdb, path = @hdbv[key.hash % @nr_slots]
+    hdb, path = @dbv[key.hash % @nr_slots]
     hdb.open(path, @rd_flags) or ex!(:open, hdb)
     yield hdb
     ensure
@@ -155,6 +155,6 @@ module Metropolis::TokyoCabinet::HDB
   end
 
   def close!
-    @hdbv.each { |(hdb,_)| hdb.close }
+    @dbv.each { |(hdb,_)| hdb.close }
   end
 end
diff --git a/lib/metropolis/tokyocabinet/hdb/ro.rb b/lib/metropolis/tokyocabinet/hdb/ro.rb
index b7a1b40..89b4dd6 100644
--- a/lib/metropolis/tokyocabinet/hdb/ro.rb
+++ b/lib/metropolis/tokyocabinet/hdb/ro.rb
@@ -5,10 +5,10 @@ module Metropolis::TokyoCabinet::HDB::RO
    obj.instance_eval do
       @wr_flags = nil
       @rd_flags |= ::TokyoCabinet::HDB::ONOLCK
-      @hdbv.each { |(hdb, path)|
+      @dbv.each { |(hdb, path)|
         hdb.open(path, @rd_flags) or ex!(:open, path)
       }
-      @ro_hdbv = @hdbv.map { |(hdb,_)| hdb }
+      @ro_dbv = @dbv.map { |(hdb,_)| hdb }
     end
   end
 
@@ -29,6 +29,6 @@ module Metropolis::TokyoCabinet::HDB::RO
   end
 
   def reader(key)
-    yield @ro_hdbv[key.hash % @nr_slots]
+    yield @ro_dbv[key.hash % @nr_slots]
   end
 end
diff --git a/test/test_tokyocabinet_hdb.rb b/test/test_tokyocabinet_hdb.rb
index f973b69..1deea1c 100644
--- a/test/test_tokyocabinet_hdb.rb
+++ b/test/test_tokyocabinet_hdb.rb
@@ -192,7 +192,7 @@ class TestTokyocabinetHDB < Test::Unit::TestCase
     assert_equal data, obj.get(k)[2].join('')
     obj.close!
     sum = obj.instance_eval {
-      @hdbv.inject(0) { |size, (hdb,path)| size += File.stat(path).size }
+      @dbv.inject(0) { |size, (hdb,path)| size += File.stat(path).size }
     }
     assert sum <= nr_bytes, "#{sum} > #{nr_bytes}"
     obj.close!
-- 
cgit v1.2.3-24-ge0c7