Commit 00888607 authored by Jérome Perrin's avatar Jérome Perrin

Update mroonga and groonga

 * https://github.com/mroonga/mroonga/commit/f4d3e6a612d346f690bbf68893e339ff0b69e5b8 might fix the crash we were observing with https://lab.nexedi.com/nexedi/slapos/-/blob/0fad9a6dcaf6f5750c03dcd2a6b42364207767ff/software/erp5/test/test/benchmarks.py , I ran this test 10 times without crash.

 * ~~There's a test failure in ERP5, but it does not seem harmful and we can have a workaround ( erp5!1993 )~~ In the end, the problem was fixed upstream so we backport the fix.

See merge request !1644
parents 4a0cb4ab ce4993db
From c5a43f8ac6cd4b690e83d0fe883939c670242d79 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Mon, 29 Sep 2014 09:42:24 +0200
Subject: [PATCH] add a temporary patch to respect more tokens in natural
language mode.
---
lib/ii.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/ii.c b/lib/ii.c
index 70c50720b..be994b301 100644
--- a/lib/ii.c
+++ b/lib/ii.c
@@ -12830,7 +12830,9 @@ grn_ii_similar_search_internal(grn_ctx *ctx, grn_ii_select_data *data)
? ((uint32_t)(data->optarg->similarity_threshold) > GRN_HASH_SIZE(h)
? GRN_HASH_SIZE(h)
: (uint32_t)(data->optarg->similarity_threshold))
- : (GRN_HASH_SIZE(h) >> 3) + 1;
+ : (GRN_HASH_SIZE(h) < 8
+ ? GRN_HASH_SIZE(h)
+ : ((GRN_HASH_SIZE(h) - 8) >> 3) + 8);
if (GRN_HASH_SIZE(h)) {
grn_id j, id;
float w2;
--
2.42.0
...@@ -15,12 +15,11 @@ extends = ...@@ -15,12 +15,11 @@ extends =
[groonga] [groonga]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://packages.groonga.org/source/groonga/groonga-13.0.1.tar.gz url = https://github.com/groonga/groonga/releases/download/v14.0.7/groonga-14.0.7.tar.gz
md5sum = d17d154c2ceffbf8b21d8ef6d3afa644 md5sum = b3d3223d704f507047c9dec766e1604e
groonga-plugin-dir = @@LOCATION@@/lib/groonga/plugins/ groonga-plugin-dir = @@LOCATION@@/lib/groonga/plugins/
# temporary patch to respect more tokens in natural language mode.
patches = patches =
${:_profile_base_location_}/groonga.patch#cc6a678acd478fc074e678c7b7dd09d8 ${:_profile_base_location_}/0001-add-a-temporary-patch-to-respect-more-tokens-in-natu.patch#f7ca3ec3ed8f8311bd5afdee0cfe0ce8
patch-options = -p1 patch-options = -p1
configure-options = configure-options =
--disable-static --disable-static
......
--- a/lib/ii.c
+++ b/lib/ii.c
@@ -10874,7 +10874,9 @@
? ((uint32_t)(data->optarg->similarity_threshold) > GRN_HASH_SIZE(h)
? GRN_HASH_SIZE(h)
:(uint32_t)(data->optarg->similarity_threshold))
- : (GRN_HASH_SIZE(h) >> 3) + 1;
+ : (GRN_HASH_SIZE(h) < 8
+ ? GRN_HASH_SIZE(h)
+ : ((GRN_HASH_SIZE(h) - 8) >> 3) + 8);
if (GRN_HASH_SIZE(h)) {
grn_id j, id;
float w2;
...@@ -135,8 +135,8 @@ md5sum = ba7abfae7947893c5a5343180808b0cb ...@@ -135,8 +135,8 @@ md5sum = ba7abfae7947893c5a5343180808b0cb
# as plugin-dir ( https://mariadb.com/kb/en/server-system-variables/#plugin_dir ) # as plugin-dir ( https://mariadb.com/kb/en/server-system-variables/#plugin_dir )
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://packages.groonga.org/source/mroonga/mroonga-13.01.tar.gz url = https://github.com/mroonga/mroonga/releases/download/v14.07/mroonga-14.07.tar.gz
md5sum = 062d9575fbf8759b529fdc46b077a9c1 md5sum = 86d98564a9bff2b993db284ce02c7260
pre-configure = pre-configure =
rm -rf fake_mariadb_source rm -rf fake_mariadb_source
mkdir -p fake_mariadb_source mkdir -p fake_mariadb_source
...@@ -159,6 +159,7 @@ make-targets = plugindir=${:plugin-dir} install ...@@ -159,6 +159,7 @@ make-targets = plugindir=${:plugin-dir} install
patch-options = -p1 patch-options = -p1
patches = patches =
${:_profile_base_location_}/mroonga_boolean.patch#c818568fe35ca6a4298f18e575d962a0 ${:_profile_base_location_}/mroonga_boolean.patch#c818568fe35ca6a4298f18e575d962a0
https://github.com/mroonga/mroonga/commit/8f080086a6b7b15b84169e66fd6bf6956644ef98.patch?full_index=1#a275fa738a09f804515f61f69b8e549a
environment = environment =
PATH=${binutils:location}/bin:${groonga:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s PATH=${binutils:location}/bin:${groonga:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
CPPFLAGS=-I${groonga:location}/include/groonga -I${pcre:location}/include CPPFLAGS=-I${groonga:location}/include/groonga -I${pcre:location}/include
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment