sonatype-lift[bot] commented on code in PR #1763:
URL: https://github.com/apache/solr/pull/1763#discussion_r1255364692
##########
solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java:
##########
@@ -153,7 +153,14 @@ JoinParams parseJoin(QParser qparser) throws SyntaxError {
CoreContainer container = qparser.req.getCoreContainer();
// if in SolrCloud mode, fromIndex should be the name of a
single-sharded collection
- coreName = ScoreJoinQParserPlugin.getCoreName(fromIndex, container);
+ coreName =
+ ScoreJoinQParserPlugin.getCoreName(
Review Comment:
<picture><img alt="12% of developers fix this issue"
src="https://lift.sonatype.com/api/commentimage/fixrate/12/display.svg";></picture>
<b>*NULL_DEREFERENCE:</b>* object `container` last assigned on line 153
could be null and is dereferenced by call to `getCoreName(...)` at line 157.
---
<details><summary>ℹ️ Expand to see all <b>@sonatype-lift</b>
commands</summary>
You can reply with the following commands. For example, reply with
***@sonatype-lift ignoreall*** to leave out all findings.
| **Command** | **Usage** |
| ------------- | ------------- |
| `@sonatype-lift ignore` | Leave out the above finding from this PR |
| `@sonatype-lift ignoreall` | Leave out all the existing findings from this
PR |
| `@sonatype-lift exclude <file\|issue\|path\|tool>` | Exclude specified
`file\|issue\|path\|tool` from Lift findings by updating your config.toml file |
**Note:** When talking to LiftBot, you need to **refresh** the page to see
its response.
<sub>[Click here](https://github.com/apps/sonatype-lift/installations/new)
to add LiftBot to another repo.</sub></details>
##########
solr/core/src/java/org/apache/solr/search/join/ScoreJoinQParserPlugin.java:
##########
@@ -262,7 +274,8 @@ private Query createQuery(
if (fromIndex != null && (!fromIndex.equals(myCore) ||
byPassShortCircutCheck)) {
CoreContainer container = req.getCoreContainer();
- final String coreName = getCoreName(fromIndex, container);
+ final String coreName =
+ getCoreName(fromIndex, container, req.getCore(), toField,
fromField, localParams);
Review Comment:
<picture><img alt="12% of developers fix this issue"
src="https://lift.sonatype.com/api/commentimage/fixrate/12/display.svg";></picture>
<b>*NULL_DEREFERENCE:</b>* object `container` last assigned on line 275
could be null and is dereferenced by call to `getCoreName(...)` at line 278.
---
<details><summary>ℹ️ Expand to see all <b>@sonatype-lift</b>
commands</summary>
You can reply with the following commands. For example, reply with
***@sonatype-lift ignoreall*** to leave out all findings.
| **Command** | **Usage** |
| ------------- | ------------- |
| `@sonatype-lift ignore` | Leave out the above finding from this PR |
| `@sonatype-lift ignoreall` | Leave out all the existing findings from this
PR |
| `@sonatype-lift exclude <file\|issue\|path\|tool>` | Exclude specified
`file\|issue\|path\|tool` from Lift findings by updating your config.toml file |
**Note:** When talking to LiftBot, you need to **refresh** the page to see
its response.
<sub>[Click here](https://github.com/apps/sonatype-lift/installations/new)
to add LiftBot to another repo.</sub></details>
##########
solr/core/src/java/org/apache/solr/search/join/ScoreJoinQParserPlugin.java:
##########
@@ -355,17 +379,126 @@ private static String resolveAlias(String fromIndex,
ZkController zkController)
}
}
- private static String findLocalReplicaForFromIndex(ZkController
zkController, String fromIndex) {
- String fromReplica = null;
+ private static String findLocalReplicaForFromIndex(
+ ZkController zkController,
+ String fromIndex,
+ SolrCore toCore,
+ String toField,
+ String fromField,
+ SolrParams localParams) {
+ final DocCollection fromCollection =
zkController.getClusterState().getCollection(fromIndex);
+ final String nodeName = zkController.getNodeName();
+ if (fromCollection.getSlices().size() == 1) {
+ return getLocalSingleShard(zkController, fromIndex);
+ } else { // sharded from
+ final CloudDescriptor toCoreDescriptor =
toCore.getCoreDescriptor().getCloudDescriptor();
+ final DocCollection toCollection =
+
zkController.getClusterState().getCollection(toCoreDescriptor.getCollectionName());
+
+ final String shardId = toCoreDescriptor.getShardId();
+ boolean isFromSideCheckRequired =
+ checkToSideRouter(toCore, toField, localParams, fromCollection,
toCollection);
+
+ checkSliceRanges(toCollection, fromCollection, shardId);
+ return findCollocatedFromCore(
+ toCore, fromField, fromCollection, nodeName,
isFromSideCheckRequired);
+ }
+ }
- String nodeName = zkController.getNodeName();
- for (Slice slice :
-
zkController.getClusterState().getCollection(fromIndex).getActiveSlicesArr()) {
- if (fromReplica != null)
- throw new SolrException(
- SolrException.ErrorCode.BAD_REQUEST,
- "SolrCloud join: To join with a sharded collection, use
method=crossCollection.");
+ private static String findCollocatedFromCore(
+ SolrCore toCore,
+ String fromField,
+ DocCollection fromCollection,
+ String nodeName,
+ boolean isFromSideCheckRequired) {
+ final CloudDescriptor toCoreDescriptor =
toCore.getCoreDescriptor().getCloudDescriptor();
+ String toShardId = toCoreDescriptor.getShardId();
+ final Slice fromShardReplicas =
fromCollection.getActiveSlicesMap().get(toShardId);
+ for (Replica collocatedFrom :
+ fromShardReplicas.getReplicas(r -> r.getNodeName().equals(nodeName))) {
Review Comment:
<picture><img alt="7% of developers fix this issue"
src="https://lift.sonatype.com/api/commentimage/fixrate/7/display.svg";></picture>
<b>*NULLPTR_DEREFERENCE:</b>* `fromShardReplicas` could be null (last
assigned on line 416) and is dereferenced.
---
<details><summary>ℹ️ Expand to see all <b>@sonatype-lift</b>
commands</summary>
You can reply with the following commands. For example, reply with
***@sonatype-lift ignoreall*** to leave out all findings.
| **Command** | **Usage** |
| ------------- | ------------- |
| `@sonatype-lift ignore` | Leave out the above finding from this PR |
| `@sonatype-lift ignoreall` | Leave out all the existing findings from this
PR |
| `@sonatype-lift exclude <file\|issue\|path\|tool>` | Exclude specified
`file\|issue\|path\|tool` from Lift findings by updating your config.toml file |
**Note:** When talking to LiftBot, you need to **refresh** the page to see
its response.
<sub>[Click here](https://github.com/apps/sonatype-lift/installations/new)
to add LiftBot to another repo.</sub></details>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
![https://lift.sonatype.com/api/commentimage/fixrate/12/display.svg"](https://lift.sonatype.com/api/commentimage/fixrate/12/display.svg"){kind=link}
![https://lift.sonatype.com/api/commentimage/fixrate/7/display.svg"](https://lift.sonatype.com/api/commentimage/fixrate/7/display.svg"){kind=link}