traject_horizon 1.1.1 → 1.2.0

data/lib/traject/horizon_reader.rb

@@ -210,14 +210,18 @@ module Traject
       EOS
 
       sql = <<-EOS
-        SELECT b.*, bc.staff_only
+        SELECT b.*
         FROM fullbib b
-        JOIN bib_control bc on b.bib# = bc.bib#
         WHERE 1 = 1
       EOS
 
+      # Oddly, Sybase seems to do a lot BETTER when we make this a sub-query
+      # as opposed to a join. Join was resulting in "Can't allocate space for object 'temp worktable' in database 'tempdb'"
+      # from Sybase, but somehow we get away with subquery?
+      #
+      # Note this subquery we managed to not refer to outer scope, that's the key. 
       if settings["horizon.public_only"].to_s == "true"
-        sql += " AND staff_only != 1"
+        sql+= " AND b.bib# NOT IN (SELECT DISTINCT bc.bib# from bib_control bc WHERE bc.staff_only = 1) "
       end
 
       # settings should not be coming from untrusted user input not going
@@ -231,19 +235,21 @@ module Traject
         sql += " AND " + clauses.join(" AND ") + " "
       end
 
-      # without the order by, rows USUALLY come back in order anyway,
-      # but sometimes they don't -- when they don't, it can cause one real
+      # without the order by, rows come back in mostly the right order,
+      # by bib#, but fairly common do NOT as well.
+      # -- when they don't, it can cause one real
       # record to be split up into multiple partial output record, which
       # cna overwrite each other in the solr index.
       #
-      # So we sort -- which seems to make query results come back somewhat
-      # slower, but SEEMS to be managagle. Ideally we might include 'tagord'
+      # So we sort -- which makes query slower, and makes it a lot harder
+      # to avoid Sybase "cannot allocate space" errors, but we've got
+      # no real choice. Ideally we might include 'tagord'
       # in the sort too, but that seems to make performance even worse,
       # we're willing to risk tags not being reassembled in exactly the
       # right order, usually they are anyway, and it doesn't usually matter anyway.
       sql+= " ORDER BY b.bib# " # ", tagord" would be even better, but slower.
 
-      pstmt = conn.prepareStatement(sql);
+      pstmt = conn.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
 
       # this may be what's neccesary to keep the driver from fetching
       # entire result set into memory.
@@ -582,7 +588,7 @@ module Traject
       # It might be higher performance to refactor to re-use the same prepared statement
       # for each item/copy fetch... but appears to be no great way to do that in JDBC3
       # where you need to parameterize "IN" values. JDBC4 has got it, but jTDS is just JDBC3.
-      pstmt = conn.prepareStatement(sql);
+      pstmt = conn.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
       rs = pstmt.executeQuery
 
 
@@ -679,6 +685,8 @@ module Traject
 
         "jdbc:jtds:#{jtds_type}://#{host}:#{port}/#{database};user=#{user}"
       end
+      # Not sure if useCursors makes a difference, but just in case.
+      url += ";useCursors=true"
 
       if include_password
         password  = settings['horizon.password'] or raise ArgumentError.new("Need horizon.password setting")

data/lib/traject_horizon/version.rb

@@ -1,3 +1,3 @@
 module TrajectHorizon
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,100 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: traject_horizon
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Jonathan Rochkind
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: traject
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: marc-marc4j
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: marc-marc4j
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: ensure_valid_encoding
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ensure_valid_encoding
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.3
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: bundler
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.5.3
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: minitest
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   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: []
@@ -119,28 +132,30 @@ files:
 homepage: http://github.com/jrochkind/traject_horizon
 licenses:
 - MIT
-metadata: {}
-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'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
-specification_version: 4
+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:
 - test/horizon_bib_auth_merge_test.rb
 - test/horizon_convert_text_test.rb
 - test/test_helper.rb
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: c445af099fb059edc31fcf8a82737032e97ea149
-  data.tar.gz: 3db072af3d1202b9235d4a0dbd9c3fcd2c29699f
-SHA512:
-  metadata.gz: 53780c5c0e8eb1d3f3929f4bb3b42f688decfafddd0c1e38ad2920b2f9e5ec690cbd656255d3d9d4f44e10bcc73b3868ce203d201e54f212360d0ffff613fca6
-  data.tar.gz: af84bb6b374d0bf2f4489361c9cf524b2670511369eefe0ec615f3d5b7bf0fde5950ac17466d5659fde59192e68be0f28bc531214b19faf5a993d05a9f70d49b