use filter instead of must in query
faster, and the score does not matter here
This commit is contained in:
@@ -235,11 +235,11 @@ export default class Job extends events.EventEmitter {
|
|||||||
constant_score: {
|
constant_score: {
|
||||||
filter: {
|
filter: {
|
||||||
bool: {
|
bool: {
|
||||||
must: { term: { jobtype: this.jobtype } },
|
filter: { term: { jobtype: this.jobtype } },
|
||||||
should: [
|
should: [
|
||||||
{ term: { status: 'pending'} },
|
{ term: { status: 'pending'} },
|
||||||
{ bool:
|
{ bool:
|
||||||
{ must: [
|
{ filter: [
|
||||||
{ term: { status: 'processing' } },
|
{ term: { status: 'processing' } },
|
||||||
{ range: { process_expiration: { lte: nowTime } } }
|
{ range: { process_expiration: { lte: nowTime } } }
|
||||||
] }
|
] }
|
||||||
|
|||||||
@@ -231,8 +231,7 @@ describe('Worker class', function () {
|
|||||||
it('should search by job type', function () {
|
it('should search by job type', function () {
|
||||||
const { body } = getSearchParams(jobtype);
|
const { body } = getSearchParams(jobtype);
|
||||||
const conditions = get(body, conditionPath);
|
const conditions = get(body, conditionPath);
|
||||||
expect(conditions).to.have.property('must');
|
expect(conditions.filter).to.eql({ term: { jobtype: jobtype } });
|
||||||
expect(conditions.must).to.eql({ term: { jobtype: jobtype } });
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should search for pending or expired jobs', function () {
|
it('should search for pending or expired jobs', function () {
|
||||||
@@ -243,7 +242,7 @@ describe('Worker class', function () {
|
|||||||
// this works because we are stopping the clock, so all times match
|
// this works because we are stopping the clock, so all times match
|
||||||
const nowTime = moment().toISOString();
|
const nowTime = moment().toISOString();
|
||||||
const pending = { term: { status: 'pending'} };
|
const pending = { term: { status: 'pending'} };
|
||||||
const expired = { bool: { must: [
|
const expired = { bool: { filter: [
|
||||||
{ term: { status: 'processing' } },
|
{ term: { status: 'processing' } },
|
||||||
{ range: { process_expiration: { lte: nowTime } } }
|
{ range: { process_expiration: { lte: nowTime } } }
|
||||||
] } };
|
] } };
|
||||||
|
|||||||
Reference in New Issue
Block a user