Merge pull request #7129 from ycombinator/safer-range-bound

Use lt instead of lte for safer upper bound in range filter.
This commit is contained in:
Spencer 2016-05-11 04:01:19 -07:00
commit 0051da439f
2 changed files with 5 additions and 5 deletions

View file

@ -72,13 +72,13 @@ describe('AggConfig Filters', function () {
expect(fieldParams).to.have.property('gte');
expect(fieldParams.gte).to.be.a('number');
expect(fieldParams).to.have.property('lte');
expect(fieldParams.lte).to.be.a('number');
expect(fieldParams).to.have.property('lt');
expect(fieldParams.lt).to.be.a('number');
expect(fieldParams).to.have.property('format');
expect(fieldParams.format).to.be('epoch_millis');
expect(fieldParams.gte).to.be.lessThan(fieldParams.lte);
expect(fieldParams.gte).to.be.lessThan(fieldParams.lt);
expect(filter).to.have.property('meta');
expect(filter.meta).to.have.property('index', vis.indexPattern.id);
@ -102,7 +102,7 @@ describe('AggConfig Filters', function () {
let params = filter.range[field.name];
expect(params.gte).to.be(+bucketStart);
expect(params.lte).to.be(+bucketStart.clone().add(interval).subtract(1, 'ms'));
expect(params.lt).to.be(+bucketStart.clone().add(interval));
});
});
});

View file

@ -8,7 +8,7 @@ export default function createDateHistogramFilterProvider(Private) {
return buildRangeFilter(agg.params.field, {
gte: start.valueOf(),
lte: start.add(interval).subtract(1, 'ms').valueOf(),
lt: start.add(interval).valueOf(),
format: 'epoch_millis'
}, agg.vis.indexPattern);
};