resolve rebase conflict

9 years ago · b4115f2945
30 changed files with 1625 additions and 1771 deletions
--- a/package.json
+++ b/package.json
@ -49,10 +49,10 @@
    "lodash": "^4.5.0",
    "markdown": "0.5.0",
    "morgan": "1.7.0",
-    "pelias-config": "^1.0.1",
+    "pelias-config": "git://github.com/pelias/config.git#elasticsearch2",
    "pelias-logger": "^0.0.8",
    "pelias-model": "^4.0.0",
-    "pelias-query": "7.0.1",
+    "pelias-query": "git://github.com/pelias/query.git#elasticsearch2",
    "pelias-suggester-pipeline": "2.0.4",
    "pelias-text-analyzer": "^1.0.1",
    "stats-lite": "1.0.3",
--- a/query/autocomplete_defaults.js
+++ b/query/autocomplete_defaults.js
@ -15,10 +15,8 @@ module.exports = _.merge({}, peliasQuery.defaults, {
  'boundary:circle:radius': '50km',
  'boundary:circle:distance_type': 'plane',
  'boundary:circle:optimize_bbox': 'indexed',
-  'boundary:circle:_cache': true,

  'boundary:rect:type': 'indexed',
-  'boundary:rect:_cache': true,

  'ngram:analyzer': 'peliasQueryPartialToken',
  'ngram:field': 'name.default',
--- a/query/reverse_defaults.js
+++ b/query/reverse_defaults.js
@ -16,10 +16,8 @@ module.exports = _.merge({}, peliasQuery.defaults, {
  'boundary:circle:radius:coarse': '500km',
  'boundary:circle:distance_type': 'plane',
  'boundary:circle:optimize_bbox': 'indexed',
-  'boundary:circle:_cache': true,

  'boundary:rect:type': 'indexed',
-  'boundary:rect:_cache': true,

  'ngram:analyzer': 'peliasQueryPartialToken',
  'ngram:field': 'name.default',
--- a/query/search_defaults.js
+++ b/query/search_defaults.js
@ -15,10 +15,8 @@ module.exports = _.merge({}, peliasQuery.defaults, {
  'boundary:circle:radius': '50km',
  'boundary:circle:distance_type': 'plane',
  'boundary:circle:optimize_bbox': 'indexed',
-  'boundary:circle:_cache': true,

  'boundary:rect:type': 'indexed',
-  'boundary:rect:_cache': true,

  'ngram:analyzer': 'peliasIndexOneEdgeGram',
  'ngram:field': 'name.default',
--- a/test/unit/fixture/autocomplete_linguistic_final_token.js
+++ b/test/unit/fixture/autocomplete_linguistic_final_token.js
@ -1,7 +1,5 @@

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [{
@ -71,8 +69,6 @@ module.exports = {
        }
      }]
    }
-      }
-    }
  },
  'sort': [ '_score' ],
  'size': 20,
--- a/test/unit/fixture/autocomplete_linguistic_focus.js
+++ b/test/unit/fixture/autocomplete_linguistic_focus.js
@ -1,7 +1,5 @@

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [{
@ -105,8 +103,6 @@ module.exports = {
        }
      }]
    }
-      }
-    }
  },
  'sort': [ '_score' ],
  'size': 20,
--- a/test/unit/fixture/autocomplete_linguistic_focus_null_island.js
+++ b/test/unit/fixture/autocomplete_linguistic_focus_null_island.js
@ -1,7 +1,5 @@

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [{
@ -105,8 +103,6 @@ module.exports = {
        }
      }]
    }
-      }
-    }
  },
  'sort': [ '_score' ],
  'size': 20,
--- a/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js
+++ b/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js
@ -1,7 +1,5 @@

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [{
@ -84,8 +82,6 @@ module.exports = {
        }
      }]
    }
-      }
-    }
  },
  'sort': [ '_score' ],
  'size': 20,
--- a/test/unit/fixture/autocomplete_linguistic_only.js
+++ b/test/unit/fixture/autocomplete_linguistic_only.js
@ -1,7 +1,5 @@

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [{
@ -61,8 +59,6 @@ module.exports = {
        }
      }]
    }
-      }
-    }
  },
  'sort': [ '_score' ],
  'size': 20,
