isomorfeus-data 2.0.16 → 2.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a77625b51b1572ddc759b5e092f00fd56367451851fe33ae4a565c4d394ab629
-  data.tar.gz: 9c6044ecff3839da6ea41810f9a6b0b6a5011771ffeba3a2984694964039e1ec
+  metadata.gz: 6bc1da15cc5909c1c6fe181094dba6c61f8bd070dc57441e3df7d47e13f5179d
+  data.tar.gz: 60106fca2424268f4b92624c1945e364406a958de65c601bf3949c0a4c5ade55
 SHA512:
-  metadata.gz: 1e6d65461634662bf6f7b4de381fa9f18d134761e27426b8b8c7519f28c4ac6cab526eca2e627a42d500a484c4ed18c20de6ffd0d2d8b1baaaa97786ea6831d8
-  data.tar.gz: a86a8c9bdf5644596f5f14a9181ced1c7317f73d4ffd096f4284f9777f8c54d8efb51bc7180d9be59b043bfd08470c025b5389980242843ca4b0f2e7f93c0f23
+  metadata.gz: 24ef5ddf157caff32c7bded5e0728b03ab2e226754a6cb3522d7ffab1814108e9643a5fb2f4c39a62f463e16ec5438699213d9e012d5ca5c9e65d1a04b21c595
+  data.tar.gz: 257cde03efe55526ecff7b2f5513cc8f0109977c4260f35545682384773f1ca7fb11030479a1b5e456ebdafd9bfb83ebc748d4d5867c5b36703f1906a32d9ab6

data/lib/isomorfeus/data/{ferret_accelerator.rb → document_accelerator.rb}

@@ -1,6 +1,6 @@
 module Isomorfeus
   module Data
-    class FerretAccelerator
+    class DocumentAccelerator
       def self.finalize(fer_acc)
         proc { fer_acc.close_index }
       end
@@ -73,7 +73,7 @@ module Isomorfeus
       def open_index
         FileUtils.mkdir_p(Isomorfeus.data_documents_path) unless Dir.exist?(Isomorfeus.data_documents_path)
         field_infos = Isomorfeus::Ferret::Index::FieldInfos.new(store: :yes, index: :yes, term_vector: :with_positions_offsets)
-        @index = Isomorfeus::Ferret::Index::Index.new(path: index_path, key: :key, auto_flush: true, lock_retry_time: 5)
+        @index = Isomorfeus::Ferret::Index::Index.new(path: index_path, key: :key, auto_flush: true, lock_retry_time: 5, field_infos: field_infos)
         @index.field_infos.add_field(:key, store: :yes, index: :yes, term_vector: :no) unless @index.field_infos[:key]
         @doc_class.field_options.each do |field, options|
           @index.field_infos.add_field(field, options) unless @index.field_infos[field]

data/lib/isomorfeus/data/object_accelerator.rb

