duckdb 1.0.0.0 → 1.0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ded07680dcaaa7309ed8578e6bd5d0a1e217b0c803f8527679e62e254aaea412
-  data.tar.gz: d2ff3d9a66b1487d867a95129a5c4fff3b4c01ed90198772d2a62b299c88bfca
+  metadata.gz: 4ec35034af422ec8f64f8474e95321a72a635925227fa8b5c26b3a430a4283a6
+  data.tar.gz: 52fb59085c80865dd6c51a5f7cb93b0e3eb2940245b4df580040753d364bd989
 SHA512:
-  metadata.gz: 253d068a5c17894a482346897f499e06a79ed9741250367e76d306d3828bfdce385379bd091528ae119fa5b1d0c7a83378cb84043477f1d6d21d86d09c00cd88
-  data.tar.gz: 2c554bdd675fea28561ed291dc28e5b660ef85a7d737d6cd69450832aa3af6a84eb94ad6a55a922828841ee9c9f802a4f86734692afd35b3a2bde4c2d6edb7e7
+  metadata.gz: 00d69fe6df1f7acdb1fac1e8bce26b17d9d7f06802fb8a8ddb287f25831858a69576c0d3558f6e5a48d0761226aae46a9f92d541b9e2547ae7f81f8b65a67441
+  data.tar.gz: dd8734f7a005a0007336faf58b6b032e6a2dbcf668859483cc9c713eef50ca585df9e564257b6890c9af3c394e82de8e0bd7a42790d3e1c033ffedeb41702e2c

data/.github/workflows/test_on_macos.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        ruby: ['3.0.7', '3.1.6', '3.2.4', '3.3.2', '3.4.0-preview1', 'head']
+        ruby: ['3.0.7', '3.1.6', '3.2.4', '3.3.3', '3.4.0-preview1', 'head']
         duckdb: ['1.0.0', '0.10.3']
 
     steps:

data/.github/workflows/test_on_ubuntu.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['3.0.7', '3.1.6', '3.2.4', '3.3.2', '3.4.0-preview1', 'head']
+        ruby: ['3.0.7', '3.1.6', '3.2.4', '3.3.3', '3.4.0-preview1', 'head']
         duckdb: ['1.0.0', '0.10.3']
 
     steps:

data/.github/workflows/test_on_windows.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        ruby: ['3.0.7', '3.1.5', '3.2.4', '3.3.1', 'ucrt', 'mingw', 'mswin', 'head']
+        ruby: ['3.0.7', '3.1.5', '3.2.4', '3.3.2', 'ucrt', 'mingw', 'mswin', 'head']
         duckdb: ['1.0.0', '0.10.3']
 
     steps:

data/CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+# 1.0.0.1 - 2024-06-16
+- support fetch the value from UHUGEINT type column.
+- add `DuckDB::Appender#append_uhugeint`.
+- DuckDB::Result supports ARRAY column type (only when DuckDB::Result.use_chunk_each is true).
+- DuckDB::Result supports LIST column type (only when DuckDB::Result.use_chunk_each is true).
+  Thanks to stephenprater.
+
 # 1.0.0.0 - 2024-06-08
 - bump duckdb to 1.0.0.
 - add `DuckDB::ExtractedStatements` class.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    duckdb (1.0.0.0)
+    duckdb (1.0.0.1)
       bigdecimal (>= 3.1.4)
 
 GEM
@@ -11,10 +11,10 @@ GEM
     bigdecimal (3.1.8)
     mini_portile2 (2.8.7)
     minitest (5.23.1)
-    nokogiri (1.16.5)
+    nokogiri (1.16.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     racc (1.8.0)
     rake (13.2.1)

data/ext/duckdb/appender.c

@@ -28,6 +28,7 @@ static VALUE appender__append_interval(VALUE self, VALUE months, VALUE days, VAL
 static VALUE appender__append_time(VALUE self, VALUE hour, VALUE min, VALUE sec, VALUE micros);
 static VALUE appender__append_timestamp(VALUE self, VALUE year, VALUE month, VALUE day, VALUE hour, VALUE min, VALUE sec, VALUE micros);
 static VALUE appender__append_hugeint(VALUE self, VALUE lower, VALUE upper);
+static VALUE appender__append_uhugeint(VALUE self, VALUE lower, VALUE upper);
 static VALUE appender_flush(VALUE self);
 static VALUE appender_close(VALUE self);
 
@@ -349,6 +350,21 @@ static VALUE appender__append_hugeint(VALUE self, VALUE lower, VALUE upper) {
     return self;
 }
 
+static VALUE appender__append_uhugeint(VALUE self, VALUE lower, VALUE upper) {
+    duckdb_uhugeint uhugeint;
+
+    uhugeint.lower = NUM2ULL(lower);
+    uhugeint.upper = NUM2ULL(upper);
+
+    rubyDuckDBAppender *ctx;
+
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
+    if (duckdb_append_uhugeint(ctx->appender, uhugeint) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to append uhugeint");
+    }
+    return self;
+}
+
 static VALUE appender_flush(VALUE self) {
     rubyDuckDBAppender *ctx;
     TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
@@ -395,6 +411,7 @@ void rbduckdb_init_duckdb_appender(void) {
     rb_define_private_method(cDuckDBAppender, "_append_time", appender__append_time, 4);
     rb_define_private_method(cDuckDBAppender, "_append_timestamp", appender__append_timestamp, 7);
     rb_define_private_method(cDuckDBAppender, "_append_hugeint", appender__append_hugeint, 2);
+    rb_define_private_method(cDuckDBAppender, "_append_uhugeint", appender__append_uhugeint, 2);
     rb_define_method(cDuckDBAppender, "flush", appender_flush, 0);
     rb_define_method(cDuckDBAppender, "close", appender_close, 0);
 }

data/ext/duckdb/result.c

@@ -62,9 +62,12 @@ static VALUE vector_interval(void* vector_data, idx_t row_idx);
 static VALUE vector_blob(void* vector_data, idx_t row_idx);
 static VALUE vector_varchar(void* vector_data, idx_t row_idx);
 static VALUE vector_hugeint(void* vector_data, idx_t row_idx);
+static VALUE vector_uhugeint(void* vector_data, idx_t row_idx);
 static VALUE vector_decimal(duckdb_logical_type ty, void* vector_data, idx_t row_idx);
 static VALUE vector_enum(duckdb_logical_type ty, void* vector_data, idx_t row_idx);
-static VALUE vector_list(duckdb_logical_type ty, duckdb_vector vector, idx_t row_idx);
+static VALUE vector_array(duckdb_logical_type ty, duckdb_vector vector, idx_t row_idx);
+static VALUE vector_array_value_at(duckdb_vector array, duckdb_logical_type element_type, idx_t index);
+static VALUE vector_list(duckdb_logical_type ty, duckdb_vector vector, void* vector_data, idx_t row_idx);
 static VALUE vector_map(duckdb_logical_type ty, duckdb_vector vector, idx_t row_idx);
 static VALUE vector_struct(duckdb_logical_type ty, duckdb_vector vector, idx_t row_idx);
 static VALUE vector_uuid(void* vector_data, idx_t row_idx);
@@ -662,6 +665,14 @@ static VALUE vector_hugeint(void* vector_data, idx_t row_idx) {
                       );
 }
 
+static VALUE vector_uhugeint(void* vector_data, idx_t row_idx) {
+    duckdb_uhugeint uhugeint = ((duckdb_uhugeint *)vector_data)[row_idx];
+    return rb_funcall(mDuckDBConverter, id__to_hugeint_from_vector, 2,
+                      ULL2NUM(uhugeint.lower),
+                      ULL2NUM(uhugeint.upper)
+                      );
+}
+
 static VALUE vector_decimal(duckdb_logical_type ty, void* vector_data, idx_t row_idx) {
     VALUE width = INT2FIX(duckdb_decimal_width(ty));
     VALUE scale = INT2FIX(duckdb_decimal_scale(ty));
@@ -721,27 +732,147 @@ static VALUE vector_enum(duckdb_logical_type ty, void* vector_data, idx_t row_id
     return value;
 }
 
-static VALUE vector_list(duckdb_logical_type ty, duckdb_vector vector, idx_t row_idx) {
-    // Lists are stored as vectors within vectors
+static VALUE vector_array(duckdb_logical_type ty, duckdb_vector vector, idx_t row_idx) {
+    VALUE ary = Qnil;
+    VALUE value = Qnil;
+
+    duckdb_logical_type child_logical_type = duckdb_array_type_child_type(ty);
+    idx_t size = duckdb_array_type_array_size(ty);
+    idx_t bgn = row_idx * size;
+    idx_t end = bgn + size;
+	duckdb_vector child = duckdb_array_vector_get_child(vector);
+
+    ary = rb_ary_new2(size);
+    for (idx_t i = bgn; i < end; ++i) {
+        value = vector_array_value_at(child, child_logical_type, i);
+        rb_ary_store(ary, i - bgn, value);
+    }
 
+    duckdb_destroy_logical_type(&child_logical_type);
+    return ary;
+}
+
+static VALUE vector_array_value_at(duckdb_vector array, duckdb_logical_type element_type, idx_t index) {
+    uint64_t *validity;
+    duckdb_type type_id;
+    void* vector_data;
+    VALUE obj = Qnil;
+
+    validity = duckdb_vector_get_validity(array);
+    if (!duckdb_validity_row_is_valid(validity, index)) {
+        return Qnil;
+    }
+
+    type_id = duckdb_get_type_id(element_type);
+    vector_data = duckdb_vector_get_data(array);
+
+    switch(type_id) {
+        case DUCKDB_TYPE_INVALID:
+            obj = Qnil;
+            break;
+        case DUCKDB_TYPE_BOOLEAN:
+            obj = (((bool*) vector_data)[index]) ? Qtrue : Qfalse;
+            break;
+        case DUCKDB_TYPE_TINYINT:
+            obj = INT2FIX(((int8_t *) vector_data)[index]);
+            break;
+        case DUCKDB_TYPE_SMALLINT:
+            obj = INT2FIX(((int16_t *) vector_data)[index]);
+            break;
+        case DUCKDB_TYPE_INTEGER:
+            obj = INT2NUM(((int32_t *) vector_data)[index]);
+            break;
+        case DUCKDB_TYPE_BIGINT:
+            obj = LL2NUM(((int64_t *) vector_data)[index]);
+            break;
+        case DUCKDB_TYPE_UTINYINT:
+            obj = INT2FIX(((uint8_t *) vector_data)[index]);
+            break;
+        case DUCKDB_TYPE_USMALLINT:
+            obj = INT2FIX(((uint16_t *) vector_data)[index]);
+            break;
+        case DUCKDB_TYPE_UINTEGER:
+            obj = UINT2NUM(((uint32_t *) vector_data)[index]);
+            break;
+        case DUCKDB_TYPE_UBIGINT:
+            obj = ULL2NUM(((uint64_t *) vector_data)[index]);
+            break;
+        case DUCKDB_TYPE_HUGEINT:
+            obj = vector_hugeint(vector_data, index);
+            break;
+        case DUCKDB_TYPE_UHUGEINT:
+            obj = vector_uhugeint(vector_data, index);
+            break;
+        case DUCKDB_TYPE_FLOAT:
+            obj = DBL2NUM((((float *) vector_data)[index]));
+            break;
+        case DUCKDB_TYPE_DOUBLE:
+            obj = DBL2NUM((((double *) vector_data)[index]));
+            break;
+        case DUCKDB_TYPE_DATE:
+            obj = vector_date(vector_data, index);
+            break;
+        case DUCKDB_TYPE_TIMESTAMP:
+            obj = vector_timestamp(vector_data, index);
+            break;
+        case DUCKDB_TYPE_TIME:
+            obj = vector_time(vector_data, index);
+            break;
+        case DUCKDB_TYPE_INTERVAL:
+            obj = vector_interval(vector_data, index);
+            break;
+        case DUCKDB_TYPE_VARCHAR:
+            obj = vector_varchar(vector_data, index);
+            break;
+        case DUCKDB_TYPE_BLOB:
+            obj = vector_blob(vector_data, index);
+            break;
+        case DUCKDB_TYPE_DECIMAL:
+            obj = vector_decimal(element_type, vector_data, index);
+            break;
+        case DUCKDB_TYPE_ENUM:
+            obj = vector_enum(element_type, vector_data, index);
+            break;
+        case DUCKDB_TYPE_ARRAY:
+            obj = vector_array(element_type, array, index);
+            break;
+        case DUCKDB_TYPE_LIST:
+            obj = vector_list(element_type, array, vector_data, index);
+            break;
+        case DUCKDB_TYPE_MAP:
+            obj = vector_map(element_type, vector_data, index);
+            break;
+        case DUCKDB_TYPE_STRUCT:
+            obj = vector_struct(element_type, vector_data, index);
+            break;
+        case DUCKDB_TYPE_UUID:
+            obj = vector_uuid(vector_data, index);
+            break;
+        default:
+            rb_warn("Unknown type %d", type_id);
+            obj = Qnil;
+    }
+
+    return obj;
+}
+
+static VALUE vector_list(duckdb_logical_type ty, duckdb_vector vector, void * vector_data, idx_t row_idx) {
     VALUE ary = Qnil;
-    VALUE element = Qnil;
+    VALUE value = Qnil;
     idx_t i;
 
-    // rb_warn("ruby-duckdb does not support List yet");
-
     duckdb_logical_type child_logical_type = duckdb_list_type_child_type(ty);
-    // duckdb_type child_type = duckdb_get_type_id(child_logical_type);
 
-    duckdb_list_entry list_entry = ((duckdb_list_entry *)vector)[row_idx];
+    duckdb_list_entry list_entry = ((duckdb_list_entry *)vector_data)[row_idx];
+    idx_t bgn = list_entry.offset;
+    idx_t end = bgn + list_entry.length;
     ary = rb_ary_new2(list_entry.length);
 
-    for (i = list_entry.offset; i < list_entry.offset + list_entry.length; ++i) {
-        /*
-         * FIXME: How to get the child element?
-         */
-        // element = ???
-        rb_ary_store(ary, i - list_entry.offset, element);
+    duckdb_vector child = duckdb_list_vector_get_child(vector);
+
+    for (i = bgn; i < end; ++i) {
+        value = vector_array_value_at(child, child_logical_type, i);
+        rb_ary_store(ary, i - bgn, value);
     }
     duckdb_destroy_logical_type(&child_logical_type);
     return ary;
@@ -848,6 +979,9 @@ static VALUE vector_value(duckdb_vector vector, idx_t row_idx) {
         case DUCKDB_TYPE_HUGEINT:
             obj = vector_hugeint(vector_data, row_idx);
             break;
+        case DUCKDB_TYPE_UHUGEINT:
+            obj = vector_uhugeint(vector_data, row_idx);
+            break;
         case DUCKDB_TYPE_FLOAT:
             obj = DBL2NUM((((float *) vector_data)[row_idx]));
             break;
@@ -878,8 +1012,11 @@ static VALUE vector_value(duckdb_vector vector, idx_t row_idx) {
         case DUCKDB_TYPE_ENUM:
             obj = vector_enum(ty, vector_data, row_idx);
             break;
+        case DUCKDB_TYPE_ARRAY:
+            obj = vector_array(ty, vector, row_idx);
+            break;
         case DUCKDB_TYPE_LIST:
-            obj = vector_list(ty, vector_data, row_idx);
+            obj = vector_list(ty, vector, vector_data, row_idx);
             break;
         case DUCKDB_TYPE_MAP:
             obj = vector_map(ty, vector_data, row_idx);

data/lib/duckdb/appender.rb

@@ -39,6 +39,24 @@ module DuckDB
       _append_hugeint(lower, upper)
     end
 
+    #
+    # appends unsigned huge int value.
+    #
+    #   require 'duckdb'
+    #   db = DuckDB::Database.open
+    #   con = db.connect
+    #   con.query('CREATE TABLE numbers (num UHUGEINT)')
+    #   appender = con.appender('numbers')
+    #   appender
+    #     .begin_row
+    #     .append_hugeint(340_282_366_920_938_463_463_374_607_431_768_211_455)
+    #     .end_row
+    #
+    def append_uhugeint(value)
+      lower, upper = integer_to_hugeint(value)
+      _append_uhugeint(lower, upper)
+    end
+
     #
     # appends date value.
     #

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 = '1.0.0.0'
+  VERSION = '1.0.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duckdb
 version: !ruby/object:Gem::Version
-  version: 1.0.0.0
+  version: 1.0.0.1
 platform: ruby
 authors:
 - Masaki Suketa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-08 00:00:00.000000000 Z
+date: 2024-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: This module is Ruby binding for DuckDB database engine.