Skip to content

[fix][core] Adjusted the return type of avg #63

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
merged 1 commit into from
Dec 1, 2025
+42 −6
Merged

[fix][core] Adjusted the return type of avg #63

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
24 changes: 19 additions & 5 deletions core/src/main/java/org/apache/calcite/rel/type/RelDataTypeSystemImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,11 @@ && getDefaultPrecision(typeName) != -1) {
RelDataType argumentType) {
if (argumentType instanceof BasicSqlType) {
SqlTypeName typeName = argumentType.getSqlTypeName();
if (typeName == SqlTypeName.DECIMAL) {
return typeFactory.createSqlType(typeName, argumentType.getPrecision() + 22, argumentType.getScale(), true);
} else if (typeName == SqlTypeName.TINYINT || typeName == SqlTypeName.SMALLINT) {
return typeFactory.createSqlType(SqlTypeName.INTEGER);
}
if (typeName.allowsPrec()
&& argumentType.getPrecision() != RelDataType.PRECISION_NOT_SPECIFIED) {
int precision = typeFactory.getTypeSystem().getMaxPrecision(typeName);
Expand All @@ -240,12 +245,21 @@ && getDefaultPrecision(typeName) != -1) {

@Override public RelDataType deriveAvgAggType(RelDataTypeFactory typeFactory,
RelDataType argumentType) {
if(argumentType.getSqlTypeName() == SqlTypeName.TINYINT ||
argumentType.getSqlTypeName() == SqlTypeName.INTEGER ||
argumentType.getSqlTypeName() == SqlTypeName.BIGINT) {
return typeFactory.createSqlType(SqlTypeName.DECIMAL, 14, 4);
if(argumentType.getSqlTypeName() == SqlTypeName.INTEGER) {
return typeFactory.createSqlType(SqlTypeName.DECIMAL, 14, 4, true);
} else if (argumentType.getSqlTypeName() == SqlTypeName.TINYINT) {
return typeFactory.createSqlType(SqlTypeName.DECIMAL, 7, 4, true);
} else if (argumentType.getSqlTypeName() == SqlTypeName.SMALLINT) {
return typeFactory.createSqlType(SqlTypeName.DECIMAL, 9, 4, true);
} else if (argumentType.getSqlTypeName() == SqlTypeName.BIGINT) {
return typeFactory.createSqlType(SqlTypeName.DECIMAL, 23, 4, true);
} else if (argumentType.getSqlTypeName() == SqlTypeName.FLOAT) {
return typeFactory.createSqlType(SqlTypeName.DOUBLE, true);
} else if (argumentType.getSqlTypeName() == SqlTypeName.DECIMAL) {
return typeFactory.createSqlType(SqlTypeName.DECIMAL, argumentType.getPrecision() + 4, argumentType.getScale() + 4, true);
} else {
return typeFactory.createTypeWithNullability(argumentType, true);
}
return argumentType;
}

@Override public RelDataType deriveCovarType(RelDataTypeFactory typeFactory,
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1750,7 +1750,7 @@ public class SqlStdOperatorTable extends ReflectiveSqlOperatorTable {
/** The {@code ROUND(numeric [, numeric])} function. */
public static final SqlFunction ROUND =
SqlBasicFunction.create("ROUND",
ReturnTypes.ARG0_NULLABLE,
ReturnTypes.ROUND,
OperandTypes.NUMERIC_OPTIONAL_INTEGER,
SqlFunctionCategory.NUMERIC);

Expand Down
22 changes: 22 additions & 0 deletions core/src/main/java/org/apache/calcite/sql/type/ReturnTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.apache.calcite.util.Util;

import com.google.common.base.Preconditions;
import org.checkerframework.checker.nullness.qual.Nullable;

import java.util.AbstractList;
import java.util.List;
Expand Down Expand Up @@ -168,6 +169,27 @@ public static SqlCall stripSeparator(SqlCall call) {
public static final SqlReturnTypeInference ARG0 =
new OrdinalReturnTypeInference(0);

public static final SqlReturnTypeInference ROUND = new SqlReturnTypeInference() {
@Override
public @Nullable RelDataType inferReturnType(SqlOperatorBinding opBinding) {
RelDataTypeFactory typeFactory = opBinding.getTypeFactory();
RelDataType relDataType = opBinding.getOperandType(0);
if (relDataType.getSqlTypeName().allowsPrecScale(true, true)) {
try {
int scale = opBinding.getOperandLiteralValue(1, Integer.class);
if (scale > relDataType.getScale()) {
scale = relDataType.getScale();
}
return typeFactory.createSqlType(relDataType.getSqlTypeName(), relDataType.getPrecision(), scale, relDataType.isNullable());
} catch (Throwable e) {
return relDataType;
}
} else {
return relDataType;
}
}
};

/**
* Type-inference strategy whereby the result type of a call is VARYING the
* type of the first argument. The length returned is the same as length of
Expand Down