Skip to content

[fix](Nereids) fix log bug and add more numeric arithmetic function cases #47228

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
morrySnow merged 4 commits into from
Feb 11, 2025
Merged

[fix](Nereids) fix log bug and add more numeric arithmetic function cases #47228

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
6d4ed07
[fix](Nereids) fix log bug and add more numeric arithmetic function c…
Jan 20, 2025
ac0ffbe
fix suite and add more cases
Jan 21, 2025
68d85fd
fix p0 case problems
Feb 10, 2025
cd92a6d
add more cases
Feb 11, 2025
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
6 changes: 3 additions & 3 deletions ...va/org/apache/doris/nereids/trees/expressions/functions/executable/NumericArithmetic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@ public static Expression log(DoubleLiteral first, DoubleLiteral second) {
if (first.getValue().equals(1.0d)) {
throw new NotSupportedException("the first input of function log can not be 1.0");
}
return checkOutputBoundary(new DoubleLiteral(Math.log(first.getValue()) / Math.log(second.getValue())));
return checkOutputBoundary(new DoubleLiteral(Math.log(second.getValue()) / Math.log(first.getValue())));
}

/**
Expand Down Expand Up @@ -1084,15 +1084,15 @@ public static Expression dpow(DoubleLiteral first, DoubleLiteral second) {
*/
@ExecFunction(name = "fmod")
public static Expression fmod(DoubleLiteral first, DoubleLiteral second) {
return checkOutputBoundary(new DoubleLiteral(first.getValue() / second.getValue()));
return checkOutputBoundary(new DoubleLiteral(first.getValue() % second.getValue()));
}

/**
* fmod
*/
@ExecFunction(name = "fmod")
public static Expression fmod(FloatLiteral first, FloatLiteral second) {
return new FloatLiteral(first.getValue() / second.getValue());
return new FloatLiteral(first.getValue() % second.getValue());
}

/**
Expand Down
10 changes: 8 additions & 2 deletions regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1691,14 +1691,20 @@ class Suite implements GroovyInterceptable {
String openFoldConstant = "set debug_skip_fold_constant=false";
sql(openFoldConstant)
logger.info(foldSql)
List<List<Object>> resultByFoldConstant = sql(foldSql)
Tuple2<List<List<Object>>, ResultSetMetaData> tupleResult = null
tupleResult = JdbcUtils.executeToStringList(context.getConnection(), foldSql)
def (resultByFoldConstant, meta) = tupleResult
logger.info("result by fold constant: " + resultByFoldConstant.toString())
String closeFoldConstant = "set debug_skip_fold_constant=true";
sql(closeFoldConstant)
logger.info(foldSql)
List<List<Object>> resultExpected = sql(foldSql)
logger.info("result expected: " + resultExpected.toString())
Assert.assertEquals(resultExpected, resultByFoldConstant)

String errorMsg = OutputUtils.checkOutput(resultExpected.iterator(), resultByFoldConstant.iterator(),
{ row -> OutputUtils.toCsvString(row as List<Object>) },
{ row -> OutputUtils.toCsvString(row) },
"check output failed", meta)
}

String getJobName(String dbName, String mtmvName) {
Expand Down
Loading
Loading