click_house 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 364117bb31fd3478fcf00d981b61205aa9fb864abbfeb9f9bdf253e53a0917fa
-  data.tar.gz: d0b0d7a21175a9c2e044a88351ddd6d107b1875769ae737d3e547e41e01d93d1
+  metadata.gz: f311abaedb0ef60cbfc25cabaae1223d266b9e5b83f677b1267c5e8b1b56048e
+  data.tar.gz: 58696f010c09d829038670e703126d28be343471b45fed0c07a05727d7ba0e95
 SHA512:
-  metadata.gz: 481ba8166f2300302c1a0836e336097e97a25015fbe5a5cf8e8fb5912b2170d50a2a1bc25178deb8b4a4b17d63e5638d0200bbca5a84c6a237de694ecf5f4d76
-  data.tar.gz: ba051b743929517452507d54f98de6d57de724b4400d1cf9db02666a48c5b00d4dbd00a3ffab6b5f2f9c3a7db78c15f84ae36523e2ee76946526fe131722ee05
+  metadata.gz: 35b8b80d3beca3ed584f29dd532d7a4e525dbc355d1cca5bca3d21d32f294ed6ba95b24ef01a6d4930ef195cbe9ab98ee0517a9620ffb1aa45c06353ddf557f1
+  data.tar.gz: 4ba73ab43c95300c19994e90b2ee7cade877490655ec07962c1dae1175968e36eb51a5711fe2ea8da49a934acacf6414d02052e9f6594914c591be8d6cac43fe

data/.rubocop.yml

@@ -7,6 +7,7 @@ AllCops:
   Exclude:
     - 'click_house.gemspec'
     - 'bin/*'
+    - 'lib/click_house/benchmark/*'
     - 'spec/**/*'
     - 'vendor/**/*'
   TargetRubyVersion: 2.7

data/CHANGELOG.md

@@ -1,6 +1,7 @@
 # 2.1.1
 * Fix logging with symbolized keys JSON
 * Unknown formats return raw `Response::ResultSelt` like regular JSON query
+* Added methods `statistics`, `summary`, `headers` and `types` to `Response::ResultSet`
 
 # 2.1.0
 * `ClickHouse.connection.insert` now returns `ClickHouse::Response::Summary` object

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    click_house (2.1.1)
+    click_house (2.1.2)
       activesupport
       faraday (>= 1.7, < 3)
 

data/Gemfile_faraday1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    click_house (2.1.1)
+    click_house (2.1.2)
       activesupport
       faraday (>= 1.7, < 3)
 

data/Gemfile_faraday2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    click_house (2.1.1)
+    click_house (2.1.2)
       activesupport
       faraday (>= 1.7, < 3)
 

data/README.md

@@ -138,12 +138,15 @@ Select all type-casted result set
 @result = ClickHouse.connection.select_all('SELECT * FROM visits')
 
 # all enumerable methods are delegated like #each, #map, #select etc
-# results of #to_a is type casted
+# results of #to_a is TYPE CASTED
 @result.to_a #=> [{"date"=>#<Date: 2000-01-01>, "id"=>1}]
 
+# raw results (WITHOUT type casting)
+# much faster if selecting a large amount of data
+@result.data #=> [{"date"=>"2000-01-01", "id"=>1}, {"date"=>"2000-01-02", "id"=>2}]
+
 # you can access raw data
 @result.meta #=> [{"name"=>"date", "type"=>"Date"}, {"name"=>"id", "type"=>"UInt32"}]
-@result.data #=> [{"date"=>"2000-01-01", "id"=>1}, {"date"=>"2000-01-02", "id"=>2}]
 @result.statistics #=> {"elapsed"=>0.0002271, "rows_read"=>2, "bytes_read"=>12}
 @result.summary #=> ClickHouse::Response::Summary
 @result.headers #=> {"x-clickhouse-query-id"=>"9bf5f604-31fc-4eff-a4b5-277f2c71d199"}

data/lib/click_house/ast/statement.rb

@@ -59,6 +59,17 @@ module ClickHouse
         @arguments ||= []
       end
 
