Search issues with 1.5

[ctmay4]

Describe the bug
The expected behavior building searches has changed in 1.5

To Reproduce
Steps to reproduce the behavior:

In this code I start with a search on "version". Optionally, I add an "or" criteria. If I add the "or", then the previous "version" search is removed. This code worked correctly in 1.3 and stopped working in 1.5.

Query<C> q = getDatastore().createQuery(_changelogClass);

q.field("version").equal(version);

// POINT A

// id searching
if (param.getDisplayId() != null) {
    List<Criteria> orCriteria = new ArrayList<>();

    orCriteria.add(q.criteria("adds.id").equal(param.getDisplayId()));
    orCriteria.add(q.criteria("deletes.id").equal(param.getDisplayId()));
    orCriteria.add(q.criteria("mods.id").equal(param.getDisplayId()));

    q.or(orCriteria.toArray(new Criteria[orCriteria.size()]));
}

// POINT B

In the code I am optionally adding an "or" block. I put the string representation of the query object below at two points in both versions

In 1.3.x:

POINT A:

{ query: { "version" : "latest" }  }

POINT B:

{
    query: {
        "version": "latest",
        "$or": [{
            "adds.id": "5cb5fa6f8d7bd65e8276cd48"
        }, {
            "deletes.id": "5cb5fa6f8d7bd65e8276cd48"
        }, {
            "mods.id": "5cb5fa6f8d7bd65e8276cd48"
        }]
    }
}

In 1.5.0:

POINT A:

{ query: { "version" : "latest" }  }

POINT B:

{
    {
        "$or": [{
            "adds.id": "5cb5fa6f8d7bd65e8276cd48"
        }, {
            "deletes.id": "5cb5fa6f8d7bd65e8276cd48"
        }, {
            "mods.id": "5cb5fa6f8d7bd65e8276cd48"
        }]
    }
}

In the new version the "or" overwrites what is in the query, whereas under 1.3 it added an "or" criteria. Is this a known change? I could write this in different ways, but I wanted to highlight that it now produces different results.

I can fix my code by changing it to look like this:

Query<C> q = getDatastore().createQuery(_changelogClass);

List<Criteria> andCriteria = new ArrayList<>();

andCriteria.add(q.criteria("version").equal(version));

// id searching
if (param.getDisplayId() != null) {
    andCriteria.add(q.or(
            q.criteria("adds.id").equal(param.getDisplayId()),
            q.criteria("deletes.id").equal(param.getDisplayId()),
            q.criteria("mods.id").equal(param.getDisplayId())
    ));
}

q.and(andCriteria.toArray(new Criteria[0]));

[evanchooly]

@ctmay4 i think i've finally untangled that code. can you try the snapshot build (either wait a few hours for it to show up once jenkins pushes it or build locally from master)?

[ctmay4]

Awesome. I'll wait until tomorrow and test the snapshot. Thanks again!

[evanchooly]

Sounds good. They should be live now in addition to the asList() -> toList() update.

[ctmay4]

Just did some testing. The snapshot definitely fixed some things. I did find one test that still produces different results. I was able to work around it, but it makes me wonder if there are still differences my unit tests are not hitting.

Here is some code that takes a defined search criteria and sometimes adds additional criteria.

@Override
protected Query<RxBean> buildSearchCriteria(RxSearchParam param) {
    Query<RxBean> q = super.buildSearchCriteria(param);

    // BEFORE

    q.and(q.criteria("type").equal(param.getType()));

    // AFTER

    return q;
}

For both versions the value of q is the same for BEFORE:

{
    "version": "latest",
    "hidden": {
        "$ne": true
    },
    "$or": [{
        "name": {
            "$regex": "\\Qterm_a\\E",
            "$options": "i"
        }
    }, {
        "alternateName": {
            "$regex": "\\Qterm_a\\E",
            "$options": "i"
        }
    }]
}

The AFTER is different.

In the old versions (1.3.x) the type is correctly added to the existing query:

{
    "type": "REGIMEN",
    "version": "latest",
    "hidden": {
        "$ne": true
    },
    "$or": [{
        "name": {
            "$regex": "\\Qterm_a\\E",
            "$options": "i"
        }
    }, {
        "alternateName": {
            "$regex": "\\Qterm_a\\E",
            "$options": "i"
        }
    }]
}

However under 1.5.x, the query is dropping the existing criteria and ends up with only the new criteria::

{
    "type": "REGIMEN"
}

Interestingly enough, if I switch the code from using and to using field:

@Override
protected Query<RxBean> buildSearchCriteria(RxSearchParam param) {
    Query<RxBean> q = super.buildSearchCriteria(param);

    // BEFORE

    q.field("type").equal(param.getType());

    // AFTER

    return q;
}

Then the value of q is correct for AFTER.

Does that make sense?

[evanchooly]

it does and I think I know why...

[evanchooly]

ok. all cleaned up.

[evanchooly]

I just pushed 1.5.1.

[ctmay4]

I did some testing and looks good. Thanks again.

[evanchooly]

Any time! Thanks for your help and patience running down that fix.