Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix for range query in Elasticsearch #156

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

Merged
m0nhawk merged 6 commits into from
Dec 13, 2022
Merged

Fix for range query in Elasticsearch #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d691230
fix: creating combined "range" query for Elasticsearch
m0nhawk Dec 12, 2022
7897531
fix: test for range merge
m0nhawk Dec 12, 2022
a64c132
fix: incorrect function name
m0nhawk Dec 12, 2022
d96b4d4
fix: test for "and" should result in different result + an extra test
m0nhawk Dec 12, 2022
fe5aab8
fix: eslint complaint about "for..in loops iterate over the entire pr…
m0nhawk Dec 12, 2022
7331f6e
fix: use Object.keys() instead of for..in loop
m0nhawk Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/server/es/__tests__/filter.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,36 @@ describe('Transfer GraphQL filter to ES filter, filter unit', () => {
expect(resultESFilter3).toEqual(expectedESFilter);
});

test('could transfer graphql filter to ES filter object, range ">=" and "<=" operator', async () => {
await esInstance.initialize();
// <=, lte, LTE
const gqlFilter1 = { and: [{ '<=': { file_count: 20 } }, { '>=': { file_count: 10 } }] };
const gqlFilter2 = { and: [{ lte: { file_count: 20 } }, { gte: { file_count: 10 } }] };
const gqlFilter3 = { and: [{ LTE: { file_count: 20 } }, { GTE: { file_count: 10 } }] };
const resultESFilter1 = getFilterObj(esInstance, esIndex, gqlFilter1);
const resultESFilter2 = getFilterObj(esInstance, esIndex, gqlFilter2);
const resultESFilter3 = getFilterObj(esInstance, esIndex, gqlFilter3);
const expectedESFilter = { bool: { must: [{ range: { file_count: { lte: 20, gte: 10 } } }] } };
expect(resultESFilter1).toEqual(expectedESFilter);
expect(resultESFilter2).toEqual(expectedESFilter);
expect(resultESFilter3).toEqual(expectedESFilter);
});

test('could transfer graphql filter to ES filter object, range "<=" operator', async () => {
await esInstance.initialize();
// <=, lte, LTE
const gqlFilter1 = { and: [{ '<=': { file_count: 20 } }] };
const gqlFilter2 = { and: [{ lte: { file_count: 20 } }] };
const gqlFilter3 = { and: [{ LTE: { file_count: 20 } }] };
const resultESFilter1 = getFilterObj(esInstance, esIndex, gqlFilter1);
const resultESFilter2 = getFilterObj(esInstance, esIndex, gqlFilter2);
const resultESFilter3 = getFilterObj(esInstance, esIndex, gqlFilter3);
const expectedESFilter = { bool: { must: [{ range: { file_count: { lte: 20 } } }] } };
expect(resultESFilter1).toEqual(expectedESFilter);
expect(resultESFilter2).toEqual(expectedESFilter);
expect(resultESFilter3).toEqual(expectedESFilter);
});

test('could transfer graphql filter to ES filter object, "search" operator', async () => {
await esInstance.initialize();
const keyword = 'male';
Expand Down
31 changes: 29 additions & 2 deletions src/server/es/filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,18 @@ const fromPathToNode = (esInstance, esIndex, path) => {
return node;
};

const mergeRangeOperations = (a, b) => {
let merged = Object.assign({}, a, b);

Object.keys(merged).forEach(function(key) {
if (typeof merged[key] === 'object' && merged[key] !== null) {
merged[key] = mergeRangeOperations(a[key], b[key]);
}
})

return merged;
}

const getNumericTextType = (
esInstance,
esIndex,
Expand Down Expand Up @@ -66,7 +78,7 @@ const getFilterItemForString = (op, pField, value, path) => {
// if using missingDataAlias, we need to remove the missingDataAlias from filter values
// and then add a must_not exists bool func to compensate missingDataAlias
if (config.esConfig.aggregationIncludeMissingData
&& value.includes(config.esConfig.missingDataAlias)) {
&& value.includes(config.esConfig.missingDataAlias)) {
const newValue = value.filter((element) => element !== config.esConfig.missingDataAlias);
return {
bool: {
Expand Down Expand Up @@ -233,14 +245,29 @@ const getFilterObj = (
if (topLevelOpLowerCase === 'and' || topLevelOpLowerCase === 'or') {
const boolConnectOp = topLevelOpLowerCase === 'and' ? 'must' : 'should';
const boolItemsList = [];

const filterRange = [];
graphqlFilterObj[topLevelOp].forEach((filterItem) => {
const filterObj = getFilterObj(
esInstance, esIndex, filterItem, aggsField, filterSelf, defaultAuthFilter, objPath,
);
if (filterObj) {
boolItemsList.push(filterObj);
if ("range" in filterObj) {
filterRange.push(filterObj);
} else {
boolItemsList.push(filterObj);
}
}
});

if (filterRange.length === 1) {
boolItemsList.push(filterRange[0]);
}

if (filterRange.length === 2) {
boolItemsList.push(mergeRangeOperations(filterRange[0], filterRange[1]));
}

if (boolItemsList.length === 0) {
resultFilterObj = null;
} else {
Expand Down