parquet 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb28e49c647fcf9dddba5d18806b366e73ecaa6fb3bf8a3534eb7df4749710f0
-  data.tar.gz: 44953fd9a1f3fc89f24754a6cb555f4d32a90d4af4bb4aa3c14fc373a1c389df
+  metadata.gz: 2b5b56cca903ed731d6981d3113e3833a6e6a6a0ffcd301040b32ab0c72bf9c1
+  data.tar.gz: 0e4486e2a67a051852166ac81754c9bfb2807c2ffa51eeda5edb41050432e930
 SHA512:
-  metadata.gz: eaa9767d45deab2c3ba3fb0fc4c7aeb222b4446494262ff01083bdc488cca3164feee0f2f07bff644a3196479da0db4049dee1395b8b89f87f5aeba24a97b60b
-  data.tar.gz: 805a9cad6698f6ade3a61b40eb514a948ed6b07682db0bd3e724aad533468a114053b9589ec6261c31e8fe6b244c4808457f9e801a6991dffa86a36326736ab0
+  metadata.gz: affe353c972f130973b309ca1ee928928278254830fa39bee8e4bed5452b5b381e2d27f6986067a0f9b27769a78f195887d371dc4825f61096414af92e9edb94
+  data.tar.gz: 9c823757be4b81d3ccafb57571c1d98b530a0d10696712083a0447b4871bf90720ba588d8c48777926b3f7a7f2ffede0c2ed7c9a076420b4dea183b7290ba47e

data/ext/parquet/src/ruby_reader.rs

@@ -184,37 +184,53 @@ impl Length for RubyReader {
             }
             RubyReader::RubyIoLike { inner } => {
                 let unwrapped_inner = ruby.get_inner(*inner);
-                let current_pos = unwrapped_inner.funcall::<_, _, u64>("seek", (0, 1));
 
-                if let Err(e) = current_pos {
+                // Get current position
+                let current_pos = match unwrapped_inner.funcall::<_, _, u64>("pos", ()) {
+                    Ok(pos) => pos,
+                    Err(e) => {
+                        eprintln!("Error seeking: {}", e);
+                        return 0;
+                    }
+                };
+
+                // Seek to end
+                if let Err(e) = unwrapped_inner.funcall::<_, _, u64>("seek", (0, 2)) {
                     eprintln!("Error seeking: {}", e);
                     return 0;
                 }
 
-                if let Err(e) = unwrapped_inner.funcall::<_, _, u64>("seek", (0, 2)) {
+                // Offset at the end of the file is the length of the file
+                let size = match unwrapped_inner.funcall::<_, _, u64>("pos", ()) {
+                    Ok(pos) => pos,
+                    Err(e) => {
+                        eprintln!("Error seeking: {}", e);
+                        return 0;
+                    }
+                };
+
+                // Restore original position
+                if let Err(e) = unwrapped_inner.funcall::<_, _, u64>("seek", (current_pos, 0)) {
                     eprintln!("Error seeking: {}", e);
                     return 0;
                 }
 
-                let size = unwrapped_inner.funcall::<_, _, u64>("pos", ());
-
-                match size {
-                    Ok(size) => {
-                        // Restore original position
-                        if let Err(e) = unwrapped_inner.funcall::<_, _, u64>(
-                            "seek",
-                            (current_pos.expect("Current position is not set!"), 0),
-                        ) {
-                            eprintln!("Error seeking: {}", e);
-                            return 0;
-                        }
-                        size
-                    }
+                let final_pos = match unwrapped_inner.funcall::<_, _, u64>("pos", ()) {
+                    Ok(pos) => pos,
                     Err(e) => {
                         eprintln!("Error seeking: {}", e);
                         return 0;
                     }
-                }
+                };
+
+                assert_eq!(
+                    current_pos, final_pos,
+                    "Failed to restore original position in seekable IO object. Started at position {}, but ended at {}",
+                    current_pos,
+                    final_pos
+                );
+
+                size
             }
         }
     }

data/lib/parquet/version.rb

@@ -1,3 +1,3 @@
 module Parquet
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

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