vvysotskyi commented on a change in pull request #1481: DRILL-6763: Codegen
optimization of SQL functions with constant values
URL: https://github.com/apache/drill/pull/1481#discussion_r222600057
##########
File path:
exec/java-exec/src/main/java/org/apache/drill/exec/expr/EvaluationVisitor.java
##########
@@ -590,109 +635,84 @@ private HoldingContainer
visitReturnValueExpression(ReturnValueExpression e, Cla
public HoldingContainer visitQuotedStringConstant(QuotedString e,
ClassGenerator<?> generator)
throws RuntimeException {
MajorType majorType = e.getMajorType();
- JBlock setup = generator.getBlock(BlockType.SETUP);
JType holderType = generator.getHolderType(majorType);
JVar var = generator.declareClassField("string", holderType);
- JExpression stringLiteral = JExpr.lit(e.value);
- JExpression buffer =
generator.getMappingSet().getIncoming().invoke("getContext").invoke("getManagedBuffer");
- setup.assign(var,
-
generator.getModel().ref(ValueHolderHelper.class).staticInvoke("getVarCharHolder").arg(buffer).arg(stringLiteral));
- return new HoldingContainer(majorType, var, null, null);
+ generator.declareSetterMethod(
+ var,
+ buffer -> ValueHolderHelper.getVarCharHolder(buffer, e.value));
+ return createHoldingContainer(majorType, var);
}
@Override
public HoldingContainer visitIntervalDayConstant(IntervalDayExpression e,
ClassGenerator<?> generator)
throws RuntimeException {
MajorType majorType = Types.required(MinorType.INTERVALDAY);
- JBlock setup = generator.getBlock(BlockType.SETUP);
JType holderType = generator.getHolderType(majorType);
JVar var = generator.declareClassField("intervalday", holderType);
- JExpression dayLiteral = JExpr.lit(e.getIntervalDay());
- JExpression millisLiteral = JExpr.lit(e.getIntervalMillis());
- setup.assign(
- var,
-
generator.getModel().ref(ValueHolderHelper.class).staticInvoke("getIntervalDayHolder").arg(dayLiteral)
- .arg(millisLiteral));
- return new HoldingContainer(majorType, var, null, null);
+ generator.declareSetterMethod(
+ var,
+ buffer -> ValueHolderHelper.getIntervalDayHolder(e.getIntervalDay(),
e.getIntervalMillis()));
+ return createHoldingContainer(majorType, var);
}
@Override
public HoldingContainer visitDecimal9Constant(Decimal9Expression e,
ClassGenerator<?> generator)
throws RuntimeException {
MajorType majorType = e.getMajorType();
- JBlock setup = generator.getBlock(BlockType.SETUP);
JType holderType = generator.getHolderType(majorType);
JVar var = generator.declareClassField("dec9", holderType);
- JExpression valueLiteral = JExpr.lit(e.getIntFromDecimal());
- JExpression scaleLiteral = JExpr.lit(e.getScale());
- JExpression precisionLiteral = JExpr.lit(e.getPrecision());
- setup.assign(
- var,
-
generator.getModel().ref(ValueHolderHelper.class).staticInvoke("getDecimal9Holder").arg(valueLiteral)
- .arg(scaleLiteral).arg(precisionLiteral));
- return new HoldingContainer(majorType, var, null, null);
+ generator.declareSetterMethod(
+ var,
+ buffer -> ValueHolderHelper.getDecimal9Holder(e.getIntFromDecimal(),
e.getScale(), e.getPrecision()));
+ return createHoldingContainer(majorType, var);
}
@Override
public HoldingContainer visitDecimal18Constant(Decimal18Expression e,
ClassGenerator<?> generator)
throws RuntimeException {
MajorType majorType = e.getMajorType();
- JBlock setup = generator.getBlock(BlockType.SETUP);
JType holderType = generator.getHolderType(majorType);
JVar var = generator.declareClassField("dec18", holderType);
- JExpression valueLiteral = JExpr.lit(e.getLongFromDecimal());
- JExpression scaleLiteral = JExpr.lit(e.getScale());
- JExpression precisionLiteral = JExpr.lit(e.getPrecision());
- setup.assign(
- var,
-
generator.getModel().ref(ValueHolderHelper.class).staticInvoke("getDecimal18Holder").arg(valueLiteral)
- .arg(scaleLiteral).arg(precisionLiteral));
- return new HoldingContainer(majorType, var, null, null);
+ generator.declareSetterMethod(
+ var,
+ buffer -> ValueHolderHelper.getDecimal18Holder(e.getLongFromDecimal(),
e.getScale(), e.getPrecision()));
+ return createHoldingContainer(majorType, var);
}
@Override
public HoldingContainer visitDecimal28Constant(Decimal28Expression e,
ClassGenerator<?> generator)
throws RuntimeException {
MajorType majorType = e.getMajorType();
- JBlock setup = generator.getBlock(BlockType.SETUP);
JType holderType = generator.getHolderType(majorType);
JVar var = generator.declareClassField("dec28", holderType);
- JExpression stringLiteral = JExpr.lit(e.getBigDecimal().toString());
- JExpression buffer =
generator.getMappingSet().getIncoming().invoke("getContext").invoke("getManagedBuffer");
- setup.assign(var,
-
generator.getModel().ref(ValueHolderHelper.class).staticInvoke("getDecimal28Holder")
- .arg(buffer).arg(stringLiteral));
- return new HoldingContainer(majorType, var, null, null);
+ generator.declareSetterMethod(
+ var,
+ buffer -> ValueHolderHelper.getDecimal28Holder(buffer,
e.getBigDecimal().toString()));
+ return createHoldingContainer(majorType, var);
}
@Override
public HoldingContainer visitDecimal38Constant(Decimal38Expression e,
ClassGenerator<?> generator)
throws RuntimeException {
MajorType majorType = e.getMajorType();
- JBlock setup = generator.getBlock(BlockType.SETUP);
JType holderType = generator.getHolderType(majorType);
JVar var = generator.declareClassField("dec38", holderType);
- JExpression stringLiteral = JExpr.lit(e.getBigDecimal().toString());
- JExpression buffer =
generator.getMappingSet().getIncoming().invoke("getContext").invoke("getManagedBuffer");
- setup.assign(var,
-
generator.getModel().ref(ValueHolderHelper.class).staticInvoke("getDecimal38Holder")
- .arg(buffer).arg(stringLiteral));
- return new HoldingContainer(majorType, var, null, null);
+ generator.declareSetterMethod(
+ var,
+ buffer -> ValueHolderHelper.getDecimal38Holder(buffer,
e.getBigDecimal().toString()));
+ return createHoldingContainer(majorType, var);
}
@Override
public HoldingContainer visitVarDecimalConstant(VarDecimalExpression e,
ClassGenerator<?> generator)
throws RuntimeException {
MajorType majorType = e.getMajorType();
- JBlock setup = generator.getBlock(BlockType.SETUP);
JType holderType = generator.getHolderType(majorType);
JVar var = generator.declareClassField("varDec", holderType);
- JExpression stringLiteral = JExpr.lit(e.getBigDecimal().toString());
- JExpression buffer =
generator.getMappingSet().getIncoming().invoke("getContext").invoke("getManagedBuffer");
- setup.assign(var,
-
generator.getModel().ref(ValueHolderHelper.class).staticInvoke("getVarDecimalHolder")
- .arg(buffer).arg(stringLiteral));
- return new HoldingContainer(majorType, var, null, null);
+ generator.declareSetterMethod(
+ var,
+ buffer -> ValueHolderHelper.getVarDecimalHolder(buffer,
e.getBigDecimal().toString()));
Review comment:
My comment is not connected to this change, but it would be good to change
`ValueHolderHelper.getVarDecimalHolder` method to take `BigDecimal` instance
instead of `String` since in all places, where it is used, the string is
obtained from the `BigDecimal` and inside this method `BigDecimal` is created
using this string.
----------------------------------------------------------------
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
