ignite-client 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e093caf963cfb87b79bbe650d161419f41557a90e024039ec395709fce977d3
-  data.tar.gz: 796674a722547b1e38c2a2b0a31b3ded504b1db80cd5dc5d3334154b90ba050f
+  metadata.gz: a81b15f9a00bf89eb585f8065bd6e660ecb19e21e1b75a63b5e41df7302806dd
+  data.tar.gz: 2894eb97340f58a8f8f40aa67a1aa3f7e3d6a2932b565339e551ec6b1b593204
 SHA512:
-  metadata.gz: e1962bc2a2da0242d76f2476c3555260a4bea3c9920449567ea454e4d3802c5656514d1aa4612bb801c9605db94c7cc10d586925f3dd6ff78670b5d240b37ed0
-  data.tar.gz: c96ecb92666ae5ac5937a1a99b411a874def4c7879e5f7a59923c3079fc3278a847dd36fd0ba8bc1621bb9f07d5eacded85682c3bc69ae8e634b066272b93bb4
+  metadata.gz: 8813cce5db934323a6d32a922f85a2ab10b3acd0738d8b6899230ab261bedf2f95058bb6d40ae426581c75de635702a5bee42bef9ed7ac2ca54e7ab6c357f8f4
+  data.tar.gz: 3f5798dace62b573e02b7c6b11859e1d607f4ae85a859b9bde29169b5e1b55f0d59000dad14940be4763636b3b721d53ae1e330353163cf099c968dd0e193596

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.1 (2021-02-04)
+
+- Added support for array types
+
 ## 0.1.0 (2021-02-02)
 
 - First release

data/README.md

@@ -89,7 +89,7 @@ client.query("SELECT * FROM products WHERE name = ?", ["Ignite"])
 
 ## Connection Options
 
-Specify a host and port
+Specify the host and port
 
 ```ruby
 Ignite::Client.new(host: "localhost", port: 10800)
@@ -117,7 +117,6 @@ For [SSL/TLS](https://ignite.apache.org/docs/latest/security/ssl-tls#ssl-for-cli
 Ignite::Client.new(
   use_ssl: true,
   ssl_params: {
-    verify_mode: OpenSSL::SSL::VERIFY_PEER,
     ca_file: "ca.pem"
   }
 )

data/lib/ignite.rb

@@ -7,8 +7,10 @@ require "socket"
 # modules
 require "ignite/cache"
 require "ignite/op_codes"
+require "ignite/pack_formats"
 require "ignite/request"
 require "ignite/response"
+require "ignite/type_codes"
 require "ignite/version"
 
 module Ignite

data/lib/ignite/pack_formats.rb

@@ -0,0 +1,17 @@
+module Ignite
+  PACK_BYTE = "C"
+  PACK_CHAR = "c"
+  PACK_SHORT = "s!<"
+  PACK_INT = "i!<"
+  PACK_LONG = "l!<"
+  PACK_FLOAT = "e"
+  PACK_DOUBLE = "E"
+
+  SIZE_BYTE = 1
+  SIZE_CHAR = 1
+  SIZE_SHORT = 2
+  SIZE_INT = 4
+  SIZE_LONG = 8
+  SIZE_FLOAT = 4
+  SIZE_DOUBLE = 8
+end

data/lib/ignite/request.rb

@@ -4,7 +4,9 @@ module Ignite
     MAX_LONG =  9223372036854775807 #  2**63-1
 
     def initialize(op_code)
-      @buffer = String.new
+      @format = String.new
+      @values = []
+
       int 0 # length placeholder
 
       if op_code != OP_HANDSHAKE
@@ -13,10 +15,14 @@ module Ignite
       end
     end
 
+    # reduce allocations by packing together
+    # but need to make sure values aren't modified
+    # between when they are added and packed
     def to_bytes
+      buffer = @values.pack(@format)
       # update length
-      @buffer[0..3] = [@buffer.bytesize - 4].pack("i!<")
-      @buffer
+      buffer[0..3] = [buffer.bytesize - 4].pack(PACK_INT)
+      buffer
     end
 
     def bool(value)
@@ -24,61 +30,90 @@ module Ignite
     end
 
     def byte(value)
-      [value].pack("C", buffer: @buffer)
+      @format << PACK_BYTE
+      @values << value
     end
 
     def short(value)
-      [value].pack("s!<", buffer: @buffer)
+      @format << PACK_SHORT
+      @values << value
     end
 
     def int(value)
-      [value].pack("i!<", buffer: @buffer)
+      @format << PACK_INT
+      @values << value
     end
 
     def long(value)
-      [value].pack("l!<", buffer: @buffer)
+      @format << PACK_LONG
+      @values << value
     end
 
     def float(value)
-      [value].pack("e", buffer: @buffer)
+      @format << PACK_FLOAT
+      @values << value
     end
 
     def double(value)
-      [value].pack("E", buffer: @buffer)
+      @format << PACK_DOUBLE
+      @values << value
     end
 
     def string(value)
-      byte 9
+      byte TYPE_STRING
       int value.bytesize
-      @buffer << value
+      @format << "a#{value.bytesize}"
+      @values << value
     end
 
     def data_object(value)
       case value
       when Integer
-        byte 4
+        byte TYPE_LONG
         long value
       when Float
-        byte 6
+        byte TYPE_DOUBLE
         double value
       when TrueClass, FalseClass
-        byte 8
+        byte TYPE_BOOL
         bool value
       when String
         string value
       when Date
-        byte 11
+        byte TYPE_DATE
         time = value.to_time
         long(time.to_i * 1000 + (time.nsec / 1000000))
+      when Array
+        array_object(value)
       when Time
-        byte 33
+        byte TYPE_TIMESTAMP
         long(value.to_i * 1000 + (value.nsec / 1000000))
         int value.nsec % 1000000
       when NilClass
-        byte 101
+        byte TYPE_NULL
       else
-        raise "Unknown type: #{value.class.name}"
+        raise Error, "Unable to cache #{value.class.name}"
       end
     end
+
+    def array_object(value)
+      # empty arrays take first path for now
+      if value.all? { |v| v.is_a?(Integer) }
+        array(TYPE_LONG_ARRAY, value, PACK_LONG)
+      elsif value.all? { |v| v.is_a?(Float) }
+        array(TYPE_DOUBLE_ARRAY, value, PACK_DOUBLE)
+      elsif value.all? { |v| v == true || v == false }
+        array(TYPE_BOOL_ARRAY, value.map { |v| v ? 1 : 0 }, PACK_CHAR)
+      else
+        raise Error, "Unable to cache array of #{value.map { |v| v.class.name }.uniq.join(", ")}"
+      end
+    end
+
+    def array(type_code, value, pack)
+      byte type_code
+      int value.size
+      @format << "#{pack}#{value.size}"
+      @values.concat(value)
+    end
   end
 end

data/lib/ignite/response.rb

@@ -6,7 +6,7 @@ module Ignite
       @client = client
 
       # use buffer so errors don't leave unread data on socket
-      len = client.read(4).unpack1("i!<")
+      len = client.read(SIZE_INT).unpack1(PACK_INT)
       @buffer = StringIO.new(client.read(len))
     end
 
@@ -15,31 +15,31 @@ module Ignite
     end
 
     def read_byte
-      read(1).unpack1("C")
+      read(SIZE_BYTE).unpack1(PACK_BYTE)
     end
 
     def read_short
-      read(2).unpack1("s!<")
+      read(SIZE_SHORT).unpack1(PACK_SHORT)
     end
 
     def read_int
-      read(4).unpack1("i!<")
+      read(SIZE_INT).unpack1(PACK_INT)
     end
 
     def read_long
-      read(8).unpack1("l!<")
+      read(SIZE_LONG).unpack1(PACK_LONG)
     end
 
     def read_float
-      read(4).unpack1("e")
+      read(SIZE_FLOAT).unpack1(PACK_FLOAT)
     end
 
     def read_double
-      read(8).unpack1("E")
+      read(SIZE_DOUBLE).unpack1(PACK_DOUBLE)
     end
 
     def read_char
-      read(1).unpack1("c")
+      read(SIZE_CHAR).unpack1(PACK_CHAR)
     end
 
     def read_bool
@@ -53,7 +53,7 @@ module Ignite
 
     def read_string_object
       type = read_byte
-      raise "Expected string, not type #{type}" unless type == 9
+      raise Error, "Expected string, not type #{type}" unless type == TYPE_STRING
       read_string
     end
 
@@ -63,6 +63,22 @@ module Ignite
       Time.at(sec).to_date
     end
 
+    def read_byte_array
+      read_array(SIZE_BYTE, PACK_BYTE)
+    end
+
+    def read_long_array
+      read_array(SIZE_LONG, PACK_LONG)
+    end
+
+    def read_double_array
+      read_array(SIZE_DOUBLE, PACK_DOUBLE)
+    end
+
+    def read_bool_array
+      read_byte_array.map { |v| v != 0 }
+    end
+
     # same as Python
     def read_decimal
       scale = read_int
@@ -93,35 +109,50 @@ module Ignite
     def read_data_object
       type_code = read_byte
       case type_code
-      when 1
+      when TYPE_BYTE
         read_byte
-      when 2
+      when TYPE_SHORT
         read_short
-      when 3
+      when TYPE_INT
         read_int
-      when 4
+      when TYPE_LONG
         read_long
-      when 5
+      when TYPE_FLOAT
         read_float
-      when 6
+      when TYPE_DOUBLE
         read_double
-      when 7
+      when TYPE_CHAR
         read_char
-      when 8
+      when TYPE_BOOL
         read_bool
-      when 9
+      when TYPE_STRING
         read_string
-      when 11
+      when TYPE_DATE
         read_date
-      when 30
+      when TYPE_BYTE_ARRAY
+        read_byte_array
+      when TYPE_LONG_ARRAY
+        read_long_array
+      when TYPE_DOUBLE_ARRAY
+        read_double_array
+      when TYPE_BOOL_ARRAY
+        read_bool_array
+      when TYPE_DECIMAL
         read_decimal
-      when 33
+      when TYPE_TIMESTAMP
         read_timestamp
-      when 101
+      when TYPE_NULL
         nil
       else
         raise Error, "Type not supported yet: #{type_code}. Please create an issue."
       end
     end
+
+    private
+
+    def read_array(size, pack)
+      len = read_int
+      read(len * size).unpack("#{pack}*")
+    end
   end
 end

data/lib/ignite/type_codes.rb

@@ -0,0 +1,28 @@
+module Ignite
+  TYPE_BYTE = 1
+  TYPE_SHORT = 2
+  TYPE_INT = 3
+  TYPE_LONG = 4
+  TYPE_FLOAT = 5
+  TYPE_DOUBLE = 6
+  TYPE_CHAR = 7
+  TYPE_BOOL = 8
+  TYPE_STRING = 9
+  TYPE_UUID = 10
+  TYPE_DATE = 11
+
+  TYPE_BYTE_ARRAY = 12
+  TYPE_INT_ARRAY = 14
+  TYPE_LONG_ARRAY = 15
+  TYPE_FLOAT_ARRAY = 16
+  TYPE_DOUBLE_ARRAY = 17
+  TYPE_CHAR_ARRAY = 18
+  TYPE_BOOL_ARRAY = 19
+
+  TYPE_ENUM = 28
+  TYPE_DECIMAL = 30
+  TYPE_TIMESTAMP = 33
+  TYPE_TIME = 36
+
+  TYPE_NULL = 101
+end

data/lib/ignite/version.rb

@@ -1,3 +1,3 @@
 module Ignite
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ignite-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies: []
 description:
 email: andrew@ankane.org
@@ -23,8 +23,10 @@ files:
 - lib/ignite/cache.rb
 - lib/ignite/client.rb
 - lib/ignite/op_codes.rb
+- lib/ignite/pack_formats.rb
 - lib/ignite/request.rb
 - lib/ignite/response.rb
+- lib/ignite/type_codes.rb
 - lib/ignite/version.rb
 homepage: https://github.com/ankane/ignite-ruby
 licenses: