Skip to content

Commit 67bdaf0

Browse files
committed
[Address Comment] Fix little things and typos
1 parent 80a7835 commit 67bdaf0

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

presto-main-base/src/main/java/com/facebook/presto/execution/CallTask.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,6 @@ public ListenableFuture<?> execute(Call call, TransactionManager transactionMana
123123
return immediateFuture(null);
124124
}
125125

126-
public static Object toTypeObjectValue(Session session, Type type, Object value)
127-
{
128-
BlockBuilder blockBuilder = type.createBlockBuilder(null, 1);
129-
writeNativeValue(type, blockBuilder, value);
130-
return type.getObjectValue(session.getSqlFunctionProperties(), blockBuilder, 0);
131-
}
132-
133126
public static Object[] extractParameterValuesInOrder(Call call, Procedure procedure, Metadata metadata, Session session, Map<NodeRef<Parameter>, Expression> parameterLookup)
134127
{
135128
// map declared argument names to positions
@@ -204,4 +197,11 @@ else if (i < procedure.getArguments().size()) {
204197

205198
return values;
206199
}
200+
201+
private static Object toTypeObjectValue(Session session, Type type, Object value)
202+
{
203+
BlockBuilder blockBuilder = type.createBlockBuilder(null, 1);
204+
writeNativeValue(type, blockBuilder, value);
205+
return type.getObjectValue(session.getSqlFunctionProperties(), blockBuilder, 0);
206+
}
207207
}

presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/StatementAnalyzer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@
258258
import static com.facebook.presto.spi.function.FunctionKind.WINDOW;
259259
import static com.facebook.presto.spi.function.table.DescriptorArgument.NULL_DESCRIPTOR;
260260
import static com.facebook.presto.spi.function.table.ReturnTypeSpecification.GenericTable.GENERIC_TABLE;
261-
import static com.facebook.presto.spi.procedure.DistributedProcedure.DistributedProcedureType.TABLE_DATA_REWRITE;
262261
import static com.facebook.presto.sql.MaterializedViewUtils.buildOwnerSession;
263262
import static com.facebook.presto.sql.MaterializedViewUtils.generateBaseTablePredicates;
264263
import static com.facebook.presto.sql.MaterializedViewUtils.generateFalsePredicates;
@@ -1211,7 +1210,7 @@ protected Scope visitCall(Call call, Optional<Scope> scope)
12111210
Object[] values = extractParameterValuesInOrder(call, procedure, metadata, session, analysis.getParameters());
12121211

12131212
analysis.setUpdateType("CALL");
1214-
analysis.setDistributedProcedureType(Optional.of(TABLE_DATA_REWRITE));
1213+
analysis.setDistributedProcedureType(Optional.of(procedure.getType()));
12151214
analysis.setProcedureArguments(Optional.of(values));
12161215
switch (procedure.getType()) {
12171216
case TABLE_DATA_REWRITE:

presto-main-base/src/main/java/com/facebook/presto/sql/planner/optimizations/SymbolMapper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
import java.util.Map;
5454
import java.util.Map.Entry;
5555
import java.util.Set;
56-
import java.util.stream.Collectors;
5756

5857
import static com.facebook.presto.spi.StandardWarningCode.MULTIPLE_ORDER_BY;
5958
import static com.facebook.presto.spi.plan.AggregationNode.groupingSets;
@@ -282,7 +281,7 @@ public CallDistributedProcedureNode map(CallDistributedProcedureNode node, PlanN
282281
node.getFragmentVariable(),
283282
node.getTableCommitContextVariable(),
284283
columns,
285-
columns.stream().map(VariableReferenceExpression::getName).collect(Collectors.toList()),
284+
columns.stream().map(VariableReferenceExpression::getName).collect(toImmutableList()),
286285
notNullColumnVariables,
287286
node.getPartitioningScheme().map(partitioningScheme -> canonicalize(partitioningScheme, source)));
288287
}

presto-spi/src/main/java/com/facebook/presto/spi/procedure/DistributedProcedure.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ protected DistributedProcedure(DistributedProcedureType type, String schema, Str
3737
{
3838
super(schema, name, arguments);
3939
this.type = requireNonNull(type, "distributed procedure type is null");
40-
this.beginCallDistributedProcedure = requireNonNull(beginCallDistributedProcedure, "beginTableExecute is null");
41-
this.finishCallDistributedProcedure = requireNonNull(finishCallDistributedProcedure, "finishTableExecute is null");
40+
this.beginCallDistributedProcedure = requireNonNull(beginCallDistributedProcedure, "beginCallDistributedProcedure is null");
41+
this.finishCallDistributedProcedure = requireNonNull(finishCallDistributedProcedure, "finishCallDistributedProcedure is null");
4242
}
4343

4444
public DistributedProcedureType getType()

0 commit comments

Comments
 (0)