odba 1.1.2 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d60345e57c1bfc54f935b1349f9e94da3a0a4135
-  data.tar.gz: 8c7ffb139d6f7b93e99aa500357267a2c2429b26
+SHA256:
+  metadata.gz: 85dc9b8b21d66f01d3d7d37d9a73ce0f62ad5a5e0669a824d541cdbccbcd342c
+  data.tar.gz: dac941a19b3261e7fae22d8e8ce24f7da06dcfab842038ed2807fbd1e85f97ef
 SHA512:
-  metadata.gz: 71678fe42e0915eada7c995c611d01282b62564f494d9fd91bcf71b538a054a8a6f7014fffb3223447836bccfa55652994676314f216124b1b389ee5f3add161
-  data.tar.gz: 5daaf796ac79b2fc707fcb4087535e8455533cd2f7fe566d6e9deeaf74d226c47d3c087349590f2cd36bc09982dad6b159d7f8ce58854239964b1b0254de5de1
+  metadata.gz: 91d1b5bbf91bc9fa9f2907e286a0c9a3598fc48fcc00892e7cea690cefde44d47bf0064a696a2a58de96ec155392605d079f62d7b3beaeaa2c86c72f36fc3880
+  data.tar.gz: 6e01aed62f94f16575b6b466454bf7ce4b2fa828e2db43adaf4e28c032c3f1f7c72b35927c14dcf309c49bff95216cebaf67eec2a73c474ddca85dc1580be247

data/.github/workflows/ruby.yml

@@ -0,0 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+# Using a matrix fails, because /setup-ruby always invokes bundle install without any additional args
+# Fixed by adding not defining the debugger group in the Gemfile
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu]
+        ruby: [2.7, 3.0, head]
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+
+    - name: Run tests via rake test
+      run: bundle exec rake test

data/Gemfile

@@ -2,16 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-group 'test' do
-  gem 'flexmock', "~> 1.3.0"
-  gem 'test-unit'
-  gem 'minitest'
-end
-
-group 'debugger' do
-  gem 'pry'
-  gem 'pry-nav'
-  gem 'pry-rescue'
-  gem 'pry-stack_explorer'
-  gem 'pry-doc'
-end
+# The group debugger must be disabled for using a matrix build via github/actions
+group :debugger do
+  gem 'pry-byebug'
+end if false

data/History.txt

@@ -1,3 +1,29 @@
+=== 1.1.7 / 20.01.2021
+
+* Reworked some tests
+* Updated to use Ruby 3.0.0
+* Added github actions
+* Updated to use ydbi 0.5.7
+
+=== 1.1.6 / 23.01.2016
+
+* Updated to use ydbi 0.5.6
+
+=== 1.1.5 / 23.01.2016
+
+* Remove unused parameter dict for update_fulltext_index
+
+=== 1.1.4 / 13.12.2017
+
+* Drop text search dictionaries/configuration before recreating
+* Remove dictionary argument in fulltext search and index_definition
+
+=== 1.1.3 / 12.12.2016
+
+* Avoid errors by always specifying "IF NOT EXISTS" when creating tables and indices
+* Add utility method get_server_version
+* Removed misleading check in generate_dictionary
+
 === 1.1.2 / 10.05.2016
 
 * requires now 'ydbi' and 'ydbd-pg'
@@ -52,6 +78,6 @@
 
 === 1.0.0 / 20.12.2010
 
-* Add ODBA.cache.index_matches(index_name, substring) 
+* Add ODBA.cache.index_matches(index_name, substring)
 
   * this new method returns all search-terms of a given index (identified by index_name) that start with substring.

data/Rakefile

@@ -16,14 +16,13 @@ end
 desc "Run tests"
 task :default => :test
 
-desc 'Run odba with all commonly used combinations'
-task :test do
-  log_file = 'suite.log'
-  res = system("bash -c 'set -o pipefail && bundle exec ruby test/suite.rb 2>&1 | tee #{log_file}'")
-  puts "Running test/suite.rb returned #{res.inspect}. Output was redirected to #{log_file}"
-  exit 1 unless res
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/test_*.rb"]
 end
 
+
 require 'rake/clean'
 CLEAN.include FileList['pkg/*.gem']
 

data/lib/odba/cache.rb

@@ -17,14 +17,15 @@ module ODBA
 	class Cache
 		include Singleton
     include DRb::DRbUndumped
-		CLEANER_PRIORITY = 0  # :nodoc: 
-		CLEANING_INTERVAL = 5 # :nodoc: 
+		CLEANER_PRIORITY = 0  # :nodoc:
+		CLEANING_INTERVAL = 5 # :nodoc:
     attr_accessor :cleaner_step, :destroy_age, :retire_age, :debug, :file_lock
-		def initialize # :nodoc: 
+		def initialize # :nodoc:
 			if(self::class::CLEANING_INTERVAL > 0)
 				start_cleaner
 			end
       @retire_age = 300
+      @receiver = nil
 			@cache_mutex = Mutex.new
       @deferred_indices = []
 			@fetched = Hash.new
@@ -36,9 +37,9 @@ module ODBA
       @loading_stats = {}
       @peers = []
       @file_lock = false
-      @debug ||= false
+      @debug ||= false # Setting @debug to true makes two unit test fail!
 		end
-		# Returns all objects designated by _bulk_fetch_ids_ and registers 
+		# Returns all objects designated by _bulk_fetch_ids_ and registers
 		# _odba_caller_ for each of them. Objects which are not yet loaded are loaded
 		# from ODBA#storage.
 		def bulk_fetch(bulk_fetch_ids, odba_caller)
@@ -79,7 +80,7 @@ module ODBA
       retire_horizon = now - @retire_age
       @cleaner_offset = _clean(retire_horizon, @fetched, @cleaner_offset)
 			if(@clean_prefetched)
-        @prefetched_offset = _clean(retire_horizon, @prefetched, 
+        @prefetched_offset = _clean(retire_horizon, @prefetched,
                                     @prefetched_offset)
 			end
       if(@debug)
@@ -93,8 +94,8 @@ module ODBA
         $stdout.flush
       end
 		end
-    def _clean(retire_time, holder, offset) # :nodoc: 
-      if(offset > holder.size) 
+    def _clean(retire_time, holder, offset) # :nodoc:
+      if(offset > holder.size)
         offset = 0
       end
       counter = 0
@@ -108,14 +109,14 @@ module ODBA
           return cutoff if(counter > cutoff)
         }
       }
-      cutoff 
+      cutoff
     # every once in a while we'll get a 'hash modified during iteration'-Error.
     # not to worry, we'll just try again later.
     rescue StandardError
       offset
     end
 		# overrides the ODBA_PREFETCH constant and @odba_prefetch instance variable
-		# in Persistable. Use this if a secondary client is more memory-bound than 
+		# in Persistable. Use this if a secondary client is more memory-bound than
 		# performance-bound.
 		def clean_prefetched(flag=true)
 			if(@clean_prefetched = flag)
@@ -133,7 +134,7 @@ module ODBA
         if(drop_existing && self.indices.include?(name))
           drop_index(name)
         end
-        unless(self.indices.include?(name)) 
+        unless(self.indices.include?(name))
           index = create_index(definition)
           if(index.target_klass.respond_to?(:odba_extent))
             index.fill(index.target_klass.odba_extent)
@@ -158,7 +159,7 @@ module ODBA
 			}
 		end
 		# Permanently deletes _object_ from the database and deconnects all connected
-		# Persistables 
+		# Persistables
 		def delete(odba_object)
 			odba_id = odba_object.odba_id
       name = odba_object.odba_name
@@ -199,7 +200,7 @@ module ODBA
 		def drop_index(index_name)
 			transaction {
 				ODBA.storage.drop_index(index_name)
-				self.delete(self.indices[index_name]) 
+				self.delete(self.indices[index_name])
 			}
 		end
     def drop_indices # :nodoc:
@@ -223,7 +224,7 @@ module ODBA
 		# Fetch a Persistable identified by _odba_id_. Registers _odba_caller_ with
 		# the CacheEntry. Loads the Persistable if it is not already loaded.
 		def fetch(odba_id, odba_caller=nil)
-			fetch_or_do(odba_id, odba_caller) { 
+			fetch_or_do(odba_id, odba_caller) {
         load_object(odba_id, odba_caller)
 			}
 		end
@@ -233,24 +234,26 @@ module ODBA
     @@receiver_name = RUBY_VERSION >= '1.9' ? :@receiver : '@receiver'
 		def fetch_collection(odba_obj) # :nodoc:
 			collection = []
-			bulk_fetch_ids = [] 
+			bulk_fetch_ids = []
 			rows = ODBA.storage.restore_collection(odba_obj.odba_id)
       return collection if rows.empty?
+      idx = 0
 			rows.each { |row|
-				key = ODBA.marshaller.load(row[0])
-				value = ODBA.marshaller.load(row[1])
+				key = row[0].is_a?(Integer) ? row[0] : ODBA.marshaller.load(row[0])
+				value = row[1].is_a?(Integer) ? row[1] : ODBA.marshaller.load(row[1])
+                idx += 1
         item = nil
         if([key, value].any? { |item| item.instance_variable_get(@@receiver_name) })
           odba_id = odba_obj.odba_id
           warn "stub for #{item.class}:#{item.odba_id} was saved with receiver in collection of #{odba_obj.class}:#{odba_id}"
           warn "repair: remove [#{odba_id}, #{row[0]}, #{row[1].length}]"
-          ODBA.storage.collection_remove(odba_id, row[0])	
+          ODBA.storage.collection_remove(odba_id, row[0])
           key = key.odba_isolated_stub
           key_dump = ODBA.marshaller.dump(key)
           value = value.odba_isolated_stub
           value_dump = ODBA.marshaller.dump(value)
           warn "repair: insert [#{odba_id}, #{key_dump}, #{value_dump.length}]"
-          ODBA.storage.collection_store(odba_id, key_dump, value_dump)	
+          ODBA.storage.collection_store(odba_id, key_dump, value_dump)
         end
 				bulk_fetch_ids.push(key.odba_id)
 				bulk_fetch_ids.push(value.odba_id)
@@ -259,8 +262,8 @@ module ODBA
 			bulk_fetch_ids.compact!
 			bulk_fetch_ids.uniq!
 			bulk_fetch(bulk_fetch_ids, odba_obj)
-			collection.each { |pair| 
-				pair.collect! { |item| 
+			collection.each { |pair|
+				pair.collect! { |item|
 					if(item.is_a?(ODBA::Stub))
             ## don't fetch: that may result in a conflict when storing.
             #fetch(item.odba_id, odba_obj)
@@ -271,7 +274,7 @@ module ODBA
             ce.odba_add_reference(odba_obj)
             ce.odba_object
 					else
-						item 
+						item
 					end
 				}
 			}
@@ -294,7 +297,7 @@ module ODBA
 			end
 		end
 		def fetch_named(name, odba_caller, &block) # :nodoc:
-			fetch_or_do(name, odba_caller) { 
+			fetch_or_do(name, odba_caller) {
 				dump = ODBA.storage.restore_named(name)
 				if(dump.nil?)
 					odba_obj = block.call
@@ -303,7 +306,7 @@ module ODBA
 					odba_obj
 				else
 					fetch_or_restore(name, dump, odba_caller)
-				end	
+				end
 			}
 		end
 		def fetch_or_do(obj_id, odba_caller, &block) # :nodoc:
@@ -332,7 +335,7 @@ module ODBA
         }
       }
     end
-		def fill_index(index_name, targets) 
+		def fill_index(index_name, targets)
 			self.indices[index_name].fill(targets)
 		end
 		# Checks wether the object identified by _odba_id_ has been loaded.
@@ -347,7 +350,7 @@ module ODBA
 			index = indices.fetch(index_name)
 			index.matches substring, limit, offset
 		end
-		# Returns a Hash-table containing all stored indices. 
+		# Returns a Hash-table containing all stored indices.
 		def indices
 			@indices ||= fetch_named('__cache_server_indices__', self) {
 				{}
@@ -420,14 +423,14 @@ module ODBA
     def print_stats
       fmh = " %-20s | %10s | %5s | %6s | %6s | %6s | %-20s\n"
       fmt = " %-20s | %10.3f | %5i | %6.3f | %6.3f | %6.3f | %s\n"
-      head = sprintf(fmh, 
+      head = sprintf(fmh,
                      "class", "total", "count", "min", "max", "avg", "callers")
-      line = "-" * head.length  
+      line = "-" * head.length
       puts line
       print head
       puts line
-      @loading_stats.sort_by { |key, val| 
-        val[:total_time] 
+      @loading_stats.sort_by { |key, val|
+        val[:total_time]
       }.reverse.each { |key, val|
         key = key.to_s
         if(key.length > 20)
@@ -482,13 +485,13 @@ module ODBA
     def size
       @prefetched.size + @fetched.size
     end
-		def start_cleaner # :nodoc: 
+		def start_cleaner # :nodoc:
 			@cleaner = Thread.new {
 				Thread.current.priority = self::class::CLEANER_PRIORITY
 				loop {
 					sleep(self::class::CLEANING_INTERVAL)
 					begin
-						clean 
+						clean
 					rescue StandardError => e
 						puts e
 						puts e.backtrace
@@ -547,14 +550,14 @@ module ODBA
         ODBA.storage.collection_remove(odba_id, key_dump)
       }.size
       changes + (collection - old_collection).each { |key_dump, value_dump|
-        ODBA.storage.collection_store(odba_id, key_dump, value_dump)	
+        ODBA.storage.collection_store(odba_id, key_dump, value_dump)
       }.size
     end
 		def store_object_connections(odba_id, target_ids) # :nodoc:
 			ODBA.storage.ensure_object_connections(odba_id, target_ids)
 		end
-		# Executes the block in a transaction. If the transaction fails, all 
-		# affected Persistable objects are reloaded from the db (which by then has 
+		# Executes the block in a transaction. If the transaction fails, all
+		# affected Persistable objects are reloaded from the db (which by then has
 		# also performed a rollback). Rollback is quite inefficient at this time.
 		def transaction(&block)
 			Thread.current[:txids] = []

data/lib/odba/cache_entry.rb

@@ -52,7 +52,7 @@ module ODBA
 			object
 		end
 		def odba_cut_connections!
-      @cache_entry_mutex.synchronize do 
+      @cache_entry_mutex.synchronize do
         @accessed_by.each { |object_id, odba_id|
           if((item = odba_id2ref(odba_id) || object_id2ref(object_id, odba_id)) \
             && item.respond_to?(:odba_cut_connection))
@@ -77,10 +77,10 @@ module ODBA
         && (retire_horizon > @last_access)
 		end
 		def odba_retire opts={}
-			# replace with stubs in accessed_by 
+			# replace with stubs in accessed_by
       instance = _odba_object
       if opts[:force]
-        @cache_entry_mutex.synchronize do 
+        @cache_entry_mutex.synchronize do
           @accessed_by.each do |object_id, odba_id|
             if item = odba_id2ref(odba_id)
               item.odba_stubize instance, opts

data/lib/odba/index.rb

@@ -23,7 +23,7 @@ module ODBA
       ]
     end
 		attr_accessor :origin_klass, :target_klass, :resolve_origin, :resolve_target,
-			:resolve_search_term, :index_name, :dictionary, :class_filter
+			:resolve_search_term, :index_name, :class_filter
 		def initialize(index_definition, origin_module)
 			@origin_klass = origin_module.instance_eval(index_definition.origin_klass.to_s)
 			@target_klass = origin_module.instance_eval(index_definition.target_klass.to_s)
@@ -31,7 +31,6 @@ module ODBA
 			@resolve_target = index_definition.resolve_target
 			@index_name = index_definition.index_name
 			@resolve_search_term = index_definition.resolve_search_term
-			@dictionary = index_definition.dictionary
       @class_filter = index_definition.class_filter
 		end
     def current_origin_ids(target_id) # :nodoc:
@@ -381,15 +380,12 @@ module ODBA
     end
 		def fetch_ids(search_term, meta=nil)  # :nodoc:
       limit = meta.respond_to?(:limit) && meta.limit
-			rows = ODBA.storage.retrieve_from_fulltext_index(@index_name, 
-				search_term, @dictionary, limit)
+			rows = ODBA.storage.retrieve_from_fulltext_index(@index_name, search_term, limit)
 			set_relevance(meta, rows)
 			rows.collect { |row| row.at(0) }
 		end
     def do_update_index(origin_id, search_text, target_id=nil) # :nodoc:
-      ODBA.storage.update_fulltext_index(@index_name, origin_id,
-                                         search_text, target_id, 
-                                         @dictionary)
+      ODBA.storage.update_fulltext_index(@index_name, origin_id, search_text, target_id)
     end
   end
 end

data/lib/odba/index_definition.rb

@@ -5,8 +5,8 @@ module ODBA
 	# IndexDefinition is a convenience class. Load a yaml-dump of this and pass it
 	# to Cache#create_index to introduce new indices 
 	class IndexDefinition
-		attr_accessor :index_name, :dictionary, :origin_klass, 
-			:target_klass, :resolve_search_term, :resolve_target, 
+		attr_accessor :index_name, :origin_klass,
+			:target_klass, :resolve_search_term, :resolve_target,
 			:resolve_origin, :fulltext, :init_source, :class_filter
 		def initialize
 			@index_name = ""
@@ -15,7 +15,6 @@ module ODBA
 			@resolve_search_term = ""
 			@resolve_target = ""
 			@resolve_origin = ""
-			@dictionary = ""
 			@init_source = ""
 			@fulltext = false
       @class_filter = :is_a?

data/lib/odba/marshal.rb

@@ -2,8 +2,8 @@
 #-- Marshal -- odba -- 29.04.2004 -- hwyss@ywesee.com rwaltert@ywesee.com mwalder@ywesee.com
 
 module ODBA
-	# Marshal is a simple extension of ::Marshal. To be able to store our data 
-	# using the DBI-Interface, we need to escape invalid characters from the 
+	# Marshal is a simple extension of ::Marshal. To be able to store our data
+	# using the DBI-Interface, we need to escape invalid characters from the
 	# standard binary dump.
 	module Marshal
 		def Marshal.dump(obj)
@@ -13,6 +13,9 @@ module ODBA
 		def Marshal.load(hexdump)
 			binary = [hexdump].pack('H*')
 			::Marshal.load(binary)
+    rescue => error
+      $stderr.puts "#{error}: hexdump is #{hexdump.inspect} #{error.backtrace.join("\n")}"
+      Date.new
 		end
 	end
 end