diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotColumn.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotColumn.java index c710a0956342..e63dcbe493ec 100755 --- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotColumn.java +++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotColumn.java @@ -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); } } diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTableBuilder.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTableBuilder.java index ecfcc4cd4061..cf31da4625ec 100755 --- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTableBuilder.java +++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTableBuilder.java @@ -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; @@ -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; @@ -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; @@ -47,7 +44,6 @@ 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; @@ -55,7 +51,6 @@ public final class DynamicTableBuilder { private static final CalciteSqlCompiler REQUEST_COMPILER = new CalciteSqlCompiler(); private static final String WILDCARD = "*"; - public static final Set SUPPORTED_INPUT_TYPES = ImmutableSet.of(INTEGER, BIGINT, REAL, DOUBLE); public static final String OFFLINE_SUFFIX = "_OFFLINE"; public static final String REALTIME_SUFFIX = "_REALTIME"; @@ -109,8 +104,6 @@ public static DynamicTable buildFromPql(PinotMetadata pinotMetadata, SchemaTable ImmutableList.Builder 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()))); @@ -167,11 +160,6 @@ private static List 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) { diff --git a/plugin/trino-pinot/src/test/resources/alltypes_realtimeSpec.json b/plugin/trino-pinot/src/test/resources/alltypes_realtimeSpec.json index 9871edd1d9dd..18563358b01a 100644 --- a/plugin/trino-pinot/src/test/resources/alltypes_realtimeSpec.json +++ b/plugin/trino-pinot/src/test/resources/alltypes_realtimeSpec.json @@ -19,7 +19,7 @@ "tableIndexConfig": { "loadMode": "MMAP", "invertedIndexColumns": ["string_col"], - "noDictionaryColumns": ["int_col", "int_array_col"], + "noDictionaryColumns": ["int_col"], "sortedColumn": ["updated_at_seconds"], "starTreeIndexConfigs": [ { diff --git a/plugin/trino-pinot/src/test/resources/mixed_case_realtimeSpec.json b/plugin/trino-pinot/src/test/resources/mixed_case_realtimeSpec.json index 10433ceb7da2..efeb76ac319b 100644 --- a/plugin/trino-pinot/src/test/resources/mixed_case_realtimeSpec.json +++ b/plugin/trino-pinot/src/test/resources/mixed_case_realtimeSpec.json @@ -9,7 +9,7 @@ "segmentPushType": "APPEND", "segmentPushFrequency": "daily", "segmentAssignmentStrategy": "BalanceNumSegmentAssignmentStrategy", - "schemaName": "alltypes", + "schemaName": "mixed_case", "replicasPerPartition": "1" }, "tenants": { diff --git a/plugin/trino-pinot/src/test/resources/too_many_rows_realtimeSpec.json b/plugin/trino-pinot/src/test/resources/too_many_rows_realtimeSpec.json index 9074723cde86..3a6503448c8c 100644 --- a/plugin/trino-pinot/src/test/resources/too_many_rows_realtimeSpec.json +++ b/plugin/trino-pinot/src/test/resources/too_many_rows_realtimeSpec.json @@ -9,7 +9,7 @@ "segmentPushType": "APPEND", "segmentPushFrequency": "daily", "segmentAssignmentStrategy": "BalanceNumSegmentAssignmentStrategy", - "schemaName": "alltypes", + "schemaName": "too_many_rows", "replicasPerPartition": "1" }, "tenants": {