From 5964e57faab200eed4fe9eabb80b18d4d479b174 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Thu, 30 Jun 2016 15:28:23 +0200 Subject: [PATCH] change ngram analyzer used in /search to peliasQueryFullToken from peliasIndexOneEdgeGram. this will have a positive effect on performance due to less tokens being produced --- query/search_defaults.js | 2 +- test/unit/fixture/search_boundary_country.js | 2 +- test/unit/fixture/search_full_address.js | 2 +- test/unit/fixture/search_linguistic_bbox.js | 2 +- test/unit/fixture/search_linguistic_focus.js | 2 +- test/unit/fixture/search_linguistic_focus_bbox.js | 2 +- test/unit/fixture/search_linguistic_focus_null_island.js | 2 +- test/unit/fixture/search_linguistic_only.js | 2 +- test/unit/fixture/search_linguistic_viewport.js | 2 +- test/unit/fixture/search_linguistic_viewport_min_diagonal.js | 2 +- test/unit/fixture/search_partial_address.js | 2 +- test/unit/fixture/search_regions_address.js | 2 +- test/unit/fixture/search_with_source_filtering.js | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/query/search_defaults.js b/query/search_defaults.js index 4f77bccc..4e6a7ffb 100644 --- a/query/search_defaults.js +++ b/query/search_defaults.js @@ -18,7 +18,7 @@ module.exports = _.merge({}, peliasQuery.defaults, { 'boundary:rect:type': 'indexed', - 'ngram:analyzer': 'peliasIndexOneEdgeGram', + 'ngram:analyzer': 'peliasQueryFullToken', 'ngram:field': 'name.default', 'ngram:boost': 1, diff --git a/test/unit/fixture/search_boundary_country.js b/test/unit/fixture/search_boundary_country.js index 37d31c3b..6af4e840 100644 --- a/test/unit/fixture/search_boundary_country.js +++ b/test/unit/fixture/search_boundary_country.js @@ -16,7 +16,7 @@ module.exports = { 'name.default': { 'query': 'test', 'boost': 1, - 'analyzer': 'peliasIndexOneEdgeGram' + 'analyzer': 'peliasQueryFullToken' } } } diff --git a/test/unit/fixture/search_full_address.js b/test/unit/fixture/search_full_address.js index 5ebb0004..6af4b35b 100644 --- a/test/unit/fixture/search_full_address.js +++ b/test/unit/fixture/search_full_address.js @@ -7,7 +7,7 @@ module.exports = { 'match': { 'name.default': { 'query': '123 main st', - 'analyzer': 'peliasIndexOneEdgeGram', + 'analyzer': 'peliasQueryFullToken', 'boost': 1 } } diff --git a/test/unit/fixture/search_linguistic_bbox.js b/test/unit/fixture/search_linguistic_bbox.js index 8a9b7849..0a8f5ddc 100644 --- a/test/unit/fixture/search_linguistic_bbox.js +++ b/test/unit/fixture/search_linguistic_bbox.js @@ -7,7 +7,7 @@ module.exports = { 'name.default': { 'query': 'test', 'boost': 1, - 'analyzer': 'peliasIndexOneEdgeGram' + 'analyzer': 'peliasQueryFullToken' } } }], diff --git a/test/unit/fixture/search_linguistic_focus.js b/test/unit/fixture/search_linguistic_focus.js index 72c0570d..e3c027c1 100644 --- a/test/unit/fixture/search_linguistic_focus.js +++ b/test/unit/fixture/search_linguistic_focus.js @@ -7,7 +7,7 @@ module.exports = { 'name.default': { 'query': 'test', 'boost': 1, - 'analyzer': 'peliasIndexOneEdgeGram' + 'analyzer': 'peliasQueryFullToken' } } }], diff --git a/test/unit/fixture/search_linguistic_focus_bbox.js b/test/unit/fixture/search_linguistic_focus_bbox.js index 23de4cf9..a185ea73 100644 --- a/test/unit/fixture/search_linguistic_focus_bbox.js +++ b/test/unit/fixture/search_linguistic_focus_bbox.js @@ -7,7 +7,7 @@ module.exports = { 'name.default': { 'query': 'test', 'boost': 1, - 'analyzer': 'peliasIndexOneEdgeGram' + 'analyzer': 'peliasQueryFullToken' } } }], diff --git a/test/unit/fixture/search_linguistic_focus_null_island.js b/test/unit/fixture/search_linguistic_focus_null_island.js index 6704b96e..152a0c42 100644 --- a/test/unit/fixture/search_linguistic_focus_null_island.js +++ b/test/unit/fixture/search_linguistic_focus_null_island.js @@ -7,7 +7,7 @@ module.exports = { 'name.default': { 'query': 'test', 'boost': 1, - 'analyzer': 'peliasIndexOneEdgeGram' + 'analyzer': 'peliasQueryFullToken' } } }], diff --git a/test/unit/fixture/search_linguistic_only.js b/test/unit/fixture/search_linguistic_only.js index d0e02c16..2e820c80 100644 --- a/test/unit/fixture/search_linguistic_only.js +++ b/test/unit/fixture/search_linguistic_only.js @@ -7,7 +7,7 @@ module.exports = { 'name.default': { 'query': 'test', 'boost': 1, - 'analyzer': 'peliasIndexOneEdgeGram' + 'analyzer': 'peliasQueryFullToken' } } }], diff --git a/test/unit/fixture/search_linguistic_viewport.js b/test/unit/fixture/search_linguistic_viewport.js index fdaa91a0..4f225a62 100644 --- a/test/unit/fixture/search_linguistic_viewport.js +++ b/test/unit/fixture/search_linguistic_viewport.js @@ -5,7 +5,7 @@ module.exports = { { 'match': { 'name.default': { - 'analyzer': 'peliasIndexOneEdgeGram', + 'analyzer': 'peliasQueryFullToken', 'boost': 1, 'query': 'test' } diff --git a/test/unit/fixture/search_linguistic_viewport_min_diagonal.js b/test/unit/fixture/search_linguistic_viewport_min_diagonal.js index 67962109..e5dbb862 100644 --- a/test/unit/fixture/search_linguistic_viewport_min_diagonal.js +++ b/test/unit/fixture/search_linguistic_viewport_min_diagonal.js @@ -7,7 +7,7 @@ module.exports = { { 'match': { 'name.default': { - 'analyzer': 'peliasIndexOneEdgeGram', + 'analyzer': 'peliasQueryFullToken', 'boost': 1, 'query': 'test' } diff --git a/test/unit/fixture/search_partial_address.js b/test/unit/fixture/search_partial_address.js index 47acb4ac..ec8ff4ea 100644 --- a/test/unit/fixture/search_partial_address.js +++ b/test/unit/fixture/search_partial_address.js @@ -8,7 +8,7 @@ module.exports = { 'match': { 'name.default': { 'query': 'soho grand', - 'analyzer': 'peliasIndexOneEdgeGram', + 'analyzer': 'peliasQueryFullToken', 'boost': 1 } } diff --git a/test/unit/fixture/search_regions_address.js b/test/unit/fixture/search_regions_address.js index a133da38..cf65b199 100644 --- a/test/unit/fixture/search_regions_address.js +++ b/test/unit/fixture/search_regions_address.js @@ -8,7 +8,7 @@ module.exports = { 'match': { 'name.default': { 'query': '1 water st', - 'analyzer': 'peliasIndexOneEdgeGram', + 'analyzer': 'peliasQueryFullToken', 'boost': 1 } } diff --git a/test/unit/fixture/search_with_source_filtering.js b/test/unit/fixture/search_with_source_filtering.js index 8feb6820..24da9468 100644 --- a/test/unit/fixture/search_with_source_filtering.js +++ b/test/unit/fixture/search_with_source_filtering.js @@ -7,7 +7,7 @@ module.exports = { 'name.default': { 'query': 'test', 'boost': 1, - 'analyzer': 'peliasIndexOneEdgeGram' + 'analyzer': 'peliasQueryFullToken' } } }],