parquet 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90e876ca198a0e1871f692a382f09ceaeec670d162da26f2c102ea4eca4244bf
-  data.tar.gz: 96743e260cbd2fb55f6cdeaf256fbb1e915c57651fdc3f20fdd58b6a34596544
+  metadata.gz: 794d11142b73d13b665ecdb4ffd46df6ab7d97e5f99336e2bc91b79dbb55a514
+  data.tar.gz: eb2843d724e7aad70445a8b992a527e3bee0a79055fdeab7f2ebd2cdfb6247d6
 SHA512:
-  metadata.gz: 1609a37c5a9bd9f1d57bb31dd02b2fdb5b608a7c044686e6ef2513c95e53e830bd7bf7048a36904465a32a5915425c7b6bf581c5b35a4fb19f950cbca20913b2
-  data.tar.gz: 96ec18377fc5944556760329c126f440de61d3b378bfa976a66437db03f0a51220c880afd14098a5b1968daa968d2e836c50f83bef21507789ba4df314c48148
+  metadata.gz: 8b97550fb18f2ab4db0b5fbb170d12448237665d9372242d4027760f1c697be0d1e7a8bb47d43886f704e0923ddf57544961fe5af29c596b49aac188f714b9e6
+  data.tar.gz: 1ea56a23e39a084d40690d4e7bd108ec2a4cb20b61714bd564e68600d3f3edda3ffd5c3e646d49d4bb85632ad14f2c7d5735e645610e7a863d9e25d6f1d2b90d

data/ext/parquet/src/types/parquet_value.rs

@@ -157,6 +157,10 @@ impl IntoValue for ParquetValue {
 
 impl ParquetValue {
     pub fn from_value(value: Value, type_: &ParquetSchemaType) -> Result<Self, MagnusError> {
+        if value.is_nil() {
+            return Ok(ParquetValue::Null);
+        }
+
         match type_ {
             ParquetSchemaType::Int8 => {
                 let v = NumericConverter::<i8>::convert_with_string_fallback(value)?;

data/ext/parquet/src/types/type_conversion.rs

@@ -592,12 +592,12 @@ pub fn convert_parquet_values_to_arrow(
             };
 
             let mut list_builder = ListBuilder::new(value_builder);
+
             for value in values {
                 match value {
                     ParquetValue::List(items) => {
-                        list_builder.append(true);
                         for item in items {
-                            match list_field.item_type {
+                            match &list_field.item_type {
                                 ParquetSchemaType::Int8 => append_list_value_copy!(
                                     list_builder,
                                     ParquetSchemaType::Int8,

data/ext/parquet/src/types/writer_types.rs

@@ -185,6 +185,11 @@ impl ColumnCollector {
             NumericConverter,
         };
 
+        if value.is_nil() {
+            self.values.push(ParquetValue::Null);
+            return Ok(());
+        }
+
         let parquet_value = match &self.type_ {
             ParquetSchemaType::Int8 => {
                 let v = NumericConverter::<i8>::convert_with_string_fallback(value)?;

data/ext/parquet/src/utils.rs

@@ -39,7 +39,7 @@ pub fn parse_parquet_rows_args(ruby: &Ruby, args: &[Value]) -> Result<ParquetRow
     let parsed_args = scan_args::<(Value,), (), (), (), _, ()>(args)?;
     let (to_read,) = parsed_args.required;
 
-    let kwargs = get_kwargs::<_, (), (Option<Value>, Option<Vec<String>>), ()>(
+    let kwargs = get_kwargs::<_, (), (Option<Option<Value>>, Option<Option<Vec<String>>>), ()>(
         parsed_args.keywords,
         &[],
         &["result_type", "columns"],
@@ -48,6 +48,7 @@ pub fn parse_parquet_rows_args(ruby: &Ruby, args: &[Value]) -> Result<ParquetRow
     let result_type: ParserResultType = match kwargs
         .optional
         .0
+        .flatten()
         .map(|value| parse_string_or_symbol(ruby, value))
     {
         Some(Ok(Some(parsed))) => parsed.try_into().map_err(|e| {
@@ -75,7 +76,7 @@ pub fn parse_parquet_rows_args(ruby: &Ruby, args: &[Value]) -> Result<ParquetRow
     Ok(ParquetRowsArgs {
         to_read,
         result_type,
-        columns: kwargs.optional.1,
+        columns: kwargs.optional.1.flatten(),
     })
 }
 
@@ -95,7 +96,16 @@ pub fn parse_parquet_columns_args(
     let parsed_args = scan_args::<(Value,), (), (), (), _, ()>(args)?;
     let (to_read,) = parsed_args.required;
 
-    let kwargs = get_kwargs::<_, (), (Option<Value>, Option<Vec<String>>, Option<usize>), ()>(
+    let kwargs = get_kwargs::<
+        _,
+        (),
+        (
+            Option<Option<Value>>,
+            Option<Option<Vec<String>>>,
+            Option<Option<usize>>,
+        ),
+        (),
+    >(
         parsed_args.keywords,
         &[],
         &["result_type", "columns", "batch_size"],
@@ -104,6 +114,7 @@ pub fn parse_parquet_columns_args(
     let result_type: ParserResultType = match kwargs
         .optional
         .0
+        .flatten()
         .map(|value| parse_string_or_symbol(ruby, value))
     {
         Some(Ok(Some(parsed))) => parsed.try_into().map_err(|e| {
@@ -131,7 +142,7 @@ pub fn parse_parquet_columns_args(
     Ok(ParquetColumnsArgs {
         to_read,
         result_type,
-        columns: kwargs.optional.1,
-        batch_size: kwargs.optional.2,
+        columns: kwargs.optional.1.flatten(),
+        batch_size: kwargs.optional.2.flatten(),
     })
 }

data/ext/parquet/src/writer/mod.rs

@@ -28,7 +28,7 @@ pub fn parse_parquet_write_args(args: &[Value]) -> Result<ParquetWriteArgs, Magn
     let parsed_args = scan_args::<(Value,), (), (), (), _, ()>(args)?;
     let (read_from,) = parsed_args.required;
 
-    let kwargs = get_kwargs::<_, (Value, Value), (Option<usize>,), ()>(
+    let kwargs = get_kwargs::<_, (Value, Value), (Option<Option<usize>>,), ()>(
         parsed_args.keywords,
         &["schema", "write_to"],
         &["batch_size"],
@@ -70,7 +70,7 @@ pub fn parse_parquet_write_args(args: &[Value]) -> Result<ParquetWriteArgs, Magn
         read_from,
         write_to: kwargs.required.1,
         schema,
-        batch_size: kwargs.optional.0,
+        batch_size: kwargs.optional.0.flatten(),
     })
 }
 

data/lib/parquet/version.rb

@@ -1,3 +1,3 @@
 module Parquet
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parquet
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Nathan Jaremko