Skip to content
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.

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

colocated-without-hints #13943

Merged
merged 30 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
656b0ce
colocated-without-hints: First commit with the proposed code
gortiz Sep 5, 2024
860437b
colocated-without-hints: Adds the ability to enable/disable this opti…
gortiz Sep 9, 2024
dec74d3
colocated-without-hints: Add a default value for QueryEnvironment.Con…
gortiz Sep 18, 2024
c674900
multi-stage-explain: Add a @Nullable because it is needed in tests
gortiz Sep 18, 2024
7bf5a00
Merge branch 'master' into colocated-without-hints
gortiz Sep 24, 2024
83a9e4b
Merge branch 'master' into colocated-without-hints
gortiz Sep 26, 2024
c58db84
Merge branch 'master' into colocated-without-hints
gortiz Oct 1, 2024
0a07920
colocated-without-hints: disable formatter in a fluent chain call
gortiz Oct 1, 2024
125be2c
colocated-without-hints: ignore PARTITION_PARALLELISM in PinotImplici…
gortiz Oct 1, 2024
5a2de52
colocated-without-hints: use RelToPlanNodeConverter.getTableNameFromT…
gortiz Oct 1, 2024
e3f2096
colocated-without-hints: Improve useImplicitColocated usage
gortiz Oct 1, 2024
ff627b3
Merge remote-tracking branch 'origin/master' into colocated-without-h…
gortiz Oct 8, 2024
bbf3e5e
Rewrite WorkerManager to be closer to the previous version
gortiz Oct 9, 2024
06e8c1b
Merge remote-tracking branch 'origin/master' into colocated-without-h…
gortiz Oct 9, 2024
bdca363
Update pom.xml
gortiz Oct 10, 2024
f16eecf
Merge remote-tracking branch 'origin/master' into colocated-without-h…
gortiz Oct 10, 2024
598b17e
Declare immutable processor as an actual annotation processor
gortiz Oct 10, 2024
75d077f
Refactor a difficult to read method
gortiz Oct 10, 2024
9fda5de
Rollback the immutables bom import
gortiz Oct 11, 2024
047500d
Removed PartitionTableFinder, unused now that we directly depend on W…
gortiz Oct 11, 2024
3743d73
Removed unneeded precondition
gortiz Oct 11, 2024
14e26f1
Support table names with type in getTablePartitionInfo
gortiz Oct 11, 2024
977fa16
Simplify PinotImplicitTableHintRule by delegating even more into Work…
gortiz Oct 11, 2024
172f605
Merge remote-tracking branch 'origin/master' into colocated-without-h…
gortiz Oct 11, 2024
c64095f
colocated-without-hints: add license header
gortiz Oct 11, 2024
24036a9
colocated-without-hints: turn pinot.broker.enable.partition.metadata.…
gortiz Oct 11, 2024
f50b3c0
colocated-without-hints: Apply suggestions on PR
gortiz Oct 15, 2024
1a13516
colocated-without-hints: Rename getHint method
gortiz Oct 16, 2024
460a8e5
colocated-without-hints: rename hint to inferPartitionHint
gortiz Oct 16, 2024
8512fd2
Merge remote-tracking branch 'origin/master' into colocated-without-h…
gortiz Oct 16, 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
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,14 @@ protected BrokerResponse handleRequest(long requestId, String query, SqlNodeAndO
Long timeoutMsFromQueryOption = QueryOptionsUtils.getTimeoutMs(queryOptions);
queryTimeoutMs = timeoutMsFromQueryOption != null ? timeoutMsFromQueryOption : _brokerTimeoutMs;
database = DatabaseUtils.extractDatabaseFromQueryRequest(queryOptions, httpHeaders);
QueryEnvironment queryEnvironment = new QueryEnvironment(database, _tableCache, _workerManager);
boolean useImplicitColocatedByDefault = _config.getProperty(CommonConstants.Broker.IMPLICIT_COLOCATE_JOIN,
CommonConstants.Broker.DEFAULT_IMPLICIT_COLOCATE_JOIN);
QueryEnvironment queryEnvironment = new QueryEnvironment(QueryEnvironment.configBuilder()
.database(database)
gortiz marked this conversation as resolved.
Show resolved Hide resolved
.tableCache(_tableCache)
.workerManager(_workerManager)
.useImplicitColocatedByDefault(useImplicitColocatedByDefault)
.build());
switch (sqlNodeAndOptions.getSqlNode().getKind()) {
case EXPLAIN:
boolean askServers = QueryOptionsUtils.isExplainAskingServers(queryOptions)
Expand Down
5 changes: 5 additions & 0 deletions pinot-query-planner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@
<groupId>org.codehaus.janino</groupId>
<artifactId>commons-compiler</artifactId>
</dependency>
<dependency>
<groupId>org.immutables</groupId>
<artifactId>value</artifactId>
gortiz marked this conversation as resolved.
Show resolved Hide resolved
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.testng</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,26 @@ public static class JoinHintOptions {
}

public static class TableHintOptions {
/**
* Indicates how many partitions the table must be partitioned by.
* This must be equal to the partition count of the table in
* {@code tableIndexConfig.segmentPartitionConfig.columnPartitionMap}.
*/
public static final String PARTITION_KEY = "partition_key";
/**
* The function to use to partition the table.
* This must be equal to {@code functionName} in {@code tableIndexConfig.segmentPartitionConfig.columnPartitionMap}.
*/
public static final String PARTITION_FUNCTION = "partition_function";
/**
* The size of each partition.
* This must be equal to {@code numPartition} in {@code tableIndexConfig.segmentPartitionConfig.columnPartitionMap}.
*/
public static final String PARTITION_SIZE = "partition_size";
/**
* The number of workers per partition
* If {@link #PARTITION_SIZE} times {@link #PARTITION_PARALLELISM} is less than the total number of
*/
public static final String PARTITION_PARALLELISM = "partition_parallelism";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,283 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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 org.apache.pinot.calcite.rel.rules;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
import org.apache.calcite.plan.RelOptRuleCall;
import org.apache.calcite.plan.RelRule;
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.hint.RelHint;
import org.apache.calcite.rel.logical.LogicalTableScan;
import org.apache.pinot.calcite.rel.hint.PinotHintOptions;
import org.apache.pinot.common.utils.DatabaseUtils;
import org.apache.pinot.core.routing.TablePartitionInfo;
import org.apache.pinot.spi.config.table.TableType;
import org.apache.pinot.spi.utils.builder.TableNameBuilder;
import org.immutables.value.Value;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Value.Enclosing
public class PinotImplicitTableHintRule extends RelRule<RelRule.Config> {

private static final Logger LOGGER = LoggerFactory.getLogger(PinotImplicitTableHintRule.class);
private final PartitionTableFinder _partitionTableFinder;

private PinotImplicitTableHintRule(Config config) {
super(config);
_partitionTableFinder = config.getTablePartitionTableFinder();
}

public static PinotImplicitTableHintRule withPartitionTableFinder(PartitionTableFinder tablePartitionTableFinder) {
return new PinotImplicitTableHintRule(ImmutablePinotImplicitTableHintRule.Config.builder()
.operandSupplier(b0 -> b0.operand(LogicalTableScan.class).anyInputs())
.tablePartitionTableFinder(tablePartitionTableFinder)
.build()
);
}

@Override
public boolean matches(RelOptRuleCall call) {
LogicalTableScan tableScan = call.rel(0);

RelHint explicitHint = getTableOptionHint(tableScan);

if (explicitHint == null) {
return true;
}
// we don't want to apply this rule if the explicit hint is complete
Map<String, String> kvOptions = explicitHint.kvOptions;
return kvOptions.containsKey(PinotHintOptions.TableHintOptions.PARTITION_KEY)
&& kvOptions.containsKey(PinotHintOptions.TableHintOptions.PARTITION_FUNCTION)
&& kvOptions.containsKey(PinotHintOptions.TableHintOptions.PARTITION_SIZE)
&& kvOptions.containsKey(PinotHintOptions.TableHintOptions.PARTITION_PARALLELISM);
gortiz marked this conversation as resolved.
Show resolved Hide resolved
}

@Override
public void onMatch(RelOptRuleCall call) {
LogicalTableScan tableScan = call.rel(0);

TablePartitionInfo tablePartitionInfo = getTablePartitionInfo(tableScan);
if (tablePartitionInfo == null) {
LOGGER.debug("Table partition info not found for table: {}", tableScan);
return;
}

@Nullable
RelHint explicitHint = getTableOptionHint(tableScan);
TableOptions tableOptions = calculateTableOptions(explicitHint, tablePartitionInfo, tableScan);
RelNode newRel = withNewTableOptions(tableScan, tableOptions);
call.transformTo(newRel);
}

/**
* Get the table option hint from the table scan, if any.
*/
@Nullable
private static RelHint getTableOptionHint(LogicalTableScan tableScan) {
return tableScan.getHints().stream()
.filter(relHint -> relHint.hintName.equals(PinotHintOptions.TABLE_HINT_OPTIONS))
.findAny()
Copy link
Contributor

Choose a reason for hiding this comment

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

We want to pick the first hint that matches the name. The reason is that user might override the same hint multiple times, and the first one should be the closest one.
Suggest adding this as a util method in PinotHintStrategyTable

.orElse(null);
}

/**
* Returns a new node which is a copy of the given table scan with the new table options hint.
*/
private static RelNode withNewTableOptions(LogicalTableScan tableScan, TableOptions tableOptions) {
ArrayList<RelHint> newHints = new ArrayList<>(tableScan.getHints());

newHints.removeIf(relHint -> relHint.hintName.equals(PinotHintOptions.TABLE_HINT_OPTIONS));

RelHint tableOptionsHint = RelHint.builder(PinotHintOptions.TABLE_HINT_OPTIONS)
.hintOption(PinotHintOptions.TableHintOptions.PARTITION_KEY, tableOptions.getPartitionKey())
.hintOption(PinotHintOptions.TableHintOptions.PARTITION_FUNCTION, tableOptions.getPartitionFunction())
.hintOption(PinotHintOptions.TableHintOptions.PARTITION_SIZE, String.valueOf(tableOptions.getPartitionSize()))
.hintOption(PinotHintOptions.TableHintOptions.PARTITION_PARALLELISM,
String.valueOf(tableOptions.getPartitionParallelism()))
.build();

newHints.add(tableOptionsHint);

return tableScan.withHints(newHints);
}

/**
* Creates a new table options hint based on the given table partition info and the explicit hint, if any.
*
* Any explicit hint will override the implicit hint obtained from the table partition info.
*/
private static TableOptions calculateTableOptions(
@Nullable RelHint relHint, TablePartitionInfo tablePartitionInfo, LogicalTableScan tableScan) {
if (relHint == null) {
return ImmutablePinotImplicitTableHintRule.TableOptions.builder()
Copy link
Contributor

Choose a reason for hiding this comment

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

I checked out the code but cannot find this class in IDE. Is this auto generated by the annotation framework?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the class that is autogenerated by immutables.

.partitionKey(tablePartitionInfo.getPartitionColumn())
.partitionFunction(tablePartitionInfo.getPartitionFunctionName())
.partitionSize(tablePartitionInfo.getNumPartitions()).partitionParallelism(1)
.build();
}

// there is a hint, check fill default data and obtain the partition parallelism if supplied
Map<String, String> kvOptions = relHint.kvOptions;
return ImmutablePinotImplicitTableHintRule.TableOptions.builder()
.partitionKey(getPartitionKey(tablePartitionInfo, tableScan, kvOptions))
.partitionFunction(getPartitionFunction(tablePartitionInfo, tableScan, kvOptions))
.partitionSize(getPartitionSize(tablePartitionInfo, tableScan, kvOptions))
.partitionParallelism(getPartitionParallelism(tableScan, kvOptions))
.build();
}

/**
* Get the partition key from the hint, if any, otherwise use the partition column from the table partition info.
*/
private static String getPartitionKey(TablePartitionInfo tablePartitionInfo, LogicalTableScan tableScan,
Map<String, String> kvOptions) {
String partitionKey = kvOptions.get(kvOptions.get(PinotHintOptions.TableHintOptions.PARTITION_KEY));
if (partitionKey != null && !partitionKey.equals(tablePartitionInfo.getPartitionColumn())) {
gortiz marked this conversation as resolved.
Show resolved Hide resolved
LOGGER.debug("Override implicit table hint for {} with explicit partition key: {}", tableScan, partitionKey);
return partitionKey;
} else {
return tablePartitionInfo.getPartitionColumn();
}
}

/**
* Get the partition function from the hint, if any, otherwise use the partition function from the table partition
* info.
*/
private static String getPartitionFunction(TablePartitionInfo tablePartitionInfo, LogicalTableScan tableScan,
Map<String, String> kvOptions) {
String partitionFunction = kvOptions.get(kvOptions.get(PinotHintOptions.TableHintOptions.PARTITION_FUNCTION));
if (partitionFunction != null && !partitionFunction.equals(tablePartitionInfo.getPartitionFunctionName())) {
LOGGER.debug("Override implicit table hint for {} with explicit partition function: {}",
tableScan, partitionFunction);
return partitionFunction;
} else {
return tablePartitionInfo.getPartitionFunctionName();
}
}

/**
* Get the partition parallelism from the hint, if any, otherwise use the default value of 1.
*/
private static int getPartitionParallelism(LogicalTableScan tableScan, Map<String, String> kvOptions) {
int partitionParallelism = 1;
String partitionParallelismStr = kvOptions.get(PinotHintOptions.TableHintOptions.PARTITION_PARALLELISM);
if (partitionParallelismStr != null) {
try {
int explicitPartitionParallelism = Integer.parseInt(partitionParallelismStr);
if (explicitPartitionParallelism != partitionParallelism) {
LOGGER.debug("Override implicit table hint for {} with explicit partition parallelism: {}", tableScan,
explicitPartitionParallelism);
partitionParallelism = explicitPartitionParallelism;
}
} catch (NumberFormatException e) {
throw new IllegalArgumentException(
"Invalid partition parallelism: " + partitionParallelismStr + " for table: " + tableScan);
}
}
return partitionParallelism;
}

/**
* Get the partition size from the hint, if any, otherwise use the partition size from the table partition info.
*/
private static int getPartitionSize(TablePartitionInfo tablePartitionInfo, LogicalTableScan tableScan,
Map<String, String> kvOptions) {
int partitionSize = tablePartitionInfo.getNumPartitions();
String partitionSizeStr = kvOptions.get(PinotHintOptions.TableHintOptions.PARTITION_SIZE);
if (partitionSizeStr != null) {
try {
int explicitPartitionSize = Integer.parseInt(partitionSizeStr);
if (explicitPartitionSize != partitionSize) {
LOGGER.debug("Override implicit table hint for {} with explicit partition size: {}", tableScan,
explicitPartitionSize);
partitionSize = explicitPartitionSize;
}
} catch (NumberFormatException e) {
throw new IllegalArgumentException("Invalid partition size: " + partitionSizeStr + " for table: " + tableScan);
}
}
return partitionSize;
}

/**
* Get the table partition info for the given table scan, transforming Calcite's table name to Pinot's table name
* and adding the table type if needed.
*/
@Nullable
private TablePartitionInfo getTablePartitionInfo(LogicalTableScan tableScan) {
List<String> qualifiedName = tableScan.getTable().getQualifiedName();
String tableName;
if (qualifiedName.size() == 1) {
tableName = qualifiedName.get(0);
} else {
tableName = DatabaseUtils.translateTableName(qualifiedName.get(1), qualifiedName.get(0));
}
gortiz marked this conversation as resolved.
Show resolved Hide resolved

if (TableNameBuilder.getTableTypeFromTableName(tableName) == null) {
tableName = TableNameBuilder.forType(TableType.OFFLINE).tableNameWithType(tableName);
Copy link
Contributor

Choose a reason for hiding this comment

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

(MAJOR) This is not robust, and can cause wrong behavior on real-time or hybrid table. We'll need to check both real-time and offline and apply hint when they match each other, or only one exists

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you think we should apply the same check done in WorkerManager that verifies that there is at least one server that is fully replicated? I would suggest:

  • If the table is hybrid
  • And it is not fully replicated
  • If the query includes SET implicitColocateJoin=true, then we should fail.
  • If the query does not include SET implicitColocateJoin=true then we should not apply the optimization.

Copy link
Contributor

Choose a reason for hiding this comment

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

How complicated is this check? Are we going to replicate a lot of logic within WorkerManager?
I was thinking only apply the hint when both tables have the same partitionColumn, partitionFunctionName and numPartitions. Then I realized another issue: we need to know if a table exists to figure out whether it is either unpartitioned, or doesn't exist.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

we need to know if a table exists

What do you mean? If the table doesn't exits we would have failed at validation time, right? Do you mean to actually have segments?

My concern here is that WorkerManager fails if there is at least one partition that is not fully replicated (see

Preconditions.checkState(!fullyReplicatedServers.isEmpty(),
). Therefore if we just compare partitionColumn, partitionFunctionName and numPartitions and the table is not fully replicated, we will end up failing at WorkerManager.

My suggestion is to modify WorkerManager to provide a method similar to getPartitionTableInfo that we can call from the rule. This method should check whether partition info is equal and if for each partition there is at least one server with a full copy of the partition. The main differences with current getPartitionTableInfo is that:

  • It cannot return PartitionTableInfo, given it is an internal class the rule don't care about.
  • It cannot call getTablePartitionInfo, which doesn't only get the info but also compares values on the hint with what is stored in the routing manager.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've changed the code. Can you take a look to the new implementation that delegates on worker manager?

}
return _partitionTableFinder.getTablePartitionInfo(tableName);
}

@Value.Immutable
public interface Config extends RelRule.Config {
PartitionTableFinder getTablePartitionTableFinder();

@Override
default PinotImplicitTableHintRule toRule() {
return new PinotImplicitTableHintRule(this);
}
}

/**
* An interface to find the table partition info for a given table name.
*/
public interface PartitionTableFinder {
gortiz marked this conversation as resolved.
Show resolved Hide resolved

/**
* Get the table partition info for the given table name with type suffix.
* @return the table partition info, or null if not found
*/
@Nullable
TablePartitionInfo getTablePartitionInfo(String tableNameWithType);

/**
* A partition table finder that always returns null, meaning that the table partition info is not found.
*/
static PartitionTableFinder disabled() {
return (table) -> null;
}
}

/**
* An internal interface used to generate the table options hint.
*/
@Value.Immutable
interface TableOptions {
String getPartitionKey();
String getPartitionFunction();
int getPartitionSize();
int getPartitionParallelism();
}
}
Loading
Loading