--- a/test/unit/fixture/autocomplete_linguistic_with_admin.js
+++ b/test/unit/fixture/autocomplete_linguistic_with_admin.js
@ -1,7 +1,5 @@

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [
@ -153,8 +151,6 @@ module.exports = {
        }
      ]
    }
-      }
-    }
  },
  'size': 20,
  'track_scores': true,
--- a/test/unit/fixture/autocomplete_single_character_street.js
+++ b/test/unit/fixture/autocomplete_single_character_street.js
@ -1,7 +1,5 @@

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [{
@ -146,8 +144,6 @@ module.exports = {
        }
      }]
    }
-      }
-    }
  },
  'sort': [ '_score' ],
  'size': 20,
--- a/test/unit/fixture/autocomplete_with_source_filtering.js
+++ b/test/unit/fixture/autocomplete_with_source_filtering.js
@ -1,7 +1,5 @@

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [{
@ -59,19 +57,13 @@ module.exports = {
            'weight': 3
          }]
        }
-          }]
-        }
-      },
-      'filter': {
-        'bool': {
-          'must': [{
+      }],
+      'filter': [{
        'terms': {
          'source': ['test_source']
        }
      }]
    }
-      }
-    }
  },
  'sort': [ '_score' ],
  'size': 20,
--- a/test/unit/fixture/reverse_boundary_circle.js
+++ b/test/unit/fixture/reverse_boundary_circle.js
@ -14,7 +14,6 @@ module.exports = {
                'distance': vs.distance,
                'distance_type': 'plane',
                'optimize_bbox': 'indexed',
-                '_cache': true,
                'center_point': {
                  'lat': 29.49136,
                  'lon': -82.50622
--- a/test/unit/fixture/reverse_null_island.js
+++ b/test/unit/fixture/reverse_null_island.js
@ -2,30 +2,18 @@ var vs = require('../../../query/reverse_defaults');

 module.exports = {
  'query': {
-    'filtered': {
-      'query': {
-        'bool': {
-          'must': []
-        }
-      },
-      'filter': {
    'bool': {
-          'must': [
-            {
+      'filter': [{
        'geo_distance': {
          'distance': '500km',
          'distance_type': 'plane',
          'optimize_bbox': 'indexed',
-                '_cache': true,
          'center_point': {
            'lat': 0,
            'lon': 0
          }
        }
-            }
-          ]
-        }
-      }
+      }]
    }
  },
  'sort': [
--- a/test/unit/fixture/reverse_standard.js
+++ b/test/unit/fixture/reverse_standard.js
@ -2,30 +2,18 @@ var vs = require('../../../query/reverse_defaults');

 module.exports = {
  'query': {
-    'filtered': {
-      'query': {
-        'bool': {
-          'must': []
-        }
-      },
-      'filter': {
    'bool': {
-          'must': [
-            {
+      'filter': [{
        'geo_distance': {
          'distance': '500km',
          'distance_type': 'plane',
          'optimize_bbox': 'indexed',
-                '_cache': true,
          'center_point': {
            'lat': 29.49136,
            'lon': -82.50622
          }
        }
-            }
-          ]
-        }
-      }
+      }]
    }
  },
  'sort': [
--- a/test/unit/fixture/reverse_with_boundary_country.js
+++ b/test/unit/fixture/reverse_with_boundary_country.js
@ -1,8 +1,6 @@
 var vs = require('../../../query/reverse_defaults');

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [
@ -14,27 +12,18 @@ module.exports = {
            }
          }
        }
-          ]
-        }
-      },
-      'filter': {
-        'bool': {
-          'must': [
-            {
+      ],
+      'filter': [{
        'geo_distance': {
          'distance': '500km',
          'distance_type': 'plane',
          'optimize_bbox': 'indexed',
-                '_cache': true,
          'center_point': {
            'lat': 29.49136,
            'lon': -82.50622
          }
        }
-            }
-          ]
-        }
-      }
+      }]
    }
  },
  'sort': [
--- a/test/unit/fixture/reverse_with_source_filtering.js
+++ b/test/unit/fixture/reverse_with_source_filtering.js
@ -2,21 +2,13 @@ var vs = require('../../../query/reverse_defaults');

 module.exports = {
  'query': {
-    'filtered': {
-      'query': {
-        'bool': {
-          'must': []
-        }
-      },
-      'filter': {
    'bool': {
-          'must': [
+      'filter': [
        {
          'geo_distance': {
            'distance': '500km',
            'distance_type': 'plane',
            'optimize_bbox': 'indexed',
-                '_cache': true,
            'center_point': {
              'lat': 29.49136,
              'lon': -82.50622
@ -30,8 +22,6 @@ module.exports = {
        }
      ]
    }
-      }
-    }
  },
  'sort': [
    '_score',
--- a/test/unit/fixture/search_boundary_country.js
+++ b/test/unit/fixture/search_boundary_country.js
@ -1,7 +1,5 @@

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [
@ -85,8 +83,6 @@ module.exports = {
        }
      }]
    }
-      }
-    }
  },
  'sort': [ '_score' ],
  'size': 10,
--- a/test/unit/fixture/search_full_address.js
+++ b/test/unit/fixture/search_full_address.js
@ -1,8 +1,6 @@
 var vs = require('../../../query/search_defaults');

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [{
@ -132,8 +130,6 @@ module.exports = {
        }
      }]
    }
-      }
-    }
  },
  'size': 10,
  'sort': [ '_score' ],
