parquet 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d72c16371c10a011af5118f2915de9bbeb33cde133369bdac2050e3c035572e
-  data.tar.gz: b39c6ec9a8232eca5b5b156bf28992ed59c05e9a36e4c13db2b8933a74485ba0
+  metadata.gz: 896f2833b6db8e4466af8fc9d43eb5c695e25a207a6f8050d22052458edded36
+  data.tar.gz: 38de2831bf7013e0194b2e61a91b26a1283fef65a04309dfbe125c570d64e9ed
 SHA512:
-  metadata.gz: c7f338b1d010fa59c2344065b233ff20a08d4a17c6ca987ef72677150dd1cbf55d134855585d68e187b748dc5121f13d5e86cb82aabc1eeb3562a3326aca459c
-  data.tar.gz: 69eaa6b133123944138a826612a7b48d9f87acb202ecbe172e253be02a1a1c7009e3d7182e8bb31ae423098bc34bb5dddc4ce042453f0d1cb41505d56d02c21e
+  metadata.gz: 52d83bc198f789856eac4bff7ff985a82c3f03f75e5de79efc5b388ce5afc63cb507b4cacc90625ee321619ade1ddc16f66f6c437ca0f60d144bc593bbec8cc5
+  data.tar.gz: c6dd98694fd2a1d29ceebec6b58d63220f3992fe4dc63dae1c28ea27f8a353764f87a16a13c95e3e2111bca811c57fde45da9f008a93d8868112b4be608d46ee

data/ext/parquet/src/ruby_reader.rs

@@ -19,12 +19,10 @@ use crate::types::ParquetGemError;
 /// and provide a standard Read implementation for them.
 pub enum RubyReader {
     String {
-        ruby: Arc<Ruby>,
         inner: Opaque<RString>,
         offset: usize,
     },
     RubyIoLike {
-        ruby: Arc<Ruby>,
         inner: Opaque<Value>,
     },
     NativeProxyIoLike {
@@ -40,7 +38,6 @@ impl RubyReader {
     pub fn new(ruby: Arc<Ruby>, value: Value) -> Result<Self, ParquetGemError> {
         if RubyReader::is_seekable_io_like(&value) {
             Ok(RubyReader::RubyIoLike {
-                ruby,
                 inner: Opaque::from(value),
             })
         } else if RubyReader::is_io_like(&value) {
@@ -49,7 +46,6 @@ impl RubyReader {
 
             // This is safe, because we won't call seek
             let inner_readable = RubyReader::RubyIoLike {
-                ruby: ruby.clone(),
                 inner: Opaque::from(value),
             };
             let mut reader = BufReader::new(inner_readable);
@@ -68,7 +64,6 @@ impl RubyReader {
                 .funcall::<_, _, RString>("to_str", ())
                 .or_else(|_| value.funcall::<_, _, RString>("to_s", ()))?;
             Ok(RubyReader::String {
-                ruby,
                 inner: Opaque::from(string_content),
                 offset: 0,
             })
@@ -89,10 +84,10 @@ impl RubyReader {
 
 impl Seek for RubyReader {
     fn seek(&mut self, pos: io::SeekFrom) -> io::Result<u64> {
+        let ruby = unsafe { Ruby::get_unchecked() };
         match self {
             RubyReader::NativeProxyIoLike { proxy_file } => proxy_file.seek(pos),
             RubyReader::String {
-                ruby,
                 inner,
                 offset: original_offset,
             } => {
@@ -113,7 +108,7 @@ impl Seek for RubyReader {
                 *original_offset = new_offset.min(unwrapped_inner.len());
                 Ok(*original_offset as u64)
             }
-            RubyReader::RubyIoLike { ruby, inner } => {
+            RubyReader::RubyIoLike { inner } => {
                 let unwrapped_inner = ruby.get_inner(*inner);
 
                 let (whence, ruby_offset) = match pos {
@@ -138,13 +133,10 @@ impl Seek for RubyReader {
 
 impl Read for RubyReader {
     fn read(&mut self, mut buf: &mut [u8]) -> io::Result<usize> {
+        let ruby = unsafe { Ruby::get_unchecked() };
         match self {
             RubyReader::NativeProxyIoLike { proxy_file } => proxy_file.read(buf),
-            RubyReader::String {
-                ruby,
-                inner,
-                offset,
-            } => {
+            RubyReader::String { inner, offset } => {
                 let unwrapped_inner = ruby.get_inner(*inner);
 
                 let string_buffer = unsafe { unwrapped_inner.as_slice() };
@@ -160,7 +152,7 @@ impl Read for RubyReader {
 
                 Ok(copy_size)
             }
-            RubyReader::RubyIoLike { ruby, inner } => {
+            RubyReader::RubyIoLike { inner } => {
                 let unwrapped_inner = ruby.get_inner(*inner);
 
                 let bytes = unwrapped_inner
@@ -184,17 +176,14 @@ impl Read for RubyReader {
 
 impl Length for RubyReader {
     fn len(&self) -> u64 {
+        let ruby = unsafe { Ruby::get_unchecked() };
         match self {
             RubyReader::NativeProxyIoLike { proxy_file } => proxy_file.len(),
-            RubyReader::String {
-                ruby,
-                inner,
-                offset: _,
-            } => {
+            RubyReader::String { inner, offset: _ } => {
                 let unwrapped_inner = ruby.get_inner(*inner);
                 unwrapped_inner.len() as u64
             }
-            RubyReader::RubyIoLike { ruby, inner } => {
+            RubyReader::RubyIoLike { inner } => {
                 let unwrapped_inner = ruby.get_inner(*inner);
 
                 // Get current position

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

@@ -160,7 +160,12 @@ impl TryIntoValue for ParquetValue {
                 Ok(ary.into_value_with(handle))
             }
             ParquetValue::Map(m) => {
+                #[cfg(ruby_lt_3_2)]
                 let hash = handle.hash_new_capa(m.len());
+
+                #[cfg(not(ruby_lt_3_2))]
+                let hash = handle.hash_new();
+
                 m.into_iter().try_for_each(|(k, v)| {
                     hash.aset(
                         k.try_into_value_with(handle)?,

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

@@ -29,8 +29,12 @@ impl<S: BuildHasher + Default> TryIntoValue for RowRecord<S> {
                 Ok(handle.into_value(ary))
             }
             RowRecord::Map(map) => {
+                #[cfg(ruby_lt_3_2)]
                 let hash = handle.hash_new_capa(map.len());
 
+                #[cfg(not(ruby_lt_3_2))]
+                let hash = handle.hash_new();
+
                 let mut values: [Value; 128] = [handle.qnil().as_value(); 128];
                 let mut i = 0;
 
@@ -78,8 +82,12 @@ impl<S: BuildHasher + Default> TryIntoValue for ColumnRecord<S> {
                 Ok(ary.into_value_with(handle))
             }
             ColumnRecord::Map(map) => {
+                #[cfg(ruby_lt_3_2)]
                 let hash = handle.hash_new_capa(map.len());
 
+                #[cfg(not(ruby_lt_3_2))]
+                let hash = handle.hash_new();
+
                 let mut values: [Value; 128] = [handle.qnil().as_value(); 128];
                 let mut i = 0;
 
@@ -175,9 +183,13 @@ impl TryIntoValue for ParquetField {
                 Ok(ary.into_value_with(handle))
             }
             Field::MapInternal(map) => {
-                let entries = map.entries();
-                let hash = handle.hash_new_capa(entries.len());
-                entries.iter().try_for_each(|(k, v)| {
+                #[cfg(ruby_lt_3_2)]
+                let hash = handle.hash_new_capa(map.len());
+
+                #[cfg(not(ruby_lt_3_2))]
+                let hash = handle.hash_new();
+
+                map.entries().iter().try_for_each(|(k, v)| {
                     hash.aset(
                         ParquetField(k.clone(), self.1).try_into_value_with(handle)?,
                         ParquetField(v.clone(), self.1).try_into_value_with(handle)?,

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

@@ -29,7 +29,6 @@ use crate::{
     IoLikeValue, ParquetSchemaType as PST, ParquetWriteArgs, SchemaField, SendableWrite,
 };
 
-const MIN_SAMPLES_FOR_ESTIMATE: usize = 10;
 const SAMPLE_SIZE: usize = 100;
 const MIN_BATCH_SIZE: usize = 10;
 const INITIAL_BATCH_SIZE: usize = 100;

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

@@ -1,7 +1,7 @@
 use super::{
     build_column_collectors_from_dsl, copy_temp_file_to_io_like, create_writer,
     parse_parquet_write_args, DEFAULT_MEMORY_THRESHOLD, INITIAL_BATCH_SIZE, MIN_BATCH_SIZE,
-    MIN_SAMPLES_FOR_ESTIMATE, SAMPLE_SIZE,
+    SAMPLE_SIZE,
 };
 use crate::{
     logger::RubyLogger,
@@ -18,6 +18,8 @@ use magnus::{
 use rand::Rng;
 use std::sync::Arc;
 
+const MIN_SAMPLES_FOR_ESTIMATE: usize = 10;
+
 #[inline]
 pub fn write_rows(args: &[Value]) -> Result<(), MagnusError> {
     let ruby = unsafe { Ruby::get_unchecked() };

data/lib/parquet/version.rb

@@ -1,3 +1,3 @@
 module Parquet
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parquet
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Nathan Jaremko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-27 00:00:00.000000000 Z
+date: 2025-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys