duckdb 0.8.1 → 0.8.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dab5e8d5f3beafce29f2d545b736b34b3502f2f31120d1d7d0714fdb83512457
-  data.tar.gz: a73a7438ec5762af143b8590923b0fd3c54ec99926aa48b485346e943fe66916
+  metadata.gz: def2e5adaab85bedca1363e7c527640eeb7f2cc2938c4bac219b026d8d79e895
+  data.tar.gz: 2f058e71abd48266432f7486bed43a67fa8ef5e8955ccc150c27a64e023fb7d5
 SHA512:
-  metadata.gz: de0988a48ae0e9652d8411ce52265835e6d63c30f53c181cc25066d7fbae26ff9a54290e014c66aa44f6a3f87b9e5da7fa3acee6f0051c1b886cb6ea5e68d4bb
-  data.tar.gz: 0edd9bfe15f0e47da50e860732acecc897a9cbba716218da5de80188be7bf43df5f1300d3419e501532a7d26cc42a1c79d76835cb3a1a956e7b06d7842b40c20
+  metadata.gz: 388302d5e187b6f8f85877c0cfd2613e78047ba78484067e99e8fe1a6cee16ca61a59918ae4d9090b4b9029e8594f0c4f63e2d9855f3f3a931979b51430ecd8f
+  data.tar.gz: 27418556352f19324ebc8e90cae28972f05965cd2394dccd92836ccf1dd044604f2e1045ebdb7f05b28afeec493de07fa1d060dde3c3367a60fbcf4fee30038f

data/CHANGELOG.md

@@ -1,7 +1,22 @@
 # ChangeLog
 
+# 0.8.1.2
+- Fix BigDecimal conversion when the value is 0.
+  Thanks to shreeve.
+
+# 0.8.1.1
+- DuckDB::Result#chunk_each supports:
+  - UTINYINT
+  - USMALLINT
+  - UINTEGER
+  - UBIGINT
+- fix memory leak of:
+  - `DuckDB::Result#_enum_dictionary_value`
+  - `DuckDB::Result#_enum_dictionary_size`
+  - `DuckDB::Result#_enum_internal_type`
+
 # 0.8.1
-- bump duckdb to 0.8.1
+- bump duckdb to 0.8.1.
 - add `DuckDB::Result#chunk_each`, `DuckDB::Result.use_chunk_each=`, `DuckDB::Result#use_chunk_each?`
   The current behavior of `DuckDB::Result#each` is same as older version.
   But `DuckDB::Result#each` behavior will be changed like as `DuckDB::Result#chunk_each` in near future release.

data/Gemfile

@@ -7,3 +7,7 @@ if /(linux|darwin)/ =~ RUBY_PLATFORM
   gem 'benchmark-ips'
   gem 'stackprof'
 end
+
+if /linux/ =~ RUBY_PLATFORM
+  gem 'ruby_memcheck'
+end

data/Gemfile.lock

@@ -1,16 +1,25 @@
 PATH
   remote: .
   specs:
-    duckdb (0.8.1)
+    duckdb (0.8.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     benchmark-ips (2.12.0)
+    mini_portile2 (2.8.2)
     minitest (5.18.1)
+    nokogiri (1.15.3)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    nokogiri (1.15.3-x86_64-linux)
+      racc (~> 1.4)
+    racc (1.7.1)
     rake (13.0.6)
     rake-compiler (1.2.3)
       rake
+    ruby_memcheck (1.3.2)
+      nokogiri
     stackprof (0.2.25)
 
 PLATFORMS
@@ -24,7 +33,8 @@ DEPENDENCIES
   minitest (~> 5.0)
   rake (~> 13.0)
   rake-compiler
+  ruby_memcheck
   stackprof
 
 BUNDLED WITH
-   2.4.10
+   2.4.17

data/Rakefile

@@ -1,19 +1,41 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+ruby_memcheck_avaiable = begin
+                           require 'ruby_memcheck'
+                           true
+                         rescue LoadError
+                           false
+                         end
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+
+if ruby_memcheck_avaiable
+  RubyMemcheck.config(
+    binary_name: 'duckdb/duckdb_native',
+    valgrind_options: ['--max-threads=1000']
+  )
+end
+
+test_config = lambda do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+Rake::TestTask.new(test: :compile, &test_config)
+
+if ruby_memcheck_avaiable
+  namespace :test do
+    RubyMemcheck::TestTask.new(valgrind: :compile, &test_config)
+  end
 end
 
-require "rake/extensiontask"
+require 'rake/extensiontask'
 
-task :build => :compile
+task build: :compile
 
-Rake::ExtensionTask.new("duckdb_native") do |ext|
+Rake::ExtensionTask.new('duckdb_native') do |ext|
   ext.ext_dir = 'ext/duckdb'
-  ext.lib_dir = "lib/duckdb"
+  ext.lib_dir = 'lib/duckdb'
 end
 
-task :default => [:clobber, :compile, :test]
+task default: %i[clobber compile test]

data/benchmark/get_converter_module_ips.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'duckdb'
+require 'benchmark/ips'
+
+db = DuckDB::Database.open
+con = db.connect
+con.query('CREATE TABLE hugeints (hugeint_val HUGEINT)')
+con.query('INSERT INTO hugeints VALUES (1234567890123456789012345678901234)')
+result = con.query('SELECT hugeint_val FROM hugeints')
+
+Benchmark.ips do |x|
+  x.report('hugeint_convert') { result.each.to_a[0][0] }
+end
+
+__END__
+
+## before
+```
+✦ ❯ ruby benchmark/get_converter_module_ips.rb
+Warming up --------------------------------------
+     hugeint_convert    45.376k i/100ms
+Calculating -------------------------------------
+     hugeint_convert    552.127k (± 0.7%) i/s -      2.768M in   5.013483s
+```

data/ext/duckdb/converter.h

@@ -0,0 +1,6 @@
+#ifndef RUBY_DUCKDB_CONVERTER_H
+#define RUBY_DUCKDB_CONVERTER_H
+
+void init_duckdb_converter(void);
+
+#endif

data/ext/duckdb/conveter.c

@@ -0,0 +1,7 @@
+#include "ruby-duckdb.h"
+
+VALUE mDuckDBConverter;
+
+void init_duckdb_converter(void) {
+    mDuckDBConverter = rb_define_module_under(mDuckDB, "Converter");
+}

data/ext/duckdb/duckdb.c

@@ -23,4 +23,5 @@ Init_duckdb_native(void) {
     init_duckdb_blob();
     init_duckdb_appender();
     init_duckdb_config();
+    init_duckdb_converter();
 }

data/ext/duckdb/result.c

@@ -362,6 +362,7 @@ static VALUE duckdb_result__enum_internal_type(VALUE oDuckDBResult, VALUE col_id
     if (logical_type) {
         type = LL2NUM(duckdb_enum_internal_type(logical_type));
     }
+    duckdb_destroy_logical_type(&logical_type);
     return type;
 }
 
@@ -375,6 +376,7 @@ static VALUE duckdb_result__enum_dictionary_size(VALUE oDuckDBResult, VALUE col_
     if (logical_type) {
         size = UINT2NUM(duckdb_enum_dictionary_size(logical_type));
     }
+    duckdb_destroy_logical_type(&logical_type);
     return size;
 }
 
@@ -393,6 +395,7 @@ static VALUE duckdb_result__enum_dictionary_value(VALUE oDuckDBResult, VALUE col
             duckdb_free(p);
         }
     }
+    duckdb_destroy_logical_type(&logical_type);
     return value;
 }
 
@@ -403,9 +406,8 @@ VALUE create_result(void) {
 #ifdef HAVE_DUCKDB_H_GE_V080
 static VALUE vector_date(void *vector_data, idx_t row_idx) {
     duckdb_date_struct date = duckdb_from_date(((duckdb_date *) vector_data)[row_idx]);
-    VALUE mConverter = rb_const_get(mDuckDB, rb_intern("Converter"));
 
-    return rb_funcall(mConverter, rb_intern("_to_date"), 3,
+    return rb_funcall(mDuckDBConverter, rb_intern("_to_date"), 3,
             INT2FIX(date.year),
             INT2FIX(date.month),
             INT2FIX(date.day)
@@ -414,8 +416,7 @@ static VALUE vector_date(void *vector_data, idx_t row_idx) {
 
 static VALUE vector_timestamp(void* vector_data, idx_t row_idx) {
     duckdb_timestamp_struct data = duckdb_from_timestamp(((duckdb_timestamp *)vector_data)[row_idx]);
-    VALUE mConverter = rb_const_get(mDuckDB, rb_intern("Converter"));
-    return rb_funcall(mConverter, rb_intern("_to_time"), 7,
+    return rb_funcall(mDuckDBConverter, rb_intern("_to_time"), 7,
             INT2FIX(data.date.year),
             INT2FIX(data.date.month),
             INT2FIX(data.date.day),
@@ -428,8 +429,7 @@ static VALUE vector_timestamp(void* vector_data, idx_t row_idx) {
 
 static VALUE vector_interval(void* vector_data, idx_t row_idx) {
     duckdb_interval data = ((duckdb_interval *)vector_data)[row_idx];
-    VALUE mConverter = rb_const_get(mDuckDB, rb_intern("Converter"));
-    return rb_funcall(mConverter, rb_intern("_to_interval_from_vector"), 3,
+    return rb_funcall(mDuckDBConverter, rb_intern("_to_interval_from_vector"), 3,
             INT2NUM(data.months),
             INT2NUM(data.days),
             LL2NUM(data.micros)
@@ -456,8 +456,7 @@ static VALUE vector_varchar(void* vector_data, idx_t row_idx) {
 
 static VALUE vector_hugeint(void* vector_data, idx_t row_idx) {
     duckdb_hugeint hugeint = ((duckdb_hugeint *)vector_data)[row_idx];
-    VALUE mConverter = rb_const_get(mDuckDB, rb_intern("Converter"));
-    return rb_funcall(mConverter, rb_intern("_to_hugeint_from_vector"), 2,
+    return rb_funcall(mDuckDBConverter, rb_intern("_to_hugeint_from_vector"), 2,
             ULL2NUM(hugeint.lower),
             LL2NUM(hugeint.upper)
             );
@@ -466,7 +465,6 @@ static VALUE vector_hugeint(void* vector_data, idx_t row_idx) {
 static VALUE vector_decimal(duckdb_logical_type ty, void* vector_data, idx_t row_idx) {
     uint8_t width = duckdb_decimal_width(ty);
     uint8_t scale = duckdb_decimal_scale(ty);
-    VALUE mConverter = rb_const_get(mDuckDB, rb_intern("Converter"));
     duckdb_type type = duckdb_decimal_internal_type(ty);
     duckdb_hugeint value;
 
@@ -481,7 +479,7 @@ static VALUE vector_decimal(duckdb_logical_type ty, void* vector_data, idx_t row
             rb_warn("Unknown decimal internal type %d", type);
     }
 
-    return rb_funcall(mConverter, rb_intern("_to_decimal_from_vector"), 4,
+    return rb_funcall(mDuckDBConverter, rb_intern("_to_decimal_from_vector"), 4,
             INT2FIX(width),
             INT2FIX(scale),
             ULL2NUM(value.lower),
@@ -581,8 +579,7 @@ static VALUE vector_struct(duckdb_logical_type ty, duckdb_vector vector, idx_t r
 
 static VALUE vector_uuid(void* vector_data, idx_t row_idx) {
     duckdb_hugeint hugeint = ((duckdb_hugeint *)vector_data)[row_idx];
-    VALUE mConverter = rb_const_get(mDuckDB, rb_intern("Converter"));
-    return rb_funcall(mConverter, rb_intern("_to_uuid_from_vector"), 2,
+    return rb_funcall(mDuckDBConverter, rb_intern("_to_uuid_from_vector"), 2,
             ULL2NUM(hugeint.lower),
             LL2NUM(hugeint.upper)
             );
@@ -623,6 +620,18 @@ static VALUE vector_value(duckdb_vector vector, idx_t row_idx) {
         case DUCKDB_TYPE_BIGINT:
             obj = LL2NUM(((int64_t *) vector_data)[row_idx]);
             break;
+	    case DUCKDB_TYPE_UTINYINT:
+            obj = INT2FIX(((uint8_t *) vector_data)[row_idx]);
+            break;
+        case DUCKDB_TYPE_USMALLINT:
+            obj = INT2FIX(((uint16_t *) vector_data)[row_idx]);
+            break;
+        case DUCKDB_TYPE_UINTEGER:
+            obj = UINT2NUM(((uint32_t *) vector_data)[row_idx]);
+            break;
+        case DUCKDB_TYPE_UBIGINT:
+            obj = ULL2NUM(((uint64_t *) vector_data)[row_idx]);
+            break;
         case DUCKDB_TYPE_HUGEINT:
             obj = vector_hugeint(vector_data, row_idx);
             break;

data/ext/duckdb/ruby-duckdb.h

@@ -19,6 +19,7 @@
 #include "./column.h"
 #include "./prepared_statement.h"
 #include "./util.h"
+#include "./converter.h"
 
 #include "./blob.h"
 #include "./appender.h"
@@ -30,5 +31,6 @@ extern VALUE cDuckDBConnection;
 extern VALUE cDuckDBBlob;
 extern VALUE cDuckDBConfig;
 extern VALUE eDuckDBError;
+extern VALUE mDuckDBConverter;
 
 #endif

data/lib/duckdb/appender.rb

@@ -2,7 +2,7 @@
 
 require 'date'
 require 'time'
-require_relative './converter'
+require_relative 'converter'
 
 module DuckDB
   # The DuckDB::Appender encapsulates DuckDB Appender.
@@ -194,17 +194,9 @@ module DuckDB
       when TrueClass, FalseClass
         append_bool(value)
       when Time
-        if respond_to?(:append_timestamp)
-          append_timestamp(value)
-        else
-          append_varchar(value.strftime('%Y-%m-%d %H:%M:%S.%N'))
-        end
+        append_timestamp(value)
       when Date
-        if respond_to?(:append_date)
-          append_date(value)
-        else
-          append_varchar(value.strftime('%Y-%m-%d'))
-        end
+        append_date(value)
       else
         raise(DuckDB::Error, "not supported type #{value} (#{value.class})")
       end

data/lib/duckdb/converter.rb

@@ -23,7 +23,7 @@ module DuckDB
 
     def _to_decimal_from_vector(_width, scale, lower, upper)
       v = _to_hugeint_from_vector(lower, upper).to_s
-      v[-scale, 0] = '.'
+      v[-scale, 0] = '.' unless v == '0'
       BigDecimal(v)
     end
 

data/lib/duckdb/result.rb

@@ -104,7 +104,7 @@ module DuckDB
     def _to_decimal_internal(row, col)
       lower, upper, _width, scale = __to_decimal_internal(row, col)
       v = (upper * Converter::HALF_HUGEINT + lower).to_s
-      v[-scale, 0] = '.'
+      v[-scale, 0] = '.' unless v == '0'
       BigDecimal(v)
     end
   end

data/lib/duckdb/version.rb

@@ -3,5 +3,5 @@
 module DuckDB
   # The version string of ruby-duckdb.
   # Currently, ruby-duckdb is NOT semantic versioning.
-  VERSION = '0.8.1'
+  VERSION = '0.8.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duckdb
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.1.2
 platform: ruby
 authors:
 - Masaki Suketa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-24 00:00:00.000000000 Z
+date: 2023-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- benchmark/get_converter_module_ips.rb
 - benchmark/to_bigdecimal_ips.rb
 - benchmark/to_hugeint_ips.rb
 - benchmark/to_hugeint_profile.rb
@@ -104,6 +105,8 @@ files:
 - ext/duckdb/config.h
 - ext/duckdb/connection.c
 - ext/duckdb/connection.h
+- ext/duckdb/converter.h
+- ext/duckdb/conveter.c
 - ext/duckdb/database.c
 - ext/duckdb/database.h
 - ext/duckdb/duckdb.c
@@ -151,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.17
 signing_key: 
 specification_version: 4
 summary: This module is Ruby binding for DuckDB database engine.