+      # @return [Array]
+      # cached argument values to increase the casting perfomance
+      def argument_values
+        @argument_values ||= arguments.map(&:value)
+      end
+
+      def argument_first!
+        # TODO: raise an error if multiple arguments
+        @argument_first ||= arguments.first
+      end
+
       def placeholder
         return @placeholder if defined?(@placeholder)
 

data/lib/click_house/benchmark/casting.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'benchmark'
+require 'pry'
+require_relative '../../click_house'
+
+
+ClickHouse.config.json_serializer = ClickHouse::Serializer::JsonOjSerializer
+ClickHouse.config.json_parser = ClickHouse::Middleware::ParseJsonOj
+ClickHouse.connection.drop_table('benchmark', if_exists: true)
+ClickHouse.connection.execute <<~SQL
+CREATE TABLE benchmark(
+  int   Nullable(Int8),
+  date  Nullable(Date),
+  array Array(String),
+  map   Map(String, IPv4)
+) ENGINE Memory
+SQL
+
+INPUT = Array.new(200_000, {
+  'int' => 21341234,
+  'date' => Date.new(2022, 1, 1),
+  'array' => ['foo'],
+  'map' => {'ip' => IPAddr.new('127.0.0.1')}
+})
+
+Benchmark.bm do |x|
+  x.report('insert: no casting') do
+    ClickHouse.connection.insert('benchmark', INPUT)
+  end
+
+  x.report('insert: with casting') do
+    schema = ClickHouse.connection.table_schema('benchmark')
+    ClickHouse.connection.insert('benchmark', schema.serialize(INPUT))
+  end
+
+  x.report('select: no casting') do
+    ClickHouse.connection.select_all('SELECT * FROM benchmark').data
+  end
+
+  x.report('select: with casting') do
+    ClickHouse.connection.select_all('SELECT * FROM benchmark').to_a
+  end
+end

data/lib/click_house/response/result_set.rb

@@ -113,7 +113,7 @@ module ClickHouse
         return cast_map(stmt, Hash(value)) if stmt.caster.map?
         return cast_tuple(stmt, Array(value)) if stmt.caster.tuple?
 
-        stmt.caster.cast(value, *stmt.arguments.map(&:value))
+        stmt.caster.cast(value, *stmt.argument_values)
       end
 
       # @return [Hash]
@@ -131,8 +131,7 @@ module ClickHouse
       # @param stmt [Ast::Statement]
       def cast_container(stmt, value)
         stmt.caster.cast_each(value) do |item|
-          # TODO: raise an error if multiple arguments
-          cast_type(stmt.arguments.first, item)
+          cast_type(stmt.argument_first!, item)
         end
       end
 
@@ -149,14 +148,13 @@ module ClickHouse
         return serialize_map(stmt, value) if stmt.caster.map?
         return serialize_tuple(stmt, Array(value)) if stmt.caster.tuple?
 
-        stmt.caster.serialize(value, *stmt.arguments.map(&:value))
+        stmt.caster.serialize(value, *stmt.argument_values)
       end
 
       # @param stmt [Ast::Statement]
       def serialize_container(stmt, value)
-        stmt.caster.cast_each(value) do |item|
-          # TODO: raise an error if multiple arguments
-          serialize_type(stmt.arguments.first, item)
+        stmt.caster.serialize_each(value) do |item|
+          serialize_type(stmt.argument_first!, item)
         end
       end
 

data/lib/click_house/type/date_time64_type.rb

@@ -3,16 +3,37 @@
 module ClickHouse
   module Type
     class DateTime64Type < BaseType
-      def cast(value, _precision = nil, tz = nil)
+      BASE_FORMAT = '%Y-%m-%d %H:%M:%S'
+      CAST_FORMAT = "#{BASE_FORMAT}.%N"
+      SERIALIZE_FORMATS = {
+        0 => BASE_FORMAT,
+        1 => "#{BASE_FORMAT}.%1N",
+        2 => "#{BASE_FORMAT}.%2N",
+        3 => "#{BASE_FORMAT}.%3N",
+        4 => "#{BASE_FORMAT}.%4N",
+        5 => "#{BASE_FORMAT}.%5N",
+        6 => "#{BASE_FORMAT}.%6N",
+        7 => "#{BASE_FORMAT}.%7N",
+        8 => "#{BASE_FORMAT}.%8N",
+        9 => "#{BASE_FORMAT}.%9N",
+      }.freeze
+
+      # Tick size (precision):
+      #   10-precision seconds.
+      #   Valid range: [ 0 : 9 ].
+      #   Typically are used - 3 (milliseconds), 6 (microseconds), 9 (nanoseconds).
+      def cast(value, precision = 0, tz = nil)
+        format = precision.zero? ? BASE_FORMAT : CAST_FORMAT
+
         if tz
-          Time.find_zone(tz).parse(value)
+          Time.find_zone(tz).strptime(value, format)
         else
-          Time.parse(value)
+          Time.strptime(value, format)
         end
       end
 
       def serialize(value, precision = 3, _tz = nil)
-        value.strftime("%Y-%m-%d %H:%M:%S.%#{precision}N")
+        value.strftime(SERIALIZE_FORMATS.fetch(precision))
       end
     end
   end

data/lib/click_house/type/date_time_type.rb

@@ -3,16 +3,18 @@
 module ClickHouse
   module Type
     class DateTimeType < BaseType
+      FORMAT = '%Y-%m-%d %H:%M:%S'
+
       def cast(value, tz = nil)
         if tz
-          Time.find_zone(tz).parse(value)
+          Time.find_zone(tz).strptime(value, FORMAT)
         else
-          Time.parse(value)
+          Time.strptime(value, FORMAT)
         end
       end
 
       def serialize(value, *)
-        value.strftime('%Y-%m-%d %H:%M:%S')
+        value.strftime(FORMAT)
       end
     end
   end

data/lib/click_house/type/date_type.rb

@@ -3,12 +3,14 @@
 module ClickHouse
   module Type
     class DateType < BaseType
+      FORMAT = '%Y-%m-%d'
+
       def cast(value)
-        Date.parse(value)
+        Date.strptime(value, FORMAT)
       end
 
       def serialize(value)
-        value.strftime('%Y-%m-%d')
+        value.strftime(FORMAT)
       end
     end
   end

data/lib/click_house/type/integer_type.rb

@@ -4,11 +4,11 @@ module ClickHouse
   module Type
     class IntegerType < BaseType
       def cast(value)
-        Integer(value) unless value.nil?
+        Integer(value)
       end
 
       def serialize(value)
-        value.to_i unless value.nil?
+        value.to_i
       end
     end
   end

data/lib/click_house/type/ip_type.rb

@@ -4,11 +4,11 @@ module ClickHouse
   module Type
     class IPType < BaseType
       def cast(value)
-        IPAddr.new(value) unless value.nil?
+        IPAddr.new(value)
       end
 
       def serialize(value)
-        value.to_s unless value.nil?
+        value.to_s
       end
     end
   end

data/lib/click_house/type/low_cardinality_type.rb

@@ -4,7 +4,11 @@ module ClickHouse
   module Type
     class LowCardinalityType < BaseType
       def cast_each(value, *_argv)
-        yield(value) unless value.nil?
+        yield(value)
+      end
+
+      def serialize_each(value, *_argv)
+        yield(value)
       end
 
       def container?

data/lib/click_house/type/nullable_type.rb

@@ -7,6 +7,10 @@ module ClickHouse
         yield(value) unless value.nil?
       end
 
+      def serialize_each(value, *_argv)
+        yield(value) unless value.nil?
+      end
+
       def container?
         true
       end

data/lib/click_house/type/string_type.rb

@@ -4,11 +4,11 @@ module ClickHouse
   module Type
     class StringType < BaseType
       def cast(value, *)
-        value.to_s unless value.nil?
+        value.to_s
       end
 
       def serialize(value, *)
-        value.to_s unless value.nil?
+        value.to_s
       end
     end
   end

data/lib/click_house/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ClickHouse
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: click_house
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Aliaksandr Shylau
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-20 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -175,6 +175,7 @@ files:
 - lib/click_house/ast/parser.rb
 - lib/click_house/ast/statement.rb
 - lib/click_house/ast/ticker.rb
+- lib/click_house/benchmark/casting.rb
 - lib/click_house/benchmark/map_join.rb
 - lib/click_house/config.rb
 - lib/click_house/connection.rb