You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by markap14 <gi...@git.apache.org> on 2018/05/22 19:22:27 UTC
[GitHub] nifi pull request #2733: NIFI-5228: Allow user to choose whether or not to a...
GitHub user markap14 opened a pull request:
https://github.com/apache/nifi/pull/2733
NIFI-5228: Allow user to choose whether or not to add File Attributes as FlowFile Attributes when using FetchFile
Thank you for submitting a contribution to Apache NiFi.
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 master)?
- [ ] Is your initial contribution a single, squashed commit?
### 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?
- [ ] 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 travis-ci for build issues and submit an update to your PR as soon as possible.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/markap14/nifi NIFI-5228
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/nifi/pull/2733.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #2733
----
commit 336d44ba34fad702cb69393be1ea96111b3d9577
Author: Mark Payne <ma...@...>
Date: 2018-05-22T16:13:49Z
NIFI-5191: Revert "NIFI-4631: Use java.nio.file.Files in ListFile to improve performance"
This reverts commit 758e44682f994b76fcb9fec900eece2061be7f07.
commit 00e2a6174ccba7e36a3bc60082216a122dd47588
Author: Mark Payne <ma...@...>
Date: 2018-05-22T19:04:59Z
NIFI-5228: Make the storing of file attributes as FlowFile attributes optional for ListFile
----
---
[GitHub] nifi pull request #2733: NIFI-5228: Allow user to choose whether or not to a...
Posted by markap14 <gi...@git.apache.org>.
Github user markap14 commented on a diff in the pull request:
https://github.com/apache/nifi/pull/2733#discussion_r190229672
--- Diff: nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFile.java ---
@@ -255,43 +262,47 @@ public void onScheduled(final ProcessContext context) {
final Path absPath = filePath.toAbsolutePath();
final String absPathString = absPath.getParent().toString() + File.separator;
+ final DateFormat formatter = new SimpleDateFormat(FILE_MODIFY_DATE_ATTR_FORMAT, Locale.US);
--- End diff --
We don't recommend ever using ThreadLocal for processors in NiFi. This is because each time a Processor is run, it is done in a potentially different thread. For a large deployment you could have hundreds of threads, and the threads stay around for the life of the instance, so the cleanup is a little awkward. The pattern that we commonly follow is to use a BlockingQueue and poll from that, then create if necessary, and put back. I.e., a simple Object Pool. And I did consider it but decided that the complexity that it adds to the code was not worth it, given the cost of creating the DateFormat.
---
[GitHub] nifi pull request #2733: NIFI-5228: Allow user to choose whether or not to a...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/nifi/pull/2733
---
[GitHub] nifi issue #2733: NIFI-5228: Allow user to choose whether or not to add File...
Posted by mgaido91 <gi...@git.apache.org>.
Github user mgaido91 commented on the issue:
https://github.com/apache/nifi/pull/2733
LGTM, thanks
---
[GitHub] nifi pull request #2733: NIFI-5228: Allow user to choose whether or not to a...
Posted by markap14 <gi...@git.apache.org>.
Github user markap14 commented on a diff in the pull request:
https://github.com/apache/nifi/pull/2733#discussion_r190232336
--- Diff: nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFile.java ---
@@ -255,43 +262,47 @@ public void onScheduled(final ProcessContext context) {
final Path absPath = filePath.toAbsolutePath();
final String absPathString = absPath.getParent().toString() + File.separator;
+ final DateFormat formatter = new SimpleDateFormat(FILE_MODIFY_DATE_ATTR_FORMAT, Locale.US);
+
attributes.put(CoreAttributes.PATH.key(), relativePathString);
attributes.put(CoreAttributes.FILENAME.key(), fileInfo.getFileName());
attributes.put(CoreAttributes.ABSOLUTE_PATH.key(), absPathString);
+ attributes.put(FILE_SIZE_ATTRIBUTE, Long.toString(fileInfo.getSize()));
+ attributes.put(FILE_LAST_MODIFY_TIME_ATTRIBUTE, formatter.format(new Date(fileInfo.getLastModifiedTime())));
+
+ if (context.getProperty(INCLUDE_FILE_ATTRIBUTES).asBoolean()) {
--- End diff --
Fair enough - pushed another commit to do this.
---
[GitHub] nifi pull request #2733: NIFI-5228: Allow user to choose whether or not to a...
Posted by mgaido91 <gi...@git.apache.org>.
Github user mgaido91 commented on a diff in the pull request:
https://github.com/apache/nifi/pull/2733#discussion_r190155739
--- Diff: nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFile.java ---
@@ -255,43 +262,47 @@ public void onScheduled(final ProcessContext context) {
final Path absPath = filePath.toAbsolutePath();
final String absPathString = absPath.getParent().toString() + File.separator;
+ final DateFormat formatter = new SimpleDateFormat(FILE_MODIFY_DATE_ATTR_FORMAT, Locale.US);
+
attributes.put(CoreAttributes.PATH.key(), relativePathString);
attributes.put(CoreAttributes.FILENAME.key(), fileInfo.getFileName());
attributes.put(CoreAttributes.ABSOLUTE_PATH.key(), absPathString);
+ attributes.put(FILE_SIZE_ATTRIBUTE, Long.toString(fileInfo.getSize()));
+ attributes.put(FILE_LAST_MODIFY_TIME_ATTRIBUTE, formatter.format(new Date(fileInfo.getLastModifiedTime())));
+
+ if (context.getProperty(INCLUDE_FILE_ATTRIBUTES).asBoolean()) {
--- End diff --
nit: maybe we can read this in the `onScheduled` method
---
[GitHub] nifi pull request #2733: NIFI-5228: Allow user to choose whether or not to a...
Posted by mgaido91 <gi...@git.apache.org>.
Github user mgaido91 commented on a diff in the pull request:
https://github.com/apache/nifi/pull/2733#discussion_r190156015
--- Diff: nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFile.java ---
@@ -255,43 +262,47 @@ public void onScheduled(final ProcessContext context) {
final Path absPath = filePath.toAbsolutePath();
final String absPathString = absPath.getParent().toString() + File.separator;
+ final DateFormat formatter = new SimpleDateFormat(FILE_MODIFY_DATE_ATTR_FORMAT, Locale.US);
--- End diff --
nit: what about creating a `ThreadLocal` global variable for this, in order to avoid creating one instance for each item?
---