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

[Backport 2.x] Fix null response from pow/power and added missing integration testing #1459

Merged
merged 1 commit into from
Mar 22, 2023
Merged

[Backport 2.x] Fix null response from pow/power and added missing integration testing #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions .../src/main/java/org/opensearch/sql/expression/operator/arthmetic/MathematicalFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,11 +342,15 @@ FunctionBuilder>>> powerFunctionImpl() {
DOUBLE, LONG, LONG),
FunctionDSL.impl(
FunctionDSL.nullMissingHandling(
(v1, v2) -> new ExprDoubleValue(Math.pow(v1.floatValue(), v2.floatValue()))),
(v1, v2) -> v1.floatValue() <= 0 && v2.floatValue()
!= Math.floor(v2.floatValue()) ? ExprNullValue.of() :
new ExprDoubleValue(Math.pow(v1.floatValue(), v2.floatValue()))),
DOUBLE, FLOAT, FLOAT),
FunctionDSL.impl(
FunctionDSL.nullMissingHandling(
(v1, v2) -> new ExprDoubleValue(Math.pow(v1.doubleValue(), v2.doubleValue()))),
(v1, v2) -> v1.doubleValue() <= 0 && v2.doubleValue()
!= Math.floor(v2.doubleValue()) ? ExprNullValue.of() :
new ExprDoubleValue(Math.pow(v1.doubleValue(), v2.doubleValue()))),
DOUBLE, DOUBLE, DOUBLE));
}

Expand Down
50 changes: 50 additions & 0 deletions .../test/java/org/opensearch/sql/expression/operator/arthmetic/MathematicalFunctionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,6 +1409,56 @@ public void pow_null_missing() {
assertTrue(power.valueOf(valueEnv()).isMissing());
}

/**
* Test pow/power with null output.
*/
@Test
public void pow_null_output() {
FunctionExpression pow = DSL.pow(DSL.literal((double) -2), DSL.literal(1.5));
assertEquals(pow.type(), DOUBLE);
assertEquals(String.format("pow(%s, %s)", (double) -2, 1.5), pow.toString());
assertTrue(pow.valueOf(valueEnv()).isNull());

pow = DSL.pow(DSL.literal((float) -2), DSL.literal((float) 1.5));
assertEquals(pow.type(), DOUBLE);
assertEquals(String.format("pow(%s, %s)", (float) -2, (float) 1.5), pow.toString());
assertTrue(pow.valueOf(valueEnv()).isNull());
}

/**
* Test pow/power with edge cases.
*/
@Test
public void pow_edge_cases() {
FunctionExpression pow = DSL.pow(DSL.literal((double) -2), DSL.literal((double) 2));
assertEquals(pow.type(), DOUBLE);
assertEquals(String.format("pow(%s, %s)",(double) -2, (double) 2), pow.toString());
assertThat(
pow.valueOf(valueEnv()),
allOf(hasType(DOUBLE), hasValue(Math.pow(-2, 2))));

pow = DSL.pow(DSL.literal((double) 2), DSL.literal((double) 1.5));
assertEquals(pow.type(), DOUBLE);
assertEquals(String.format("pow(%s, %s)", (double) 2, (double) 1.5), pow.toString());
assertThat(
pow.valueOf(valueEnv()),
allOf(hasType(DOUBLE), hasValue(Math.pow(2, 1.5))));

pow = DSL.pow(DSL.literal((float) -2), DSL.literal((float) 2));
assertEquals(pow.type(), DOUBLE);
assertEquals(String.format("pow(%s, %s)", (float) -2, (float) 2), pow.toString());
assertThat(
pow.valueOf(valueEnv()),
allOf(hasType(DOUBLE), hasValue(Math.pow((float) -2, (float) 2))));

pow = DSL.pow(DSL.literal((float) 2), DSL.literal((float) 1.5));
assertEquals(pow.type(), DOUBLE);
assertEquals(String.format("pow(%s, %s)", (float) 2, (float) 1.5), pow.toString());
assertThat(
pow.valueOf(valueEnv()),
allOf(hasType(DOUBLE), hasValue(Math.pow((float) 2, (float) 1.5))));
}

/**
* Test rint with byte value.
*/
Expand Down
62 changes: 62 additions & 0 deletions integ-test/src/test/java/org/opensearch/sql/sql/MathematicalFunctionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,68 @@ public void testMod() throws IOException {
verifyDataRows(result, rows(1.1));
}

@Test
public void testPow() throws IOException {
JSONObject result = executeQuery("select pow(3, 2)");
verifySchema(result, schema("pow(3, 2)", null, "double"));
verifyDataRows(result, rows(9.0));

result = executeQuery("select pow(0, 2)");
verifySchema(result, schema("pow(0, 2)", null, "double"));
verifyDataRows(result, rows(0.0));

result = executeQuery("select pow(3, 0)");
verifySchema(result, schema("pow(3, 0)", null, "double"));
verifyDataRows(result, rows(1.0));

result = executeQuery("select pow(-2, 3)");
verifySchema(result, schema("pow(-2, 3)", null, "double"));
verifyDataRows(result, rows(-8.0));

result = executeQuery("select pow(2, -2)");
verifySchema(result, schema("pow(2, -2)", null, "double"));
verifyDataRows(result, rows(0.25));

result = executeQuery("select pow(-2, -3)");
verifySchema(result, schema("pow(-2, -3)", null, "double"));
verifyDataRows(result, rows(-0.125));

result = executeQuery("select pow(-1, 0.5)");
verifySchema(result, schema("pow(-1, 0.5)", null, "double"));
verifyDataRows(result, rows((Object) null));
}

@Test
public void testPower() throws IOException {
JSONObject result = executeQuery("select power(3, 2)");
verifySchema(result, schema("power(3, 2)", null, "double"));
verifyDataRows(result, rows(9.0));

result = executeQuery("select power(0, 2)");
verifySchema(result, schema("power(0, 2)", null, "double"));
verifyDataRows(result, rows(0.0));

result = executeQuery("select power(3, 0)");
verifySchema(result, schema("power(3, 0)", null, "double"));
verifyDataRows(result, rows(1.0));

result = executeQuery("select power(-2, 3)");
verifySchema(result, schema("power(-2, 3)", null, "double"));
verifyDataRows(result, rows(-8.0));

result = executeQuery("select power(2, -2)");
verifySchema(result, schema("power(2, -2)", null, "double"));
verifyDataRows(result, rows(0.25));

result = executeQuery("select power(2, -2)");
verifySchema(result, schema("power(2, -2)", null, "double"));
verifyDataRows(result, rows(0.25));

result = executeQuery("select power(-2, -3)");
verifySchema(result, schema("power(-2, -3)", null, "double"));
verifyDataRows(result, rows(-0.125));
}

@Test
public void testRint() throws IOException {
JSONObject result = executeQuery("select rint(56.78)");
Expand Down