dor-services 6.6.0 → 6.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03910688a2a69cb49c106e7880699b27afc3d5003c5bae6dea3bb355389f5fab'
-  data.tar.gz: 8486a5b5fb60208f4bd8565e2dae88aba9eb0f8247684e7a01fa05d5a1995cce
+  metadata.gz: 1cd18417e804e157e21f34db466b6dcd63931274bde523445a33837c8be5ccbd
+  data.tar.gz: acd804769d9ba047c1f93407aa84fdf4e965e7fac117640dd5b284723e345dcf
 SHA512:
-  metadata.gz: 9d0f4c34c5a90c92cd7981cfbe68d0fd6ec305a51e66b6d19451edb40f3d591496d26a024dc41a6f795b7fb8b58a3765482f8412bff9c8f32340961e21df8be0
-  data.tar.gz: 799de786b209a5549af2e3f68c318f92e69bd02b2a58fac0b51eb51582231a5ca5675682acb704648a9473f77b9d49fd2f00400af00f455c3b7984a660db85f5
+  metadata.gz: adbfbd13f0ddd200c69d55761b30cdf485c93cd0339c547df35ef9661391f5681522b9e020e88b8bc3991d63dbdf52dd38ba682668fca6f65ec3fbef3df915c9
+  data.tar.gz: 47dcf1212aebc8d515f328311d847d93754be771b7d530b2fc9a43a53f62b5705d8daae709eee9bc7e6e3aac990a790ef1e5e3247c33a7851d32488a2544ed10

data/lib/dor/indexers/workflow_indexer.rb

@@ -19,7 +19,7 @@ module Dor
 
     private
 
-    # @returns [Array<Dor::WorkflowDocument>]
+    # @return [Array<Dor::WorkflowDocument>]
     def workflows
       resource.workflows.workflows
     end

data/lib/dor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dor
-  VERSION = '6.6.0'
+  VERSION = '6.6.1'
 end

data/lib/dor/workflow/document.rb

@@ -7,6 +7,18 @@ module Dor
       include SolrDocHelper
       include ::OM::XML::Document
 
+      ERROR_OMISSION = '... (continued)'
+      private_constant :ERROR_OMISSION
+
+      # see https://lucene.apache.org/core/7_3_1/core/org/apache/lucene/util/BytesRefHash.MaxBytesLengthExceededException.html
+      MAX_ERROR_LENGTH = 32_768 - 2 - ERROR_OMISSION.length
+      private_constant :MAX_ERROR_LENGTH
+
+      WF_SOLR_TYPE = :string
+      private_constant :WF_SOLR_TYPE
+      WF_SOLR_ATTRS = [:symbol].freeze
+      private_constant :WF_SOLR_ATTRS
+
       set_terminology do |t|
         t.root(path: 'workflow')
         t.repository(path: { attribute: 'repository' })
@@ -88,14 +100,13 @@ module Dor
       def to_solr(solr_doc = {}, *_args)
         wf_name = workflowId.first
         repo = repository.first
-        wf_solr_type = :string
-        wf_solr_attrs = [:symbol]
-        add_solr_value(solr_doc, 'wf',     wf_name, wf_solr_type, wf_solr_attrs)
-        add_solr_value(solr_doc, 'wf_wps', wf_name, wf_solr_type, wf_solr_attrs)
-        add_solr_value(solr_doc, 'wf_wsp', wf_name, wf_solr_type, wf_solr_attrs)
+
+        add_solr_value(solr_doc, 'wf',     wf_name, WF_SOLR_TYPE, WF_SOLR_ATTRS)
+        add_solr_value(solr_doc, 'wf_wps', wf_name, WF_SOLR_TYPE, WF_SOLR_ATTRS)
+        add_solr_value(solr_doc, 'wf_wsp', wf_name, WF_SOLR_TYPE, WF_SOLR_ATTRS)
         status = processes.empty? ? 'empty' : (workflow_should_show_completed?(processes) ? 'completed' : 'active')
         errors = processes.count(&:error?)
-        add_solr_value(solr_doc, 'workflow_status', [wf_name, status, errors, repo].join('|'), wf_solr_type, wf_solr_attrs)
+        add_solr_value(solr_doc, 'workflow_status', [wf_name, status, errors, repo].join('|'), WF_SOLR_TYPE, WF_SOLR_ATTRS)
 
         processes.each do |process|
           next unless process.status.present?
@@ -104,22 +115,23 @@ module Dor
           if !process.date_time.blank? && process.status && (process.status == 'completed' || process.status == 'error')
             solr_doc["wf_#{wf_name}_#{process.name}_dttsi"] = Time.parse(process.date_time).utc.iso8601
           end
-          # index the error message without the druid so we hopefully get some overlap
-          add_solr_value(solr_doc, 'wf_error', "#{wf_name}:#{process.name}:#{process.error_message}", wf_solr_type, wf_solr_attrs) if process.error_message
-          add_solr_value(solr_doc, 'wf_wsp', "#{wf_name}:#{process.status}", wf_solr_type, wf_solr_attrs)
-          add_solr_value(solr_doc, 'wf_wsp', "#{wf_name}:#{process.status}:#{process.name}", wf_solr_type, wf_solr_attrs)
-          add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}", wf_solr_type, wf_solr_attrs)
-          add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}:#{process.status}", wf_solr_type, wf_solr_attrs)
-          add_solr_value(solr_doc, 'wf_swp', process.status.to_s, wf_solr_type, wf_solr_attrs)
-          add_solr_value(solr_doc, 'wf_swp', "#{process.status}:#{wf_name}", wf_solr_type, wf_solr_attrs)
-          add_solr_value(solr_doc, 'wf_swp', "#{process.status}:#{wf_name}:#{process.name}", wf_solr_type, wf_solr_attrs)
+
+          index_error_message(solr_doc, wf_name, process)
+
+          add_solr_value(solr_doc, 'wf_wsp', "#{wf_name}:#{process.status}", WF_SOLR_TYPE, WF_SOLR_ATTRS)
+          add_solr_value(solr_doc, 'wf_wsp', "#{wf_name}:#{process.status}:#{process.name}", WF_SOLR_TYPE, WF_SOLR_ATTRS)
+          add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}", WF_SOLR_TYPE, WF_SOLR_ATTRS)
+          add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}:#{process.status}", WF_SOLR_TYPE, WF_SOLR_ATTRS)
+          add_solr_value(solr_doc, 'wf_swp', process.status.to_s, WF_SOLR_TYPE, WF_SOLR_ATTRS)
+          add_solr_value(solr_doc, 'wf_swp', "#{process.status}:#{wf_name}", WF_SOLR_TYPE, WF_SOLR_ATTRS)
+          add_solr_value(solr_doc, 'wf_swp', "#{process.status}:#{wf_name}:#{process.name}", WF_SOLR_TYPE, WF_SOLR_ATTRS)
           next unless process.state != process.status
 
-          add_solr_value(solr_doc, 'wf_wsp', "#{wf_name}:#{process.state}:#{process.name}", wf_solr_type, wf_solr_attrs)
-          add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}:#{process.state}", wf_solr_type, wf_solr_attrs)
-          add_solr_value(solr_doc, 'wf_swp', process.state.to_s, wf_solr_type, wf_solr_attrs)
-          add_solr_value(solr_doc, 'wf_swp', "#{process.state}:#{wf_name}", wf_solr_type, wf_solr_attrs)
-          add_solr_value(solr_doc, 'wf_swp', "#{process.state}:#{wf_name}:#{process.name}", wf_solr_type, wf_solr_attrs)
+          add_solr_value(solr_doc, 'wf_wsp', "#{wf_name}:#{process.state}:#{process.name}", WF_SOLR_TYPE, WF_SOLR_ATTRS)
+          add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}:#{process.state}", WF_SOLR_TYPE, WF_SOLR_ATTRS)
+          add_solr_value(solr_doc, 'wf_swp', process.state.to_s, WF_SOLR_TYPE, WF_SOLR_ATTRS)
+          add_solr_value(solr_doc, 'wf_swp', "#{process.state}:#{wf_name}", WF_SOLR_TYPE, WF_SOLR_ATTRS)
+          add_solr_value(solr_doc, 'wf_swp', "#{process.state}:#{wf_name}:#{process.name}", WF_SOLR_TYPE, WF_SOLR_ATTRS)
         end
 
         solr_doc[Solrizer.solr_name('wf_wps', :symbol)]&.uniq!
@@ -133,6 +145,17 @@ module Dor
       def inspect
         "#<#{self.class.name}:#{object_id}>"
       end
+
+      private
+
+      # index the error message without the druid so we hopefully get some overlap
+      # truncate to avoid org.apache.lucene.util.BytesRefHash$MaxBytesLengthExceededException
+      def index_error_message(solr_doc, wf_name, process)
+        return unless process.error_message
+
+        error_message = "#{wf_name}:#{process.name}:#{process.error_message}".truncate(MAX_ERROR_LENGTH, omission: ERROR_OMISSION)
+        add_solr_value(solr_doc, 'wf_error', error_message, WF_SOLR_TYPE, WF_SOLR_ATTRS)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 6.6.0
+  version: 6.6.1
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -504,14 +504,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.65.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.65.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement