Skip to content

Minor cleanups in Pinot connector #9178

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
hashhar merged 4 commits into from
Sep 10, 2021
Merged

Minor cleanups in Pinot connector #9178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7bfc3f3
Fixed mismatched schema names
elonazoulay Aug 30, 2021
16bfb42
Fix typo in PinotColumn error message
elonazoulay Aug 30, 2021
443e675
Fix realtime spec for alltypes table
elonazoulay Aug 30, 2021
856c9e8
Remove unused variables and functions from DynamicTableBuilder
elonazoulay Sep 10, 2021
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
2 changes: 1 addition & 1 deletion plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,6 @@ public static Type getTrinoTypeFromPinotType(DataType dataType)
default:
break;
}
throw new PinotException(PINOT_UNSUPPORTED_COLUMN_TYPE, Optional.empty(), "Not support type conversion for pinot data type: " + dataType);
throw new PinotException(PINOT_UNSUPPORTED_COLUMN_TYPE, Optional.empty(), "Unsupported type conversion for pinot data type: " + dataType);
}
}
12 changes: 0 additions & 12 deletions plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTableBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
package io.trino.plugin.pinot.query;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import io.trino.plugin.pinot.PinotColumnHandle;
import io.trino.plugin.pinot.PinotException;
import io.trino.plugin.pinot.PinotMetadata;
Expand All @@ -23,7 +22,6 @@
import io.trino.spi.connector.SchemaTableName;
import io.trino.spi.type.ArrayType;
import io.trino.spi.type.Type;
import org.apache.pinot.common.request.AggregationInfo;
import org.apache.pinot.common.request.BrokerRequest;
import org.apache.pinot.common.request.SelectionSort;
import org.apache.pinot.common.utils.DataSchema;
Expand All @@ -36,7 +34,6 @@
import java.util.Map;
import java.util.Optional;
import java.util.OptionalLong;
import java.util.Set;

import static com.google.common.collect.ImmutableList.toImmutableList;
import static io.trino.plugin.pinot.PinotErrorCode.PINOT_UNSUPPORTED_COLUMN_TYPE;
Expand All @@ -47,15 +44,13 @@
import static io.trino.spi.type.RealType.REAL;
import static io.trino.spi.type.VarbinaryType.VARBINARY;
import static io.trino.spi.type.VarcharType.VARCHAR;
import static java.lang.String.format;
import static java.util.Locale.ENGLISH;
import static java.util.Objects.requireNonNull;

public final class DynamicTableBuilder
{
private static final CalciteSqlCompiler REQUEST_COMPILER = new CalciteSqlCompiler();
private static final String WILDCARD = "*";
public static final Set<Type> SUPPORTED_INPUT_TYPES = ImmutableSet.of(INTEGER, BIGINT, REAL, DOUBLE);
public static final String OFFLINE_SUFFIX = "_OFFLINE";
public static final String REALTIME_SUFFIX = "_REALTIME";

Expand Down Expand Up @@ -109,8 +104,6 @@ public static DynamicTable buildFromPql(PinotMetadata pinotMetadata, SchemaTable
ImmutableList.Builder<PinotColumnHandle> aggregateColumnsBuilder = ImmutableList.builder();
if (request.getAggregationsInfo() != null) {
for (AggregationFunction aggregationFunction : queryContext.getAggregationFunctions()) {
aggregationFunction.getResultColumnName();
aggregationFunction.getType().getName();
aggregateColumnsBuilder.add(new PinotColumnHandle(
aggregationFunction.getResultColumnName(),
toTrinoType(aggregationFunction.getFinalResultColumnType())));
Expand Down Expand Up @@ -167,11 +160,6 @@ private static List<String> resolvePinotColumns(SchemaTableName schemaTableName,
return pinotColumnNamesBuilder.build();
}

private static String getOutputColumnName(AggregationInfo aggregationInfo, String pinotColumnName)
{
return format("%s(%s)", aggregationInfo.getAggregationType(), pinotColumnName).toLowerCase(ENGLISH);
}

private static OptionalLong getTopNOrLimit(BrokerRequest request)
{
if (request.getGroupBy() != null) {
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-pinot/src/test/resources/alltypes_realtimeSpec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"tableIndexConfig": {
"loadMode": "MMAP",
"invertedIndexColumns": ["string_col"],
"noDictionaryColumns": ["int_col", "int_array_col"],
"noDictionaryColumns": ["int_col"],
"sortedColumn": ["updated_at_seconds"],
"starTreeIndexConfigs": [
{
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-pinot/src/test/resources/mixed_case_realtimeSpec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"segmentPushType": "APPEND",
"segmentPushFrequency": "daily",
"segmentAssignmentStrategy": "BalanceNumSegmentAssignmentStrategy",
"schemaName": "alltypes",
"schemaName": "mixed_case",
"replicasPerPartition": "1"
},
"tenants": {
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-pinot/src/test/resources/too_many_rows_realtimeSpec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"segmentPushType": "APPEND",
"segmentPushFrequency": "daily",
"segmentAssignmentStrategy": "BalanceNumSegmentAssignmentStrategy",
"schemaName": "alltypes",
"schemaName": "too_many_rows",
"replicasPerPartition": "1"
},
"tenants": {
Expand Down