filedictrb 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64d09435d5e09d917e12a06932a75ddf365b081a9caa1253a3b11a53a235196c
-  data.tar.gz: 4cd1fedaa0035da30c2d9572eb28dd190cab901803089b164c36ba4d5776d36c
+  metadata.gz: 3c8fd3a6260d33ec56a995b4116af3cdb60ec8b52fa8aee688c7fd0b305b14ae
+  data.tar.gz: '0349634431c7e9abde136b1503e4ae23a8855236cdafb21ee9157f946456c16c'
 SHA512:
-  metadata.gz: d232d34e3b99221baf055c56ca672b2536d910103a3a4dd6bab1be9005270db86cda72690f1dd56ed230fb0214ef4cecae45a9f8ae5931b7ebcb3288df8492e2
-  data.tar.gz: de03f2dc36efad352a54f647f3275cc15bae641799e3b2ca258cdbb08100103493ac35e2c37e327f7f39feb2dc92eb80af6fb3c4cd645fad8794612ee0cffcfc
+  metadata.gz: 5811b3a6fba572d75e39d9fec5d7e2d6cb1bde1701604d80e0fa040de624b7b7c7edca928293fa9814b91614a3c5d6289f15e55becc7e4b1153d34212216ec39
+  data.tar.gz: db8da5021c456578f8654bce8feab2a7f4138f9c3f405423fb441ff3248cc3924b451da94473d5eac1b9d3eccda643d22582b278dbaebb6a7087f819bf896e08

data/ext/filedict/filedict.h

@@ -38,7 +38,7 @@ typedef struct filedict_header_t {
 } __attribute__ ((__packed__)) filedict_header_t;
 
 typedef struct filedict_read_t {
-    const filedict_t *filedict;
+    filedict_t *filedict;
     const char *key;
     const char *value;
     filedict_bucket_t *bucket;
@@ -353,7 +353,7 @@ static int filedict_read_advance_entry(filedict_read_t *read) {
  * Returns 0 when there are no more hashmaps, or the latest hashmap has no matching entries.
  */
 static int filedict_read_advance_hashmap(filedict_read_t *read) {
-    const filedict_t *filedict = read->filedict;
+    filedict_t *filedict = read->filedict;
 
     assert(filedict);
     assert(filedict->data);
@@ -363,6 +363,24 @@ static int filedict_read_advance_hashmap(filedict_read_t *read) {
     if (read->hashmap_i >= header->hashmap_count) log_return(0);
 
     size_t offset = filedict_file_size(header->initial_bucket_count, read->hashmap_i);
+
+    if (offset >= filedict->data_len) {
+        /* Need to resize! */
+        size_t computed_size = filedict_file_size(header->initial_bucket_count, header->hashmap_count);
+        munmap(filedict->data, filedict->data_len);
+        filedict->data = mmap(
+            filedict->data,
+            computed_size,
+            PROT_READ | PROT_WRITE,
+            MAP_SHARED,
+            filedict->fd,
+            0
+        );
+        if (filedict->data == MAP_FAILED) { filedict->error = strerror(errno); return 0; }
+        filedict->data_len = computed_size;
+        header = (filedict_header_t*)filedict->data;
+    }
+
     filedict_bucket_t *hashmap = filedict->data + offset;
 
     read->bucket_count = (size_t)header->initial_bucket_count << read->hashmap_i;
@@ -377,7 +395,7 @@ static int filedict_read_advance_hashmap(filedict_read_t *read) {
 /*
  * Returns a "read" at the given key. If there's a hit, <return>.value will have the value.
  */
-static filedict_read_t filedict_get(const filedict_t *filedict, const char *key) {
+static filedict_read_t filedict_get(filedict_t *filedict, const char *key) {
     filedict_read_t read;
     read.filedict = filedict;
     read.key = key;

data/ext/filedictrb/hash.c

@@ -3,7 +3,6 @@
 
 extern VALUE mFiledict;
 VALUE cHash;
-VALUE mSetExt;
 VALUE cSet;
 
 ID id_add;
@@ -89,7 +88,7 @@ static VALUE fd_set_add(int argc, VALUE *argv, VALUE self) {
     VALUE fd_hash_ruby_object = rb_ivar_get(self, id_fd_hash);
 
     if (fd_hash_ruby_object == Qnil) {
-        return self;
+        return rb_call_super(argc, argv);
     }
 
     fd_hash_t *fd_hash = RTYPEDDATA_DATA(fd_hash_ruby_object);
@@ -124,8 +123,6 @@ static VALUE fd_hash_access(VALUE self, VALUE key) {
     rb_ivar_set(result, id_fd_hash, self);
     rb_ivar_set(result, id_fd_key, key);
 
-    rb_extend_object(result, mSetExt);
-
     return result;
 }
 
@@ -139,9 +136,8 @@ void fdrb_init_hash() {
 
     VALUE rb_cSet = rb_define_class("Set", rb_cObject);
     cSet = rb_define_class_under(mFiledict, "Set", rb_cSet);
-    mSetExt = rb_define_module_under(mFiledict, "SetExt");
 
-    rb_define_method(mSetExt, "add", fd_set_add, -1);
+    rb_define_method(cSet, "add", fd_set_add, -1);
 
     id_add = rb_intern("add");
     id_remove = rb_intern("remove");

data/lib/filedict/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Filedict
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filedictrb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nigel Baillie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies: []
 description:
 email: