Skip to content

Followup: Register OpenSearchTypeSystem to OpenSearchTypeFactory #3349

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
Feb 26, 2025
Merged

Followup: Register OpenSearchTypeSystem to OpenSearchTypeFactory #3349

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
3 changes: 2 additions & 1 deletion core/src/main/java/org/opensearch/sql/calcite/utils/OpenSearchTypeFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@
import org.opensearch.sql.data.model.ExprValueUtils;
import org.opensearch.sql.data.type.ExprCoreType;
import org.opensearch.sql.data.type.ExprType;
import org.opensearch.sql.executor.OpenSearchTypeSystem;
import org.opensearch.sql.storage.Table;

/** This class is used to create RelDataType and map RelDataType to Java data type */
public class OpenSearchTypeFactory extends JavaTypeFactoryImpl {
public static final OpenSearchTypeFactory TYPE_FACTORY =
new OpenSearchTypeFactory(RelDataTypeSystem.DEFAULT);
new OpenSearchTypeFactory(OpenSearchTypeSystem.INSTANCE);

private OpenSearchTypeFactory(RelDataTypeSystem typeSystem) {
super(typeSystem);
Expand Down
13 changes: 6 additions & 7 deletions core/src/main/java/org/opensearch/sql/executor/OpenSearchTypeSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@ public class OpenSearchTypeSystem extends RelDataTypeSystemImpl {

private OpenSearchTypeSystem() {}

@Override
public RelDataType deriveAvgAggType(RelDataTypeFactory typeFactory, RelDataType argumentType) {
switch (argumentType.getSqlTypeName()) {
case INTEGER:
case BIGINT:
return typeFactory.createSqlType(SqlTypeName.DOUBLE);

default:
return super.deriveSumType(typeFactory, argumentType);
if (SqlTypeName.INT_TYPES.contains(argumentType.getSqlTypeName())) {
return typeFactory.createTypeWithNullability(
typeFactory.createSqlType(SqlTypeName.DOUBLE), false);
} else {
return argumentType;
}
}
}
3 changes: 2 additions & 1 deletion integ-test/src/test/java/org/opensearch/sql/calcite/standalone/CalcitePPLSortIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;

import java.io.IOException;
import org.junit.Ignore;
import org.junit.jupiter.api.Test;

/** testSortXXAndXX could fail. TODO Remove this @Ignore when the issue fixed. */
// @Ignore
@Ignore
public class CalcitePPLSortIT extends CalcitePPLIntegTestCase {

@Override
Expand Down
Loading