duckdb 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4780513bea94513e38b460cf9580b9bad9b9128d913a46f58f2054451cf838d
-  data.tar.gz: 5cbfe5da32da9562d121d634a7a45fdc153222bb4c5b8c79a2f37dbff6f57f27
+  metadata.gz: 8e8040d795ad975b4472fe439aa2cfb403ad5f24f9c602bca7dbdf6103c37b65
+  data.tar.gz: 82cd61d78fec67f62be8ad0280305b224ae605ffd2ea453855168dcaa77f4d32
 SHA512:
-  metadata.gz: 04acc6297bac9ae7d217072d1fec3b7c603f407270143d654f738462e0f540a2e8ebdb67fa4d466ff13636dab279a0d245241201c9b3f829f4e97fbf628fb086
-  data.tar.gz: aa200fce49d05edee27095771e4c7e394a7431b8b1881e58d053f46dafc628920e4924c899159619c2fd337c6607eeed55f5863ea0e119f13ec2236d72c33f6b
+  metadata.gz: b54b53aa6ec96ef9e8607bea7f96b8ef9fc7c4e2189675e575eeabdfaa2d608320c02ac86dc8ca7453cd9d314ceb943241a0a858689c85b8221374ff5dc6e00e
+  data.tar.gz: 86936495132694846dd8931998c9f716d405571dd34842f6f8563ad531f2e0b8fb678f4477cff9ec33a1c0d3affc615884a4dd8063909f57cb8e4a1da2a0434f

data/.github/workflows/test_on_macos.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        ruby: ['2.7.7', '3.0.5', '3.1.3', '3.2.1', 'head']
-        duckdb: ['0.7.0', '0.6.1']
+        ruby: ['2.7.8', '3.0.6', '3.1.4', '3.2.2', 'head']
+        duckdb: ['0.7.1', '0.8.0']
 
     steps:
     - uses: actions/checkout@v3
