[WIP] search: disable batching in newer versions of Xapian, for now

[WIP] search: disable batching in newer versions of Xapian, for now

[Eric Wong]

This warrants further investigation...
---
 lib/PublicInbox/SearchIdx.pm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index f8249c5..114ff9e 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -43,6 +43,17 @@ sub new {
 			require File::Path;
 			File::Path::mkpath($dir);
 			$self->{batch_size} = 100;
+
+			# XXX temporary hack...
+			my $v = ((Search::Xapian::major_version << 16) |
+				 (Search::Xapian::minor_version << 8 ) |
+				 Search::Xapian::revision());
+			if ($v >= 0x10222) { # >= 1.2.22
+				warn "batch size unsupported in ",
+					$Search::Xapian::VERSION, "\n";
+				$self->{batch_size} = undef;
+			}
+
 			$flag = Search::Xapian::DB_CREATE_OR_OPEN;
 			_lock_acquire($self);
 		}
-- 
EW

Re: [WIP] search: disable batching in newer versions of Xapian, for now

[Eric Wong]

Eric Wong <e@80x24.org> wrote:
>  			$self->{batch_size} = 100;
> +
> +			# XXX temporary hack...
> +			my $v = ((Search::Xapian::major_version << 16) |
> +				 (Search::Xapian::minor_version << 8 ) |
> +				 Search::Xapian::revision());
> +			if ($v >= 0x10222) { # >= 1.2.22

			if ($v >= 0x1222) { # >= 1.2.22

Meh, I need sleep, this workaround is bogus even with the above
fix.

> +				warn "batch size unsupported in ",
> +					$Search::Xapian::VERSION, "\n";
> +				$self->{batch_size} = undef;
> +			}
> +
>  			$flag = Search::Xapian::DB_CREATE_OR_OPEN;
>  			_lock_acquire($self);
>  		}