ihuzenko commented on a change in pull request #1894: DRILL-7440: Failure
during loading of RepeatedCount functions
URL: https://github.com/apache/drill/pull/1894#discussion_r344236079
##########
File path:
exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillFuncHolder.java
##########
@@ -304,19 +305,23 @@ protected void declareVarArgArray(JCodeModel model,
JBlock jBlock, HoldingContai
private JType getParamClass(JCodeModel model, ValueReference parameter,
JType defaultType) {
if (parameter.isFieldReader()) {
return model._ref(FieldReader.class);
- } else if (parameter.getType().getMinorType() == MinorType.MAP) {
- if (parameter.getType().getMode() == TypeProtos.DataMode.REPEATED) {
- return model._ref(RepeatedMapHolder.class);
- } else {
- return model._ref(MapHolder.class);
- }
- } else if (parameter.getType().getMinorType() == MinorType.LIST) {
- if (parameter.getType().getMode() == TypeProtos.DataMode.REPEATED) {
- return model._ref(RepeatedListHolder.class);
- } else {
- return model._ref(ListHolder.class);
- }
}
+
+ boolean repeated = parameter.getType().getMode() ==
TypeProtos.DataMode.REPEATED;
+ Class<?> holderClass = null;
+ MinorType type = parameter.getType().getMinorType();
+ if (type == MinorType.MAP) {
+ holderClass = repeated ? RepeatedMapHolder.class : MapHolder.class;
+ } else if (type == MinorType.LIST) {
+ holderClass = repeated ? RepeatedListHolder.class : ListHolder.class;
+ } else if (type == MinorType.DICT) {
+ holderClass = repeated ? RepeatedDictHolder.class : DictHolder.class;
+ }
+
+ if (holderClass != null) {
+ return model._ref(holderClass);
Review comment:
Could you please utilize ```org.apache.drill.exec.expr.TypeHelper``` for
holder selection ?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