@@ -52,11 +52,14 @@ jobs:
         cp duckdb-v$DUCKDB_VERSION/src/include/*.h /usr/local/include
         cp duckdb-v$DUCKDB_VERSION/build/release/src/*.dylib /usr/local/lib
 
-    - name: Build and test with Rake with Ruby ${{ matrix.ruby }}
+    - name: Build with Ruby ${{ matrix.ruby }}
       run: |
-        ruby -v
         bundle install --jobs 4 --retry 3
-        bundle exec rake
+        rake build
+
+    - name: run test with Ruby ${{ matrix.ruby }}
+      run: |
+        rake test
 
   post-test:
     name: All tests passed on macos

data/.github/workflows/test_on_ubuntu.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.7.7', '3.0.5', '3.1.3', '3.2.1', 'head']
-        duckdb: ['0.7.0', '0.6.1']
+        ruby: ['2.7.8', '3.0.6', '3.1.4', '3.2.2', 'head']
+        duckdb: ['0.7.1', '0.8.0']
 
     steps:
     - uses: actions/checkout@v3
@@ -45,13 +45,19 @@ jobs:
         cp -rip duckdb-tmp-v$DUCKDB_VERSION/build/release/src/*.so duckdb-v$DUCKDB_VERSION/build/release/src
         cp -rip duckdb-tmp-v$DUCKDB_VERSION/src/include duckdb-v$DUCKDB_VERSION/src/
 
-    - name: Build and test with Rake with Ruby ${{ matrix.ruby }}
+    - name: Build with Ruby ${{ matrix.ruby }}
       env:
         DUCKDB_VERSION: ${{ matrix.duckdb }}
       run: |
         gem install bundler
         bundle install --jobs 4 --retry 3
-        bundle exec rake -- --with-duckdb-include=${GITHUB_WORKSPACE}/duckdb-v${DUCKDB_VERSION}/src/include --with-duckdb-lib=${GITHUB_WORKSPACE}/duckdb-v${DUCKDB_VERSION}/build/release/src/
+        bundle exec rake build -- --with-duckdb-include=${GITHUB_WORKSPACE}/duckdb-v${DUCKDB_VERSION}/src/include --with-duckdb-lib=${GITHUB_WORKSPACE}/duckdb-v${DUCKDB_VERSION}/build/release/src/
+
+    - name: test with Ruby ${{ matrix.ruby }}
+      env:
+        DUCKDB_VERSION: ${{ matrix.duckdb }}
+      run: |
+        rake test
 
   post-test:
     name: All tests passed on Ubuntu

data/.github/workflows/test_on_windows.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        ruby: ['2.7.7', '3.0.5', '3.1.3', '3.2.1', 'ucrt', 'mingw', 'mswin', 'head']
-        duckdb: ['0.7.0', '0.6.1']
+        ruby: ['2.7.8', '3.0.6', '3.1.4', '3.2.2', 'ucrt', 'mingw', 'mswin', 'head']
+        duckdb: ['0.7.1', '0.8.0']
 
     steps:
     - uses: actions/checkout@v3

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # ChangeLog
 
+# 0.8.0
+- bump duckdb to 0.8.0
+- add DuckDB::Result#_to_decimal_internal
+- add DuckDB::Result#_to_hugeint_internal
+
+## Breaking Change
+- DuckDB::Result returns BigDecimal object instead of String object if the column type is DECIMAL.
+
+# 0.7.1
+- bump duckdb to 0.7.1
+- fix docker build error on M1 Mac
+
 # 0.7.0
 - bump duckdb to 0.7.0
 - fix have_func argument order

data/CONTRIBUTION.md

@@ -1,5 +1,33 @@
 # Contribution Guide
 
+## Environment setup
+
+### With docker
+
+1. Fork the repository and `git clone` to your local machine.
+2. Build and access to docker container
+
+```
+docker-compose build ubuntu
+docker-compose run --rm ubuntu bash
+```
+
+In case you want custom ruby or duckdb versions, use `--build-arg` options
+```
+docker-compose build ubuntu --build-arg RUBY_VERSION=3.1.3 --build-arg DUCKDB_VERSION=0.6.0
+```
+
+### Without docker
+
+1. Install [Ruby](https://www.ruby-lang.org/) into your local machine.
+2. Install [duckdb](https://duckdb.org/) into your local machine.
+3. Fork the repository and `git clone` to your local machine.
+4. Run `bundle install`
+5. Run `rake build`
+   or you might run with C duckdb header and library directories:
+   `rake build -- --with-duckdb-include=/duckdb_header_directory --with-duckdb-lib=/duckdb_library_directory`
+
+
 ## Issue
 
 If you spot a problem, [search if an issue already exists](https://github.com/suketa/ruby-duckdb/issues).
@@ -8,17 +36,10 @@ If a related issue doesn't exist, you can open a [new issue](https://github.com/
 
 ## Fix Issues or Add New Features.
 
-1. install [Ruby](https://www.ruby-lang.org/) into your local machine.
-2. install [duckdb](https://duckdb.org/) into your local machine.
-3. fork the repository and `git clone` to your local machine.
-4. run `bundle install`
-5. run `rake build`
-   or you might run with C duckdb header and library directories:
-   `rake build -- --with-duckdb-include=/duckdb_header_directory --with-duckdb-lib=/duckdb_library_directory`
-6. run `rake test`
-7. create new branch to change the code.
-8. change the code.
-9. write test.
-10. run `rake test` and confirm all tests pass.
-11. git push.
-12. create PR.
+1. Run `rake test`
+2. Create new branch to change the code.
+3. Change the code.
+4. Write test.
+5. Run `rake test` and confirm all tests pass.
+6. Git push.
+7. Create PR.

data/Dockerfile

@@ -0,0 +1,21 @@
+ARG RUBY_VERSION=3.2.1
+FROM ruby:${RUBY_VERSION}
+
+ARG DUCKDB_VERSION=0.7.1
+
+RUN apt update -qq && \
+    apt install -y build-essential curl git wget
+
+COPY getduckdb.sh .
+RUN ./getduckdb.sh
+
+RUN unzip duckdb.zip -d libduckdb
+RUN mv libduckdb/duckdb.* /usr/local/include
+RUN mv libduckdb/libduckdb.so /usr/local/lib
+RUN ldconfig /usr/local/lib
+
+COPY . /root/ruby-duckdb
+WORKDIR /root/ruby-duckdb
+RUN git config --global --add safe.directory /root/ruby-duckdb
+RUN bundle install
+RUN rake build

data/Gemfile

@@ -2,3 +2,8 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in duckdb.gemspec
 gemspec
+
+if /(linux|darwin)/ =~ RUBY_PLATFORM
+  gem 'benchmark-ips'
+  gem 'stackprof'
+end

data/Gemfile.lock

@@ -1,26 +1,30 @@
 PATH
   remote: .
   specs:
-    duckdb (0.7.0)
+    duckdb (0.8.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.17.0)
+    benchmark-ips (2.12.0)
+    minitest (5.18.0)
     rake (13.0.6)
     rake-compiler (1.2.1)
       rake
+    stackprof (0.2.24)
 
 PLATFORMS
   ruby
   x86_64-linux
 
 DEPENDENCIES
+  benchmark-ips
   bundler (~> 2.3)
   duckdb!
   minitest (~> 5.0)
   rake (~> 13.0)
   rake-compiler
+  stackprof
 
 BUNDLED WITH
-   2.3.22
+   2.4.9

data/benchmark/to_bigdecimal_ips.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'duckdb'
+require 'benchmark/ips'
+
+db = DuckDB::Database.open
+con = db.connect
+con.query('CREATE TABLE decimals (decimal_value DECIMAL(38, 3))')
+con.query('INSERT INTO decimals VALUES (1234567890123.456)')
+result = con.query('SELECT decimal_value FROM decimals')
+
+Benchmark.ips do |x|
+  x.report('_to_decimal') { result.send(:_to_decimal, 0, 0) }
+  x.report('_to_decimal_internal') { result.send(:_to_decimal_internal, 0, 0) }
+end

data/benchmark/to_hugeint_ips.rb

@@ -0,0 +1,16 @@
+# 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_value HUGEINT)')
+con.query('INSERT INTO hugeints VALUES (123456789012345678901234567890123456789)')
+result = con.query('SELECT hugeint_value FROM hugeints')
+
+Benchmark.ips do |x|
+  x.report('_to_hugeint') { result.send(:_to_hugeint, 0, 0) }
+  x.report('_to_hugeint_internal') { result.send(:_to_hugeint_internal, 0, 0) }
+end

data/benchmark/to_hugeint_profile.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'duckdb'
+require 'stackprof'
+
+db = DuckDB::Database.open
+con = db.connect
+con.query('CREATE TABLE hugeints (hugeint_value HUGEINT)')
+con.query('INSERT INTO hugeints VALUES (123456789012345678901234567890123456789)')
+result = con.query('SELECT hugeint_value FROM hugeints')
+
+def profile(name, &block)
+  profile = StackProf.run(mode: :wall, interval: 1_000) do
+    2_000_000.times(&block)
+  end
+
+  result = StackProf::Report.new(profile)
+  puts
+  puts "=== #{name} ==="
+  result.print_text
+  puts
+end
+
+profile(:_to_hugeint) { result.send(:_to_hugeint, 0, 0) }
+profile(:_to_hugeint_internal) { result.send(:_to_hugeint_internal, 0, 0) }

data/docker-compose.yml

@@ -0,0 +1,12 @@
+version: '3'
+services:
+  ubuntu:
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+      args:
+        - RUBY_VERSION
+        - DUCKDB_VERSION
+    working_dir: /root/ruby-duckdb
+    volumes:
+      - .:/root/ruby-duckdb

data/ext/duckdb/extconf.rb

@@ -22,13 +22,10 @@ dir_config('duckdb')
 
 check_duckdb_library('duckdb_pending_prepared', '0.5.0')
 
-# check duckdb >= 0.3.3
-# ducdb >= 0.3.3 if duckdb_append_data_chunk() is defined.
-have_func('duckdb_append_data_chunk', 'duckdb.h')
-
 # check duckdb >= 0.6.0
 have_func('duckdb_value_string', 'duckdb.h')
 
-have_func('duckdb_free', 'duckdb.h')
+# check duckdb >= 0.7.0
+have_func('duckdb_extract_statements', 'duckdb.h')
 
 create_makefile('duckdb/duckdb_native')

data/ext/duckdb/prepared_statement.c

@@ -68,7 +68,7 @@ static VALUE duckdb_prepared_statement_initialize(VALUE self, VALUE con, VALUE q
 static VALUE duckdb_prepared_statement_nparams(VALUE self) {
     rubyDuckDBPreparedStatement *ctx;
     TypedData_Get_Struct(self, rubyDuckDBPreparedStatement, &prepared_statement_data_type, ctx);
-    return rb_int2big(duckdb_nparams(ctx->prepared_statement));
+    return ULL2NUM(duckdb_nparams(ctx->prepared_statement));
 }
 
 
@@ -86,7 +86,7 @@ static VALUE duckdb_prepared_statement_execute(VALUE self) {
 }
 
 static idx_t check_index(VALUE vidx) {
-    idx_t idx = FIX2INT(vidx);
+    idx_t idx = NUM2ULL(vidx);
     if (idx <= 0) {
         rb_raise(rb_eArgError, "index of parameter must be greater than 0");
     }

data/ext/duckdb/result.c

@@ -87,7 +87,7 @@ static VALUE to_ruby_obj_integer(duckdb_result *result, idx_t col_idx, idx_t row
 
 static VALUE to_ruby_obj_bigint(duckdb_result *result, idx_t col_idx, idx_t row_idx) {
     int64_t i64val = duckdb_value_int64(result, col_idx, row_idx);
-    return rb_int2big(i64val);
+    return LL2NUM(i64val);
 }
 
 static VALUE to_ruby_obj_hugeint(duckdb_result *result, idx_t col_idx, idx_t row_idx) {

data/ext/duckdb/ruby-duckdb.h

@@ -4,14 +4,14 @@
 #include "ruby.h"
 #include <duckdb.h>
 
-#ifdef HAVE_DUCKDB_APPEND_DATA_CHUNK
-#define HAVE_DUCKDB_H_GE_V033 1
-#endif
-
 #ifdef HAVE_DUCKDB_VALUE_STRING
 #define HAVE_DUCKDB_H_GE_V060 1
 #endif
 
+#ifdef HAVE_DUCKDB_EXTRACT_STATEMENTS
+#define HAVE_DUCKDB_H_GE_V070 1
+#endif
+
 #include "./error.h"
 #include "./database.h"
 #include "./connection.h"

data/getduckdb.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+MACHINE=`uname -m`
+
+case "$MACHINE" in
+  "x86_64" ) ARC=amd64 ;;
+  "aarch64" ) ARC=aarch64 ;;
+esac
+
+wget -O duckdb.zip "https://github.com/duckdb/duckdb/releases/download/v$DUCKDB_VERSION/libduckdb-linux-$ARC.zip"

data/lib/duckdb/appender.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 require 'time'
 require_relative './converter'

data/lib/duckdb/column.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DuckDB
   class Column
     #

data/lib/duckdb/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DuckDB
   if defined?(DuckDB::Config)
     # The DuckDB::Config encapsulates DuckDB Configuration.

data/lib/duckdb/connection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DuckDB
   # The DuckDB::Connection encapsulates connection with DuckDB database.
   #

data/lib/duckdb/converter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DuckDB
   module Converter
     HALF_HUGEINT = 1 << 64

data/lib/duckdb/database.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DuckDB
   # The Database class encapsulates a DuckDB database.
   #

data/lib/duckdb/prepared_statement.rb

@@ -1,4 +1,5 @@
 require 'date'
+require 'bigdecimal'
 require_relative './converter'
 
 module DuckDB
@@ -192,6 +193,8 @@ module DuckDB
         bind_varchar(i, value.strftime('%Y-%m-%d %H:%M:%S.%N'))
       when Date
         bind_varchar(i, value.strftime('%Y-%m-%d'))
+      when BigDecimal
+        bind_varchar(i, value.to_s('F'))
       else
         raise(DuckDB::Error, "not supported type `#{value}` (#{value.class})")
       end

data/lib/duckdb/result.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require 'bigdecimal'
+
 module DuckDB
   # The Result class encapsulates a execute result of DuckDB database.
   #
@@ -28,8 +32,9 @@ module DuckDB
       5 => :_to_bigint,
       10 => :_to_float,
       11 => :_to_double,
-      16 => :_to_hugeint,
+      16 => :_to_hugeint_internal,
       18 => :_to_blob,
+      19 => :_to_decimal_internal
     }
 
     ToRuby.default = :_to_string
@@ -70,5 +75,21 @@ module DuckDB
     def _to_hugeint(row, col)
       _to_string(row, col).to_i
     end
+
+    def _to_hugeint_internal(row, col)
+      lower, upper = __to_hugeint_internal(row, col)
+      upper * Converter::HALF_HUGEINT + lower
+    end
+
+    def _to_decimal(row, col)
+      BigDecimal(_to_string(row, col))
+    end
+
+    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] = '.'
+      BigDecimal(v)
+    end
   end
 end

data/lib/duckdb/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module DuckDB
   # The version string of ruby-duckdb.
   # Currently, ruby-duckdb is NOT semantic versioning.
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.0'.freeze
 end

data/lib/duckdb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'duckdb/duckdb_native'
 require 'duckdb/library_version'
 require 'duckdb/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duckdb
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Masaki Suketa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-18 00:00:00.000000000 Z
+date: 2023-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,13 +81,18 @@ files:
 - ".gitignore"
 - CHANGELOG.md
 - CONTRIBUTION.md
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- benchmark/to_bigdecimal_ips.rb
+- benchmark/to_hugeint_ips.rb
+- benchmark/to_hugeint_profile.rb
 - bin/console
 - bin/setup
+- docker-compose.yml
 - duckdb.gemspec
 - ext/duckdb/appender.c
 - ext/duckdb/appender.h
@@ -112,6 +117,7 @@ files:
 - ext/duckdb/ruby-duckdb.h
 - ext/duckdb/util.c
 - ext/duckdb/util.h
+- getduckdb.sh
 - lib/duckdb.rb
 - lib/duckdb/appender.rb
 - lib/duckdb/column.rb
@@ -145,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: This module is Ruby binding for DuckDB database engine.