Merge pull request #384 from kiwix/xapian-1.4.14

Bump-up Xapian to 1.4.14 (#382)

appveyor/install_xapian.cmd

@@ -1,9 +1,9 @@
 REM ========================================================
 REM Install xapian
-curl -fsSL -O http://download.kiwix.org/dev/xapian-core-1.4.10.zip || exit /b 1
+curl -fsSL -O http://download.kiwix.org/dev/xapian-core-1.4.14.zip || exit /b 1
-7z x xapian-core-1.4.10.zip || exit /b 1
+7z x xapian-core-1.4.14.zip || exit /b 1
-cd xapian-core-1.4.10
+cd xapian-core-1.4.14
 mkdir build
 cd build
-%MINGW64_RUN% "cd /c/Projects/kiwix-build/xapian-core-1.4.10/build && /c/Projects/kiwix-build/appveyor/build_xapian.sh" > build_xapian.log || exit /b 1
+%MINGW64_RUN% "cd /c/Projects/kiwix-build/xapian-core-1.4.14/build && /c/Projects/kiwix-build/appveyor/build_xapian.sh" > build_xapian.log || exit /b 1
 cd ..\..

kiwixbuild/dependencies/xapian.py

@@ -12,11 +12,12 @@ class Xapian(Dependency):
     name = "xapian-core"
 
     class Source(ReleaseDownload):
-        archive = Remotefile('xapian-core-1.4.10.tar.xz',
+        archive = Remotefile('xapian-core-1.4.14.tar.xz',
-                             '68669327e08544ac88fe3473745dbcae4e8e98d5060b436c4d566f1f78709bb8')
+                             '975a7ac018c9d34a15cc94a3ecc883204403469f748907e5c4c64d0aec2e4949')
         patches = [
             'xapian_sys_types.patch',
-            'xapian_fix_include_errno.patch'
+            'xapian_fix_include_errno.patch',
+            'xapian_remote.patch'
         ]
 
     class Builder(MakeBuilder):

kiwixbuild/patches/xapian_remote.patch

@@ -0,0 +1,47 @@
+diff -ur xapian-core-1.4.14/matcher/multimatch.cc xapian-core-1.4.14.patched/matcher/multimatch.cc
+--- xapian-core-1.4.14/matcher/multimatch.cc	2019-11-23 08:12:20.000000000 +0100
++++ xapian-core-1.4.14.patched/matcher/multimatch.cc	2019-12-08 20:14:24.948683845 +0100
+@@ -441,9 +441,11 @@
+     // number of matching documents which is higher than the number of
+     // documents it returns (because it wasn't asked for more documents).
+     Xapian::doccount definite_matches_not_seen = 0;
++#ifdef XAPIAN_HAS_REMOTE_BACKEND
+     // Track these for calculating uncollapsed_upper_bound for the local.
+     size_t n_remotes = 0;
+     Xapian::doccount remote_uncollapsed_upper_bound = 0;
++#endif
+     try {
+ 	for (size_t i = 0; i != leaves.size(); ++i) {
+ 	    // Pick the highest total subqueries answer amongst the
+@@ -453,6 +455,7 @@
+ 	    Xapian::termcount total_subqs_i = 0;
+ 	    PostList* pl = leaves[i]->get_postlist(this, &total_subqs_i);
+ 	    total_subqs = max(total_subqs, total_subqs_i);
++#ifdef XAPIAN_HAS_REMOTE_BACKEND
+ 	    if (is_remote[i]) {
+ 		++n_remotes;
+ 		RemoteSubMatch* rem_match =
+@@ -469,6 +472,7 @@
+ 		    definite_matches_not_seen -= first + maxitems;
+ 		}
+ 	    }
++#endif
+ 	    postlists.push_back(pl);
+ 	}
+     } catch (...) {
+@@ -950,6 +954,7 @@
+     Xapian::doccount uncollapsed_lower_bound = matches_lower_bound;
+     Xapian::doccount uncollapsed_upper_bound = matches_upper_bound;
+     Xapian::doccount uncollapsed_estimated = matches_estimated;
++#ifdef XAPIAN_HAS_REMOTE_BACKEND
+     if (collapser && n_remotes) {
+ 	// We need to adjust uncollapsed_upper_bound if there are multiple
+ 	// shards and some or all are remote.  The lower bound and estimate
+@@ -971,6 +976,7 @@
+ 	    }
+ 	}
+     }
++#endif
+     if (items.size() < max_msize) {
+ 	// We have fewer items in the mset than we tried to get for it, so we
+ 	// must have all the matches in it.

kiwixbuild/versions.py

@@ -42,13 +42,13 @@ release_versions = {
 
 # This is the "version" of the whole base_deps_versions dict.
 # Change this when you change base_deps_versions.
-base_deps_meta_version = '55'
+base_deps_meta_version = '57'
 
 base_deps_versions = {
   'zlib' : '1.2.8',
   'lzma' : '5.2.4',
   'uuid' : '1.43.4',
-  'xapian-core' : '1.4.10',
+  'xapian-core' : '1.4.14',
   'mustache' : '3.2',
   'pugixml' : '1.2',
   'libmicrohttpd' : '0.9.66',