--- a/test/unit/fixture/search_linguistic_bbox.js
+++ b/test/unit/fixture/search_linguistic_bbox.js
@ -1,7 +1,5 @@

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [{
@ -73,12 +71,8 @@ module.exports = {
            'weight': 2
          }]
        }
-          }]
-        }
-      },
-      'filter': {
-        'bool': {
-          'must': [{
+      }],
+      'filter': [{
        'geo_bounding_box': {
          'center_point': {
            'top': 11.51,
@ -86,13 +80,10 @@ module.exports = {
            'bottom': 47.47,
            'left': -103.16
          },
-              '_cache': true,
          'type': 'indexed'
        }
      }]
    }
-      }
-    }
  },
  'sort': [ '_score' ],
  'size': 10,
--- a/test/unit/fixture/search_linguistic_focus.js
+++ b/test/unit/fixture/search_linguistic_focus.js
@ -1,7 +1,5 @@

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [{
@ -105,8 +103,6 @@ module.exports = {
        }
      }]
    }
-      }
-    }
  },
  'sort': [ '_score' ],
  'size': 10,
--- a/test/unit/fixture/search_linguistic_focus_bbox.js
+++ b/test/unit/fixture/search_linguistic_focus_bbox.js
@ -1,7 +1,5 @@

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [{
@ -103,12 +101,8 @@ module.exports = {
            'weight': 2
          }]
        }
-          }]
-        }
-      },
-      'filter': {
-        'bool': {
-          'must': [{
+      }],
+      'filter': [{
        'geo_bounding_box': {
          'center_point': {
            'top': 11.51,
@ -116,13 +110,10 @@ module.exports = {
            'bottom': 47.47,
            'left': -103.16
          },
-              '_cache': true,
          'type': 'indexed'
        }
      }]
    }
-      }
-    }
  },
  'sort': [ '_score' ],
  'size': 10,
--- a/test/unit/fixture/search_linguistic_focus_null_island.js
+++ b/test/unit/fixture/search_linguistic_focus_null_island.js
@ -1,7 +1,5 @@

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [{
@ -105,8 +103,6 @@ module.exports = {
        }
      }]
    }
-      }
-    }
  },
  'sort': [ '_score' ],
  'size': 10,
--- a/test/unit/fixture/search_linguistic_only.js
+++ b/test/unit/fixture/search_linguistic_only.js
@ -1,7 +1,5 @@

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [{
@ -75,8 +73,6 @@ module.exports = {
        }
      }]
    }
-      }
-    }
  },
  'sort': [ '_score' ],
  'size': 10,
--- a/test/unit/fixture/search_linguistic_viewport.js
+++ b/test/unit/fixture/search_linguistic_viewport.js
@ -1,6 +1,4 @@
 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [
@ -117,8 +115,6 @@ module.exports = {
        }
      ]
    }
-      }
-    }
  },
  'size': 10,
  'track_scores': true,
