Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
Copy link
Contributor Author

@mlyublena mlyublena Nov 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a benchmark test @kaikalur:

INFO: Without optimization
Nov 04, 2022 11:13:36 AM com.facebook.airlift.log.Logger info
INFO: -- Loading system access control --
Nov 04, 2022 11:13:36 AM com.facebook.airlift.log.Logger info
INFO: -- Loaded system access control allow-all --
Nov 04, 2022 11:13:36 AM com.facebook.airlift.log.Logger info
INFO: -- Loading temp storage local --
Nov 04, 2022 11:13:36 AM com.facebook.airlift.log.Logger info
INFO: -- Loaded temp storage local --
Nov 04, 2022 11:13:36 AM com.facebook.airlift.log.Logger info
INFO: -- Loading temp storage local --
Nov 04, 2022 11:13:36 AM com.facebook.airlift.log.Logger info
INFO: -- Loaded temp storage local --
peak_memory:1049052,elapsed_millis:71,input_rows_per_second:352,output_rows_per_second:70,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:70884750,cpu_nanos:63690000,user_nanos:59689000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:88,input_rows_per_second:282,output_rows_per_second:56,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:88427792,cpu_nanos:82240000,user_nanos:76153000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:73,input_rows_per_second:342,output_rows_per_second:68,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:73053500,cpu_nanos:66569000,user_nanos:61794000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:90,input_rows_per_second:277,output_rows_per_second:55,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:89986583,cpu_nanos:83379000,user_nanos:76933000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:81,input_rows_per_second:307,output_rows_per_second:61,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:81414083,cpu_nanos:72700000,user_nanos:68129000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:75,input_rows_per_second:335,output_rows_per_second:67,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:74596792,cpu_nanos:70166000,user_nanos:65303000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:73,input_rows_per_second:341,output_rows_per_second:68,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:73201583,cpu_nanos:67967000,user_nanos:62847000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:96,input_rows_per_second:261,output_rows_per_second:52,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:95575666,cpu_nanos:85599000,user_nanos:78474000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:151,input_rows_per_second:165,output_rows_per_second:33,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:151015041,cpu_nanos:135654000,user_nanos:123756000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:153,input_rows_per_second:163,output_rows_per_second:32,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:153300500,cpu_nanos:124190000,user_nanos:114321000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:150,input_rows_per_second:166,output_rows_per_second:33,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:149765583,cpu_nanos:139011000,user_nanos:127773000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:121,input_rows_per_second:206,output_rows_per_second:41,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:121312292,cpu_nanos:113491000,user_nanos:105332000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:58,input_rows_per_second:428,output_rows_per_second:85,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:58363583,cpu_nanos:53699000,user_nanos:50201000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:67,input_rows_per_second:371,output_rows_per_second:74,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:67276167,cpu_nanos:62683000,user_nanos:58266000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:59,input_rows_per_second:421,output_rows_per_second:84,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:59347209,cpu_nanos:55699000,user_nanos:51709000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:51,input_rows_per_second:493,output_rows_per_second:98,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:50684583,cpu_nanos:47907000,user_nanos:45072000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:53,input_rows_per_second:475,output_rows_per_second:95,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:52540792,cpu_nanos:48898000,user_nanos:45745000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:77,input_rows_per_second:326,output_rows_per_second:65,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:76682500,cpu_nanos:69061000,user_nanos:63892000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:57,input_rows_per_second:441,output_rows_per_second:88,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:56605834,cpu_nanos:52881000,user_nanos:49281000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1049052,elapsed_millis:54,input_rows_per_second:459,output_rows_per_second:91,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:54454666,cpu_nanos:51225000,user_nanos:47822000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
      pull_constants_above_group_by ::   77.335 cpu ms ::   1MB peak memory :: in    25,      0B,     323/s,      0B/s :: out     5,    130B,      64/s,  1.64KB/s
Nov 04, 2022 11:13:45 AM com.facebook.airlift.log.Logger info
INFO: With optimization
Nov 04, 2022 11:13:45 AM com.facebook.airlift.log.Logger info
INFO: -- Loading system access control --
Nov 04, 2022 11:13:45 AM com.facebook.airlift.log.Logger info
INFO: -- Loaded system access control allow-all --
Nov 04, 2022 11:13:45 AM com.facebook.airlift.log.Logger info
INFO: -- Loading temp storage local --
Nov 04, 2022 11:13:45 AM com.facebook.airlift.log.Logger info
INFO: -- Loaded temp storage local --
Nov 04, 2022 11:13:45 AM com.facebook.airlift.log.Logger info
INFO: -- Loading temp storage local --
Nov 04, 2022 11:13:45 AM com.facebook.airlift.log.Logger info
INFO: -- Loaded temp storage local --
peak_memory:1495616,elapsed_millis:37,input_rows_per_second:684,output_rows_per_second:136,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:36547500,cpu_nanos:35853000,user_nanos:30955000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:42,input_rows_per_second:595,output_rows_per_second:119,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:42003750,cpu_nanos:40892000,user_nanos:34889000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:59,input_rows_per_second:421,output_rows_per_second:84,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:59294625,cpu_nanos:55689000,user_nanos:47761000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:48,input_rows_per_second:522,output_rows_per_second:104,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:47834833,cpu_nanos:45860000,user_nanos:39594000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:36,input_rows_per_second:693,output_rows_per_second:138,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:36051750,cpu_nanos:35401000,user_nanos:30276000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:108,input_rows_per_second:232,output_rows_per_second:46,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:107698834,cpu_nanos:67399000,user_nanos:60120000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:89,input_rows_per_second:279,output_rows_per_second:55,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:89431750,cpu_nanos:87399000,user_nanos:82486000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:36,input_rows_per_second:702,output_rows_per_second:140,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:35595250,cpu_nanos:34275000,user_nanos:32643000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:39,input_rows_per_second:642,output_rows_per_second:128,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:38891708,cpu_nanos:37020000,user_nanos:34996000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:34,input_rows_per_second:732,output_rows_per_second:146,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:34141125,cpu_nanos:32628000,user_nanos:30786000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:38,input_rows_per_second:653,output_rows_per_second:130,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:38242459,cpu_nanos:36824000,user_nanos:35107000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:48,input_rows_per_second:520,output_rows_per_second:104,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:48046416,cpu_nanos:44795000,user_nanos:41783000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:38,input_rows_per_second:664,output_rows_per_second:132,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:37624625,cpu_nanos:36067000,user_nanos:34233000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:29,input_rows_per_second:860,output_rows_per_second:172,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:29043125,cpu_nanos:28326000,user_nanos:27263000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:53,input_rows_per_second:470,output_rows_per_second:94,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:53106041,cpu_nanos:49474000,user_nanos:46099000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:45,input_rows_per_second:553,output_rows_per_second:110,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:45162917,cpu_nanos:42568000,user_nanos:39742000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:40,input_rows_per_second:619,output_rows_per_second:123,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:40335667,cpu_nanos:36132000,user_nanos:34354000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:43,input_rows_per_second:581,output_rows_per_second:116,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:43028208,cpu_nanos:40935000,user_nanos:38190000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:30,input_rows_per_second:822,output_rows_per_second:164,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:30398000,cpu_nanos:29613000,user_nanos:28504000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
peak_memory:1495616,elapsed_millis:29,input_rows_per_second:867,output_rows_per_second:173,input_megabytes:0,input_megabytes_per_second:0,wall_nanos:28825333,cpu_nanos:28177000,user_nanos:27255000,input_rows:25,input_bytes:0,output_rows:5,output_bytes:130
      pull_constants_above_group_by ::   42.266 cpu ms :: 1.43MB peak memory :: in    25,      0B,     591/s,      0B/s :: out     5,    130B,     118/s,     3KB/s

* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.facebook.presto.benchmark;

import com.facebook.airlift.log.Logger;
import com.facebook.presto.testing.LocalQueryRunner;
import com.google.common.collect.ImmutableMap;
import org.intellij.lang.annotations.Language;

import java.util.Map;

import static com.facebook.presto.benchmark.BenchmarkQueryRunner.createLocalQueryRunner;

public class SqlPullConstantsAboveGroupByBenchmark
extends AbstractSqlBenchmark
{
private static final Logger LOGGER = Logger.get(SqlRewriteConditionalAggregationBenchmarks.class);

public SqlPullConstantsAboveGroupByBenchmark(LocalQueryRunner localQueryRunner, @Language("SQL") String sql)
{
super(localQueryRunner,
"pull_constants_above_group_by",
10,
20,
sql);
}

public static void main(String[] args)
{
Map<String, String> disableOptimization = ImmutableMap.of("optimize_constant_grouping_keys", "false");
String sql = "SELECT * FROM (SELECT regionkey, col, count(*) FROM (SELECT regionkey, 'bla' as col FROM nation) GROUP BY regionkey, col)";
LOGGER.info("Without optimization");
new SqlPullConstantsAboveGroupByBenchmark(createLocalQueryRunner(disableOptimization), sql).runBenchmark(new SimpleLineBenchmarkResultWriter(System.out));
LOGGER.info("With optimization");
new SqlPullConstantsAboveGroupByBenchmark(createLocalQueryRunner(), sql).runBenchmark(new SimpleLineBenchmarkResultWriter(System.out));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ public final class SystemSessionProperties
public static final String MAX_TASKS_PER_STAGE = "max_tasks_per_stage";
public static final String DEFAULT_FILTER_FACTOR_ENABLED = "default_filter_factor_enabled";
public static final String PUSH_LIMIT_THROUGH_OUTER_JOIN = "push_limit_through_outer_join";
public static final String OPTIMIZE_CONSTANT_GROUPING_KEYS = "optimize_constant_grouping_keys";
public static final String MAX_CONCURRENT_MATERIALIZATIONS = "max_concurrent_materializations";
public static final String PUSHDOWN_SUBFIELDS_ENABLED = "pushdown_subfields_enabled";
public static final String TABLE_WRITER_MERGE_OPERATOR_ENABLED = "table_writer_merge_operator_enabled";
Expand Down Expand Up @@ -958,6 +959,11 @@ public SystemSessionProperties(
"push limits to the outer side of an outer join",
featuresConfig.isPushLimitThroughOuterJoin(),
false),
booleanProperty(
OPTIMIZE_CONSTANT_GROUPING_KEYS,
"Pull constant grouping keys above the group by",
featuresConfig.isOptimizeConstantGroupingKeys(),
false),
integerProperty(
MAX_CONCURRENT_MATERIALIZATIONS,
"Maximum number of materializing plan sections that can run concurrently",
Expand Down Expand Up @@ -2055,6 +2061,11 @@ public static boolean isPushLimitThroughOuterJoin(Session session)
return session.getSystemProperty(PUSH_LIMIT_THROUGH_OUTER_JOIN, Boolean.class);
}

public static boolean isOptimizeConstantGroupingKeys(Session session)
{
return session.getSystemProperty(OPTIMIZE_CONSTANT_GROUPING_KEYS, Boolean.class);
}

public static int getMaxConcurrentMaterializations(Session session)
{
return session.getSystemProperty(MAX_CONCURRENT_MATERIALIZATIONS, Integer.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ public class FeaturesConfig
private double partialAggregationByteReductionThreshold = 0.5;
private boolean optimizeTopNRowNumber = true;
private boolean pushLimitThroughOuterJoin = true;
private boolean optimizeConstantGroupingKeys = true;

private Duration iterativeOptimizerTimeout = new Duration(3, MINUTES); // by default let optimizer wait a long time in case it retrieves some data from ConnectorMetadata
private Duration queryAnalyzerTimeout = new Duration(3, MINUTES);
Expand Down Expand Up @@ -1629,6 +1630,18 @@ public boolean isPushLimitThroughOuterJoin()
return pushLimitThroughOuterJoin;
}

@Config("optimizer.optimize-constant-grouping-keys")
public FeaturesConfig setOptimizeConstantGroupingKeys(boolean optimizeConstantGroupingKeys)
{
this.optimizeConstantGroupingKeys = optimizeConstantGroupingKeys;
return this;
}

public boolean isOptimizeConstantGroupingKeys()
{
return optimizeConstantGroupingKeys;
}

@Config("max-concurrent-materializations")
@ConfigDescription("The maximum number of materializing plan sections that can run concurrently")
public FeaturesConfig setMaxConcurrentMaterializations(int maxConcurrentMaterializations)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
import com.facebook.presto.sql.planner.iterative.rule.PruneTopNColumns;
import com.facebook.presto.sql.planner.iterative.rule.PruneValuesColumns;
import com.facebook.presto.sql.planner.iterative.rule.PruneWindowColumns;
import com.facebook.presto.sql.planner.iterative.rule.PullConstantsAboveGroupBy;
import com.facebook.presto.sql.planner.iterative.rule.PushAggregationThroughOuterJoin;
import com.facebook.presto.sql.planner.iterative.rule.PushDownDereferences;
import com.facebook.presto.sql.planner.iterative.rule.PushLimitThroughMarkDistinct;
Expand Down Expand Up @@ -415,7 +416,12 @@ public PlanOptimizers(
new InlineProjections(metadata.getFunctionAndTypeManager()),
new RemoveRedundantIdentityProjections(),
new TransformCorrelatedSingleRowSubqueryToProject())),
new CheckSubqueryNodesAreRewritten());
new CheckSubqueryNodesAreRewritten(),
new IterativeOptimizer(
ruleStats,
statsCalculator,
estimatedExchangesCostCalculator,
ImmutableSet.of(new PullConstantsAboveGroupBy())));

// TODO: move this before optimization if possible!!
// Replace all expressions with row expressions
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.facebook.presto.sql.planner.iterative.rule;

import com.facebook.presto.Session;
import com.facebook.presto.matching.Capture;
import com.facebook.presto.matching.Captures;
import com.facebook.presto.matching.Pattern;
import com.facebook.presto.spi.plan.AggregationNode;
import com.facebook.presto.spi.plan.Assignments;
import com.facebook.presto.spi.plan.ProjectNode;
import com.facebook.presto.spi.relation.ConstantExpression;
import com.facebook.presto.spi.relation.RowExpression;
import com.facebook.presto.spi.relation.VariableReferenceExpression;
import com.facebook.presto.sql.planner.iterative.Rule;
import com.google.common.collect.ImmutableList;

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

import static com.facebook.presto.SystemSessionProperties.isOptimizeConstantGroupingKeys;
import static com.facebook.presto.spi.plan.AggregationNode.singleGroupingSet;
import static com.facebook.presto.sql.analyzer.ExpressionTreeUtils.isConstant;
import static com.facebook.presto.sql.planner.plan.Patterns.aggregation;
import static com.facebook.presto.sql.planner.plan.Patterns.project;
import static com.facebook.presto.sql.planner.plan.Patterns.source;
import static com.facebook.presto.sql.relational.OriginalExpressionUtils.castToExpression;
import static com.facebook.presto.sql.relational.OriginalExpressionUtils.isExpression;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static java.util.function.Function.identity;

/**
* Transforms:
* <pre>
* - GroupBy key1, <const_expr>, key2
* </pre>
* Into:
* <pre>
* - Project <const_expr>
* - GroupBy key1, key2
* </pre>
*/
public class PullConstantsAboveGroupBy
implements Rule<AggregationNode>
{
private static final Capture<ProjectNode> SOURCE = Capture.newCapture();

private static final Pattern<AggregationNode> PATTERN =
aggregation()
.matching(agg -> agg.getGroupingSetCount() == 1)
.with(source().matching(project().capturedAs(SOURCE)));

@Override
public boolean isEnabled(Session session)
{
return isOptimizeConstantGroupingKeys(session);
}

@Override
public Pattern<AggregationNode> getPattern()
{
return PATTERN;
}

@Override
public Result apply(AggregationNode parent, Captures captures, Context context)
{
if (!isEnabled(context.getSession())) {
return Result.empty();
}

// for each variable references in grouping keys, check if the source expression defines them as constants
ProjectNode source = captures.get(SOURCE);
List<VariableReferenceExpression> outputVariables = parent.getOutputVariables();

Map<VariableReferenceExpression, RowExpression> constSourceVars = extractConstVars(source, outputVariables);

List<VariableReferenceExpression> groupingKeys = parent.getGroupingKeys();
List<VariableReferenceExpression> newGroupingKeys =
groupingKeys.stream()
.filter(key -> !constSourceVars.containsKey(key))
.collect(toImmutableList());

if (constSourceVars.isEmpty() || newGroupingKeys.equals(groupingKeys)) {
return Result.empty();
}

AggregationNode newAgg = new AggregationNode(
parent.getSourceLocation(),
parent.getId(),
source,
parent.getAggregations(),
singleGroupingSet(newGroupingKeys),
ImmutableList.of(),
parent.getStep(),
parent.getHashVariable(),
parent.getGroupIdVariable());

Map<VariableReferenceExpression, RowExpression> remainingVars =
outputVariables.stream()
.filter(var -> !constSourceVars.containsKey(var))
.collect(toImmutableMap(identity(), identity()));

Assignments.Builder assignments = Assignments.builder();
assignments.putAll(constSourceVars);
assignments.putAll(remainingVars);
return Result.ofPlanNode(
new ProjectNode(
parent.getSourceLocation(),
context.getIdAllocator().getNextId(),
newAgg,
assignments.build(),
source.getLocality()));
}

private static Map<VariableReferenceExpression, RowExpression> extractConstVars(ProjectNode projectNode, List<VariableReferenceExpression> outputVariables)
{
return projectNode.getAssignments().entrySet().stream()
.filter((entry) -> isConstantRowExpr(entry.getValue()) && outputVariables.contains(entry.getKey()))
.collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue));
}

private static boolean isConstantRowExpr(RowExpression expr)
{
if (isExpression(expr)) {
return isConstant(castToExpression(expr));
}
return expr instanceof ConstantExpression;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ public void testDefaults()
.setLegacyUnnestArrayRows(false)
.setJsonSerdeCodeGenerationEnabled(false)
.setPushLimitThroughOuterJoin(true)
.setOptimizeConstantGroupingKeys(true)
.setMaxConcurrentMaterializations(3)
.setPushdownSubfieldsEnabled(false)
.setPushdownDereferenceEnabled(false)
Expand Down Expand Up @@ -321,6 +322,7 @@ public void testExplicitPropertyMappings()
.put("deprecated.legacy-unnest-array-rows", "true")
.put("experimental.json-serde-codegen-enabled", "true")
.put("optimizer.push-limit-through-outer-join", "false")
.put("optimizer.optimize-constant-grouping-keys", "false")
.put("max-concurrent-materializations", "5")
.put("experimental.pushdown-subfields-enabled", "true")
.put("experimental.pushdown-dereference-enabled", "true")
Expand Down Expand Up @@ -479,6 +481,7 @@ public void testExplicitPropertyMappings()
.setDefaultFilterFactorEnabled(true)
.setJsonSerdeCodeGenerationEnabled(true)
.setPushLimitThroughOuterJoin(false)
.setOptimizeConstantGroupingKeys(false)
.setMaxConcurrentMaterializations(5)
.setPushdownSubfieldsEnabled(true)
.setPushdownDereferenceEnabled(true)
Expand Down
Loading