Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package tracker2 for openSUSE:Factory 
checked in at 2021-01-19 15:58:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tracker2 (Old)
 and      /work/SRC/openSUSE:Factory/.tracker2.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "tracker2"

Tue Jan 19 15:58:30 2021 rev:2 rq:863165 version:2.3.6

Changes:
--------
--- /work/SRC/openSUSE:Factory/tracker2/tracker2.changes        2020-09-25 
16:27:57.631700438 +0200
+++ /work/SRC/openSUSE:Factory/.tracker2.new.28504/tracker2.changes     
2021-01-19 15:58:32.855049235 +0100
@@ -1,0 +2,10 @@
+Wed Jan 13 12:15:51 UTC 2021 - Bj??rn Lie <[email protected]>
+
+- Add tracker2-Avoid-deletion-empty-rows.patch: libtracker-data:
+  Avoid deletion of empty rows in FTS table. Starting with SQLite
+  3.34.0, this turns into a consistency error. Ensure rows being
+  deleted have actually some content before proceeding to deletion,
+  and ensure we don't process individual properties one by one in
+  the course of a whole rdfs:Resource deletion.
+
+-------------------------------------------------------------------

New:
----
  tracker2-Avoid-deletion-empty-rows.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ tracker2.spec ++++++
--- /var/tmp/diff_new_pack.g7bPeB/_old  2021-01-19 15:58:33.955050898 +0100
+++ /var/tmp/diff_new_pack.g7bPeB/_new  2021-01-19 15:58:33.959050904 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package tracker
+# spec file for package tracker2
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 # Copyright (c) 2010 Luis Medinas, Portugal
 #
 # All modifications and additions to the file contributed by third parties
@@ -32,6 +32,8 @@
 
 # PATCH-FIX-UPSTREAM tracker-ontology-upgrades.patch boo#1170587 
[email protected] -- Fix ontology migration from very old tracker versions
 Patch1:         tracker-ontology-upgrades.patch
+# PATCH-FIX-UPSTREAM tracker2-Avoid-deletion-empty-rows.patch -- 
libtracker-data: Avoid deletion of empty rows in FTS table
+Patch2:         tracker2-Avoid-deletion-empty-rows.patch
 
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++

++++++ tracker2-Avoid-deletion-empty-rows.patch ++++++
>From 29a6650f698bbd449e11fc0481269cd8f0593f27 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <[email protected]>
Date: Thu, 10 Dec 2020 03:55:08 +0100
Subject: [PATCH] libtracker-data: Avoid deletion of empty rows in FTS table

Starting with SQLite 3.34.0, this turns into a consistency error. Ensure
rows being deleted have actually some content before proceeding to deletion,
and ensure we don't process individual properties one by one in the course
of a whole rdfs:Resource deletion.

Fixes: https://bugs.archlinux.org/task/68903
---
 src/libtracker-data/tracker-data-update.c         | 1 +
 src/libtracker-data/tracker-db-interface-sqlite.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libtracker-data/tracker-data-update.c 
b/src/libtracker-data/tracker-data-update.c
index e2f46685e..19cae25f9 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -2244,6 +2244,7 @@ cache_delete_resource_type_full (TrackerData  *data,
                    g_hash_table_size (data->resource_buffer->tables) == 0) {
 #if HAVE_TRACKER_FTS
                        tracker_db_interface_sqlite_fts_delete_id (iface, 
data->resource_buffer->id);
+                       data->resource_buffer->fts_updated = TRUE;
 #endif
                        /* skip subclass query when deleting whole resource
                           to improve performance */
diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c 
b/src/libtracker-data/tracker-db-interface-sqlite.c
index da88080ed..cdeb960e7 100644
--- a/src/libtracker-data/tracker-db-interface-sqlite.c
+++ b/src/libtracker-data/tracker-db-interface-sqlite.c
@@ -1770,7 +1770,8 @@ tracker_db_interface_sqlite_fts_create_delete_all_query 
(TrackerDBInterface *db_
        g_string_append_printf (insert_str,
                                "INSERT INTO fts5 (fts5, rowid %s) "
                                "SELECT 'delete', rowid %s FROM fts_view "
-                               "WHERE rowid = ?",
+                               "WHERE rowid = ? AND COALESCE(NULL %s) IS NOT 
NULL",
+                               db_interface->fts_properties,
                                db_interface->fts_properties,
                                db_interface->fts_properties);
        return g_string_free (insert_str, FALSE);
-- 
GitLab

Reply via email to