libenchao commented on code in PR #3189:
URL: https://github.com/apache/calcite/pull/3189#discussion_r1187308259
##########
core/src/main/java/org/apache/calcite/sql/fun/SqlCastFunction.java:
##########
@@ -122,8 +128,50 @@ static SqlReturnTypeInference returnTypeInference(boolean
safe) {
/** Derives the type of "CAST(expression AS targetType)". */
public static RelDataType deriveType(RelDataTypeFactory typeFactory,
RelDataType expressionType, RelDataType targetType, boolean safe) {
- return typeFactory.createTypeWithNullability(targetType,
- expressionType.isNullable() || safe);
+ return createTypeWithNullabilityFromExpr(typeFactory, expressionType,
targetType, safe);
+ }
+
+ public static RelDataType
createTypeWithNullabilityFromExpr(RelDataTypeFactory typeFactory,
Review Comment:
There is no need to expose it as `public` for now.
##########
core/src/main/java/org/apache/calcite/sql/fun/SqlCastFunction.java:
##########
@@ -122,8 +128,50 @@ static SqlReturnTypeInference returnTypeInference(boolean
safe) {
/** Derives the type of "CAST(expression AS targetType)". */
public static RelDataType deriveType(RelDataTypeFactory typeFactory,
RelDataType expressionType, RelDataType targetType, boolean safe) {
- return typeFactory.createTypeWithNullability(targetType,
- expressionType.isNullable() || safe);
+ return createTypeWithNullabilityFromExpr(typeFactory, expressionType,
targetType, safe);
+ }
+
+ public static RelDataType
createTypeWithNullabilityFromExpr(RelDataTypeFactory typeFactory,
+ RelDataType expressionType, RelDataType targetType, boolean safe) {
+ boolean isn = expressionType.isNullable() || safe;
Review Comment:
`isn` is not a good name, how about name it `isNullable` or `nullable`?
##########
core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java:
##########
@@ -6984,9 +6984,9 @@ void testGroupExpressionEquivalenceParams() {
@Test void testCastAsCollectionType() {
sql("select cast(array[1,null,2] as int array) from (values (1))")
- .columnType("INTEGER NOT NULL ARRAY NOT NULL");
+ .columnType("INTEGER ARRAY NOT NULL");
Review Comment:
Could you also try to add tests for map/row/multiset types?
##########
core/src/main/java/org/apache/calcite/sql/fun/SqlCastFunction.java:
##########
@@ -122,8 +128,50 @@ static SqlReturnTypeInference returnTypeInference(boolean
safe) {
/** Derives the type of "CAST(expression AS targetType)". */
public static RelDataType deriveType(RelDataTypeFactory typeFactory,
RelDataType expressionType, RelDataType targetType, boolean safe) {
- return typeFactory.createTypeWithNullability(targetType,
- expressionType.isNullable() || safe);
+ return createTypeWithNullabilityFromExpr(typeFactory, expressionType,
targetType, safe);
+ }
+
+ public static RelDataType
createTypeWithNullabilityFromExpr(RelDataTypeFactory typeFactory,
+ RelDataType expressionType, RelDataType targetType, boolean safe) {
+ boolean isn = expressionType.isNullable() || safe;
+
+ if (isCollection(expressionType)) {
+ RelDataType expressionElementType = expressionType.getComponentType();
+ RelDataType targetElementType = targetType.getComponentType();
+ RelDataType newElementType =
+ createTypeWithNullabilityFromExpr(typeFactory,
expressionElementType, targetElementType, false);
Review Comment:
The third parameter should be `safe`?
##########
core/src/main/java/org/apache/calcite/sql/fun/SqlCastFunction.java:
##########
@@ -122,8 +128,50 @@ static SqlReturnTypeInference returnTypeInference(boolean
safe) {
/** Derives the type of "CAST(expression AS targetType)". */
public static RelDataType deriveType(RelDataTypeFactory typeFactory,
RelDataType expressionType, RelDataType targetType, boolean safe) {
- return typeFactory.createTypeWithNullability(targetType,
- expressionType.isNullable() || safe);
+ return createTypeWithNullabilityFromExpr(typeFactory, expressionType,
targetType, safe);
+ }
+
+ public static RelDataType
createTypeWithNullabilityFromExpr(RelDataTypeFactory typeFactory,
+ RelDataType expressionType, RelDataType targetType, boolean safe) {
+ boolean isn = expressionType.isNullable() || safe;
+
+ if (isCollection(expressionType)) {
+ RelDataType expressionElementType = expressionType.getComponentType();
+ RelDataType targetElementType = targetType.getComponentType();
+ RelDataType newElementType =
+ createTypeWithNullabilityFromExpr(typeFactory,
expressionElementType, targetElementType, false);
+ if (isArray(expressionType)) {
+ return SqlTypeUtil.createArrayType(typeFactory, newElementType, isn);
+ } else {
+ return SqlTypeUtil.createMultisetType(typeFactory, newElementType,
isn);
+ }
+ }
+
+ if (isRow(expressionType)) {
+ int fieldCount = expressionType.getFieldCount();
Review Comment:
We usually add `final` to variables when it's possible.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
