Merge branch 'wip/carlosg/fts-consistence-fixes' into 'master'

libtracker-sparql: Fix handling of partial FTS deletion

Closes #361

See merge request !510

src/libtracker-common/tracker-parser.h

@@ -30,7 +30,7 @@
  * at runtime, the former must be rebuilt for those to match perfectly
  * to avoid returning meaningless results on FTS searches.
  */
-#define TRACKER_PARSER_VERSION 3
+#define TRACKER_PARSER_VERSION 4
 
 G_BEGIN_DECLS
 

src/libtracker-sparql/core/tracker-data-update.c

@@ -1694,6 +1694,7 @@ get_old_property_values (TrackerData      *data,
 				g_ptr_array_unref (fts_text);
 
 				old_values = g_hash_table_lookup (data->resource_buffer->predicates, property);
+				data->resource_buffer->fts_updated = TRUE;
 			} else {
 				old_values = get_property_values (data, property, error);
 			}
@@ -2443,6 +2444,8 @@ delete_single_valued (TrackerData       *data,
 			                    FALSE);
 			if (tracker_property_get_data_type (predicate) == TRACKER_PROPERTY_TYPE_RESOURCE)
 				tracker_data_resource_unref (data, g_value_get_int64 (value), multiple_values);
+
+			g_array_remove_index (old_values, 0);
 		} else {
 			/* no need to error out if statement does not exist for any reason */
 			g_clear_error (&inner_error);

tests/fts/consistency/insert-or-replace-1.out

+"http://www.example.org/test#1"

tests/fts/consistency/insert-or-replace-1.rq

+SELECT ?u { ?u fts:match 'two' }

tests/fts/consistency/insert-or-replace-2.rq

+SELECT ?u { ?u fts:match 'one' }

tests/fts/consistency/insert-or-replace-data.rq

+INSERT OR REPLACE {
+	test:1 a test:A ; test:p "one" .
+};
+
+INSERT OR REPLACE {
+	test:1 a test:A ; test:p "two" .
+};

tests/fts/consistency/partial-update-1.rq

+SELECT ?u { ?u fts:match "two" }

tests/fts/consistency/partial-update-2.out

+"http://www.example.org/test#1"

tests/fts/consistency/partial-update-2.rq

+select ?u { ?u fts:match 'three' }

tests/fts/consistency/partial-update-data.rq

+INSERT DATA {
+	test:1 a test:A ; test:p "one" ; test:q "two" .
+};
+
+DELETE DATA {
+	test:1 test:q "two" .
+}
+
+INSERT DATA {
+	test:1 test:q "three" .
+};

tests/fts/tracker-fts-test.c

@@ -35,6 +35,8 @@ struct _TestInfo {
 const TestInfo tests[] = {
 	{ "fts3aa", 3 },
 	{ "fts3ae", 1 },
+	{ "consistency/partial-update", 2 },
+	{ "consistency/insert-or-replace", 2 },
 	{ "prefix/fts3prefix", 3 },
 	{ "limits/fts3limits", 4 },
 	{ "input/fts3input", 3 },