Cleanup some unused code in pinot-query-runtime (#16718)

yashmayya · web-flow · commit 0e7393a1ac06 · 2025-08-29T11:58:38.000-07:00
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/TimeSeriesRequestHandler.java b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/TimeSeriesRequestHandler.java
@@ -135,7 +135,7 @@ public TimeSeriesBlock handleTimeSeriesRequest(String lang, String rawQueryParam
 
       tableLevelAccessControlCheck(httpHeaders, dispatchablePlan.getTableNames());
       timeSeriesBlock = _queryDispatcher.submitAndGet(requestContext.getRequestId(), dispatchablePlan,
-          timeSeriesRequest.getTimeout().toMillis(), new HashMap<>(), requestContext);
+          timeSeriesRequest.getTimeout().toMillis(), requestContext);
       return timeSeriesBlock;
     } catch (Exception e) {
       _brokerMetrics.addMeteredGlobalValue(BrokerMeter.TIME_SERIES_GLOBAL_QUERIES_FAILED, 1);
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/GrpcSendingMailbox.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/GrpcSendingMailbox.java
@@ -49,7 +49,6 @@
 import org.apache.pinot.query.runtime.blocks.SuccessMseBlock;
 import org.apache.pinot.query.runtime.operator.MailboxSendOperator;
 import org.apache.pinot.segment.spi.memory.DataBuffer;
-import org.apache.pinot.spi.env.PinotConfiguration;
 import org.apache.pinot.spi.exception.QueryErrorCode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -73,8 +72,7 @@ public class GrpcSendingMailbox implements SendingMailbox {
 
   private StreamObserver<MailboxContent> _contentObserver;
 
-  public GrpcSendingMailbox(
-      PinotConfiguration config, String id, ChannelManager channelManager, String hostname, int port, long deadlineMs,
+  public GrpcSendingMailbox(String id, ChannelManager channelManager, String hostname, int port, long deadlineMs,
       StatMap<MailboxSendOperator.StatKey> statMap, int maxByteStringSize) {
     _id = id;
     _channelManager = channelManager;
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/MailboxService.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/MailboxService.java
@@ -139,8 +139,8 @@ public SendingMailbox getSendingMailbox(String hostname, int port, String mailbo
     if (_hostname.equals(hostname) && _port == port) {
       return new InMemorySendingMailbox(mailboxId, this, deadlineMs, statMap);
     } else {
-      return new GrpcSendingMailbox(
-          _config, mailboxId, _channelManager, hostname, port, deadlineMs, statMap, _maxByteStringSize);
+      return new GrpcSendingMailbox(mailboxId, _channelManager, hostname, port, deadlineMs, statMap,
+          _maxByteStringSize);
     }
   }
 
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/executor/OpChainScheduler.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/executor/OpChainScheduler.java
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/BlockingStream.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/BlockingStream.java
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/MultiStageQueryStats.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/MultiStageQueryStats.java
@@ -471,10 +471,6 @@ public MultiStageOperator.Type getOperatorType(int index) {
       return _operatorTypes.get(index);
     }
 
-    public MultiStageOperator.Type getLastType() {
-      return _operatorTypes.get(_operatorTypes.size() - 1);
-    }
-
     public StatMap<?> getLastOperatorStats() {
       return _operatorStats.get(_operatorStats.size() - 1);
     }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/server/ServerPlanRequestUtils.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/server/ServerPlanRequestUtils.java
@@ -90,16 +90,6 @@ public static OpChain compileLeafStage(OpChainExecutionContext executionContext,
         }, false, rowFilters);
   }
 
-  public static OpChain compileLeafStage(
-      OpChainExecutionContext executionContext,
-      StagePlan stagePlan,
-      QueryExecutor leafQueryExecutor,
-      ExecutorService executorService) {
-    return compileLeafStage(executionContext, stagePlan, leafQueryExecutor, executorService,
-        (planNode, multiStageOperator) -> {
-        }, false, null);
-  }
-
   /**
    * main entry point for compiling leaf-stage {@link StagePlan}.
    *
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/QueryDispatcher.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/QueryDispatcher.java
@@ -698,7 +698,7 @@ public void shutdown() {
   }
 
   public TimeSeriesBlock submitAndGet(long requestId, TimeSeriesDispatchablePlan plan, long timeoutMs,
-      Map<String, String> queryOptions, RequestContext requestContext)
+      RequestContext requestContext)
       throws Exception {
     long deadlineMs = System.currentTimeMillis() + timeoutMs;
     BaseTimeSeriesPlanNode brokerFragment = plan.getBrokerFragment();
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/timeseries/AsyncQueryTimeSeriesDispatchResponse.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/timeseries/AsyncQueryTimeSeriesDispatchResponse.java
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/EnrichedHashJoinOperatorTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/EnrichedHashJoinOperatorTest.java
@@ -36,7 +36,6 @@
 
 
 public class EnrichedHashJoinOperatorTest {
-  private AutoCloseable _mocks;
   private MultiStageOperator _leftInput;
   private MultiStageOperator _rightInput;
   private static final DataSchema DEFAULT_CHILD_SCHEMA = new DataSchema(new String[]{"int_col", "string_col"},
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/MailboxSendOperatorTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/MailboxSendOperatorTest.java
@@ -98,7 +98,6 @@ public void shouldSendErrorBlockWhenInputThrows()
 
     // Then:
     assertTrue(block.isError(), "expected error block to propagate");
-    ErrorMseBlock errorMseBlock = (ErrorMseBlock) block;
     ArgumentCaptor<MseBlock.Eos> captor = ArgumentCaptor.forClass(MseBlock.Eos.class);
     verify(_exchange).send(captor.capture(), anyList());
     assertTrue(captor.getValue().isError(), "expected to send error block to exchange");
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/queries/QueryRunnerTestBase.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/queries/QueryRunnerTestBase.java
@@ -76,7 +76,6 @@
 import org.h2.jdbc.JdbcArray;
 
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
@@ -453,11 +452,6 @@ protected List<GenericRow> toRow(List<QueryTestCase.ColumnAndType> columnAndType
 
   protected Connection _h2Connection;
 
-  protected Connection getH2Connection() {
-    assertNotNull(_h2Connection, "H2 Connection has not been initialized");
-    return _h2Connection;
-  }
-
   protected void setH2Connection()
       throws Exception {
     assertNull(_h2Connection);
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/queries/ResourceBasedQueriesTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/queries/ResourceBasedQueriesTest.java
@@ -580,11 +580,4 @@ private Map<String, QueryTestCase> getTestCases()
     }
     return testCaseMap;
   }
-
-  private static Object extractExtraProps(Map<String, Object> extraProps, String propKey) {
-    if (extraProps == null) {
-      return null;
-    }
-    return extraProps.getOrDefault(propKey, null);
-  }
 }
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/testutils/MockInstanceDataManagerFactory.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/testutils/MockInstanceDataManagerFactory.java
@@ -138,10 +138,6 @@ public Map<String, Schema> getRegisteredSchemaMap() {
     return _registeredSchemaMap;
   }
 
-  public Map<String, Schema> buildSchemaMap() {
-    return _schemaMap;
-  }
-
   public Map<String, List<GenericRow>> buildTableRowsMap() {
     return _tableRowsMap;
   }

Original file line number	Diff line number	Diff line change
`@@ -139,8 +139,8 @@ public SendingMailbox getSendingMailbox(String hostname, int port, String mailbo`
`139`	`139`	`if (_hostname.equals(hostname) && _port == port) {`
`140`	`140`	`return new InMemorySendingMailbox(mailboxId, this, deadlineMs, statMap);`
`141`	`141`	`} else {`
`142`		`- return new GrpcSendingMailbox(`
`143`		`- _config, mailboxId, _channelManager, hostname, port, deadlineMs, statMap, _maxByteStringSize);`
	`142`	`+ return new GrpcSendingMailbox(mailboxId, _channelManager, hostname, port, deadlineMs, statMap,`
	`143`	`+ _maxByteStringSize);`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`
Original file line number	Diff line number	Diff line change
`@@ -471,10 +471,6 @@ public MultiStageOperator.Type getOperatorType(int index) {`
`471`	`471`	`return _operatorTypes.get(index);`
`472`	`472`	`}`
`473`	`473`
`474`		`- public MultiStageOperator.Type getLastType() {`
`475`		`- return _operatorTypes.get(_operatorTypes.size() - 1);`
`476`		`- }`
`477`		`-`
`478`	`474`	`public StatMap<?> getLastOperatorStats() {`
`479`	`475`	`return _operatorStats.get(_operatorStats.size() - 1);`
`480`	`476`	`}`
Original file line number	Diff line number	Diff line change
`@@ -698,7 +698,7 @@ public void shutdown() {`
`698`	`698`	`}`
`699`	`699`
`700`	`700`	`public TimeSeriesBlock submitAndGet(long requestId, TimeSeriesDispatchablePlan plan, long timeoutMs,`
`701`		`- Map<String, String> queryOptions, RequestContext requestContext)`
	`701`	`+ RequestContext requestContext)`
`702`	`702`	`throws Exception {`
`703`	`703`	`long deadlineMs = System.currentTimeMillis() + timeoutMs;`
`704`	`704`	`BaseTimeSeriesPlanNode brokerFragment = plan.getBrokerFragment();`