osv 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 137ae556685639f7d13234e3061d9b310757ce02f75a713753d175f1bc71b628
-  data.tar.gz: 5892494ad08d783955d2b932150d65433a4d3593376fadbaf54e54780e7a350f
+  metadata.gz: c05364b766bdf78065ac6da9553bfa7992d61691b5ca111609e385ae05ded4e8
+  data.tar.gz: 6eb41be77ba5dfd567f5014ac13232f93231edba7777ea63039e836840b2673e
 SHA512:
-  metadata.gz: 6efbc2ee65a8e79379722ae977ee7dbec6131b78968d080f9feb86a3310368c387da54dd8c073e9b4008cb80d906293ea9115982d00d5ff637cf5ab51179b53c
-  data.tar.gz: 7b4ab3199f90654cd831dfbb52a9d22b70237e7120bd5308a1b7698268fa981abefd7ee47d53424d0c7bff46956256db8f1e139d17e381fd5570a16ca183e376
+  metadata.gz: 65ede075b21b4a9f172343002943799765a599ed5462384ce21199eae451dd8b7a66fa1eb1809bcaec9e44ef48654a6212b6c765015e338435aa792790931051
+  data.tar.gz: 4edbfc0d1c152c13e0b679ba035426cbea9fbac7d4a4f5a07ef3c4a9797724aa43ef6ee1424671568770e1e6fb121a3501a32f86fc6ee1aacaccdd85610644ee

data/ext/osv/src/csv/header_cache.rs

@@ -8,7 +8,7 @@ use std::{
     collections::HashMap,
     sync::{
         atomic::{AtomicU32, Ordering},
-        Arc, LazyLock, Mutex, OnceLock,
+        Arc, LazyLock, Mutex,
     },
 };
 
@@ -112,54 +112,4 @@ impl StringCache {
         }
         Ok(result)
     }
-
-    pub fn clear(headers: &[Arc<StringCacheKey>]) -> Result<(), CacheError> {
-        let mut cache = STRING_CACHE
-            .lock()
-            .map_err(|e| CacheError::LockError(e.to_string()))?;
-
-        let to_remove: Vec<_> = headers
-            .iter()
-            .filter_map(|header| {
-                let key = header.as_ref().as_ref();
-                if let Some((_, (_, counter))) = cache.get_key_value(key) {
-                    let prev_count = counter.fetch_sub(1, Ordering::Relaxed);
-                    if prev_count == 1 {
-                        Some(key)
-                    } else {
-                        None
-                    }
-                } else {
-                    None
-                }
-            })
-            .collect();
-
-        for key in to_remove {
-            cache.remove(key);
-        }
-
-        Ok(())
-    }
-}
-
-pub struct HeaderCacheCleanupIter<I> {
-    pub inner: I,
-    pub headers: OnceLock<Vec<Arc<StringCacheKey>>>,
-}
-
-impl<I: Iterator> Iterator for HeaderCacheCleanupIter<I> {
-    type Item = I::Item;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next()
-    }
-}
-
-impl<I> Drop for HeaderCacheCleanupIter<I> {
-    fn drop(&mut self) {
-        if let Some(headers) = self.headers.get() {
-            StringCache::clear(headers).unwrap();
-        }
-    }
 }

data/ext/osv/src/csv/record_reader.rs

@@ -1,7 +1,7 @@
 use super::builder::ReaderError;
 use super::header_cache::StringCacheKey;
 use super::parser::{CsvRecordType, RecordParser};
-use super::{header_cache::StringCache, ruby_reader::SeekableRead};
+use super::ruby_reader::SeekableRead;
 use magnus::{Error, Ruby};
 use std::borrow::Cow;
 use std::io::{BufReader, Read};
@@ -137,11 +137,3 @@ impl<'a, T: RecordParser<'a>> Iterator for RecordReader<'a, T> {
         (0, None) // Cannot determine size without reading entire file
     }
 }
-
-impl<'a, T: RecordParser<'a>> Drop for RecordReader<'a, T> {
-    #[inline]
-    fn drop(&mut self) {
-        // Intentionally ignore errors during cleanup as there's no meaningful way to handle them
-        let _ = StringCache::clear(&self.headers);
-    }
-}

data/ext/osv/src/reader.rs

@@ -94,7 +94,7 @@ pub fn parse_csv(rb_self: Value, args: &[Value]) -> Result<Value, Error> {
     match result_type {
         ResultType::Hash => {
             let builder = RecordReaderBuilder::<
-                HashMap<Arc<StringCacheKey>, Option<CowStr<'static>>, RandomState>,
+                HashMap<Arc<StringCacheKey>, Option<CowStr<'_>>, RandomState>,
             >::new(ruby, to_read)
             .has_headers(has_headers)
             .flexible(flexible)
@@ -113,7 +113,7 @@ pub fn parse_csv(rb_self: Value, args: &[Value]) -> Result<Value, Error> {
             }
         }
         ResultType::Array => {
-            let builder = RecordReaderBuilder::<Vec<Option<CowStr<'static>>>>::new(ruby, to_read)
+            let builder = RecordReaderBuilder::<Vec<Option<CowStr<'_>>>>::new(ruby, to_read)
                 .has_headers(has_headers)
                 .flexible(flexible)
                 .trim(trim)

data/lib/osv/version.rb

@@ -1,3 +1,3 @@
 module OSV
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

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