Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deterministic score tiebreaker #130

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

deterministic score tiebreaker #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion layout/AddressesUsingIdsQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ class AddressesUsingIdsQuery extends Query {
}
},
size: vs.var('size'),
track_scores: vs.var('track_scores')
track_scores: vs.var('track_scores'),
sort: ['_score', '_id']
};

// add unit/housenumber/street if available
Expand Down
2 changes: 1 addition & 1 deletion layout/FilteredBooleanQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Layout.base = function( vs ){
},
size: vs.var('size'),
track_scores: vs.var('track_scores'),
sort: ['_score']
sort: ['_score', '_id']
};
};

Expand Down
3 changes: 2 additions & 1 deletion layout/VenuesQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ class VenuesQuery extends Query {
}
},
size: vs.var('size'),
track_scores: vs.var('track_scores')
track_scores: vs.var('track_scores'),
sort: ['_score', '_id']
};

// add any scores (_.compact removes falsey values from arrays)
Expand Down
3 changes: 2 additions & 1 deletion layout/baseQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ module.exports = {
}
},
sort: [
'_score'
'_score',
'_id'
]
};
6 changes: 5 additions & 1 deletion test/fixtures/addressesUsingIdsQuery/housenumber_no_units.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,9 @@
}
},
"size": "size value",
"track_scores": "track_scores value"
"track_scores": "track_scores value",
"sort": [
"_score",
"_id"
]
}
6 changes: 5 additions & 1 deletion test/fixtures/addressesUsingIdsQuery/no_housenumber.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,9 @@
}
},
"size": "size value" ,
"track_scores": "track_scores value"
"track_scores": "track_scores value",
"sort": [
"_score",
"_id"
]
}
6 changes: 5 additions & 1 deletion test/fixtures/addressesUsingIdsQuery/no_layers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,9 @@
}
},
"size": "size value" ,
"track_scores": "track_scores value"
"track_scores": "track_scores value",
"sort": [
"_score",
"_id"
]
}
6 changes: 5 additions & 1 deletion test/fixtures/addressesUsingIdsQuery/no_layers_with_boosts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,9 @@
}
},
"size": "size value" ,
"track_scores": "track_scores value"
"track_scores": "track_scores value",
"sort": [
"_score",
"_id"
]
}
6 changes: 5 additions & 1 deletion test/fixtures/addressesUsingIdsQuery/unit_no_housenumber.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,9 @@
}
},
"size": "size value",
"track_scores": "track_scores value"
"track_scores": "track_scores value",
"sort": [
"_score",
"_id"
]
}
6 changes: 5 additions & 1 deletion test/fixtures/addressesUsingIdsQuery/with_filters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,9 @@
}
},
"size": "size value" ,
"track_scores": "track_scores value"
"track_scores": "track_scores value",
"sort": [
"_score",
"_id"
]
}
6 changes: 5 additions & 1 deletion test/fixtures/addressesUsingIdsQuery/with_layers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,9 @@
}
},
"size": "size value" ,
"track_scores": "track_scores value"
"track_scores": "track_scores value",
"sort": [
"_score",
"_id"
]
}
6 changes: 5 additions & 1 deletion test/fixtures/addressesUsingIdsQuery/with_layers_and_filters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,9 @@
}
},
"size": "size value" ,
"track_scores": "track_scores value"
"track_scores": "track_scores value",
"sort": [
"_score",
"_id"
]
}
6 changes: 5 additions & 1 deletion test/fixtures/addressesUsingIdsQuery/with_scores.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,9 @@
}
},
"size": "size value" ,
"track_scores": "track_scores value"
"track_scores": "track_scores value",
"sort": [
"_score",
"_id"
]
}
3 changes: 2 additions & 1 deletion test/fixtures/fallbackQuery1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,7 @@
"size": "size value",
"track_scores": "track_scores value",
"sort": [
"_score"
"_score",
"_id"
]
}
3 changes: 2 additions & 1 deletion test/fixtures/fallbackQuery2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,7 @@
"size": "size value",
"track_scores": "track_scores value",
"sort": [
"_score"
"_score",
"_id"
]
}
3 changes: 2 additions & 1 deletion test/fixtures/fallbackQuery_address_with_postcode.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
"size": "size value",
"track_scores": "track_scores value",
"sort": [
"_score"
"_score",
"_id"
]
}
3 changes: 2 additions & 1 deletion test/fixtures/fallbackQuery_neighbourhood_only.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"size": "size value",
"track_scores": "track_scores value",
"sort": [
"_score"
"_score",
"_id"
]
}
3 changes: 2 additions & 1 deletion test/fixtures/fallbackQuery_nothing_set.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"size": "size value",
"track_scores": "track_scores value",
"sort": [
"_score"
"_score",
"_id"
]
}
3 changes: 2 additions & 1 deletion test/fixtures/structuredFallbackQuery/address.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,7 @@
"size": "size value",
"track_scores": "track_scores value",
"sort": [
"_score"
"_score",
"_id"
]
}
3 changes: 2 additions & 1 deletion test/fixtures/structuredFallbackQuery/address_with_postcode.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
"size": "size value",
"track_scores": "track_scores value",
"sort": [
"_score"
"_score",
"_id"
]
}
3 changes: 2 additions & 1 deletion test/fixtures/structuredFallbackQuery/housenumber.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"size": "size value",
"track_scores": "track_scores value",
"sort": [
"_score"
"_score",
"_id"
]
}
3 changes: 2 additions & 1 deletion test/fixtures/structuredFallbackQuery/locality_as_borough.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@
"size": "size value",
"track_scores": "track_scores value",
"sort": [
"_score"
"_score",
"_id"
]
}
3 changes: 2 additions & 1 deletion test/fixtures/structuredFallbackQuery/query.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,7 @@
"size": "size value",
"track_scores": "track_scores value",
"sort": [
"_score"
"_score",
"_id"
]
}
6 changes: 5 additions & 1 deletion test/fixtures/venuesQuery/base_render.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,9 @@
}
},
"size": "size value" ,
"track_scores": "track_scores value"
"track_scores": "track_scores value",
"sort": [
"_score",
"_id"
]
}
6 changes: 5 additions & 1 deletion test/fixtures/venuesQuery/with_filters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,9 @@
}
},
"size": "size value" ,
"track_scores": "track_scores value"
"track_scores": "track_scores value",
"sort": [
"_score",
"_id"
]
}
6 changes: 5 additions & 1 deletion test/fixtures/venuesQuery/with_scores.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,9 @@
}
},
"size": "size value" ,
"track_scores": "track_scores value"
"track_scores": "track_scores value",
"sort": [
"_score",
"_id"
]
}
14 changes: 7 additions & 7 deletions test/layout/FilteredBooleanQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports.tests.base_render = function(test, common) {
},
size: { $: 'size value' },
track_scores: { $: 'track_scores value' },
sort: ['_score']
sort: ['_score', '_id']
};

