isomorfeus-hamster 0.6.0 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f2c656886add52a2a6c29ccc906bb62f352472c798a0338a51fd1a292c9d352
-  data.tar.gz: 96cfa58fae24aaf67e3494c09bea40f9e222dedcc6018336f61f778b1b0c47ae
+  metadata.gz: c0a62ae4a77a996b8dc257b1f39600f1c90a2903765fb495a8ae47e70ba961c7
+  data.tar.gz: 3fd95f68beed49e13b4f2c3dc13ffc97d9ad48beb3b62822e232c1781aee5f59
 SHA512:
-  metadata.gz: 8a95b54cd64e1b73953aea2629bb9be0ffe107f9256bcf98ee619801c4a399f9ebacede1a6be9f02a1e99af05245038d8a1950fb2e172f4d87a1c8d7f0ba140b
-  data.tar.gz: f954296c5e25078c26bfc03e7a2b29df2ea8d71a2140448476eced461e21ab2a68143b876e4a3c01a0a14bd8b70c0098167d9f2b6e014a6a8ae56e0b62a54c26
+  metadata.gz: aa0b2b6738eab73e3ceb690ad5fdaa8a90e2046ff6a2429dded499afe78d3286a14ec9a9a7bfae03d78a78f685b9ba24abcb84b4e276b2fb2820b59d573f8405
+  data.tar.gz: d59d6b728565ea92591f49eb49f0c8228bcf1423fe052de117dc3b24c5f97dc70f502a7a96b422aa5fc9a8385844add878ff755745f91535fa756e664fdbf16c

data/README.md

@@ -1,7 +1,10 @@
-# isomorfeus-hamster
+<h1 align="center">
+  <img src="https://github.com/isomorfeus/isomorfeus-hamster/blob/master/Logo.png?raw=true" align="center" width="234" height="143" />
+  <br/>
+  Isomorfeus Hamster<br/>
+</h1>
 
 Convenient and well performing key value store and object database.
 
 ### Community and Support
 At the [Isomorfeus Framework Project](http://isomorfeus.com)
-

data/ext/isomorfeus_hamster_ext/isomorfeus_hamster.c

@@ -146,9 +146,10 @@ static void transaction_finish(VALUE self, int commit) {
                 mdb_txn_abort(transaction->txn);
 
         long i;
+        // mdb_txn_commit and mdb_txn_abort already closed MDB cursors, just clear it
         for (i=0; i<RARRAY_LEN(transaction->cursors); i++) {
                 VALUE cursor = RARRAY_AREF(transaction->cursors, i);
-                cursor_close(cursor);
+                cursor_clear(cursor);
         }
         rb_ary_clear(transaction->cursors);
 
@@ -1015,6 +1016,15 @@ static void cursor_mark(Cursor* cursor) {
         rb_gc_mark(cursor->db);
 }
 
+/**
+ * @overload clear
+ *  Clear a cursor after the mdb cursor has been closed.  The cursor must not be used again after this call.
+ */
+void cursor_clear(VALUE self) {
+        CURSOR(self, cursor);
+        cursor->cur = 0;
+}
+
 /**
  * @overload close
  *  Close a cursor.  The cursor must not be used again after this call.

data/ext/isomorfeus_hamster_ext/isomorfeus_hamster.h

@@ -108,6 +108,7 @@ static VALUE call_with_transaction(VALUE venv, VALUE self, const char* name, int
 static VALUE call_with_transaction_helper(VALUE arg);
 static void check(int code);
 static void cursor_check(Cursor* cursor);
+static void cursor_clear(VALUE self);
 static VALUE cursor_close(VALUE self);
 static VALUE cursor_count(VALUE self);
 static VALUE cursor_delete(int argc, VALUE *argv, VALUE self);

data/lib/isomorfeus/hamster/marshal.rb

@@ -2,60 +2,22 @@ module Isomorfeus
   module Hamster
     module Marshal
       class << self
-        def dump(db, key, obj)
-          db.env.transaction { db.put(key, Oj.dump(obj)) }
+        def dump(db, key, obj, class_cache: true)
+          db.env.transaction { db.put(key, ::Oj.dump(obj, mode: :object, class_cache: class_cache)) }
         end
 
-        def load(db, key)
+        def load(db, key, class_cache: true)
           obj_j = db.get(key)
           return nil unless obj_j
-          Oj.load(obj_j)
+          ::Oj.load(obj_j, mode: :object, class_cache: class_cache)
         end
 
-        def structured_dump(db, obj)
-          kv = []
-          oc = obj.class.to_s
-          ky = obj.key
-          as = obj.attributes
-          kv << [ats_key(oc, ky), Oj.dump(as)]
-          as.each do |at|
-            kv << [at_key(oc, ky, at), Oj.dump(obj.send(at))]
-          end
-          db.env.transaction do
-            kv.each do |k, v|
-              db.put(k, v)
-            end
-          end
+        def serialize(obj, class_cache: true)
+          ::Oj.dump(obj, mode: :object, class_cache: class_cache)
         end
 
-        def structured_load(db, oc, ky)
-          if oc.class = String
-            oC = const_get(oc)
-          else
-            oC = oc
-            oc = oc.to_s
-          end
-          ak = ats_key(oc, ky)
-          oh = {}
-          db.env.transaction do
-            as_j = db.get(ak)
-            as = Oj.load(as_j)
-            as.each do |at|
-              v_j = db.get(at_key(oc, ky, at))
-              oh[at] = Oj.load(v_j)
-            end
-          end
-          oC.instance_from_hash(oh)
-        end
-
-        private
-
-        def ats_key(oc, ky)
-          "#{oc}|#{ky}|attributes"
-        end
-
-        def at_key(oc, ky, at)
-          "#{oc}|#{ky}|:|#{at}"
+        def unserialize(obj_j, class_cache: true)
+          ::Oj.load(obj_j, mode: :object, class_cache: class_cache)
         end
       end
     end

data/lib/isomorfeus/hamster/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Hamster
-    VERSION = '0.6.0'
+    VERSION = '0.6.4'
   end
 end

data/lib/isomorfeus-hamster.rb

@@ -1,3 +1,4 @@
+require 'oj'
 require 'isomorfeus_hamster_ext'
 require 'isomorfeus/hamster/version'
 require 'isomorfeus/hamster/database'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-hamster
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.4
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-02 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.9
+        version: 3.13.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.9
+        version: 3.13.11
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +103,7 @@ licenses:
 - MIT
 metadata:
   github_repo: ssh://github.com/isomorfeus/gems
+  source_code_uri: https://github.com/isomorfeus/isomorfeus-hamster
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -118,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: KV store and ObjectDB for Isomorfeus.