diff --git a/docs/src/main/sphinx/connector/pinot.rst b/docs/src/main/sphinx/connector/pinot.rst
index 6a20df81af38..b70c735200cc 100644
--- a/docs/src/main/sphinx/connector/pinot.rst
+++ b/docs/src/main/sphinx/connector/pinot.rst
@@ -14,7 +14,7 @@ Requirements
 
 To connect to Pinot, you need:
 
-* Pinot 0.10.0 or higher.
+* Pinot 0.11.0 or higher.
 * Network access from the Trino coordinator and workers to the Pinot controller
   nodes. Port 8098 is the default port.
 
diff --git a/plugin/trino-pinot/pom.xml b/plugin/trino-pinot/pom.xml
index 9fce465071c4..ee01bf04fb00 100755
--- a/plugin/trino-pinot/pom.xml
+++ b/plugin/trino-pinot/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-        <dep.pinot.version>0.11.0</dep.pinot.version>
+        <dep.pinot.version>0.12.1</dep.pinot.version>
         <!--
            Project's default for air.test.parallel is 'methods'. By design, 'instances' makes TestNG run tests from one class in a single thread.
            As a side effect, it prevents TestNG from initializing multiple test instances upfront, which happens with 'methods'.
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotDataFetcher.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotDataFetcher.java
index 460a1039559e..09ad09388b95 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotDataFetcher.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotDataFetcher.java
@@ -16,7 +16,7 @@
 import io.trino.plugin.pinot.PinotException;
 import io.trino.plugin.pinot.PinotSplit;
 import io.trino.spi.connector.ConnectorSession;
-import org.apache.pinot.common.utils.DataTable;
+import org.apache.pinot.common.datatable.DataTable;
 
 import java.util.List;
 import java.util.Map;
@@ -27,7 +27,7 @@
 import static io.trino.plugin.pinot.PinotErrorCode.PINOT_EXCEPTION;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
-import static org.apache.pinot.common.utils.DataTable.EXCEPTION_METADATA_KEY;
+import static org.apache.pinot.common.datatable.DataTable.EXCEPTION_METADATA_KEY;
 
 public interface PinotDataFetcher
 {
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotDataTableWithSize.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotDataTableWithSize.java
index 31881ee37d24..820657e8654d 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotDataTableWithSize.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotDataTableWithSize.java
@@ -13,7 +13,7 @@
  */
 package io.trino.plugin.pinot.client;
 
-import org.apache.pinot.common.utils.DataTable;
+import org.apache.pinot.common.datatable.DataTable;
 
 public class PinotDataTableWithSize
 {
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotGrpcDataFetcher.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotGrpcDataFetcher.java
index a8c7ed692b72..54c56264a486 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotGrpcDataFetcher.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotGrpcDataFetcher.java
@@ -23,9 +23,9 @@
 import io.trino.plugin.pinot.query.PinotProxyGrpcRequestBuilder;
 import io.trino.spi.connector.ConnectorSession;
 import org.apache.pinot.common.config.GrpcConfig;
+import org.apache.pinot.common.datatable.DataTableFactory;
 import org.apache.pinot.common.proto.Server;
 import org.apache.pinot.common.utils.grpc.GrpcQueryClient;
-import org.apache.pinot.core.common.datatable.DataTableFactory;
 import org.apache.pinot.spi.utils.CommonConstants.Query.Response.MetadataKeys;
 import org.apache.pinot.spi.utils.CommonConstants.Query.Response.ResponseType;
 
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotLegacyDataFetcher.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotLegacyDataFetcher.java
index 8ee8c534655b..5accc85bae48 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotLegacyDataFetcher.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotLegacyDataFetcher.java
@@ -21,15 +21,17 @@
 import io.trino.plugin.pinot.PinotSessionProperties;
 import io.trino.plugin.pinot.PinotSplit;
 import io.trino.spi.connector.ConnectorSession;
+import org.apache.pinot.common.datatable.DataTable;
 import org.apache.pinot.common.metrics.BrokerMetrics;
 import org.apache.pinot.common.request.BrokerRequest;
 import org.apache.pinot.common.utils.DataSchema;
-import org.apache.pinot.common.utils.DataTable;
 import org.apache.pinot.core.transport.AsyncQueryResponse;
 import org.apache.pinot.core.transport.QueryRouter;
 import org.apache.pinot.core.transport.ServerInstance;
 import org.apache.pinot.core.transport.ServerResponse;
 import org.apache.pinot.core.transport.ServerRoutingInstance;
+import org.apache.pinot.core.transport.server.routing.stats.ServerRoutingStatsManager;
+import org.apache.pinot.spi.env.PinotConfiguration;
 import org.apache.pinot.spi.metrics.PinotMetricUtils;
 import org.apache.pinot.spi.metrics.PinotMetricsRegistry;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
@@ -189,7 +191,7 @@ public PinotLegacyServerQueryClient(PinotHostMapper pinotHostMapper, PinotConfig
             PinotMetricsRegistry registry = PinotMetricUtils.getPinotMetricsRegistry();
             this.brokerMetrics = new BrokerMetrics(registry);
             brokerMetrics.initializeGlobalMeters();
-            queryRouter = new QueryRouter(trinoHostId, brokerMetrics);
+            queryRouter = new QueryRouter(trinoHostId, brokerMetrics, new ServerRoutingStatsManager(new PinotConfiguration()));
         }
 
         private static String getDefaultTrinoId()
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotExpressionRewriter.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotExpressionRewriter.java
index 596724ab5822..42a04a9b5b7c 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotExpressionRewriter.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotExpressionRewriter.java
@@ -51,18 +51,20 @@
 import static io.trino.plugin.pinot.query.PinotPatterns.transformFunction;
 import static io.trino.plugin.pinot.query.PinotPatterns.transformFunctionType;
 import static io.trino.plugin.pinot.query.PinotSqlFormatter.getColumnHandle;
+import static io.trino.plugin.pinot.query.PinotTransformFunctionTypeResolver.getTransformFunctionType;
 import static java.lang.String.format;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static org.apache.pinot.common.function.TransformFunctionType.DATETIMECONVERT;
 import static org.apache.pinot.common.function.TransformFunctionType.DATETRUNC;
 import static org.apache.pinot.common.function.TransformFunctionType.TIMECONVERT;
+import static org.apache.pinot.common.request.Literal.stringValue;
 import static org.apache.pinot.common.request.context.ExpressionContext.Type.FUNCTION;
 import static org.apache.pinot.common.request.context.ExpressionContext.Type.IDENTIFIER;
 import static org.apache.pinot.common.request.context.ExpressionContext.Type.LITERAL;
 import static org.apache.pinot.common.request.context.ExpressionContext.forFunction;
 import static org.apache.pinot.common.request.context.ExpressionContext.forIdentifier;
-import static org.apache.pinot.common.request.context.ExpressionContext.forLiteral;
+import static org.apache.pinot.common.request.context.ExpressionContext.forLiteralContext;
 import static org.apache.pinot.core.operator.transform.function.DateTruncTransformFunction.EXAMPLE_INVOCATION;
 import static org.apache.pinot.core.operator.transform.transformer.timeunit.TimeUnitTransformerFactory.getTimeUnitTransformer;
 import static org.apache.pinot.segment.spi.AggregationFunctionType.COUNT;
@@ -124,7 +126,7 @@ private static FunctionContext rewriteFunction(FunctionContext functionContext,
     {
         Optional<FunctionContext> result = Optional.empty();
         if (functionContext.getType() == FunctionContext.Type.TRANSFORM) {
-            RewriteRule<FunctionContext> rule = FUNCTION_RULE_MAP.get(TransformFunctionType.getTransformFunctionType(functionContext.getFunctionName()));
+            RewriteRule<FunctionContext> rule = FUNCTION_RULE_MAP.get(getTransformFunctionType(functionContext).orElseThrow());
             if (rule != null) {
                 result = applyRule(rule, functionContext, context);
             }
@@ -176,15 +178,15 @@ public FunctionContext rewrite(FunctionContext object, Captures captures, Contex
 
             ImmutableList.Builder<ExpressionContext> argumentsBuilder = ImmutableList.builder();
             argumentsBuilder.add(rewriteExpression(object.getArguments().get(0), context));
-            String inputFormat = object.getArguments().get(1).getLiteral().toUpperCase(ENGLISH);
-            argumentsBuilder.add(forLiteral(inputFormat));
-            String outputFormat = object.getArguments().get(2).getLiteral().toUpperCase(ENGLISH);
-            argumentsBuilder.add(forLiteral(outputFormat));
-            String granularity = object.getArguments().get(3).getLiteral().toUpperCase(ENGLISH);
+            String inputFormat = object.getArguments().get(1).getLiteral().getValue().toString().toUpperCase(ENGLISH);
+            argumentsBuilder.add(forLiteralContext(stringValue(inputFormat)));
+            String outputFormat = object.getArguments().get(2).getLiteral().getValue().toString().toUpperCase(ENGLISH);
+            argumentsBuilder.add(forLiteralContext(stringValue(outputFormat)));
+            String granularity = object.getArguments().get(3).getLiteral().getValue().toString().toUpperCase(ENGLISH);
             BaseDateTimeTransformer dateTimeTransformer = DateTimeTransformerFactory.getDateTimeTransformer(inputFormat, outputFormat, granularity);
             // Even if the format is valid, make sure it is not a simple date format: format characters can be ambiguous due to lower casing
             checkState(dateTimeTransformer instanceof EpochToEpochTransformer, "Unsupported date format: simple date format not supported");
-            argumentsBuilder.add(forLiteral(granularity));
+            argumentsBuilder.add(forLiteralContext(stringValue(granularity)));
             return new FunctionContext(object.getType(), object.getFunctionName(), argumentsBuilder.build());
         }
     }
@@ -209,13 +211,13 @@ public FunctionContext rewrite(FunctionContext object, Captures captures, Contex
 
             ImmutableList.Builder<ExpressionContext> argumentsBuilder = ImmutableList.builder();
             argumentsBuilder.add(rewriteExpression(object.getArguments().get(0), context));
-            String inputTimeUnitArgument = object.getArguments().get(1).getLiteral().toUpperCase(ENGLISH);
+            String inputTimeUnitArgument = object.getArguments().get(1).getLiteral().getValue().toString().toUpperCase(ENGLISH);
             TimeUnit inputTimeUnit = TimeUnit.valueOf(inputTimeUnitArgument);
-            String outputTimeUnitArgument = object.getArguments().get(2).getLiteral().toUpperCase(ENGLISH);
+            String outputTimeUnitArgument = object.getArguments().get(2).getLiteral().getValue().toString().toUpperCase(ENGLISH);
             // Check that this is a valid time unit transform
             getTimeUnitTransformer(inputTimeUnit, outputTimeUnitArgument);
-            argumentsBuilder.add(forLiteral(inputTimeUnitArgument));
-            argumentsBuilder.add(forLiteral(outputTimeUnitArgument));
+            argumentsBuilder.add(forLiteralContext(stringValue(inputTimeUnitArgument)));
+            argumentsBuilder.add(forLiteralContext(stringValue(outputTimeUnitArgument)));
             return new FunctionContext(object.getType(), object.getFunctionName(), argumentsBuilder.build());
         }
     }
@@ -240,27 +242,27 @@ public FunctionContext rewrite(FunctionContext object, Captures captures, Contex
             ImmutableList.Builder<ExpressionContext> argumentsBuilder = ImmutableList.builder();
 
             checkState(arguments.get(0).getType() == LITERAL, "First argument must be a literal");
-            String unit = arguments.get(0).getLiteral().toLowerCase(ENGLISH);
-            argumentsBuilder.add(forLiteral(unit));
+            String unit = arguments.get(0).getLiteral().getValue().toString().toLowerCase(ENGLISH);
+            argumentsBuilder.add(forLiteralContext(stringValue(unit)));
             verifyIsIdentifierOrFunction(object.getArguments().get(1));
             ExpressionContext valueArgument = rewriteExpression(arguments.get(1), context);
             argumentsBuilder.add(valueArgument);
             if (arguments.size() >= 3) {
                 checkState(arguments.get(2).getType() == LITERAL, "Unexpected 3rd argument: '%s'", arguments.get(2));
-                String inputTimeUnitArgument = arguments.get(2).getLiteral().toUpperCase(ENGLISH);
+                String inputTimeUnitArgument = arguments.get(2).getLiteral().getValue().toString().toUpperCase(ENGLISH);
                 // Ensure this is a valid TimeUnit
                 TimeUnit inputTimeUnit = TimeUnit.valueOf(inputTimeUnitArgument);
-                argumentsBuilder.add(forLiteral(inputTimeUnit.name()));
+                argumentsBuilder.add(forLiteralContext(stringValue(inputTimeUnit.name())));
                 if (arguments.size() >= 4) {
                     checkState(arguments.get(3).getType() == LITERAL, "Unexpected 4th argument '%s'", arguments.get(3));
                     // Time zone is lower cased inside Pinot
                     argumentsBuilder.add(arguments.get(3));
                     if (arguments.size() >= 5) {
                         checkState(arguments.get(4).getType() == LITERAL, "Unexpected 5th argument: '%s'", arguments.get(4));
-                        String outputTimeUnitArgument = arguments.get(4).getLiteral().toUpperCase(ENGLISH);
+                        String outputTimeUnitArgument = arguments.get(4).getLiteral().getValue().toString().toUpperCase(ENGLISH);
                         // Ensure this is a valid TimeUnit
                         TimeUnit outputTimeUnit = TimeUnit.valueOf(outputTimeUnitArgument);
-                        argumentsBuilder.add(forLiteral(outputTimeUnit.name()));
+                        argumentsBuilder.add(forLiteralContext(stringValue(outputTimeUnit.name())));
                     }
                 }
             }
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotPatterns.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotPatterns.java
index 93240aa355a0..e569e8d508a9 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotPatterns.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotPatterns.java
@@ -34,7 +34,7 @@
 import java.util.Optional;
 
 import static io.trino.matching.Pattern.typeOf;
-import static org.apache.pinot.common.function.TransformFunctionType.getTransformFunctionType;
+import static io.trino.plugin.pinot.query.PinotTransformFunctionTypeResolver.getTransformFunctionType;
 import static org.apache.pinot.common.request.context.ExpressionContext.Type.FUNCTION;
 import static org.apache.pinot.common.request.context.ExpressionContext.Type.IDENTIFIER;
 import static org.apache.pinot.common.request.context.FunctionContext.Type.AGGREGATION;
@@ -235,7 +235,7 @@ public static Pattern<FunctionContext> binaryFunction()
     {
         return Property.optionalProperty("transformFunctionType", functionContext -> {
             if (functionContext.getType() == TRANSFORM) {
-                return Optional.of(getTransformFunctionType(functionContext.getFunctionName()));
+                return getTransformFunctionType(functionContext);
             }
             return Optional.empty();
         });
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotSqlFormatter.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotSqlFormatter.java
index 7c5040c68b16..e1303adf468d 100644
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotSqlFormatter.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotSqlFormatter.java
@@ -71,6 +71,7 @@
 import static io.trino.plugin.pinot.query.PinotPatterns.transformFunction;
 import static io.trino.plugin.pinot.query.PinotPatterns.transformFunctionName;
 import static io.trino.plugin.pinot.query.PinotPatterns.transformFunctionType;
+import static io.trino.plugin.pinot.query.PinotTransformFunctionTypeResolver.getTransformFunctionType;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
@@ -198,7 +199,7 @@ private static String formatExpression(ExpressionContext expressionContext, Cont
     {
         switch (expressionContext.getType()) {
             case LITERAL:
-                return singleQuoteValue(expressionContext.getLiteral());
+                return singleQuoteValue(expressionContext.getLiteral().getValue().toString());
             case IDENTIFIER:
                 if (context.getColumnHandles().isPresent()) {
                     return quoteIdentifier(getColumnHandle(expressionContext.getIdentifier(), context.getSchemaTableName(), context.getColumnHandles().get()).getColumnName());
@@ -214,7 +215,7 @@ private static String formatFunction(FunctionContext functionContext, Context co
     {
         Optional<String> result = Optional.empty();
         if (functionContext.getType() == FunctionContext.Type.TRANSFORM) {
-            Rule<FunctionContext> rule = FUNCTION_RULE_MAP.get(TransformFunctionType.getTransformFunctionType(functionContext.getFunctionName()));
+            Rule<FunctionContext> rule = FUNCTION_RULE_MAP.get(getTransformFunctionType(functionContext).orElseThrow());
 
             if (rule != null) {
                 result = applyRule(rule, functionContext, context);
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotTransformFunctionTypeResolver.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotTransformFunctionTypeResolver.java
new file mode 100644
index 000000000000..a7ccdcd0f14f
--- /dev/null
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotTransformFunctionTypeResolver.java
@@ -0,0 +1,61 @@
+/*
+ * 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 io.trino.plugin.pinot.query;
+
+import org.apache.pinot.common.function.FunctionRegistry;
+import org.apache.pinot.common.function.TransformFunctionType;
+import org.apache.pinot.common.request.context.FunctionContext;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
+import static org.apache.pinot.common.function.TransformFunctionType.SCALAR;
+import static org.apache.pinot.core.operator.transform.function.TransformFunctionFactory.canonicalize;
+
+public final class PinotTransformFunctionTypeResolver
+{
+    private PinotTransformFunctionTypeResolver() {}
+
+    private static final Map<String, TransformFunctionType> TRANSFORM_FUNCTION_TYPE_MAP;
+
+    static
+    {
+        Map<String, TransformFunctionType> builder = new HashMap<>();
+        for (TransformFunctionType transformFunctionType : TransformFunctionType.values()) {
+            for (String alias : transformFunctionType.getAliases()) {
+                TransformFunctionType previousValue = builder.put(canonicalize(alias), transformFunctionType);
+                checkState(previousValue == null || previousValue == transformFunctionType, "Duplicate key with different values for alias '%s', transform function type '%s' and previous value '%s'", canonicalize(alias), transformFunctionType, previousValue);
+            }
+        }
+        TRANSFORM_FUNCTION_TYPE_MAP = Map.copyOf(builder);
+    }
+
+    // Extracted from org.apache.pinot.core.operator.transform.function.TransformFunctionFactory::get
+    public static Optional<TransformFunctionType> getTransformFunctionType(FunctionContext function)
+    {
+        requireNonNull(function, "function is null");
+        String canonicalizedFunctionName = canonicalize(function.getFunctionName());
+        TransformFunctionType transformFunctionType = TRANSFORM_FUNCTION_TYPE_MAP.get(canonicalizedFunctionName);
+        if (transformFunctionType != null) {
+            return Optional.of(transformFunctionType);
+        }
+        if (FunctionRegistry.containsFunction(canonicalizedFunctionName)) {
+            return Optional.of(SCALAR);
+        }
+        return Optional.empty();
+    }
+}
diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/BasePinotIntegrationConnectorSmokeTest.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/BasePinotIntegrationConnectorSmokeTest.java
index 59b16e917f2b..0346609fe347 100644
--- a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/BasePinotIntegrationConnectorSmokeTest.java
+++ b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/BasePinotIntegrationConnectorSmokeTest.java
@@ -83,7 +83,6 @@
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
 import static io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG;
 import static io.trino.plugin.pinot.PinotQueryRunner.createPinotQueryRunner;
-import static io.trino.plugin.pinot.TestingPinotCluster.PINOT_LATEST_IMAGE_NAME;
 import static io.trino.plugin.pinot.TestingPinotCluster.PINOT_PREVIOUS_IMAGE_NAME;
 import static io.trino.spi.type.DoubleType.DOUBLE;
 import static io.trino.spi.type.RealType.REAL;
@@ -142,11 +141,6 @@ protected String getPinotImageName()
         return PINOT_PREVIOUS_IMAGE_NAME;
     }
 
-    protected boolean isLatestVersion()
-    {
-        return getPinotImageName().equals(PINOT_LATEST_IMAGE_NAME);
-    }
-
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
@@ -308,13 +302,6 @@ private void createAndPopulateTooManyRowsTable(TestingKafka kafka, TestingPinotC
                     .set("updatedAt", initialUpdatedAt.plusMillis(i * 1000).toEpochMilli())
                     .build()));
         }
-        // For pinot 0.11.0+: rows with null time column values are ingested
-        // Only add a null row with a null time column for pinot < 0.11.0
-        if (!isLatestVersion()) {
-            // Add a null row, verify it was not ingested as pinot does not accept null time column values.
-            // The data is verified in testBrokerQueryWithTooManyRowsForSegmentQuery
-            tooManyRowsRecordsBuilder.add(new ProducerRecord<>(TOO_MANY_ROWS_TABLE, "key" + MAX_ROWS_PER_SPLIT_FOR_SEGMENT_QUERIES, new GenericRecordBuilder(tooManyRowsAvroSchema).build()));
-        }
         kafka.sendMessages(tooManyRowsRecordsBuilder.build().stream(), schemaRegistryAwareProducer(kafka));
         pinot.createSchema(getClass().getClassLoader().getResourceAsStream("too_many_rows_schema.json"), TOO_MANY_ROWS_TABLE);
         pinot.addRealTimeTable(getClass().getClassLoader().getResourceAsStream("too_many_rows_realtimeSpec.json"), TOO_MANY_ROWS_TABLE);
diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestingPinotCluster.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestingPinotCluster.java
index d13a981ad5ce..c3d717ea0d31 100644
--- a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestingPinotCluster.java
+++ b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestingPinotCluster.java
@@ -66,8 +66,8 @@
 public class TestingPinotCluster
         implements Closeable
 {
-    public static final String PINOT_LATEST_IMAGE_NAME = "apachepinot/pinot:0.11.0";
-    public static final String PINOT_PREVIOUS_IMAGE_NAME = "apachepinot/pinot:0.10.0";
+    public static final String PINOT_LATEST_IMAGE_NAME = "apachepinot/pinot:0.12.1";
+    public static final String PINOT_PREVIOUS_IMAGE_NAME = "apachepinot/pinot:0.11.0";
 
     private static final String ZOOKEEPER_INTERNAL_HOST = "zookeeper";
     private static final JsonCodec<List<String>> LIST_JSON_CODEC = listJsonCodec(String.class);
diff --git a/pom.xml b/pom.xml
index ce7c5f994e61..fa3d75ad2324 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1904,7 +1904,7 @@
             <dependency>
                 <groupId>org.roaringbitmap</groupId>
                 <artifactId>RoaringBitmap</artifactId>
-                <version>0.9.30</version>
+                <version>0.9.35</version>
             </dependency>
 
             <dependency>