Accepting request 987493 from GNOME:Factory

Scripted push from GNOME:Next (forwarded request 987420 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/987493
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tracker?expand=0&rev=149
This commit is contained in:
Dominique Leuenberger 2022-07-09 14:59:37 +00:00 committed by Git OBS Bridge
commit 84a88143b8
5 changed files with 20 additions and 52 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5ad6f5bc97781ebf55ecd6947cd4ae7ff4192516580d10bd8380f1dd47196ed2
size 1976268

3
tracker-3.3.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0ed2b98918956d6f16429c607dd8a14c84f4da0a48970fd2eb8c93aba3cf9913
size 1977512

View File

@ -1,46 +0,0 @@
diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
index 2a29008b88a362cfa84762b2620739d69dd7c918..33decd3e28ca9856db017feaa216ce70dcb4d439 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -3866,20 +3866,34 @@ rebuild_fts_tokens (TrackerDataManager *manager,
TrackerDBInterface *iface,
GError **error)
{
+ TrackerProperty **properties;
GHashTableIter iter;
gchar *graph;
+ gboolean has_fts = FALSE;
+ guint len, i;
- g_debug ("Rebuilding FTS tokens, this may take a moment...");
- if (!tracker_db_interface_sqlite_fts_rebuild_tokens (iface, "main", error))
- return FALSE;
+ properties = tracker_ontologies_get_properties (manager->ontologies, &len);
- g_hash_table_iter_init (&iter, manager->graphs);
- while (g_hash_table_iter_next (&iter, (gpointer*) &graph, NULL)) {
- if (!tracker_db_interface_sqlite_fts_rebuild_tokens (iface, graph, error))
+ for (i = 0; i < len; i++) {
+ has_fts |= tracker_property_get_fulltext_indexed (properties[i]);
+ if (has_fts)
+ break;
+ }
+
+ if (has_fts) {
+ g_debug ("Rebuilding FTS tokens, this may take a moment...");
+ if (!tracker_db_interface_sqlite_fts_rebuild_tokens (iface, "main", error))
return FALSE;
+
+ g_hash_table_iter_init (&iter, manager->graphs);
+ while (g_hash_table_iter_next (&iter, (gpointer*) &graph, NULL)) {
+ if (!tracker_db_interface_sqlite_fts_rebuild_tokens (iface, graph, error))
+ return FALSE;
+ }
+
+ g_debug ("FTS tokens rebuilt");
}
- g_debug ("FTS tokens rebuilt");
/* Update the stamp file */
tracker_db_manager_tokenizer_update (manager->db_manager);

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Jul 7 11:50:16 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 3.3.2:
+ Avoid redundant queries in TrackerNotifiers proxied through an
D-Bus connection.
+ Do not attempt to rebuild non-existing FTS tables on parser
updates.
+ Convert values to the right type when propagating insertions
over superproperties.
+ Fix test to handle SQLite >= 3.39.0.
+ Fix handling of nrl:modified after opening existing databases.
+ Linking fixes to CLI executables.
- Drop tracker-do-not-rebuild-non-existing-FTS-tables.patch: fixed
upstream.
-------------------------------------------------------------------
Wed Jul 6 07:49:28 UTC 2022 - Alynx Zhou <alynx.zhou@suse.com>

View File

@ -21,15 +21,13 @@
%define RPMTrackerAPI 3_0
Name: tracker
Version: 3.3.1
Version: 3.3.2
Release: 0
Summary: Object database, tag/metadata database, search tool and indexer
License: GPL-2.0-or-later
Group: Productivity/Other
URL: https://wiki.gnome.org/Projects/Tracker
Source0: https://download.gnome.org/sources/tracker/3.3/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM tracker-do-not-rebuild-non-existing-FTS-tables.patch bsc#1201246 glgo#GNOME/tracker!515 alynx.zhou@suse.com -- Prevent rebuilding non-existing FTS tables
Patch0: tracker-do-not-rebuild-non-existing-FTS-tables.patch
BuildRequires: asciidoc
BuildRequires: fdupes