You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by GitBox <gi...@apache.org> on 2020/12/23 23:19:54 UTC
[GitHub] [nifi] MikeThomsen opened a new pull request #4739: NIFI-7906 Fix a Cypher bug that was missed during initial review
MikeThomsen opened a new pull request #4739:
URL: https://github.com/apache/nifi/pull/4739
NIFI-7906 Fixed bugs in unit tests.
Thank you for submitting a contribution to Apache NiFi.
Please provide a short description of the PR here:
#### Description of PR
_Enables X functionality; fixes bug NIFI-YYYY._
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
### For all changes:
- [ ] Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
- [ ] Does your PR title start with **NIFI-XXXX** where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
- [ ] Has your PR been rebased against the latest commit within the target branch (typically `main`)?
- [ ] Is your initial contribution a single, squashed commit? _Additional commits in response to PR reviewer feedback should be made on this branch and pushed to allow change tracking. Do not `squash` or use `--force` when pushing to allow for clean monitoring of changes._
### For code changes:
- [ ] Have you ensured that the full suite of tests is executed via `mvn -Pcontrib-check clean install` at the root `nifi` folder?
- [ ] Have you written or updated unit tests to verify your changes?
- [ ] Have you verified that the full build is successful on JDK 8?
- [ ] Have you verified that the full build is successful on JDK 11?
- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
- [ ] If applicable, have you updated the `LICENSE` file, including the main `LICENSE` file under `nifi-assembly`?
- [ ] If applicable, have you updated the `NOTICE` file, including the main `NOTICE` file found under `nifi-assembly`?
- [ ] If adding new Properties, have you added `.displayName` in addition to .name (programmatic access) for each of the new properties?
### For documentation related changes:
- [ ] Have you ensured that format looks appropriate for the output in which it is rendered?
### Note:
Please ensure that once the PR is submitted, you check GitHub Actions CI for build issues and submit an update to your PR as soon as possible.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] mattyb149 commented on pull request #4739: NIFI-7906 Fix a Cypher bug that was missed during initial review
Posted by GitBox <gi...@apache.org>.
mattyb149 commented on pull request #4739:
URL: https://github.com/apache/nifi/pull/4739#issuecomment-758734159
+1 LGTM, ran contrib-check and tried on a live system. I did notice a typo on the `records.count` attribute, I will change that on merge to read `record.count` for consistency with other record-based processors. Also it's interesting that if the fields used in EL in the query aren't defined fields in the input record, it went through correctly (possibly because a `null` or empty string was inserted and no results were returned from the otherwise-valid query). Might want to look into this as a follow-on to see if there's a way to detect whether a field is unset or set to null.
Thanks for the improvements! Merging to main
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] mattyb149 closed pull request #4739: NIFI-7906 Fix a Cypher bug that was missed during initial review
Posted by GitBox <gi...@apache.org>.
mattyb149 closed pull request #4739:
URL: https://github.com/apache/nifi/pull/4739
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] MikeThomsen commented on a change in pull request #4739: NIFI-7906 Fix a Cypher bug that was missed during initial review
Posted by GitBox <gi...@apache.org>.
MikeThomsen commented on a change in pull request #4739:
URL: https://github.com/apache/nifi/pull/4739#discussion_r554147729
##########
File path: nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/main/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecord.java
##########
@@ -223,14 +237,19 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
}
dynamicPropertyMap.putAll(input.getAttributes());
+ if (getLogger().isDebugEnabled()) {
+ getLogger().info("Parameter map: " + dynamicPropertyMap);
+ }
List<Map<String, Object>> graphResponses = new ArrayList<>(executeQuery(recordScript, dynamicPropertyMap));
OutputStream graphOutputStream = session.write(graph);
String graphOutput = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(graphResponses);
graphOutputStream.write(graphOutput.getBytes(StandardCharsets.UTF_8));
graphOutputStream.close();
session.transfer(graph, GRAPH);
+ records++;
} catch (Exception e) {
+ getLogger().error("Error processing record", e);
Review comment:
Not a good one, but I decided to add the record index.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] exceptionfactory commented on a change in pull request #4739: NIFI-7906 Fix a Cypher bug that was missed during initial review
Posted by GitBox <gi...@apache.org>.
exceptionfactory commented on a change in pull request #4739:
URL: https://github.com/apache/nifi/pull/4739#discussion_r551295426
##########
File path: nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/main/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecord.java
##########
@@ -223,14 +237,19 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
}
dynamicPropertyMap.putAll(input.getAttributes());
+ if (getLogger().isDebugEnabled()) {
+ getLogger().info("Parameter map: " + dynamicPropertyMap);
Review comment:
Should this be changed to `getLogger().debug()`? Using a parameterized logging statement with `dynamicPropertyMap` would also optimize the implementation:
```suggestion
getLogger().debug("Dynamic Properties: {}", new Object[]{dynamicPropertyMap});
```
##########
File path: nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/main/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecord.java
##########
@@ -223,14 +237,19 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
}
dynamicPropertyMap.putAll(input.getAttributes());
+ if (getLogger().isDebugEnabled()) {
+ getLogger().info("Parameter map: " + dynamicPropertyMap);
+ }
List<Map<String, Object>> graphResponses = new ArrayList<>(executeQuery(recordScript, dynamicPropertyMap));
OutputStream graphOutputStream = session.write(graph);
String graphOutput = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(graphResponses);
graphOutputStream.write(graphOutput.getBytes(StandardCharsets.UTF_8));
graphOutputStream.close();
session.transfer(graph, GRAPH);
+ records++;
} catch (Exception e) {
+ getLogger().error("Error processing record", e);
Review comment:
Is there any type of record identifier that could be included in the log message? That could be useful when attempting to troubleshoot a problem if more than one record failed during this loop.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] MikeThomsen commented on a change in pull request #4739: NIFI-7906 Fix a Cypher bug that was missed during initial review
Posted by GitBox <gi...@apache.org>.
MikeThomsen commented on a change in pull request #4739:
URL: https://github.com/apache/nifi/pull/4739#discussion_r554147955
##########
File path: nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/main/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecord.java
##########
@@ -240,6 +259,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
delta = (end - start) / 1000;
if (getLogger().isDebugEnabled()){
getLogger().debug(String.format("Took %s seconds.", delta));
+ getLogger().debug(String.format("Handled %d records", records));
Review comment:
I prefer to put the allocation inside of that check, but yeah, it could be one line.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] MikeThomsen commented on a change in pull request #4739: NIFI-7906 Fix a Cypher bug that was missed during initial review
Posted by GitBox <gi...@apache.org>.
MikeThomsen commented on a change in pull request #4739:
URL: https://github.com/apache/nifi/pull/4739#discussion_r554147729
##########
File path: nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/main/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecord.java
##########
@@ -223,14 +237,19 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
}
dynamicPropertyMap.putAll(input.getAttributes());
+ if (getLogger().isDebugEnabled()) {
+ getLogger().info("Parameter map: " + dynamicPropertyMap);
+ }
List<Map<String, Object>> graphResponses = new ArrayList<>(executeQuery(recordScript, dynamicPropertyMap));
OutputStream graphOutputStream = session.write(graph);
String graphOutput = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(graphResponses);
graphOutputStream.write(graphOutput.getBytes(StandardCharsets.UTF_8));
graphOutputStream.close();
session.transfer(graph, GRAPH);
+ records++;
} catch (Exception e) {
+ getLogger().error("Error processing record", e);
Review comment:
Not a good one, but I decided to add the record index.
##########
File path: nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/main/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecord.java
##########
@@ -240,6 +259,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
delta = (end - start) / 1000;
if (getLogger().isDebugEnabled()){
getLogger().debug(String.format("Took %s seconds.", delta));
+ getLogger().debug(String.format("Handled %d records", records));
Review comment:
I prefer to put the allocation inside of that check, but yeah, it could be one line.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] mattyb149 commented on a change in pull request #4739: NIFI-7906 Fix a Cypher bug that was missed during initial review
Posted by GitBox <gi...@apache.org>.
mattyb149 commented on a change in pull request #4739:
URL: https://github.com/apache/nifi/pull/4739#discussion_r553652199
##########
File path: nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/main/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecord.java
##########
@@ -240,6 +259,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
delta = (end - start) / 1000;
if (getLogger().isDebugEnabled()){
getLogger().debug(String.format("Took %s seconds.", delta));
+ getLogger().debug(String.format("Handled %d records", records));
Review comment:
This could be done in one statement (and doesn't need the isDebugEnabled check IIRC)
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] MikeThomsen commented on pull request #4739: NIFI-7906 Fix a Cypher bug that was missed during initial review
Posted by GitBox <gi...@apache.org>.
MikeThomsen commented on pull request #4739:
URL: https://github.com/apache/nifi/pull/4739#issuecomment-758072926
@mattyb149 should be good now. How to set up:
```
docker run -p 7474:7474 -p 7687:7687 --name neo4j3 -d neo4j:3.5
```
```
CREATE (p:Person { name: "John Smith" })
CREATE (p2:Person { name: "Jane Doe" })
CREATE (p)-[r:SUPERVISES]->(p2)
CREATE (p2)-[r2:SUPERVISED_BY]->(p)
RETURN p,p2
```
[ExecuteGraphQueryRecord_Test.xml.txt](https://github.com/apache/nifi/files/5797031/ExecuteGraphQueryRecord_Test.xml.txt)
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] MikeThomsen commented on pull request #4739: NIFI-7906 Fix a Cypher bug that was missed during initial review
Posted by GitBox <gi...@apache.org>.
MikeThomsen commented on pull request #4739:
URL: https://github.com/apache/nifi/pull/4739#issuecomment-750551199
@mattyb149 FYI, this is the change I sent as a PR to your branch.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org