@@ -0,0 +1,75 @@
+module Isomorfeus
+  module Data
+    class ObjectAccelerator
+      def self.finalize(ham_acc)
+        proc { ham_acc.close_index }
+      end
+
+      attr_accessor :index
+
+      def initialize(&block)
+        if block_given?
+          res = block.call(self)
+          @index = res unless @index
+        else
+          open_index
+        end
+        ObjectSpace.define_finalizer(self, self.class.finalize(self))
+      end
+
+      def destroy_index
+        close_index
+        FileUtils.rm_rf(Isomorfeus.data_object_idx_path)
+      end
+
+      def close_index
+        @index.close
+      end
+
+      def create_doc(document)
+        @index.add_document(document)
+      end
+
+      def destroy_doc(key)
+        id = get_doc_id(key)
+        @index.delete(id) if id
+        true
+      end
+
+      def load_doc(key)
+        id = get_doc_id(key)
+        @index.doc(id)&.load&.to_h if id
+      end
+
+      def save_doc(key, document)
+        id = get_doc_id(key)
+        if id
+          @index.update(id, document)
+          true
+        end
+      end
+
+      def search_each(query, options, &block)
+        @index.search_each(query, options, &block)
+      end
+
+      private
+
+      def get_doc_id(key)
+        # special characters must be escaped, characters taken from the ferret query parser documentation
+        escaped_key = key.gsub(/([\\\&\:\(\)\[\]\{\}\!\"\~\^\|\<\>\=\*\?\+\-\s])/, '\\\\\1')
+        top_docs = @index.search("sid_s_attr:\"#{escaped_key}\"", limit: 1)
+        id = top_docs.hits[0].doc if top_docs.total_hits == 1
+      end
+
+      def open_index
+        FileUtils.mkdir_p(Isomorfeus.data_object_idx_path) unless Dir.exist?(Isomorfeus.data_object_idx_path)
+        @index = Isomorfeus::Ferret::Index::Index.new(path: Isomorfeus.data_object_idx_path, key: :sid_s_attr, auto_flush: true, lock_retry_time: 5)
+        @index.field_infos.add_field(:attribute, store: :no, term_vector: :no) unless index.field_infos[:attribute]
+        @index.field_infos.add_field(:class_name, store: :no, term_vector: :no) unless index.field_infos[:class_name]
+        @index.field_infos.add_field(:value, store: :no) unless index.field_infos[:value]
+        @index.field_infos.add_field(:sid_s_attr, store: :yes, term_vector: :no) unless index.field_infos[:sid_s_attr]
+      end
+    end
+  end
+end

data/lib/isomorfeus/data/{hamster_storage_expander.rb → object_expander.rb}

@@ -1,6 +1,6 @@
 module Isomorfeus
   module Data
-    class HamsterStorageExpander
+    class ObjectExpander
       class << self
         def environment
           @environment
@@ -45,11 +45,12 @@ module Isomorfeus
         end
         @db = self.class.environment.database('objects', create: true)
         @index_db = self.class.environment.database('index', create: true, dupsort: true)
+        @use_class_cache = !Isomorfeus.development?
         ObjectSpace.define_finalizer(self, self.class.finalize(self.class))
       end
 
       def create_object(sid_s, obj)
-        Isomorfeus::Hamster::Marshal.dump(@db, sid_s, obj)
+        Isomorfeus::Hamster::Marshal.dump(@db, sid_s, obj, class_cache: @use_class_cache)
       end
 
       def destroy_object(sid_s)
@@ -58,11 +59,11 @@ module Isomorfeus
       end
 
       def load_object(sid_s)
-        Isomorfeus::Hamster::Marshal.load(@db, sid_s)
+        Isomorfeus::Hamster::Marshal.load(@db, sid_s, class_cache: @use_class_cache)
       end
 
       def save_object(sid_s, obj)
-        Isomorfeus::Hamster::Marshal.dump(@db, sid_s, obj)
+        Isomorfeus::Hamster::Marshal.dump(@db, sid_s, obj, class_cache: @use_class_cache)
       end
 
       def index_delete(key, val)
@@ -79,7 +80,7 @@ module Isomorfeus
 
       def each(&block)
         @db.each do |key, obj|
-          block.call(Isomorfeus::Hamster::Marshal.unserialize(obj))
+          block.call(Isomorfeus::Hamster::Marshal.unserialize(obj, class_cache: @use_class_cache))
         end
       end
 

data/lib/isomorfeus/data/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Data
-    VERSION = '2.0.16'
+    VERSION = '2.0.20'
   end
 end

data/lib/isomorfeus-data.rb

@@ -23,11 +23,11 @@ else
   require 'active_support/core_ext/hash'
 
   require 'isomorfeus-ferret'
-  require 'isomorfeus/data/ferret_accelerator'
+  require 'isomorfeus/data/document_accelerator'
 
   require 'isomorfeus-hamster'
-  require 'isomorfeus/data/hamster_storage_expander'
-  require 'isomorfeus/data/hamster_accelerator'
+  require 'isomorfeus/data/object_expander'
+  require 'isomorfeus/data/object_accelerator'
 
   require 'isomorfeus_data/lucid_query_result'
   require 'isomorfeus_data/lucid_object/mixin'

data/lib/isomorfeus_data/lucid_document/mixin.rb

@@ -92,9 +92,9 @@ module LucidDocument
           def ferret_accelerator
             return @ferret_accelerator if @ferret_accelerator
             @ferret_accelerator = if @_setup_index_block
-                                    Isomorfeus::Data::FerretAccelerator.new(self, &@_setup_index_block)
+                                    Isomorfeus::Data::DocumentAccelerator.new(self, &@_setup_index_block)
                                   else
-                                    Isomorfeus::Data::FerretAccelerator.new(self)
+                                    Isomorfeus::Data::DocumentAccelerator.new(self)
                                   end
           end
 

data/lib/isomorfeus_data/lucid_object/mixin.rb

@@ -90,18 +90,18 @@ module LucidObject
           def hamster_storage_expander
             return @hamster_storage_expander if @hamster_storage_expander
             @hamster_storage_expander = if @_setup_environment_block
-                                          Isomorfeus::Data::HamsterStorageExpander.new(&@_setup_index_block)
+                                          Isomorfeus::Data::ObjectExpander.new(&@_setup_index_block)
                                         else
-                                          Isomorfeus::Data::HamsterStorageExpander.new
+                                          Isomorfeus::Data::ObjectExpander.new
                                         end
           end
 
           def hamster_accelerator
             return @hamster_accelerator if @hamster_accelerator
             @hamster_accelerator = if @_setup_index_block
-                                     Isomorfeus::Data::HamsterAccelerator.new(&@_setup_index_block)
+                                     Isomorfeus::Data::ObjectAccelerator.new(&@_setup_index_block)
                                    else
-                                     Isomorfeus::Data::HamsterAccelerator.new
+                                     Isomorfeus::Data::ObjectAccelerator.new
                                    end
           end
 
@@ -113,7 +113,7 @@ module LucidObject
               query = "+value:#{val} +class_name:#{self.name}"
               query << " +attribute:#{attr}" if attr != '*'
               self.hamster_accelerator.search_each(query, options) do |id|
-                doc = self.hamster_accelerator.load_doc(id)
+                doc = self.hamster_accelerator.index.doc(id)&.load
                 if doc
                   sid_s = doc[:sid_s_attr].split(':|:')[0]
                   obj = self.load(key: sid_s)
@@ -123,12 +123,12 @@ module LucidObject
             else
               if val == '*'
                 self.hamster_storage_expander.each do |obj|
-                  objs << obj if obj
+                  objs << obj if obj.class == self
                 end
               else
                 attr_s = ":[#{attr}]"
                 accept_all_attr = attr_s == ":[*]" ? true : false
-                self.hamster_storage_expander.search(":[:#{val}:]:") do |sid_s_attr|
+                self.hamster_storage_expander.search(":[#{self.name}]:|:[:#{val}:]:") do |sid_s_attr|
                   if accept_all_attr || sid_s_attr.end_with?(attr_s)
                     sid_s = sid_s_attr.split(':|:[')[0]
                     obj = self.load(key: sid_s)
@@ -145,7 +145,7 @@ module LucidObject
             self.class.hamster_storage_expander.create_object(self.sid_s, self)
             self.class.indexed_attributes.each do |attr, idx_type|
               if idx_type == :text
-                self._store_text_indexed_attribute(attr)
+                self._create_text_indexed_attribute(attr)
               else
                 self._store_value_indexed_attribute(attr)
               end
@@ -163,7 +163,7 @@ module LucidObject
               else
                 old_val = self.hamster_storage_expander.index_get("#{sid_s}:|:[#{attr}]")
                 self.hamster_storage_expander.index_delete("#{sid_s}:|:[#{attr}]", old_val)
-                self.hamster_storage_expander.index_delete(":[:#{old_val}:]:", "#{sid_s}:|:[#{attr}]")
+                self.hamster_storage_expander.index_delete(":[#{self.name}]:|:[:#{old_val}:]:", "#{sid_s}:|:[#{attr}]")
               end
             end
             true
@@ -200,6 +200,11 @@ module LucidObject
           @_raw_attributes = attributes
         end
 
+        def _create_text_indexed_attribute(attr)
+          doc = { sid_s_attr: "#{self.sid_s}:|:[#{attr}]", value: self.send(attr).to_s, attribute: attr.to_s, class_name: @class_name }
+          self.class.hamster_accelerator.create_doc(doc)
+        end
+
         def _store_text_indexed_attribute(attr)
           doc = { sid_s_attr: "#{self.sid_s}:|:[#{attr}]", value: self.send(attr).to_s, attribute: attr.to_s, class_name: @class_name }
           self.class.hamster_accelerator.save_doc("#{self.sid_s}:|:[#{attr}]", doc)
@@ -208,10 +213,10 @@ module LucidObject
         def _store_value_indexed_attribute(attr)
           old_val = self.class.hamster_storage_expander.index_get("#{self.sid_s}:|:[#{attr}]")
           self.class.hamster_storage_expander.index_delete("#{self.sid_s}:|:[#{attr}]", old_val)
-          self.class.hamster_storage_expander.index_delete(":[:#{old_val}:]:", "#{self.sid_s}:|:[#{attr}]")
+          self.class.hamster_storage_expander.index_delete(":[#{self.class.name}]:|:[:#{old_val}:]:", "#{self.sid_s}:|:[#{attr}]")
           val = "#{self.send(attr)}"[0..300]
           self.class.hamster_storage_expander.index_put("#{self.sid_s}:|:[#{attr}]", val)
-          self.class.hamster_storage_expander.index_put(":[:#{val}:]:", "#{self.sid_s}:|:[#{attr}]")
+          self.class.hamster_storage_expander.index_put(":[#{self.class.name}]:|:[:#{val}:]:", "#{self.sid_s}:|:[#{attr}]")
         end
 
         def _unchange!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-data
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 2.0.20
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-05 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: isomorfeus-preact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.27
+        version: 10.6.30
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.27
+        version: 10.6.30
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.16
+        version: 2.0.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.16
+        version: 2.0.20
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.16
+        version: 2.0.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.16
+        version: 2.0.20
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -207,13 +207,13 @@ files:
 - lib/isomorfeus-data.rb
 - lib/isomorfeus/data/attribute_support.rb
 - lib/isomorfeus/data/config.rb
-- lib/isomorfeus/data/ferret_accelerator.rb
+- lib/isomorfeus/data/document_accelerator.rb
 - lib/isomorfeus/data/field_support.rb
 - lib/isomorfeus/data/generic_class_api.rb
 - lib/isomorfeus/data/generic_instance_api.rb
-- lib/isomorfeus/data/hamster_accelerator.rb
-- lib/isomorfeus/data/hamster_storage_expander.rb
 - lib/isomorfeus/data/handler/generic.rb
+- lib/isomorfeus/data/object_accelerator.rb
+- lib/isomorfeus/data/object_expander.rb
 - lib/isomorfeus/data/reducer.rb
 - lib/isomorfeus/data/version.rb
 - lib/isomorfeus_data/lucid_document/base.rb

data/lib/isomorfeus/data/hamster_accelerator.rb

@@ -1,87 +0,0 @@
-module Isomorfeus
-  module Data
-    class HamsterAccelerator
-      class << self
-        def index
-          @index
-        end
-
-        def index=(idx)
-          @index = idx
-        end
-
-        def ref
-          @ref ||= 0
-        end
-
-        def ref=(val)
-          @ref = val
-        end
-
-        def refa
-          self.ref += 1
-        end
-
-        def refs
-          self.ref -= 1 if self.ref > 0
-        end
-
-        def finalize(cls)
-          proc do
-            cls.refs
-            cls.index.close if cls.ref == 0
-          end
-        end
-      end
-
-      def initialize(&block)
-        if block_given?
-          res = block.call(self)
-          self.class.index = res unless self.class.index
-        else
-          open_index
-        end
-        ObjectSpace.define_finalizer(self, self.class.finalize(self.class))
-      end
-
-      def destroy_index
-        close_index
-        FileUtils.rm_rf(Isomorfeus.data_object_idx_path)
-      end
-
-      def destroy_doc(id)
-        self.class.index.delete(id)
-        true
-      end
-
-      def load_doc(id)
-        self.class.index.doc(id)&.load
-      end
-
-      def save_doc(id, document)
-        self.class.index.update(id, document)
-      end
-
-      def search_each(query, options, &block)
-        self.class.index.search_each(query, options, &block)
-      end
-
-      private
-
-      def open_index
-        return self.class.refa if self.class.index
-        unless Dir.exist?(Isomorfeus.data_object_idx_path)
-          FileUtils.mkdir_p(Isomorfeus.data_object_idx_path)
-          fis = Isomorfeus::Ferret::Index::FieldInfos.new
-          fis.add_field(:attribute, store: :no)
-          fis.add_field(:class_name, store: :no)
-          fis.add_field(:value, store: :no)
-          fis.add_field(:sid_s_attr, store: :yes)
-          fis.create_index(Isomorfeus.data_object_idx_path)
-        end
-        self.class.index = Isomorfeus::Ferret::Index::Index.new(path: Isomorfeus.data_object_idx_path, id_field: :sid_s_attr)
-        self.class.refa
-      end
-    end
-  end
-end