t.deepEquals(actual, expected);
Expand Down Expand Up @@ -94,7 +94,7 @@ module.exports.tests.scores = function(test, common) {
},
size: { $: 'size value' },
track_scores: { $: 'track_scores value' },
sort: ['_score']
sort: ['_score', '_id']
};

t.deepEquals(actual, expected);
Expand Down Expand Up @@ -127,7 +127,7 @@ module.exports.tests.scores = function(test, common) {
},
size: { $: 'size value' },
track_scores: { $: 'track_scores value' },
sort: ['_score']
sort: ['_score', '_id']
};

t.deepEquals(actual, expected);
Expand Down Expand Up @@ -160,7 +160,7 @@ module.exports.tests.scores = function(test, common) {
},
size: { $: 'size value' },
track_scores: { $: 'track_scores value' },
sort: ['_score']
sort: ['_score', '_id']
};

t.deepEquals(actual, expected);
Expand Down Expand Up @@ -204,7 +204,7 @@ module.exports.tests.scores = function(test, common) {
},
size: { $: 'size value' },
track_scores: { $: 'track_scores value' },
sort: ['_score']
sort: ['_score', '_id']
};

t.equals(score_views_called, 8);
Expand Down Expand Up @@ -254,7 +254,7 @@ module.exports.tests.filter = function(test, common) {
},
size: { $: 'size value' },
track_scores: { $: 'track_scores value' },
sort: ['_score']
sort: ['_score', '_id']
};

t.equals(filter_views_called, 8);
Expand Down Expand Up @@ -299,7 +299,7 @@ module.exports.tests.sort = function(test, common) {
size: { $: 'size value' },
track_scores: { $: 'track_scores value' },
sort: [
'_score',
'_score', '_id',
{ 'sort field 1': 'sort value 1'},
{ 'sort field 2': 'sort value 2'}
]
Expand Down