Skip to content

Commit 4cfc14e

Browse files
committed
fix(search): keep livePhoto.contentId out of the search siblings
1 parent ca6b6c1 commit 4cfc14e

3 files changed

Lines changed: 10 additions & 41 deletions

File tree

services/search/pkg/bleve/testdata/mapping.golden.json

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -734,30 +734,6 @@
734734
}
735735
]
736736
},
737-
"contentId_lowercase": {
738-
"enabled": true,
739-
"dynamic": true,
740-
"fields": [
741-
{
742-
"type": "text",
743-
"analyzer": "keyword",
744-
"index": true,
745-
"include_term_vectors": true
746-
}
747-
]
748-
},
749-
"contentId_words": {
750-
"enabled": true,
751-
"dynamic": true,
752-
"fields": [
753-
{
754-
"type": "text",
755-
"analyzer": "words",
756-
"index": true,
757-
"include_term_vectors": true
758-
}
759-
]
760-
},
761737
"stillImageTimeUs": {
762738
"enabled": true,
763739
"dynamic": true,

services/search/pkg/opensearch/testdata/resource.golden.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -196,14 +196,6 @@
196196
"contentId": {
197197
"type": "keyword"
198198
},
199-
"contentId_lowercase": {
200-
"doc_values": false,
201-
"type": "keyword"
202-
},
203-
"contentId_words": {
204-
"analyzer": "words",
205-
"type": "text"
206-
},
207199
"stillImageTimeUs": {
208200
"type": "long"
209201
},

services/search/pkg/search/search.go

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,16 @@ var resourceFieldOverrides = sync.OnceValue(func() map[string]mapping.FieldOpts
7979
// every keyword field searches case-insensitively and by word (name,
8080
// title, the facets) unless opted out: ids are opaque, paths are POSIX,
8181
// the mime type is normalized already, a tag is one label
82-
"ID": {CaseInsensitive: &False, NoWordBreaker: &True},
83-
"RootID": {CaseInsensitive: &False, NoWordBreaker: &True},
84-
"ParentID": {CaseInsensitive: &False, NoWordBreaker: &True},
85-
"Path": {Type: mapping.TypePath, CaseInsensitive: &False},
86-
"MimeType": {CaseInsensitive: &False, NoWordBreaker: &True},
87-
"Content": {Type: mapping.TypeFulltext},
88-
"Tags": {NoWordBreaker: &True, IncludeInAll: &False},
89-
"Favorites": {NoWordBreaker: &True, IncludeInAll: &False, CaseInsensitive: &False}, // opaque user ids
90-
"location": {Type: mapping.TypeGeopoint},
82+
"ID": {CaseInsensitive: &False, NoWordBreaker: &True},
83+
"RootID": {CaseInsensitive: &False, NoWordBreaker: &True},
84+
"ParentID": {CaseInsensitive: &False, NoWordBreaker: &True},
85+
"Path": {Type: mapping.TypePath, CaseInsensitive: &False},
86+
"MimeType": {CaseInsensitive: &False, NoWordBreaker: &True},
87+
"Content": {Type: mapping.TypeFulltext},
88+
"Tags": {NoWordBreaker: &True, IncludeInAll: &False},
89+
"Favorites": {NoWordBreaker: &True, IncludeInAll: &False, CaseInsensitive: &False}, // opaque user ids
90+
"livePhoto.contentId": {NoWordBreaker: &True, CaseInsensitive: &False}, // opaque pairing uuid
91+
"location": {Type: mapping.TypeGeopoint},
9192
}
9293
})
9394

0 commit comments

Comments
 (0)