fdb 6.0.12 → 6.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53a6e7d35e892440840f2e8e82cf1a35050d8d7b
-  data.tar.gz: 1d208d1e26a02570740c0cb333676724195d440c
+  metadata.gz: 847e484d16af572e9247d167c32f63844c9ec629
+  data.tar.gz: 50993f0a35f135fea6acc20d09cb45db7ce764ac
 SHA512:
-  metadata.gz: 7e713ddf35c2a0e78c77d99fe5f198cd768f32fad60080a7bfd5e29ab1fe4415836290b3bef0cd21d7ad104d3105bc6a82fd56f2b4f971531a47861ca9864312
-  data.tar.gz: 9d017386c12126fb54598a733ccbcca2176dd08b9f4b446fb5c62f01a53ca033f8ae2ff71cbc0496b73f2b91f28adf33144f2c300983676c6bea769276bfa7f3
+  metadata.gz: d42d2d1cc37bc065386cd10dff91202b2df94d2f8e7c2a9a18326704c157a3e7586ac357e2153cb67b9bffafbc203b6d0bb843e30dac3d8d725eec5a0fe49206
+  data.tar.gz: 94721608319eb035ef4e027c3b4ef223e98c6b6b6d3dd97f085f6610b46efd1e150d5322dec2dfb9de83ea224e08094d8ecb4336e6c42e32951879afcc2d7553

data/lib/fdbimpl.rb

@@ -170,7 +170,7 @@ module FDB
           Proc.new do || @setfunc.call(v[0], nil) end
         when String then
           Proc.new do |opt=nil| @setfunc.call(v[0], (opt.nil? ? opt : opt.encode('UTF-8')) ) end
-        when Fixnum then
+        when Integer then
           Proc.new do |opt| @setfunc.call(v[0], [opt].pack("q<")) end
         else
           raise ArgumentError, "Don't know how to set options of type #{v[2].class}"

data/lib/fdbtuple.rb

@@ -35,8 +35,8 @@ module FDB
     @@STRING_CODE     = 0x02
     @@NESTED_CODE     = 0x05
     @@INT_ZERO_CODE   = 0x14
-    @@POS_INT_END     = 0x1c
-    @@NEG_INT_START   = 0x0c
+    @@POS_INT_END     = 0x1d
+    @@NEG_INT_START   = 0x0b
     @@FLOAT_CODE      = 0x20
     @@DOUBLE_CODE     = 0x21
     @@FALSE_CODE      = 0x26
@@ -117,12 +117,28 @@ module FDB
       elsif code == @@STRING_CODE
         epos = find_terminator(v, pos+1)
         [v.slice(pos+1, epos-pos-1).gsub("\x00\xFF", "\x00").force_encoding("UTF-8"), epos+1]
-      elsif code >= @@INT_ZERO_CODE && code <= @@POS_INT_END
+      elsif code >= @@INT_ZERO_CODE && code < @@POS_INT_END
         n = code - @@INT_ZERO_CODE
         [("\x00" * (8-n) + v.slice(pos+1, n)).unpack("Q>")[0], pos+n+1]
-      elsif code >= @@NEG_INT_START and code < @@INT_ZERO_CODE
+      elsif code > @@NEG_INT_START and code < @@INT_ZERO_CODE
         n = @@INT_ZERO_CODE - code
         [("\x00" * (8-n) + v.slice(pos+1, n)).unpack("Q>")[0]-@@size_limits[n], pos+n+1]
+      elsif code == @@POS_INT_END
+        length = v.getbyte(pos+1)
+        val = 0
+        length.times do |i|
+          val = val << 8
+          val += v.getbyte(pos+2+i)
+        end
+        [val, pos+length+2]
+      elsif code == @@NEG_INT_START
+        length = v.getbyte(pos+1) ^ 0xff
+        val = 0
+        length.times do |i|
+          val = val << 8
+          val += v.getbyte(pos+2+i)
+        end
+        [val - (1 << (length*8)) + 1, pos+length+2]
       elsif code == @@FALSE_CODE
         [false, pos+1]
       elsif code == @@TRUE_CODE
@@ -182,15 +198,34 @@ module FDB
           raise ArgumentError, "unsupported encoding #{v.encoding.name}"
         end
       elsif v.kind_of? Integer
-        raise RangeError, "value outside inclusive range -2**64+1 to 2**64-1" if v < -2**64+1 || v > 2**64-1
+        raise RangeError, "Integer magnitude is too large (more than 255 bytes)" if v < -2**2040+1 || v > 2**2040-1
         if v == 0
           @@INT_ZERO_CODE.chr
         elsif v > 0
-          n = bisect_left( @@size_limits, v )
-          (20+n).chr + [v].pack("Q>").slice(8-n, n)
+          if v > @@size_limits[-1]
+            length = (v.bit_length + 7) / 8
+            result = @@POS_INT_END.chr + length.chr
+            length.times do |i|
+              result << ((v >> (8 * (length-i-1))) & 0xff)
+            end
+            result
+          else
+            n = bisect_left( @@size_limits, v )
+            (@@INT_ZERO_CODE+n).chr + [v].pack("Q>").slice(8-n, n)
+          end
         else
-          n = bisect_left( @@size_limits, -v )
-          (20-n).chr + [@@size_limits[n]+v].pack("Q>").slice(8-n, n)
+          if -v > @@size_limits[-1]
+            length = ((-v).bit_length + 7) / 8
+            v += (1 << (length * 8)) - 1
+            result = @@NEG_INT_START.chr + (length ^ 0xff).chr
+            length.times do |i|
+              result << ((v >> (8 * (length-i-1))) & 0xff)
+            end
+            result
+          else
+            n = bisect_left( @@size_limits, -v )
+            (@@INT_ZERO_CODE-n).chr + [@@size_limits[n]+v].pack("Q>").slice(8-n, n)
+          end
         end
       elsif v.kind_of? TrueClass
         @@TRUE_CODE.chr

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fdb
 version: !ruby/object:Gem::Version
-  version: 6.0.12
+  version: 6.0.16
 platform: ruby
 authors:
 - FoundationDB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi