fdb 6.0.14 → 6.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc889788b138145161a6362d527f18e1fa591cb1
-  data.tar.gz: 0293fa211a5a67b666f0114c0c0f684122163d92
+  metadata.gz: 1623c8895eed2ba5d05d65e2710ee7675f33bfeb
+  data.tar.gz: 022a06865f41c18e61dad70f34965b834b00cd78
 SHA512:
-  metadata.gz: 7000c2698f6d488c0383fccf9a544e6481e1dd11ad91f010af735e173a7ee41be7769a1617689261f1fed79746f284dbca8df1e0e76599f6a2f8edea7de5fea7
-  data.tar.gz: 8201385cb3381d6cb1e5db427376c4bd6fbf81884dbc8f4d5a049699f70108bf5c0e1ec483f6d00f881ad5a13cc6303e37e7f4950e0344c35191413c457440e9
+  metadata.gz: 27e4e4aa6b5e1c131f0fda38665a721c9a05e6f5e6e4307307bbed0198dc8b1e517d1721a3041287df255e636e1872e240371261f7e76437167ef75f752a6487
+  data.tar.gz: 6afd15e371296a0f5342572f7eba6a86c6d676f4c723f535860b4b89fd2dd8efbb235563f41ff971dc954b7ce767b5831a72e0e953067afecf2e44760ae12f70

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.14
+  version: 6.0.15
 platform: ruby
 authors:
 - FoundationDB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi