Skip to content

Reuse more variables in row constructors #22004

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

Merged
merged 2 commits into from
May 17, 2024
Merged

Reuse more variables in row constructors #22004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d403547
Update airlift/bytecode to 1.6
pettyjamesm May 17, 2024
2917c60
Reuse more variables in row constructors
pettyjamesm May 17, 2024
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
24 changes: 12 additions & 12 deletions core/trino-main/src/main/java/io/trino/sql/gen/RowConstructorCodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@
import io.trino.sql.relational.RowExpression;
import io.trino.sql.relational.SpecialForm;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

import static io.airlift.bytecode.ParameterizedType.type;
import static io.airlift.bytecode.expression.BytecodeExpressions.constantFalse;
Expand Down Expand Up @@ -70,15 +68,12 @@ public BytecodeNode generateExpression(BytecodeGeneratorContext context)
Scope scope = context.getScope();
List<Type> types = rowType.getTypeParameters();

Variable fieldBlocks = scope.createTempVariable(Block[].class);
Variable fieldBlocks = scope.getOrCreateTempVariable(Block[].class);
block.append(fieldBlocks.set(newArray(type(Block[].class), arguments.size())));
// Cache local variable declarations per java type on stack for reuse
Map<Class<?>, Variable> javaTypeTempVariables = new HashMap<>();

Variable blockBuilder = scope.createTempVariable(BlockBuilder.class);
Variable blockBuilder = scope.getOrCreateTempVariable(BlockBuilder.class);
for (int i = 0; i < arguments.size(); ++i) {
Type fieldType = types.get(i);
Variable field = javaTypeTempVariables.computeIfAbsent(fieldType.getJavaType(), scope::createTempVariable);

block.append(blockBuilder.set(constantType(binder, fieldType).invoke(
"createBlockBuilder",
Expand All @@ -89,16 +84,20 @@ public BytecodeNode generateExpression(BytecodeGeneratorContext context)
block.comment("Clean wasNull and Generate + " + i + "-th field of row");
block.append(context.wasNull().set(constantFalse()));
block.append(context.generate(arguments.get(i)));
Variable field = scope.getOrCreateTempVariable(fieldType.getJavaType());
block.putVariable(field);
block.append(new IfStatement()
.condition(context.wasNull())
.ifTrue(blockBuilder.invoke("appendNull", BlockBuilder.class).pop())
.ifFalse(constantType(binder, fieldType).writeValue(blockBuilder, field).pop()));
scope.releaseTempVariableForReuse(field);

block.append(fieldBlocks.setElement(i, blockBuilder.invoke("build", Block.class)));
}
scope.releaseTempVariableForReuse(blockBuilder);

block.append(newInstance(SqlRow.class, constantInt(0), fieldBlocks));
scope.releaseTempVariableForReuse(fieldBlocks);
block.append(context.wasNull().set(constantFalse()));
return block;
}
Expand All @@ -112,29 +111,30 @@ private BytecodeNode generateExpressionForLargeRows(BytecodeGeneratorContext con
Scope scope = context.getScope();
List<Type> types = rowType.getTypeParameters();

Variable fieldBuilders = scope.createTempVariable(BlockBuilder[].class);
Variable fieldBuilders = scope.getOrCreateTempVariable(BlockBuilder[].class);
block.append(fieldBuilders.set(invokeStatic(RowConstructorCodeGenerator.class, "createFieldBlockBuildersForSingleRow", BlockBuilder[].class, constantType(binder, rowType))));

// Cache local variable declarations per java type on stack for reuse
Map<Class<?>, Variable> javaTypeTempVariables = new HashMap<>();
Variable blockBuilder = scope.createTempVariable(BlockBuilder.class);
Variable blockBuilder = scope.getOrCreateTempVariable(BlockBuilder.class);
for (int i = 0; i < arguments.size(); ++i) {
Type fieldType = types.get(i);
Variable field = javaTypeTempVariables.computeIfAbsent(fieldType.getJavaType(), scope::createTempVariable);

block.append(blockBuilder.set(fieldBuilders.getElement(constantInt(i))));

block.comment("Clean wasNull and Generate + " + i + "-th field of row");
block.append(context.wasNull().set(constantFalse()));
block.append(context.generate(arguments.get(i)));
Variable field = scope.getOrCreateTempVariable(fieldType.getJavaType());
block.putVariable(field);
block.append(new IfStatement()
.condition(context.wasNull())
.ifTrue(blockBuilder.invoke("appendNull", BlockBuilder.class).pop())
.ifFalse(constantType(binder, fieldType).writeValue(blockBuilder, field).pop()));
scope.releaseTempVariableForReuse(field);
}
scope.releaseTempVariableForReuse(blockBuilder);

block.append(invokeStatic(RowConstructorCodeGenerator.class, "createSqlRowFromFieldBuildersForSingleRow", SqlRow.class, fieldBuilders));
scope.releaseTempVariableForReuse(fieldBuilders);
block.append(context.wasNull().set(constantFalse()));
return block;
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@
<dependency>
<groupId>io.airlift</groupId>
<artifactId>bytecode</artifactId>
<version>1.5</version>
<version>1.6</version>
</dependency>

<dependency>
Expand Down