roma-storage 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4b857ef17c3024f5e685a89bb579cfcf672e0bc7a019455533fa2daccdaf49d
-  data.tar.gz: 5ceac66c7a78a4deb3d984ef560dd6e3b5f8b70cf66da3c42fa914a92385b450
+  metadata.gz: e683364828401598f900c197ee7a9d4de6d911e6870fc836722ea5f2863c2986
+  data.tar.gz: a80f61deb26e63d8ef0a54343e82641472e55881349a56deaddf010f62291998
 SHA512:
-  metadata.gz: 1bbacc59fea65d29c505c1fcad537e68fd9e468fe15bc4bc6f2e1dae39f66f8127851a12d6d60eb61a44a7276e3c358a81c323617596f7d0d9d2b7c64cfa0969
-  data.tar.gz: 76c65ff78393467df8e72019ee1bcdce6a97a29a3b68806acbafdfa4b46cca8cca346fe74c7d7bda15e9fb4e5ef20f0f42c2876c0d7e7f2cd326693cc5168fd2
+  metadata.gz: 85fc39c8979a0990d1279b8599d5784f163adf2a3197eca743821e6bda0cd91a24f8941645b3ff575687a7e8d6989f2db42bf1ae23eb0e8ee09367ae249f9956
+  data.tar.gz: aa712f58b74d9cdc01c3cec7ff11562b00bcf3889f381c50c3816ad9580887c1b1b6d752d900b413a20c5a7b8a2aa76d690aba1626120f09e267a0d777a3deda

data/lib/roma/storage/basic_storage.rb

@@ -138,7 +138,28 @@ module Roma
       def unpack_data(str)
         str.unpack(PACK_TEMPLATE)
       end
-      private :pack_header, :unpack_header, :pack_data, :unpack_data
+
+      # The fields of a packed record, without unpacking the others, which
+      # makes objects.
+      def logical_clock_of(str)
+        uint32_at(str, 8)
+      end
+      def expire_of(str)
+        uint32_at(str, 12)
+      end
+      def value_of(str)
+        str.byteslice(16, str.bytesize - 16)
+      end
+      def uint32_at(str, i)
+        (str.getbyte(i) << 24) | (str.getbyte(i + 1) << 16) | (str.getbyte(i + 2) << 8) | str.getbyte(i + 3)
+      end
+
+      # The unix time, without making a Time.
+      def now
+        Process.clock_gettime(Process::CLOCK_REALTIME, :second)
+      end
+      private :pack_header, :unpack_header, :pack_data, :unpack_data,
+              :logical_clock_of, :expire_of, :value_of, :uint32_at, :now
 
       def db_get(vn, k)
         n = @hdiv[vn]
@@ -207,11 +228,10 @@ module Roma
         buf = db_get(vn, k)
         clk = 0
         if buf
-          data = unpack_data(buf)
-          clk = (data[2] + 1) & 0xffffffff
+          clk = (logical_clock_of(buf) + 1) & 0xffffffff
         end
 
-        ret = [vn, Time.now.to_i, clk, expt, v]
+        ret = [vn, now, clk, expt, v]
         return ret if db_put(vn , k, pack_data(*ret))
         nil
       end
@@ -276,10 +296,9 @@ module Roma
       def get(vn, k, d)
         buf = db_get(vn, k)
         return nil unless buf
-        vn, _t, _clk, expt, v = unpack_data(buf)
+        return nil if now > expire_of(buf)
 
-        return nil if Time.now.to_i > expt
-        v
+        value_of(buf)
       end
 
       def raw(vn, k, d)

data/lib/roma/storage/version.rb

@@ -1,5 +1,5 @@
 module Roma
   module Storage
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roma-storage
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tatsuya Sato