Skip to content

Increased query performance for some cases #467

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

Open
ghost wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Increased query performance for some cases #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ebbd4b
Increased query performance for some cases
May 4, 2018
8d96f2b
Allow number strings to be compared to numbers
Jul 18, 2018
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
10 changes: 6 additions & 4 deletions json-path/src/main/java/com/jayway/jsonpath/internal/CharacterIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,16 +220,18 @@ public void readSignificantChar(char c) {
incrementPosition(1);
}

public void readSignificantSubSequence(CharSequence s) {
// true if successful, false if invalid path
public boolean readSignificantSubSequence(CharSequence s) {
skipBlanks();
if (! inBounds(position + s.length() - 1)) {
throw new InvalidPathException(String.format("End of string reached while expecting: %s", s));
return false;
}
if (! subSequence(position, position + s.length()).equals(s)) {
throw new InvalidPathException(String.format("Expected: %s", s));
return false;
}

incrementPosition(s.length());
return true;
}

public int indexOfPreviousSignificantChar(int startPosition){
Expand Down Expand Up @@ -314,4 +316,4 @@ public CharacterIndex trim() {
skipBlanksAtEnd();
return this;
}
}
}
2 changes: 1 addition & 1 deletion json-path/src/main/java/com/jayway/jsonpath/internal/JsonContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ public DocumentContext put(JsonPath path, String key, Object value) {

private JsonPath pathFromCache(String path, Predicate[] filters) {
Cache cache = CacheProvider.getCache();
String cacheKey = Utils.concat(path, new LinkedList<Predicate>(asList(filters)).toString());
String cacheKey = path + new LinkedList<Predicate>(asList(filters)).toString();
JsonPath jsonPath = cache.get(cacheKey);
if (jsonPath == null) {
jsonPath = compile(path, filters);
Expand Down
35 changes: 30 additions & 5 deletions json-path/src/main/java/com/jayway/jsonpath/internal/filter/EvaluatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,13 @@ public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateCont
private static class LessThanEvaluator implements Evaluator {
@Override
public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateContext ctx) {
if(left.isNumberNode() && right.isNumberNode()){
if(left.isStringNode() && right.isNumberNode()) {
return Double.parseDouble(left.asStringNode().getString()) < right.asNumberNode().getNumber().doubleValue();
}
else if(left.isNumberNode() && right.isStringNode()) {
return left.asNumberNode().getNumber().doubleValue() < Double.parseDouble(right.asStringNode().getString());
}
else if(left.isNumberNode() && right.isNumberNode()){
return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) < 0;
} if(left.isStringNode() && right.isStringNode()){
return left.asStringNode().getString().compareTo(right.asStringNode().getString()) < 0;
Expand All @@ -103,7 +109,13 @@ public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateCont
private static class LessThanEqualsEvaluator implements Evaluator {
@Override
public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateContext ctx) {
if(left.isNumberNode() && right.isNumberNode()){
if(left.isStringNode() && right.isNumberNode()) {
return Double.parseDouble(left.asStringNode().getString()) <= right.asNumberNode().getNumber().doubleValue();
}
else if(left.isNumberNode() && right.isStringNode()) {
return left.asNumberNode().getNumber().doubleValue() <= Double.parseDouble(right.asStringNode().getString());
}
else if(left.isNumberNode() && right.isNumberNode()){
return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) <= 0;
} if(left.isStringNode() && right.isStringNode()){
return left.asStringNode().getString().compareTo(right.asStringNode().getString()) <= 0;
Expand All @@ -115,9 +127,16 @@ public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateCont
private static class GreaterThanEvaluator implements Evaluator {
@Override
public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateContext ctx) {
if(left.isNumberNode() && right.isNumberNode()){
if(left.isStringNode() && right.isNumberNode()) {
return Double.parseDouble(left.asStringNode().getString()) > right.asNumberNode().getNumber().doubleValue();
}
else if(left.isNumberNode() && right.isStringNode()) {
return left.asNumberNode().getNumber().doubleValue() > Double.parseDouble(right.asStringNode().getString());
}
else if(left.isNumberNode() && right.isNumberNode()){
return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) > 0;
} else if(left.isStringNode() && right.isStringNode()){
}
else if(left.isStringNode() && right.isStringNode()){
return left.asStringNode().getString().compareTo(right.asStringNode().getString()) > 0;
}
return false;
Expand All @@ -127,7 +146,13 @@ public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateCont
private static class GreaterThanEqualsEvaluator implements Evaluator {
@Override
public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateContext ctx) {
if(left.isNumberNode() && right.isNumberNode()){
if(left.isStringNode() && right.isNumberNode()) {
return Double.parseDouble(left.asStringNode().getString()) >= right.asNumberNode().getNumber().doubleValue();
}
else if(left.isNumberNode() && right.isStringNode()) {
return left.asNumberNode().getNumber().doubleValue() >= Double.parseDouble(right.asStringNode().getString());
}
else if(left.isNumberNode() && right.isNumberNode()){
return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) >= 0;
} else if(left.isStringNode() && right.isStringNode()){
return left.asStringNode().getString().compareTo(right.asStringNode().getString()) >= 0;
Expand Down
16 changes: 16 additions & 0 deletions json-path/src/main/java/com/jayway/jsonpath/internal/filter/FilterCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,13 @@ private ExpressionNode readLogicalOR() {

while (true) {
int savepoint = filter.position();
if (filter.readSignificantSubSequence(LogicalOperator.OR.getOperatorString()))
ops.add(readLogicalAND());
else {
filter.setPosition(savepoint);
break;
}
/*
try {
filter.readSignificantSubSequence(LogicalOperator.OR.getOperatorString());
ops.add(readLogicalAND());
Expand All @@ -140,6 +147,7 @@ private ExpressionNode readLogicalOR() {
filter.setPosition(savepoint);
break;
}
*/
}

return 1 == ops.size() ? ops.get(0) : LogicalExpressionNode.createLogicalOr(ops);
Expand All @@ -152,6 +160,13 @@ private ExpressionNode readLogicalAND() {

while (true) {
int savepoint = filter.position();
if (filter.readSignificantSubSequence(LogicalOperator.AND.getOperatorString()))
ops.add(readLogicalANDOperand());
else {
filter.setPosition(savepoint);
break;
}
/*
try {
filter.readSignificantSubSequence(LogicalOperator.AND.getOperatorString());
ops.add(readLogicalANDOperand());
Expand All @@ -160,6 +175,7 @@ private ExpressionNode readLogicalAND() {
filter.setPosition(savepoint);
break;
}
*/
}

return 1 == ops.size() ? ops.get(0) : LogicalExpressionNode.createLogicalAnd(ops);
Expand Down
2 changes: 1 addition & 1 deletion json-path/src/main/java/com/jayway/jsonpath/internal/filter/ValueNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ public PathNode asExistsCheck(boolean shouldExist) {

@Override
public String toString() {
return existsCheck && ! shouldExist ? Utils.concat("!" , path.toString()) : path.toString();
return existsCheck && ! shouldExist ? ('!' + path.toString()) : path.toString();
}

public ValueNode evaluate(Predicate.PredicateContext ctx) {
Expand Down
4 changes: 2 additions & 2 deletions json-path/src/main/java/com/jayway/jsonpath/internal/path/PathToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ void handleObjectProperty(String currentPath, Object model, EvaluationContextImp

if(properties.size() == 1) {
String property = properties.get(0);
String evalPath = Utils.concat(currentPath, "['", property, "']");
String evalPath = currentPath + "['" + property + "']";
Object propertyVal = readObjectProperty(property, model, ctx);
if(propertyVal == JsonProvider.UNDEFINED){
// Conditions below heavily depend on current token type (and its logic) and are not "universal",
Expand Down Expand Up @@ -123,7 +123,7 @@ private static Object readObjectProperty(String property, Object model, Evaluati


protected void handleArrayIndex(int index, String currentPath, Object model, EvaluationContextImpl ctx) {
String evalPath = Utils.concat(currentPath, "[", String.valueOf(index), "]");
String evalPath = currentPath + "[" + index + "]";
PathRef pathRef = ctx.forUpdate() ? PathRef.create(model, index) : PathRef.NO_OP;
int effectiveIndex = index < 0 ? ctx.jsonProvider().length(model) + index : index;
try {
Expand Down