This is an automated email from the ASF dual-hosted git repository.
Jackie-Jiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new e149b276bed Bump com.puppycrawl.tools:checkstyle from 14.1.0 to 14.3.0
(#19731)
e149b276bed is described below
commit e149b276beddd46411a22343bf4f91211ef68bc1
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Sat Oct 3 13:32:37 2026 -0700
Bump com.puppycrawl.tools:checkstyle from 14.1.0 to 14.3.0 (#19731)
---
.../query/planner/logical/StagesTestBase.java | 84 +++++++++-------------
pom.xml | 2 +-
2 files changed, 35 insertions(+), 51 deletions(-)
diff --git
a/pinot-query-planner/src/test/java/org/apache/pinot/query/planner/logical/StagesTestBase.java
b/pinot-query-planner/src/test/java/org/apache/pinot/query/planner/logical/StagesTestBase.java
index 3c0e6617616..8aec7e0caca 100644
---
a/pinot-query-planner/src/test/java/org/apache/pinot/query/planner/logical/StagesTestBase.java
+++
b/pinot-query-planner/src/test/java/org/apache/pinot/query/planner/logical/StagesTestBase.java
@@ -87,8 +87,7 @@ public class StagesTestBase {
return (stageId, mySchema, myHints) -> {
MailboxSendNode mailbox = childBuilder.build(stageId);
int nextStageId = mailbox.getStageId();
- return new MailboxReceiveNode(stageId, mySchema, nextStageId, null,
null, null, null, false, false,
- mailbox);
+ return new MailboxReceiveNode(stageId, mySchema, nextStageId, null,
null, null, null, false, false, mailbox);
};
}
@@ -97,14 +96,13 @@ public class StagesTestBase {
/// The join type will be [JoinRelType#FULL], the join strategy will be
[JoinNode.JoinStrategy#HASH] and
/// there will be no conditions. If custom joins are needed feel free to add
more builder methods or create your own
/// instance of [SimpleChildBuilder].
- public SimpleChildBuilder<JoinNode> join(
- SimpleChildBuilder<? extends PlanNode> leftBuilder,
+ public SimpleChildBuilder<JoinNode> join(SimpleChildBuilder<? extends
PlanNode> leftBuilder,
SimpleChildBuilder<? extends PlanNode> rightBuilder) {
return (stageId, mySchema, myHints) -> {
PlanNode left = leftBuilder.build(stageId);
PlanNode right = rightBuilder.build(stageId);
- return new JoinNode(stageId, mySchema, myHints, List.of(left, right),
JoinRelType.FULL,
- List.of(), List.of(), List.of(), JoinNode.JoinStrategy.HASH);
+ return new JoinNode(stageId, mySchema, myHints, List.of(left, right),
JoinRelType.FULL, List.of(), List.of(),
+ List.of(), JoinNode.JoinStrategy.HASH);
};
}
@@ -114,22 +112,16 @@ public class StagesTestBase {
///
/// Although there are builder methods to create send and receive mailboxes
separately, this method is recommended
/// because it deals with the stageId management and creates tests that are
easier to read.
- public ExchangeBuilder exchange(
- int nextStageId, SimpleChildBuilder<? extends PlanNode> childBuilder) {
- return new ExchangeBuilder() {
- @Override
- public MailboxReceiveNode build(int stageId, DataSchema dataSchema,
PlanNode.NodeHint hints,
- PinotRelExchangeType exchangeType, RelDistribution.Type
distribution, List<Integer> keys,
- boolean prePartitioned, List<RelFieldCollation> collations, boolean
sort, boolean sortedOnSender) {
- PlanNode input = childBuilder.build(nextStageId);
- MailboxSendNode mailboxSendNode = new MailboxSendNode(nextStageId,
input.getDataSchema(), List.of(input),
- stageId, exchangeType, distribution, keys, prePartitioned,
collations, sort,
- KeySelector.DEFAULT_HASH_ALGORITHM);
- MailboxSendNode old = _stageRoots.put(nextStageId, mailboxSendNode);
- Preconditions.checkState(old == null, "Mailbox already exists for
stageId: %s", nextStageId);
- return new MailboxReceiveNode(stageId, input.getDataSchema(),
nextStageId, exchangeType, distribution, keys,
- collations, sort, sortedOnSender, mailboxSendNode);
- }
+ public ExchangeBuilder exchange(int nextStageId, SimpleChildBuilder<?
extends PlanNode> childBuilder) {
+ return (stageId, _, _, exchangeType, distribution, keys, prePartitioned,
collations, sort, sortedOnSender) -> {
+ PlanNode input = childBuilder.build(nextStageId);
+ MailboxSendNode mailboxSendNode =
+ new MailboxSendNode(nextStageId, input.getDataSchema(),
List.of(input), stageId, exchangeType, distribution,
+ keys, prePartitioned, collations, sort,
KeySelector.DEFAULT_HASH_ALGORITHM);
+ MailboxSendNode old = _stageRoots.put(nextStageId, mailboxSendNode);
+ Preconditions.checkState(old == null, "Mailbox already exists for
stageId: %s", nextStageId);
+ return new MailboxReceiveNode(stageId, input.getDataSchema(),
nextStageId, exchangeType, distribution, keys,
+ collations, sort, sortedOnSender, mailboxSendNode);
};
}
@@ -143,10 +135,9 @@ public class StagesTestBase {
}
default ExchangeBuilder withDistributionType(RelDistribution.Type
distribution) {
- return (stageId, dataSchema, hints, exchangeType, distribution1, keys,
prePartitioned, collations, sort,
- sortedOnSender) ->
- build(stageId, dataSchema, hints, exchangeType, distribution, keys,
prePartitioned, collations, sort,
- sortedOnSender);
+ return (stageId, dataSchema, hints, exchangeType, _, keys,
prePartitioned, collations, sort, sortedOnSender) ->
+ build(stageId, dataSchema, hints, exchangeType, distribution, keys,
prePartitioned, collations, sort,
+ sortedOnSender);
}
}
@@ -157,10 +148,8 @@ public class StagesTestBase {
}
/// Creates an ASOF join node whose whole comparison lives in the match
condition, as ASOF joins require.
- public SimpleChildBuilder<JoinNode> asofJoin(
- SimpleChildBuilder<? extends PlanNode> leftBuilder,
- SimpleChildBuilder<? extends PlanNode> rightBuilder,
- RexExpression matchCondition) {
+ public SimpleChildBuilder<JoinNode> asofJoin(SimpleChildBuilder<? extends
PlanNode> leftBuilder,
+ SimpleChildBuilder<? extends PlanNode> rightBuilder, RexExpression
matchCondition) {
return (stageId, mySchema, myHints) -> {
PlanNode left = leftBuilder.build(stageId);
PlanNode right = rightBuilder.build(stageId);
@@ -231,12 +220,13 @@ public class StagesTestBase {
///
/// It is usually recommended to use [#exchange(int, SimpleChildBuilder)]
instead of this method, given that
/// `exchange` creates a pair of send and receive mailboxes and deals with
the stageId management.
- public SimpleChildBuilder<MailboxSendNode> sendMailbox(
- int newStageId, SimpleChildBuilder<? extends PlanNode> childBuilder) {
- return (stageId, mySchema, myHints) -> {
+ public SimpleChildBuilder<MailboxSendNode> sendMailbox(int newStageId,
+ SimpleChildBuilder<? extends PlanNode> childBuilder) {
+ return (stageId, mySchema, _) -> {
PlanNode input = childBuilder.build(stageId);
- MailboxSendNode mailboxSendNode = new MailboxSendNode(newStageId,
mySchema, List.of(input), stageId, null,
- null, null, false, null, false, KeySelector.DEFAULT_HASH_ALGORITHM);
+ MailboxSendNode mailboxSendNode =
+ new MailboxSendNode(newStageId, mySchema, List.of(input), stageId,
null, null, null, false, null, false,
+ KeySelector.DEFAULT_HASH_ALGORITHM);
MailboxSendNode old = _stageRoots.put(stageId, mailboxSendNode);
Preconditions.checkState(old == null, "Mailbox already exists for
stageId: %s", stageId);
return mailboxSendNode;
@@ -263,7 +253,7 @@ public class StagesTestBase {
/// );
/// ```
default SimpleChildBuilder<P> withDataSchema(DataSchema dataSchema) {
- return (stageId, dataSchema1, hints) -> build(stageId, dataSchema,
hints);
+ return (stageId, _, hints) -> build(stageId, dataSchema, hints);
}
/// This can be used to set the hints for the node being built in a fluent
way.
@@ -277,10 +267,9 @@ public class StagesTestBase {
/// );
/// ```
default SimpleChildBuilder<P> withHints(String key, Map<String, String>
values) {
- return (stageId, dataSchema, hints1) -> {
- PlanNode.NodeHint myHints = hints1 == null
- ? new PlanNode.NodeHint(Map.of(key, values))
- : hints1.with(key, values);
+ return (stageId, dataSchema, hints) -> {
+ PlanNode.NodeHint myHints =
+ hints == null ? new PlanNode.NodeHint(Map.of(key, values)) :
hints.with(key, values);
return build(stageId, dataSchema, myHints);
};
}
@@ -383,7 +372,6 @@ public class StagesTestBase {
return spoolReceiverBuilder;
}
-
/// Creates a new receiver builder that can be used to create a new
receiver for this spool.
///
/// This method is similar to other builder methods (like
[#tableScan(String)] or
@@ -403,8 +391,8 @@ public class StagesTestBase {
PlanNode input = _childBuilder.build(_senderStageId);
DataSchema mySchema = input.getDataSchema();
- _sender = new MailboxSendNode(_senderStageId, mySchema, List.of(input),
0, null,
- null, null, false, null, false, KeySelector.DEFAULT_HASH_ALGORITHM);
+ _sender = new MailboxSendNode(_senderStageId, mySchema, List.of(input),
0, null, null, null, false, null, false,
+ KeySelector.DEFAULT_HASH_ALGORITHM);
}
/// This is the internal class returned as a result of the
[#newReceiver(Function)] method.
@@ -436,8 +424,8 @@ public class StagesTestBase {
_receiver = receiveBuilder.build(stageId);
_sender.addReceiver(_receiver);
}
- Preconditions.checkState(_receiver.getStageId() == stageId, "Receiver
stageId mismatch. "
- + "Expected %s, received %s", _receiver.getStageId(), stageId);
+ Preconditions.checkState(_receiver.getStageId() == stageId,
+ "Receiver stageId mismatch. " + "Expected %s, received %s",
_receiver.getStageId(), stageId);
assert _receiver != null;
return _receiver;
}
@@ -478,11 +466,7 @@ public class StagesTestBase {
for (int i = 0; i < _indent; i++) {
_builder.append(" ");
}
- _builder.append('[')
- .append(stageId)
- .append("]: ")
- .append(node.explain())
- .append('\n');
+ _builder.append('[').append(stageId).append("]:
").append(node.explain()).append('\n');
_indent++;
return null;
}
diff --git a/pom.xml b/pom.xml
index 962a1da33e1..a2b7e0adf73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2537,7 +2537,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>14.1.0</version>
+ <version>14.3.0</version>
</dependency>
</dependencies>
<executions>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
