This is an automated email from the ASF dual-hosted git repository.
rongr pushed a commit to branch multi_stage_query_engine
in repository https://gitbox.apache.org/repos/asf/pinot.git
commit 30bc434343aa5e662081a7a51d63d5003e0860b7
Author: Rong Rong <ro...@apache.org>
AuthorDate: Fri May 6 09:33:34 2022 -0700
fix rebase issue after PQL deprecation (#8652)
Co-authored-by: Rong Rong <ro...@startree.ai>
---
.../main/java/org/apache/pinot/query/routing/WorkerManager.java | 3 +--
.../test/java/org/apache/pinot/query/QueryEnvironmentTest.java | 8 ++++----
.../org/apache/pinot/query/runtime/operator/HashJoinOperator.java | 6 ------
.../pinot/query/runtime/operator/MailboxReceiveOperator.java | 6 ------
.../apache/pinot/query/runtime/operator/MailboxSendOperator.java | 6 ------
5 files changed, 5 insertions(+), 24 deletions(-)
diff --git
a/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/WorkerManager.java
b/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/WorkerManager.java
index 5b6ba6d804..74e2036e77 100644
---
a/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/WorkerManager.java
+++
b/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/WorkerManager.java
@@ -45,7 +45,6 @@ import org.apache.pinot.sql.parsers.CalciteSqlCompiler;
* the worker manager later when we split out the query-spi layer.
*/
public class WorkerManager {
- private static final CalciteSqlCompiler CALCITE_SQL_COMPILER = new
CalciteSqlCompiler();
private final String _hostName;
private final int _port;
@@ -90,7 +89,7 @@ public class WorkerManager {
String rawTableName = TableNameBuilder.extractRawTableName(tableName);
// TODO: support both offline and realtime, now we hard code offline table.
String tableNameWithType =
TableNameBuilder.forType(TableType.OFFLINE).tableNameWithType(rawTableName);
- return
_routingManager.getRoutingTable(CALCITE_SQL_COMPILER.compileToBrokerRequest(
+ return
_routingManager.getRoutingTable(CalciteSqlCompiler.compileToBrokerRequest(
"SELECT * FROM " + tableNameWithType));
}
}
diff --git
a/pinot-query-planner/src/test/java/org/apache/pinot/query/QueryEnvironmentTest.java
b/pinot-query-planner/src/test/java/org/apache/pinot/query/QueryEnvironmentTest.java
index 9f4778743b..d63c5c55c7 100644
---
a/pinot-query-planner/src/test/java/org/apache/pinot/query/QueryEnvironmentTest.java
+++
b/pinot-query-planner/src/test/java/org/apache/pinot/query/QueryEnvironmentTest.java
@@ -68,18 +68,18 @@ public class QueryEnvironmentTest extends
QueryEnvironmentTestBase {
// table scan stages; for tableA it should have 2 hosts, for tableB it
should have only 1
Assert.assertEquals(
e.getValue().getServerInstances().stream().map(ServerInstance::toString).collect(Collectors.toList()),
- tables.get(0).equals("a") ? ImmutableList.of("Server_localhost_1",
"Server_localhost_2")
- : ImmutableList.of("Server_localhost_1"));
+ tables.get(0).equals("a") ? ImmutableList.of("localhost_1",
"localhost_2")
+ : ImmutableList.of("localhost_1"));
} else if (!PlannerUtils.isRootStage(e.getKey())) {
// join stage should have both servers used.
Assert.assertEquals(
e.getValue().getServerInstances().stream().map(ServerInstance::toString).collect(Collectors.toList()),
- ImmutableList.of("Server_localhost_1", "Server_localhost_2"));
+ ImmutableList.of("localhost_1", "localhost_2"));
} else {
// reduce stage should have the reducer instance.
Assert.assertEquals(
e.getValue().getServerInstances().stream().map(ServerInstance::toString).collect(Collectors.toList()),
- ImmutableList.of("Server_localhost_3"));
+ ImmutableList.of("localhost_3"));
}
}
}
diff --git
a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/HashJoinOperator.java
b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/HashJoinOperator.java
index 6cf9fddd12..238c1d807b 100644
---
a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/HashJoinOperator.java
+++
b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/HashJoinOperator.java
@@ -43,7 +43,6 @@ import
org.apache.pinot.query.runtime.blocks.DataTableBlockUtils;
* <p>For each of the data block received from the left table, it will
generate a joint data block.
*/
public class HashJoinOperator extends BaseOperator<DataTableBlock> {
- private static final String OPERATOR_NAME = "BroadcastJoinOperator";
private static final String EXPLAIN_NAME = "BROADCAST_JOIN";
private final HashMap<Object, List<Object[]>> _broadcastHashTable;
@@ -68,11 +67,6 @@ public class HashJoinOperator extends
BaseOperator<DataTableBlock> {
_broadcastHashTable = new HashMap<>();
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
-
@Override
public List<Operator> getChildOperators() {
// WorkerExecutor doesn't use getChildOperators, returns null here.
diff --git
a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MailboxReceiveOperator.java
b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MailboxReceiveOperator.java
index d15a9fc1db..7b396b13cc 100644
---
a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MailboxReceiveOperator.java
+++
b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MailboxReceiveOperator.java
@@ -44,7 +44,6 @@ import org.slf4j.LoggerFactory;
*/
public class MailboxReceiveOperator extends BaseOperator<DataTableBlock> {
private static final Logger LOGGER =
LoggerFactory.getLogger(MailboxReceiveOperator.class);
- private static final String OPERATOR_NAME = "MailboxReceiveOperator";
private static final String EXPLAIN_NAME = "MAILBOX_RECEIVE";
private static final long DEFAULT_TIMEOUT_NANO = 10_000_000_000L;
@@ -68,11 +67,6 @@ public class MailboxReceiveOperator extends
BaseOperator<DataTableBlock> {
_stageId = stageId;
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
-
@Override
public List<Operator> getChildOperators() {
// WorkerExecutor doesn't use getChildOperators, returns null here.
diff --git
a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MailboxSendOperator.java
b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MailboxSendOperator.java
index 3dd9c5ff77..51f24c97d4 100644
---
a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MailboxSendOperator.java
+++
b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MailboxSendOperator.java
@@ -48,7 +48,6 @@ import org.slf4j.LoggerFactory;
*/
public class MailboxSendOperator extends BaseOperator<DataTableBlock> {
private static final Logger LOGGER =
LoggerFactory.getLogger(MailboxSendOperator.class);
- private static final String OPERATOR_NAME = "MailboxSendOperator";
private static final String EXPLAIN_NAME = "MAILBOX_SEND";
private static final Set<RelDistribution.Type> SUPPORTED_EXCHANGE_TYPE =
ImmutableSet.of(RelDistribution.Type.SINGLETON,
RelDistribution.Type.RANDOM_DISTRIBUTED,
@@ -101,11 +100,6 @@ public class MailboxSendOperator extends
BaseOperator<DataTableBlock> {
_stageId = stageId;
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
-
@Override
public List<Operator> getChildOperators() {
// WorkerExecutor doesn't use getChildOperators, returns null here.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
