rdf-lmdb 0.2.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44a37cfc92db953f40ab6973acdacd645d652f1b5cc0c4e2524727eadaddbe3a
-  data.tar.gz: 25fffce08cbe02ca7baeacd485bd1bf8124cd735344a6203b51c79bbcba7f33d
+  metadata.gz: ea35cfcc72e22d7a71f047728b412575ce712691c2815a3693d23f94909a78b2
+  data.tar.gz: ab6e65528c0b9bc70bf4d18a7f47b2f47206dbfd1d09aa99c4551a799694b3a0
 SHA512:
-  metadata.gz: 5efc6ee2af73f21d4e1810f176b4652b78517d396f7a13ff70680ad5042a4b43549f923845abf39e0b79193806d3ae10452e3f2aa090f577c796824d4a0ae2de
-  data.tar.gz: '08f9e412178177a143b513a9379606a4290f1fa89de0f74afed6dd9d6068d63813bc3ea8c032f373866f0b9d9a1b066b4366b50e39b549b0569716ed1356b666'
+  metadata.gz: 483d8b372297ee978595110432dd21170cd34fafde285b7f0f1269fea9d5d06428066b19e8e9b6cf294c6e71dbf378e1b30e37215e36810fae19dd6ebbeda5fc
+  data.tar.gz: 20fac6ce5e493fa10ef923bd12e0e549e33b83a46f859b623f5fe5838ab42348ec1ef67884bfbe7baaa396ae1937a6bb3256897f86e8fd0343b0705ac2ed423d

data/README.md

@@ -1,6 +1,6 @@
 # RDF::LMDB - Lightweight, persistent, transactional RDF store
 
-This library implements `RDF::Repository` using the Symax Lightning
+This library implements `RDF::Repository` using the Symas Lightning
 MDB key-value database. It is intended to be a basic, durable,
 locally-attached quad store, that avails itself of the properties of
 LMDB.

data/lib/rdf/lmdb/version.rb

@@ -1,5 +1,5 @@
 module RDF
   module LMDB
-    VERSION = "0.2.1"
+    VERSION = "0.3.2"
   end
 end

data/lib/rdf/lmdb.rb

@@ -65,13 +65,13 @@ module RDF
       def initialize repository,
           graph_name: nil, mutable: false, **options, &block
         @repository = repository
-        @snapshot = 
+        @snapshot =
           repository.supports?(:snapshots) ? repository.snapshot : repository
         @options    = options.dup
         @mutable    = mutable
         @graph_name = graph_name
 
-        raise TransactionError, 
+        raise TransactionError,
           'Tried to open a mutable transaction on an immutable repository' if
           @mutable && !@repository.mutable?
 
@@ -110,11 +110,20 @@ module RDF
 
     #
     # RDF::LMDB::Repository implements a lightweight, transactional,
-    # locally-attached data store using Symax LMDB.
+    # locally-attached data store using Symas LMDB.
     #
     class Repository < ::RDF::Repository
       private
 
+      # for the mapsize parameter
+      UNITS = { nil => 1 }
+      'kmgtpe'.split('').each_with_index do |x, i|
+        j = i + 1
+        UNITS[x] = 1000 ** j
+        UNITS[x.upcase] = 1024 ** j
+      end
+      UNITS.freeze
+
       DEFAULT_TX_CLASS = RDF::LMDB::Transaction
 
       SUPPORTS = %i[
@@ -126,10 +135,20 @@ module RDF
         'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
       ].pack('H*').freeze
 
+      def int_bytes bytes
+        m = /\A\s*(\d+)([kmgtpeKMGTPE])?\s*\Z/s.match bytes.to_s
+        raise ArgumentError, "#{bytes} not a viable byte size" unless m
+
+        factor, unit = m.captures
+        factor.to_i * UNITS[unit]
+      end
+
       def init_lmdb dir, **options
         dir = Pathname(dir).expand_path
         dir.mkdir unless dir.exist?
 
+        options[:mapsize] = int_bytes options[:mapsize] if options[:mapsize]
+
         # fire up the environment
         @lmdb = ::LMDB.new dir, **options
 
@@ -198,7 +217,7 @@ Currently you have to dump from the old layout and reload the new one. Sorry!
 
       def int_for term
         case term
-        when nil then 0
+        when nil, RDF::Query::Variable then 0
         when RDF::Statement
           terms = term.to_a.map { |t| int_for t }
           return if terms.include? nil # the statement implicitly not here
@@ -420,7 +439,7 @@ Currently you have to dump from the old layout and reload the new one. Sorry!
         seq = []
         out = string.unpack('J*').map do |i|
           seq << i
-          j = resolve_term(i, cache: cache, write: write) 
+          j = resolve_term(i, cache: cache, write: write)
           [i, j]
         end.to_h
 
@@ -518,7 +537,7 @@ Currently you have to dump from the old layout and reload the new one. Sorry!
 
             # warn thash.inspect, ihash.inspect
 
-            # note 
+            # note
             if gint = ihash[:graph_name]
               gpack = [gint].pack ?J
               return unless @dbs[:stmt2g].has? spack, gpack
@@ -669,8 +688,18 @@ Currently you have to dump from the old layout and reload the new one. Sorry!
       end
 
       def delete_statement statement
+        # note that this does not get called by `delete_statements`,
+        # because we want the transaction on the outside.
         complete! statement
-        @lmdb.transaction { |t| rm_one statement; t.commit }
+        # warn "WTF LOL #{statement.inspect}"
+        @lmdb.transaction do |t|
+          if statement.variable?
+            query(statement).each { |stmt| rm_one stmt }
+          else
+            rm_one statement
+          end
+          t.commit
+        end
         nil
       end
 
@@ -688,12 +717,25 @@ Currently you have to dump from the old layout and reload the new one. Sorry!
       def delete_statements statements
         @lmdb.transaction do |t|
           hashes = []
-          statements.each do |statement|
-            complete! statement
-            hashes += rm_one statement, scan: false
+
+          # we don't know what's in here but it may contain statements
+          # with variables, in which case we have to handle them
+          enums = [statements]
+          # also note that RDF::Util::Coercions#coerce_statements
+          # which is called in advance of this is supposed to take
+          # care of this situation but doesn't for some reason.
+          until enums.empty?
+            statements = enums.shift
+            statements.each do |statement|
+              if statement.variable?
+                enums << query(statement)
+              else
+                hashes += rm_one statement, scan: false
+              end
+            end
           end
 
-          clean_terms hashes
+          clean_terms hashes.uniq
           t.commit
         end
 
@@ -792,7 +834,8 @@ Currently you have to dump from the old layout and reload the new one. Sorry!
       # end
 
       def delete_insert deletes, inserts
-        ret = super(deletes, inserts)
+        ret = nil
+        @lmdb.transaction { ret = super(deletes, inserts) }
         commit_transaction # this is to satiate the test suite
         ret
       end
@@ -835,7 +878,7 @@ Currently you have to dump from the old layout and reload the new one. Sorry!
         pack = [int].pack ?J
         @dbs[:s2stmt].has? pack
       end
-    
+
       def has_predicate? predicate
         raise ArgumentError, 'predicate must be an RDF::Term' unless
           predicate.is_a? RDF::Term
@@ -843,7 +886,7 @@ Currently you have to dump from the old layout and reload the new one. Sorry!
         pack = [int].pack ?J
         @dbs[:p2stmt].has? pack
       end
-    
+
       def has_object? object
         raise ArgumentError, 'object must be an RDF::Term' unless
           object.is_a? RDF::Term

data/rdf-lmdb.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['code@doriantaylor.com']
   spec.license       = 'Apache-2.0'
   spec.homepage      = 'https://github.com/doriantaylor/rb-rdf-lmdb'
-  spec.summary       = 'Symax LMDB back-end for RDF::Repository'
+  spec.summary       = 'Symas LMDB back-end for RDF::Repository'
   spec.description   = <<-DESC
 This module implements RDF::Repository on top of LMDB, a fast and
 robust key-value store.
@@ -25,16 +25,16 @@ robust key-value store.
   spec.require_paths = ["lib"]
 
   # ruby
-  spec.required_ruby_version = '~> 2.0'
+  spec.required_ruby_version = '>= 2.0'
 
   # dev/test dependencies
-  spec.add_development_dependency 'bundler',  '~> 2.0'
-  spec.add_development_dependency 'rake',     '~> 13.0'
-  spec.add_development_dependency 'rspec',    '~> 3.0'
-  spec.add_development_dependency 'rdf-spec', '~> 3.0'
+  spec.add_development_dependency 'bundler',  '~> 2'
+  spec.add_development_dependency 'rake',     '~> 13'
+  spec.add_development_dependency 'rspec',    '~> 3'
+  spec.add_development_dependency 'rdf-spec', '~> 3'
 
   # stuff we use
-  spec.add_runtime_dependency 'unf',  '~> 0.1.3'
-  spec.add_runtime_dependency 'rdf',  '~> 3.1.3'
-  spec.add_runtime_dependency 'lmdb', '~> 0.5.3'
+  spec.add_runtime_dependency 'unf',  '~> 0.1'
+  spec.add_runtime_dependency 'rdf',  '~> 3'
+  spec.add_runtime_dependency 'lmdb', '~> 0.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-lmdb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Dorian Taylor
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: lmdb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.1
 description: |
   This module implements RDF::Repository on top of LMDB, a fast and
   robust key-value store.
@@ -134,13 +134,13 @@ homepage: https://github.com/doriantaylor/rb-rdf-lmdb
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -149,8 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.15
+signing_key:
 specification_version: 4
-summary: Symax LMDB back-end for RDF::Repository
+summary: Symas LMDB back-end for RDF::Repository
 test_files: []