--- a/test/unit/fixture/search_partial_address.js
+++ b/test/unit/fixture/search_partial_address.js
@ -2,8 +2,6 @@
 var vs = require('../../../query/search_defaults');

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [{
@ -100,8 +98,6 @@ module.exports = {
        }
      }]
    }
-      }
-    }
  },
  'size': 10,
  'sort': [ '_score' ],
--- a/test/unit/fixture/search_regions_address.js
+++ b/test/unit/fixture/search_regions_address.js
@ -2,8 +2,6 @@
 var vs = require('../../../query/search_defaults');

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [{
@ -116,8 +114,6 @@ module.exports = {
        }
      }]
    }
-      }
-    }
  },
  'size': 10,
  'sort': [ '_score' ],
--- a/test/unit/fixture/search_with_source_filtering.js
+++ b/test/unit/fixture/search_with_source_filtering.js
@ -1,7 +1,5 @@

 module.exports = {
-  'query': {
-    'filtered': {
  'query': {
    'bool': {
      'must': [{
@ -73,19 +71,13 @@ module.exports = {
            'weight': 2
          }]
        }
-          }]
-        }
-      },
-      'filter': {
-        'bool': {
-          'must': [{
+      }],
+      'filter': [{
        'terms': {
          'source': ['test_source']
        }
      }]
    }
-      }
-    }
  },
  'sort': [ '_score' ],
  'size': 20,
--- a/test/unit/query/reverse.js
+++ b/test/unit/query/reverse.js
@ -22,7 +22,7 @@ module.exports.tests.query = function(test, common) {
    var compiled = JSON.parse( JSON.stringify( query ) );
    var expected = require('../fixture/reverse_standard');

-    t.deepEqual(compiled, expected, 'valid reverse query');
+    t.deepEqual(compiled, expected, 'reverse_standard');
    t.end();
  });

@ -38,7 +38,7 @@ module.exports.tests.query = function(test, common) {
    var compiled = JSON.parse( JSON.stringify( query ) );
    var expected = require('../fixture/reverse_null_island');

-    t.deepEqual(compiled, expected, 'valid reverse query');
+    t.deepEqual(compiled, expected, 'reverse_null_island');
    t.end();
  });

@ -54,7 +54,7 @@ module.exports.tests.query = function(test, common) {
    var compiled = JSON.parse( JSON.stringify( query ) );
    var expected = '123km';

-    t.deepEqual(compiled.query.filtered.filter.bool.must[0].geo_distance.distance, expected, 'distance set to boundary circle radius');
+    t.deepEqual(compiled.query.bool.filter[0].geo_distance.distance, expected, 'distance set to boundary circle radius');
    t.end();
  });

@ -71,9 +71,9 @@ module.exports.tests.query = function(test, common) {

    // this should not equal `point.lat` and `point.lon` as it was explitely specified
    var expected = { lat: clean['boundary.circle.lat'], lon: clean['boundary.circle.lon'] };
-    var centroid = compiled.query.filtered.filter.bool.must[0].geo_distance.center_point;
+    var centroid = compiled.query.bool.filter[0].geo_distance.center_point;

-    t.deepEqual(centroid, expected, 'boundary.circle/lon overrides point.lat/lon');
+    t.deepEqual(centroid, expected, 'reverse: boundary.circle/lon overrides point.lat/lon');
    t.end();
  });

--- a/test/unit/query/search.js
+++ b/test/unit/query/search.js
@ -178,7 +178,7 @@ module.exports.tests.query = function(test, common) {
    var compiled = JSON.parse( JSON.stringify( query ) );
    var expected = require('../fixture/search_boundary_country');

-    t.deepEqual(compiled, expected, 'valid boundary.country query');
+    t.deepEqual(compiled, expected, 'search: valid boundary.country query');
    t.end();
  });

@ -191,7 +191,7 @@ module.exports.tests.query = function(test, common) {
    var compiled = JSON.parse( JSON.stringify( query ) );
    var expected = require('../fixture/search_with_source_filtering');

-    t.deepEqual(compiled, expected, 'valid search query with source filtering');
+    t.deepEqual(compiled, expected, 'search: valid search query with source filtering');
    t.end();
  });