traject_horizon 0.10.0 → 0.10.1

data/lib/traject/horizon_reader.rb

@@ -123,15 +123,6 @@ module Traject
   # [jtds.jar_path]  Normally we'll use a distribution of jtds bundled with this gem.
   #                  But specify a filepath of a directory containing jtds jar(s),
   #                  and all jars in that dir will be loaded instead of our bundled jtds.
-  #
-  #
-  # Note: Could probably make this even faster by using a thread pool -- the bottleneck
-  # is probably processing into MARC, not the database query and streaming. But it's a
-  # bit tricky to refactor for concurrency there. Perhaps pull all the raw
-  # row values out and batch them in groups by bib#, then feed those lists
-  # to a threadpool. And then we'd just be fighting for CPU time with the
-  # threadpool for mapping, not sure if overall throughput increase would happen, would
-  # depend on exact environment.
   class HorizonReader
     attr_reader :settings
     attr_reader :things_to_close
@@ -145,7 +136,11 @@ module Traject
 
       require_jars!
 
-      @thread_pool = Traject::ThreadPool.new( settings["horizon.thread_pool"].to_i )
+      pool_size     = settings["horizon.thread_pool"].to_i
+
+      logger.debug("HorizonReader with thread pool size #{pool_size}")
+
+      @thread_pool  = Traject::ThreadPool.new( pool_size )
     end
 
     # Requires marc4j and jtds, and java_import's some classes.
@@ -309,8 +304,6 @@ module Traject
             @thread_pool.maybe_in_thread_pool(batch) do |batch|
               enhance_batch!(extra_connection, batch)
               batch.each do |r|
-                # set current_bib_id for error logging
-                current_bib_id = r['001'].value
                 yield r
               end
             end
@@ -428,10 +421,6 @@ module Traject
       logger.info("HorizonReader: Closed JDBC objects")
     end
 
-    def process_batch(batch)
-
-    end
-
     # Pass in an array of MARC::Records', adds fields for copy and item
     # info if so configured. Returns record_batch so you can chain if you want.
     def enhance_batch!(conn, record_batch)

data/lib/traject_horizon/version.rb

@@ -1,3 +1,3 @@
 module TrajectHorizon
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/traject_horizon.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
 end

metadata

@@ -1,65 +1,81 @@
 --- !ruby/object:Gem::Specification
 name: traject_horizon
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.10.0
+  version: 0.10.1
+  prerelease: 
 platform: ruby
 authors:
 - Jonathan Rochkind
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: traject
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
     none: false
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-description:
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 
 email:
 - jonathan@dnil.net
 executables: []
@@ -83,26 +99,26 @@ files:
 homepage: http://github.com/jrochkind/traject_horizon
 licenses:
 - MIT
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
+rubyforge_project: 
+rubygems_version: 1.8.23
+signing_key: 
 specification_version: 3
 summary: Horizon ILS MARC Exporter, a plugin for the traject tool
 test_files: