vdiravka commented on a change in pull request #1602: DRILL-6944:
UnsupportedOperationException thrown for view over MapR-DB binary table
URL: https://github.com/apache/drill/pull/1602#discussion_r248336156
##########
File path:
exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/View.java
##########
@@ -242,32 +269,38 @@ public RelDataType getRowType(RelDataTypeFactory
factory) {
return new RelDataTypeDrillImpl(new RelDataTypeHolder(), factory);
}
- List<RelDataType> types = Lists.newArrayList();
- List<String> names = Lists.newArrayList();
-
+ List<RelDataType> types = new ArrayList<>(fields.size());
+ List<String> names = new ArrayList<>(fields.size());
for (FieldType field : fields) {
names.add(field.getName());
- RelDataType type;
- if ( SqlTypeFamily.INTERVAL_YEAR_MONTH == field.getType().getFamily()
- || SqlTypeFamily.INTERVAL_DAY_TIME == field.getType().getFamily()
) {
- type = factory.createSqlIntervalType( field.getIntervalQualifier() );
- } else if (field.getPrecision() == null && field.getScale() == null) {
- type = factory.createSqlType(field.getType());
- } else if (field.getPrecision() != null && field.getScale() == null) {
- type = factory.createSqlType(field.getType(), field.getPrecision());
- } else {
- type = factory.createSqlType(field.getType(), field.getPrecision(),
field.getScale());
- }
-
- if (field.getIsNullable()) {
- types.add(factory.createTypeWithNullability(type, true));
- } else {
- types.add(type);
- }
+ types.add(getType(field, factory));
}
return factory.createStructType(types, names);
}
+ private RelDataType getType(FieldType field, RelDataTypeFactory factory) {
+ RelDataType type;
+ final SqlTypeName typeName = field.getType();
+ final Integer precision = field.getPrecision();
+ final Integer scale = field.getScale();
+
+ if (field.isInterval()) {
+ type = factory.createSqlIntervalType(field.getIntervalQualifier());
+ } else if (nonNull(precision)) {
+ type = nonNull(scale)
+ ? factory.createSqlType(typeName, precision, scale)
+ : factory.createSqlType(typeName, precision);
+ } else if (typeName == SqlTypeName.MAP) {
+ type = field.isMapTypesPresent()
+ ? factory.createMapType(getType(field.getKeyType(), factory),
getType(field.getValueType(), factory))
+ : factory.createSqlType(SqlTypeName.ANY);
Review comment:
Could you please put a comment here why `ANY` is used in case of untyped
`MAP`?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
