Skip to content

Map Calcite ROW to STRUCT in convertSqlTypeNameToExprType #5737

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

Open
mch2 wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −0
Open

Map Calcite ROW to STRUCT in convertSqlTypeNameToExprType #5737

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
5 changes: 5 additions & 0 deletions 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 @@ -252,6 +252,11 @@ public static ExprType convertSqlTypeNameToExprType(SqlTypeName sqlTypeName) {
INTERVAL;
case ARRAY -> ARRAY;
case MAP -> STRUCT;
// Calcite spells a struct as ROW. convertExprTypeToRelDataType builds STRUCT as
// MAP<VARCHAR, ANY> since the v2 path only passes _source JSON through, so a genuine ROW —
// from an engine that builds a struct out of typed columns — matched nothing and fell
// through to UNKNOWN.
case ROW -> STRUCT;
case GEOMETRY -> GEO_POINT;
case NULL, ANY, OTHER -> UNDEFINED;
default -> UNKNOWN;
Expand Down
6 changes: 6 additions & 0 deletions core/src/test/java/org/opensearch/sql/calcite/utils/OpenSearchTypeFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,12 @@ public void testConvertExprTypeBinaryToNullableVarbinary() {
assertTrue(result.isNullable());
}

@Test
public void testConvertRowReturnsStructExprType() {
assertEquals(
ExprCoreType.STRUCT, OpenSearchTypeFactory.convertSqlTypeNameToExprType(SqlTypeName.ROW));
}

// ---------- convertAnalyticsEngineRelDataTypeToExprType ----------
// UDT-aware variant for the response-schema path. Must agree with the
// planner-internal convertRelDataTypeToExprType on every non-UDT input.
Expand Down
Loading