From 39d02aab887e458001b5f2c55cb32fb62ab34da7 Mon Sep 17 00:00:00 2001 From: missinglink Date: Tue, 23 Feb 2021 16:32:08 +1300 Subject: [PATCH 1/2] feat(norms_false): disable field norms across the board --- integration/analyzer_peliasPhrase.js | 2 +- mappings/document.js | 27 ++-- mappings/partial/admin.json | 4 +- mappings/partial/countryAbbreviation.json | 4 +- mappings/partial/postalcode.json | 4 +- test/compile.js | 9 +- test/fixtures/expected.json | 149 ++++++++++++++++------ 7 files changed, 143 insertions(+), 56 deletions(-) diff --git a/integration/analyzer_peliasPhrase.js b/integration/analyzer_peliasPhrase.js index 3232db51..587822a3 100644 --- a/integration/analyzer_peliasPhrase.js +++ b/integration/analyzer_peliasPhrase.js @@ -225,7 +225,7 @@ module.exports.tests.slop_query = function(test, common){ t.equal( getTotalHits(res.hits), 3 ); var hits = res.hits.hits; - t.equal( hits[0]._source.name.default, 'Lake Cayuga' ); + t.equal( hits[0]._source.name.default, '7991 Lake Cayuga Dr' ); // This behaviour changed between elasticsearch 2.4 & 5.6 // In 2.4 the sloppy exact match ranked higher, after upgrading diff --git a/mappings/document.js b/mappings/document.js index da22b396..fa55e238 100644 --- a/mappings/document.js +++ b/mappings/document.js @@ -28,37 +28,43 @@ var schema = { type: 'text', analyzer: 'keyword', search_analyzer: 'keyword', - similarity: 'peliasDefaultSimilarity' + similarity: 'peliasDefaultSimilarity', + norms: false }, unit: { type: 'text', analyzer: 'peliasUnit', search_analyzer: 'peliasUnit', - similarity: 'peliasDefaultSimilarity' + similarity: 'peliasDefaultSimilarity', + norms: false }, number: { type: 'text', analyzer: 'peliasHousenumber', search_analyzer: 'peliasHousenumber', - similarity: 'peliasDefaultSimilarity' + similarity: 'peliasDefaultSimilarity', + norms: false }, street: { type: 'text', analyzer: 'peliasStreet', search_analyzer: 'peliasQuery', - similarity: 'peliasDefaultSimilarity' + similarity: 'peliasDefaultSimilarity', + norms: false }, cross_street: { type: 'text', analyzer: 'peliasStreet', search_analyzer: 'peliasQuery', - similarity: 'peliasDefaultSimilarity' + similarity: 'peliasDefaultSimilarity', + norms: false }, zip: { type: 'text', analyzer: 'peliasZip', search_analyzer: 'peliasZip', - similarity: 'peliasDefaultSimilarity' + similarity: 'peliasDefaultSimilarity', + norms: false }, } }, @@ -182,7 +188,8 @@ var schema = { type: 'text', analyzer: 'peliasIndexOneEdgeGram', search_analyzer: 'peliasQuery', - similarity: 'peliasDefaultSimilarity' + similarity: 'peliasDefaultSimilarity', + norms: false } }, },{ @@ -193,7 +200,8 @@ var schema = { type: 'text', analyzer: 'peliasPhrase', search_analyzer: 'peliasQuery', - similarity: 'peliasDefaultSimilarity' + similarity: 'peliasDefaultSimilarity', + norms: false } } },{ @@ -203,7 +211,8 @@ var schema = { mapping: { type: 'keyword', index: false, - doc_values: false + doc_values: false, + norms: false } } }], diff --git a/mappings/partial/admin.json b/mappings/partial/admin.json index 5aef0094..2971a42c 100644 --- a/mappings/partial/admin.json +++ b/mappings/partial/admin.json @@ -3,13 +3,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } } diff --git a/mappings/partial/countryAbbreviation.json b/mappings/partial/countryAbbreviation.json index 67b605f1..8b8241ca 100644 --- a/mappings/partial/countryAbbreviation.json +++ b/mappings/partial/countryAbbreviation.json @@ -3,13 +3,15 @@ "analyzer": "peliasIndexCountryAbbreviation", "search_analyzer": "peliasQuery", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexCountryAbbreviationOneEdgeGram", "search_analyzer": "peliasQuery", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } } diff --git a/mappings/partial/postalcode.json b/mappings/partial/postalcode.json index 6f23d466..03f943ea 100644 --- a/mappings/partial/postalcode.json +++ b/mappings/partial/postalcode.json @@ -3,12 +3,14 @@ "analyzer": "peliasZip", "search_analyzer": "peliasZip", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasZip", - "similarity": "peliasDefaultSimilarity" + "similarity": "peliasDefaultSimilarity", + "norms": false } } } diff --git a/test/compile.js b/test/compile.js index 719dde7a..72792719 100644 --- a/test/compile.js +++ b/test/compile.js @@ -44,7 +44,8 @@ module.exports.tests.dynamic_templates = function(test, common) { type: 'text', analyzer: 'peliasIndexOneEdgeGram', search_analyzer: 'peliasQuery', - similarity: 'peliasDefaultSimilarity' + similarity: 'peliasDefaultSimilarity', + norms: false }); t.end(); }); @@ -57,7 +58,8 @@ module.exports.tests.dynamic_templates = function(test, common) { type: 'text', analyzer: 'peliasPhrase', search_analyzer: 'peliasQuery', - similarity: 'peliasDefaultSimilarity' + similarity: 'peliasDefaultSimilarity', + norms: false }); t.end(); }); @@ -69,7 +71,8 @@ module.exports.tests.dynamic_templates = function(test, common) { t.deepEqual(template.mapping, { type: 'keyword', index: false, - doc_values: false + doc_values: false, + norms: false }); t.end(); }); diff --git a/test/fixtures/expected.json b/test/fixtures/expected.json index 6e58831e..c932bc2f 100644 --- a/test/fixtures/expected.json +++ b/test/fixtures/expected.json @@ -2366,37 +2366,43 @@ "type": "text", "analyzer": "keyword", "search_analyzer": "keyword", - "similarity": "peliasDefaultSimilarity" + "similarity": "peliasDefaultSimilarity", + "norms": false }, "unit": { "type": "text", "analyzer": "peliasUnit", "search_analyzer": "peliasUnit", - "similarity": "peliasDefaultSimilarity" + "similarity": "peliasDefaultSimilarity", + "norms": false }, "number": { "type": "text", "analyzer": "peliasHousenumber", "search_analyzer": "peliasHousenumber", - "similarity": "peliasDefaultSimilarity" + "similarity": "peliasDefaultSimilarity", + "norms": false }, "street": { "type": "text", "analyzer": "peliasStreet", "search_analyzer": "peliasQuery", - "similarity": "peliasDefaultSimilarity" + "similarity": "peliasDefaultSimilarity", + "norms": false }, "cross_street": { "type": "text", "analyzer": "peliasStreet", "search_analyzer": "peliasQuery", - "similarity": "peliasDefaultSimilarity" + "similarity": "peliasDefaultSimilarity", + "norms": false }, "zip": { "type": "text", "analyzer": "peliasZip", "search_analyzer": "peliasZip", - "similarity": "peliasDefaultSimilarity" + "similarity": "peliasDefaultSimilarity", + "norms": false } } }, @@ -2409,13 +2415,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2424,13 +2432,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2447,13 +2457,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2462,13 +2474,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2485,13 +2499,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2500,13 +2516,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2523,13 +2541,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2538,13 +2558,15 @@ "analyzer": "peliasIndexCountryAbbreviation", "search_analyzer": "peliasQuery", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexCountryAbbreviationOneEdgeGram", "search_analyzer": "peliasQuery", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2561,13 +2583,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2576,13 +2600,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2599,13 +2625,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2614,13 +2642,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2637,13 +2667,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2652,13 +2684,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2675,13 +2709,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2690,13 +2726,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2713,13 +2751,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2728,13 +2768,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2751,13 +2793,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2766,13 +2810,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2789,13 +2835,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2804,13 +2852,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2827,13 +2877,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2842,13 +2894,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2865,13 +2919,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2880,13 +2936,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2903,13 +2961,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2918,13 +2978,15 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "doc_values": false + "doc_values": false, + "norms": false } } }, @@ -2941,12 +3003,14 @@ "analyzer": "peliasZip", "search_analyzer": "peliasZip", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasZip", - "similarity": "peliasDefaultSimilarity" + "similarity": "peliasDefaultSimilarity", + "norms": false } } }, @@ -2955,12 +3019,14 @@ "analyzer": "peliasZip", "search_analyzer": "peliasZip", "similarity": "peliasDefaultSimilarity", + "norms": false, "fields": { "ngram": { "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasZip", - "similarity": "peliasDefaultSimilarity" + "similarity": "peliasDefaultSimilarity", + "norms": false } } }, @@ -3014,7 +3080,8 @@ "type": "text", "analyzer": "peliasIndexOneEdgeGram", "search_analyzer": "peliasQuery", - "similarity": "peliasDefaultSimilarity" + "similarity": "peliasDefaultSimilarity", + "norms": false } } }, @@ -3026,7 +3093,8 @@ "type": "text", "analyzer": "peliasPhrase", "search_analyzer": "peliasQuery", - "similarity": "peliasDefaultSimilarity" + "similarity": "peliasDefaultSimilarity", + "norms": false } } }, @@ -3037,7 +3105,8 @@ "mapping": { "type": "keyword", "index": false, - "doc_values": false + "doc_values": false, + "norms": false } } } @@ -3050,4 +3119,4 @@ }, "dynamic": "strict" } -} +} \ No newline at end of file From 729187c15f32504f68e113a214194724588674af Mon Sep 17 00:00:00 2001 From: missinglink Date: Wed, 24 Feb 2021 13:50:18 +1300 Subject: [PATCH 2/2] feat(norms_false): only disable field norms for ngram fields --- integration/analyzer_peliasPhrase.js | 2 +- mappings/document.js | 21 ++++------ mappings/partial/admin.json | 1 - mappings/partial/countryAbbreviation.json | 1 - mappings/partial/postalcode.json | 1 - test/compile.js | 3 +- test/fixtures/expected.json | 51 ++++------------------- 7 files changed, 16 insertions(+), 64 deletions(-) diff --git a/integration/analyzer_peliasPhrase.js b/integration/analyzer_peliasPhrase.js index 587822a3..3232db51 100644 --- a/integration/analyzer_peliasPhrase.js +++ b/integration/analyzer_peliasPhrase.js @@ -225,7 +225,7 @@ module.exports.tests.slop_query = function(test, common){ t.equal( getTotalHits(res.hits), 3 ); var hits = res.hits.hits; - t.equal( hits[0]._source.name.default, '7991 Lake Cayuga Dr' ); + t.equal( hits[0]._source.name.default, 'Lake Cayuga' ); // This behaviour changed between elasticsearch 2.4 & 5.6 // In 2.4 the sloppy exact match ranked higher, after upgrading diff --git a/mappings/document.js b/mappings/document.js index fa55e238..38e8b9d4 100644 --- a/mappings/document.js +++ b/mappings/document.js @@ -28,43 +28,37 @@ var schema = { type: 'text', analyzer: 'keyword', search_analyzer: 'keyword', - similarity: 'peliasDefaultSimilarity', - norms: false + similarity: 'peliasDefaultSimilarity' }, unit: { type: 'text', analyzer: 'peliasUnit', search_analyzer: 'peliasUnit', - similarity: 'peliasDefaultSimilarity', - norms: false + similarity: 'peliasDefaultSimilarity' }, number: { type: 'text', analyzer: 'peliasHousenumber', search_analyzer: 'peliasHousenumber', - similarity: 'peliasDefaultSimilarity', - norms: false + similarity: 'peliasDefaultSimilarity' }, street: { type: 'text', analyzer: 'peliasStreet', search_analyzer: 'peliasQuery', - similarity: 'peliasDefaultSimilarity', - norms: false + similarity: 'peliasDefaultSimilarity' }, cross_street: { type: 'text', analyzer: 'peliasStreet', search_analyzer: 'peliasQuery', - similarity: 'peliasDefaultSimilarity', - norms: false + similarity: 'peliasDefaultSimilarity' }, zip: { type: 'text', analyzer: 'peliasZip', search_analyzer: 'peliasZip', - similarity: 'peliasDefaultSimilarity', - norms: false + similarity: 'peliasDefaultSimilarity' }, } }, @@ -200,8 +194,7 @@ var schema = { type: 'text', analyzer: 'peliasPhrase', search_analyzer: 'peliasQuery', - similarity: 'peliasDefaultSimilarity', - norms: false + similarity: 'peliasDefaultSimilarity' } } },{ diff --git a/mappings/partial/admin.json b/mappings/partial/admin.json index 2971a42c..7cd43480 100644 --- a/mappings/partial/admin.json +++ b/mappings/partial/admin.json @@ -3,7 +3,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", diff --git a/mappings/partial/countryAbbreviation.json b/mappings/partial/countryAbbreviation.json index 8b8241ca..84326a1b 100644 --- a/mappings/partial/countryAbbreviation.json +++ b/mappings/partial/countryAbbreviation.json @@ -3,7 +3,6 @@ "analyzer": "peliasIndexCountryAbbreviation", "search_analyzer": "peliasQuery", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", diff --git a/mappings/partial/postalcode.json b/mappings/partial/postalcode.json index 03f943ea..a919117b 100644 --- a/mappings/partial/postalcode.json +++ b/mappings/partial/postalcode.json @@ -3,7 +3,6 @@ "analyzer": "peliasZip", "search_analyzer": "peliasZip", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", diff --git a/test/compile.js b/test/compile.js index 72792719..2fc674d4 100644 --- a/test/compile.js +++ b/test/compile.js @@ -58,8 +58,7 @@ module.exports.tests.dynamic_templates = function(test, common) { type: 'text', analyzer: 'peliasPhrase', search_analyzer: 'peliasQuery', - similarity: 'peliasDefaultSimilarity', - norms: false + similarity: 'peliasDefaultSimilarity' }); t.end(); }); diff --git a/test/fixtures/expected.json b/test/fixtures/expected.json index c932bc2f..b4f73cfe 100644 --- a/test/fixtures/expected.json +++ b/test/fixtures/expected.json @@ -2366,43 +2366,37 @@ "type": "text", "analyzer": "keyword", "search_analyzer": "keyword", - "similarity": "peliasDefaultSimilarity", - "norms": false + "similarity": "peliasDefaultSimilarity" }, "unit": { "type": "text", "analyzer": "peliasUnit", "search_analyzer": "peliasUnit", - "similarity": "peliasDefaultSimilarity", - "norms": false + "similarity": "peliasDefaultSimilarity" }, "number": { "type": "text", "analyzer": "peliasHousenumber", "search_analyzer": "peliasHousenumber", - "similarity": "peliasDefaultSimilarity", - "norms": false + "similarity": "peliasDefaultSimilarity" }, "street": { "type": "text", "analyzer": "peliasStreet", "search_analyzer": "peliasQuery", - "similarity": "peliasDefaultSimilarity", - "norms": false + "similarity": "peliasDefaultSimilarity" }, "cross_street": { "type": "text", "analyzer": "peliasStreet", "search_analyzer": "peliasQuery", - "similarity": "peliasDefaultSimilarity", - "norms": false + "similarity": "peliasDefaultSimilarity" }, "zip": { "type": "text", "analyzer": "peliasZip", "search_analyzer": "peliasZip", - "similarity": "peliasDefaultSimilarity", - "norms": false + "similarity": "peliasDefaultSimilarity" } } }, @@ -2415,7 +2409,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2432,7 +2425,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2457,7 +2449,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2474,7 +2465,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2499,7 +2489,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2516,7 +2505,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2541,7 +2529,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2558,7 +2545,6 @@ "analyzer": "peliasIndexCountryAbbreviation", "search_analyzer": "peliasQuery", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2583,7 +2569,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2600,7 +2585,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2625,7 +2609,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2642,7 +2625,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2667,7 +2649,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2684,7 +2665,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2709,7 +2689,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2726,7 +2705,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2751,7 +2729,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2768,7 +2745,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2793,7 +2769,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2810,7 +2785,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2835,7 +2809,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2852,7 +2825,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2877,7 +2849,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2894,7 +2865,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2919,7 +2889,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2936,7 +2905,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2961,7 +2929,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -2978,7 +2945,6 @@ "analyzer": "peliasAdmin", "search_analyzer": "peliasAdmin", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -3003,7 +2969,6 @@ "analyzer": "peliasZip", "search_analyzer": "peliasZip", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -3019,7 +2984,6 @@ "analyzer": "peliasZip", "search_analyzer": "peliasZip", "similarity": "peliasDefaultSimilarity", - "norms": false, "fields": { "ngram": { "type": "text", @@ -3093,8 +3057,7 @@ "type": "text", "analyzer": "peliasPhrase", "search_analyzer": "peliasQuery", - "similarity": "peliasDefaultSimilarity", - "norms": false + "similarity": "peliasDefaultSimilarity" } } },