From 0bcfb31f391ff420b4f242474b87726f864a19e4 Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Wed, 25 Jan 2017 10:56:23 -0500 Subject: [PATCH] LP#1657885: Inform Vandelay of new chunking/bundling logic There is a naive attempt to force immediate streaming of results in Vandelay for certain processes, but it both only helps a little, and breaks under the new OpenSRF bundling/chunking logic. So, we'll drop it where it's not directly configurable, and test for the appropriate features where we can. Signed-off-by: Mike Rylander Signed-off-by: Kathy Lussier --- .../lib/OpenILS/Application/Vandelay.pm | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm index 39c857f209..a56be962f6 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm @@ -330,7 +330,8 @@ __PACKAGE__->register_method( method => "process_spool", api_level => 1, argc => 3, - max_chunk_size => 0, + #max_chunk_size => 0, + max_bundle_count => 1, record_type => 'bib' ); __PACKAGE__->register_method( @@ -338,7 +339,8 @@ __PACKAGE__->register_method( method => "process_spool", api_level => 1, argc => 3, - max_chunk_size => 0, + #max_chunk_size => 0, + max_bundle_count => 1, record_type => 'auth' ); @@ -348,7 +350,8 @@ __PACKAGE__->register_method( api_level => 1, argc => 3, stream => 1, - max_chunk_size => 0, + #max_chunk_size => 0, + max_bundle_count => 1, record_type => 'bib' ); __PACKAGE__->register_method( @@ -357,7 +360,8 @@ __PACKAGE__->register_method( api_level => 1, argc => 3, stream => 1, - max_chunk_size => 0, + #max_chunk_size => 0, + max_bundle_count => 1, record_type => 'auth' ); @@ -779,7 +783,8 @@ __PACKAGE__->register_method( api_level => 1, argc => 2, stream => 1, - max_chunk_size => 0, + #max_chunk_size => 0, + max_bundle_count => 1, record_type => 'bib', signature => { desc => q/ @@ -795,7 +800,8 @@ __PACKAGE__->register_method( api_level => 1, argc => 2, stream => 1, - max_chunk_size => 0, + #max_chunk_size => 0, + max_bundle_count => 1, record_type => 'auth' ); @@ -901,7 +907,7 @@ sub import_record_list_impl { report_all => $$args{report_all} }; - $conn->max_chunk_count(1) if $$args{report_all}; + $conn->max_chunk_count(1) if (!$conn->can('max_bundle_size') && $conn->can('max_chunk_size') && $$args{report_all}); my $auto_overlay_exact = $$args{auto_overlay_exact}; my $auto_overlay_1match = $$args{auto_overlay_1match}; -- 2.43.2