Skip to content
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

Jump to bottom

Bump org.json dependency version #1586

Merged
merged 4 commits into from
Apr 26, 2023
Merged

Bump org.json dependency version #1586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92e2a7e
Bump org.json version for CVE
dai-chen Apr 26, 2023
7b8aef3
Fix assertion by json array similar method
dai-chen Apr 26, 2023
073493b
Fix more assertions which failed on query path return BigDecimal
dai-chen Apr 26, 2023
cc43408
Fix legacy expr value factory
dai-chen Apr 26, 2023
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
5 changes: 3 additions & 2 deletions integ-test/src/test/java/org/opensearch/sql/legacy/AggregationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import static org.opensearch.sql.util.MatcherUtils.verifySchema;

import java.io.IOException;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
Expand Down Expand Up @@ -1029,7 +1030,7 @@ public void minOnNestedField() throws Exception {
TEST_INDEX_NESTED_TYPE);
JSONObject result = executeQuery(query);
JSONObject aggregation = getAggregation(result, "message.dayOfWeek@NESTED");
Assert.assertEquals(1.0, (double) aggregation.query("/minDays/value"), 0.0001);
Assert.assertEquals(1.0, ((BigDecimal) aggregation.query("/minDays/value")).doubleValue(), 0.0001);
}

@Test
Expand All @@ -1039,7 +1040,7 @@ public void sumOnNestedField() throws Exception {
TEST_INDEX_NESTED_TYPE);
JSONObject result = executeQuery(query);
JSONObject aggregation = getAggregation(result, "message.dayOfWeek@NESTED");
Assert.assertEquals(19.0, (double) aggregation.query("/sumDays/value"), 0.0001);
Assert.assertEquals(19.0, ((BigDecimal) aggregation.query("/sumDays/value")).doubleValue(), 0.0001);
}

@Test
Expand Down
23 changes: 12 additions & 11 deletions integ-test/src/test/java/org/opensearch/sql/legacy/NestedFieldQueryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import static org.opensearch.sql.util.MatcherUtils.kvString;

import java.io.IOException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.function.Function;
import org.hamcrest.BaseMatcher;
Expand Down Expand Up @@ -316,7 +317,7 @@ public void aggregationWithoutGroupBy() throws IOException {
JSONObject result = executeQuery(sql);
JSONObject aggregation = getAggregation(result, "message.dayOfWeek@NESTED");

Assert.assertThat((Double) aggregation.query("/avgDay/value"), closeTo(3.166666666, 0.01));
Assert.assertThat(((BigDecimal) aggregation.query("/avgDay/value")).doubleValue(), closeTo(3.166666666, 0.01));
}

@Test
Expand Down Expand Up @@ -350,10 +351,10 @@ public void groupByRegularFieldAndSum() throws IOException {
Assert.assertNotNull(msgInfoBuckets);
Assert.assertThat(msgInfoBuckets.length(), equalTo(2));
Assert.assertThat(msgInfoBuckets.query("/0/key"), equalTo("a"));
Assert.assertThat((Double) msgInfoBuckets.query("/0/message.dayOfWeek@NESTED/sumDay/value"),
Assert.assertThat(((BigDecimal) msgInfoBuckets.query("/0/message.dayOfWeek@NESTED/sumDay/value")).doubleValue(),
closeTo(9.0, 0.01));
Assert.assertThat(msgInfoBuckets.query("/1/key"), equalTo("b"));
Assert.assertThat((Double) msgInfoBuckets.query("/1/message.dayOfWeek@NESTED/sumDay/value"),
Assert.assertThat(((BigDecimal) msgInfoBuckets.query("/1/message.dayOfWeek@NESTED/sumDay/value")).doubleValue(),
closeTo(10.0, 0.01));
}

Expand Down Expand Up @@ -593,12 +594,12 @@ public void maxAggOnNestedInnerFieldWithoutWhere() throws IOException {
Assert.assertThat(bucket.length(), equalTo(2));
Assert.assertThat(bucket.query("/0/key"), equalTo("Bob Smith"));
Assert.assertThat(
bucket.query("/0/projects.started_year@NESTED/projects.started_year@FILTER/max/value"),
equalTo(2015.0));
((BigDecimal) bucket.query("/0/projects.started_year@NESTED/projects.started_year@FILTER/max/value")).doubleValue(),
closeTo(2015.0, 0.01));
Assert.assertThat(bucket.query("/1/key"), equalTo("Jane Smith"));
Assert.assertThat(
bucket.query("/1/projects.started_year@NESTED/projects.started_year@FILTER/max/value"),
equalTo(2015.0));
((BigDecimal) bucket.query("/1/projects.started_year@NESTED/projects.started_year@FILTER/max/value")).doubleValue(),
closeTo(2015.0, 0.01));
}

@Test
Expand Down Expand Up @@ -780,12 +781,12 @@ public void havingMaxAggOnNestedInnerFieldWithoutWhere() throws IOException {
Assert.assertThat(bucket.length(), equalTo(2));
Assert.assertThat(bucket.query("/0/key"), equalTo("Bob Smith"));
Assert.assertThat(
bucket.query("/0/projects.started_year@NESTED/projects.started_year@FILTER/max_0/value"),
equalTo(2015.0));
((BigDecimal) bucket.query("/0/projects.started_year@NESTED/projects.started_year@FILTER/max_0/value")).doubleValue(),
closeTo(2015.0, 0.01));
Assert.assertThat(bucket.query("/1/key"), equalTo("Jane Smith"));
Assert.assertThat(
bucket.query("/1/projects.started_year@NESTED/projects.started_year@FILTER/max_0/value"),
equalTo(2015.0));
((BigDecimal) bucket.query("/1/projects.started_year@NESTED/projects.started_year@FILTER/max_0/value")).doubleValue(),
closeTo(2015.0, 0.01));
}

/***********************************************************
Expand Down
5 changes: 4 additions & 1 deletion integ-test/src/test/java/org/opensearch/sql/legacy/SubqueryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
package org.opensearch.sql.legacy;

import static org.hamcrest.Matchers.both;
import static org.hamcrest.Matchers.closeTo;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.core.Is.is;
import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
Expand All @@ -22,6 +23,7 @@

import com.google.common.collect.Ordering;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
Expand Down Expand Up @@ -345,7 +347,8 @@ public void selectFromSubqueryCountAndSum() throws IOException {
TEST_INDEX_ACCOUNT));

assertThat(result.query("/aggregations/count/value"), equalTo(1000));
assertThat(result.query("/aggregations/balance/value"), equalTo(25714837.0));
assertThat(((BigDecimal) result.query("/aggregations/balance/value")).doubleValue(),
closeTo(25714837.0, 0.01));
}

@Test
Expand Down
28 changes: 3 additions & 25 deletions integ-test/src/test/java/org/opensearch/sql/util/MatcherUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import com.google.common.base.Strings;
import com.google.gson.JsonParser;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -121,7 +122,7 @@ public static Matcher<JSONObject> kvString(String key, Matcher<String> matcher)
}

public static Matcher<JSONObject> kvDouble(String key, Matcher<Double> matcher) {
return featureValueOf("Json Match", matcher, actual -> (Double) actual.query(key));
return featureValueOf("Json Match", matcher, actual -> ((BigDecimal) actual.query(key)).doubleValue());
}

public static Matcher<JSONObject> kvInt(String key, Matcher<Integer> matcher) {
Expand Down Expand Up @@ -231,30 +232,7 @@ public void describeTo(Description description) {

@Override
protected boolean matchesSafely(JSONArray array) {
if (array.length() != expectedObjects.length) {
return false;
}

for (int i = 0; i < expectedObjects.length; i++) {
Object expected = expectedObjects[i];
boolean isEqual;

// Use similar() because JSONObject/JSONArray.equals() only check if same reference
if (expected instanceof JSONObject) {
isEqual = ((JSONObject) expected).similar(array.get(i));
} else if (expected instanceof JSONArray) {
isEqual = ((JSONArray) expected).similar(array.get(i));
} else if (null == expected) {
isEqual = JSONObject.NULL == array.get(i);
} else {
isEqual = expected.equals(array.get(i));
}

if (!isEqual) {
return false;
}
}
return true;
return array.similar(new JSONArray(expectedObjects));
}
};
}
Expand Down
2 changes: 1 addition & 1 deletion legacy/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ dependencies {
}
}
implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
implementation group: 'org.json', name: 'json', version:'20180813'
implementation group: 'org.json', name: 'json', version:'20230227'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
// add geo module as dependency. https://github.com/opensearch-project/OpenSearch/pull/4180/.
Expand Down
3 changes: 3 additions & 0 deletions legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprValueFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

package org.opensearch.sql.legacy.expression.model;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -61,6 +62,8 @@ public static ExprValue from(Object o) {
return booleanValue((Boolean) o);
} else if (o instanceof Double) {
return doubleValue((Double) o);
} else if (o instanceof BigDecimal) {
return doubleValue(((BigDecimal) o).doubleValue());
} else if (o instanceof String) {
return stringValue((String) o);
} else {
Expand Down
2 changes: 1 addition & 1 deletion opensearch/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies {
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${versions.jackson}"
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${versions.jackson_databind}"
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${versions.jackson}"
implementation group: 'org.json', name: 'json', version:'20180813'
implementation group: 'org.json', name: 'json', version:'20230227'
compileOnly group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}"
implementation group: 'org.opensearch', name:'opensearch-ml-client', version: "${opensearch_build}"

Expand Down
2 changes: 1 addition & 1 deletion ppl/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ dependencies {

implementation "org.antlr:antlr4-runtime:4.7.1"
implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
api group: 'org.json', name: 'json', version: '20180813'
api group: 'org.json', name: 'json', version: '20230227'
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
api project(':common')
api project(':core')
Expand Down
2 changes: 1 addition & 1 deletion prometheus/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
implementation 'com.github.babbel:okhttp-aws-signer:1.0.2'
implementation group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.12.1'
implementation group: 'com.amazonaws', name: 'aws-java-sdk-sts', version: '1.12.1'
implementation group: 'org.json', name: 'json', version: '20180813'
implementation group: 'org.json', name: 'json', version: '20230227'

testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
Expand Down
2 changes: 1 addition & 1 deletion sql/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependencies {

implementation "org.antlr:antlr4-runtime:4.7.1"
implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
implementation group: 'org.json', name: 'json', version:'20180813'
implementation group: 'org.json', name: 'json', version:'20230227'
implementation project(':common')
implementation project(':core')
api project(':protocol')
Expand Down