From 30dcb9416fe350356f228761d3bbf72639047237 Mon Sep 17 00:00:00 2001 From: olaughter Date: Thu, 29 Aug 2024 14:30:58 +0100 Subject: [PATCH 1/3] Remove obsolete 'version' from docker compose file Deals with the warning from docker that: ``` `version` is obsolete ``` --- docker-compose.dev.yml | 1 - docker-compose.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 704f048a..7e72d6db 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,4 +1,3 @@ -version: "3.7" services: vespatest: image: vespaengine/vespa:8.396.18 diff --git a/docker-compose.yml b/docker-compose.yml index 934a44c1..68b95790 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.7" services: backend_db: image: postgres:14 From 9c8fba41a521222cec989a594e0958e9f784c997 Mon Sep 17 00:00:00 2001 From: olaughter Date: Thu, 29 Aug 2024 14:33:02 +0100 Subject: [PATCH 2/3] Remove obsolete type assignment for summaries Deals with the warning for each field in our test schema: ``` WARNING For schema '...', summary field '...': Specifying the type is deprecated, ignored and will be an error in Vespa 9. Remove the type specification to silence this warning. ``` --- .../schemas/document_passage.sd | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/search/search_fixtures/vespa_test_schema/schemas/document_passage.sd b/tests/search/search_fixtures/vespa_test_schema/schemas/document_passage.sd index 1f58b600..23620639 100644 --- a/tests/search/search_fixtures/vespa_test_schema/schemas/document_passage.sd +++ b/tests/search/search_fixtures/vespa_test_schema/schemas/document_passage.sd @@ -68,25 +68,25 @@ schema document_passage { } document-summary search_summary { - summary family_name type string {} - summary family_description type string {} - summary family_import_id type string {} - summary family_slug type string {} - summary family_category type string {} - summary family_publication_ts type string {} - summary family_geography type string {} - summary family_source type string {} - summary document_import_id type string {} - summary document_slug type string {} - summary document_languages type array {} - summary document_content_type type string {} - summary document_cdn_object type string {} - summary document_source_url type string {} - summary text_block type string {} - summary text_block_id type string {} - summary text_block_type type string {} - summary text_block_page type int {} - summary text_block_coords type array> {} + summary family_name {} + summary family_description {} + summary family_import_id {} + summary family_slug {} + summary family_category {} + summary family_publication_ts {} + summary family_geography {} + summary family_source {} + summary document_import_id {} + summary document_slug {} + summary document_languages {} + summary document_content_type {} + summary document_cdn_object {} + summary document_source_url {} + summary text_block {} + summary text_block_id {} + summary text_block_type {} + summary text_block_page {} + summary text_block_coords {} } rank-profile exact inherits default { From 0e7d143d4f2adeab0c1b0b12162491672d7d4f24 Mon Sep 17 00:00:00 2001 From: olaughter Date: Thu, 29 Aug 2024 14:34:24 +0100 Subject: [PATCH 3/3] Remove embeddings from fieldset Deals with the error: ``` WARNING For schema '...', fieldset 'default': Tensor fields ['...'] cannot be mixed with non-tensor fields ['...'] in the same fieldset. See https://docs.vespa.ai/en/reference/schema-reference.html#fieldset ``` --- .../vespa_test_schema/schemas/document_passage.sd | 2 +- .../vespa_test_schema/schemas/family_document.sd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/search/search_fixtures/vespa_test_schema/schemas/document_passage.sd b/tests/search/search_fixtures/vespa_test_schema/schemas/document_passage.sd index 23620639..e279cd0f 100644 --- a/tests/search/search_fixtures/vespa_test_schema/schemas/document_passage.sd +++ b/tests/search/search_fixtures/vespa_test_schema/schemas/document_passage.sd @@ -64,7 +64,7 @@ schema document_passage { import field search_weights_ref.passage_weight as passage_weight {} fieldset default { - fields: text_block, text_embedding + fields: text_block } document-summary search_summary { diff --git a/tests/search/search_fixtures/vespa_test_schema/schemas/family_document.sd b/tests/search/search_fixtures/vespa_test_schema/schemas/family_document.sd index c64360bf..e62d6df5 100644 --- a/tests/search/search_fixtures/vespa_test_schema/schemas/family_document.sd +++ b/tests/search/search_fixtures/vespa_test_schema/schemas/family_document.sd @@ -155,7 +155,7 @@ schema family_document { import field search_weights_ref.description_weight as description_weight {} fieldset default { - fields: family_name_index, family_description_index, family_description_embedding + fields: family_name_index, family_description_index } rank-profile exact inherits default {