NIFI-12224: Add support for updateMany operation with operators enabled option in PutMongo processor
#8610
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dan-s1
reviewed
Apr 17, 2024
| _relationships.add(REL_SUCCESS); | ||
| _relationships.add(REL_FAILURE); | ||
| relationships = Collections.unmodifiableSet(_relationships); | ||
| relationships = Set.of(REL_SUCCESS, REL_FAILURE); |
There was a problem hiding this comment.
If this enhancement is meant to be back ported to the 1. x branch, then this should be reverted as Set.of is not supported in Java 8.
There was a problem hiding this comment.
Just a note on that, this is a helpful change for the main branch, and if the other aspects of the feature are to be backported, an alternative PR could be raised.
There was a problem hiding this comment.
The ticket description says that currently the behavior of the processor is not clearly documented (where it uses updateOne and user might be expecting updateMany), so I think it's a bug fix. For bug fixes, we usually do a backport as well? I will then raise another pull request for 1.x branch and keep these changes for main branch.
dan-s1
reviewed
Apr 19, 2024
| @@ -141,8 +135,8 @@ public class PutMongoRecord extends AbstractMongoProcessor { | |||
| .displayName("Update Mode") | |||
| .dependsOn(UPDATE_KEY_FIELDS) | |||
| .description("Choose between updating a single document or multiple documents per incoming record.") | |||
| .allowableValues(UPDATE_ONE, UPDATE_MANY, UPDATE_FF_ATTRIBUTE) | |||
| .defaultValue(UPDATE_ONE.getValue()) | |||
| .allowableValues(MongoUpdateOption.allowedValues()) | |||
There was a problem hiding this comment.
Suggested change
| .allowableValues(MongoUpdateOption.allowedValues()) | |
| .allowableValues(MongoUpdateOption.class) |
| .displayName("Mongo Update Query Mode") | ||
| .dependsOn(UPDATE_OPERATION_MODE,UPDATE_WITH_OPERATORS) | ||
| .description("Choose between 'updateOne' or 'updateMany' Mongo documents per incoming flow file.") | ||
| .allowableValues(MongoUpdateOption.allowedValues()) |
There was a problem hiding this comment.
Suggested change
| .allowableValues(MongoUpdateOption.allowedValues()) | |
| .allowableValues(MongoUpdateOption.class) |
...nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoHelper.java
Outdated
Show resolved
Hide resolved
dan-s1
reviewed
Apr 19, 2024
...undle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongo.java
Outdated
Show resolved
Hide resolved
...undle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongo.java
Outdated
Show resolved
Hide resolved
| flowFile = session.putAttribute(flowFile, ATTRIBUTE_UPDATE_MODIFY_COUNT, String.valueOf(updateResult.getModifiedCount())); | ||
| BsonValue upsertedId = updateResult.getUpsertedId(); | ||
| if (upsertedId != null) { | ||
| String id = upsertedId.isString()? upsertedId.asString().getValue(): upsertedId.asObjectId().getValue().toString(); |
There was a problem hiding this comment.
Suggested change
| String id = upsertedId.isString()? upsertedId.asString().getValue(): upsertedId.asObjectId().getValue().toString(); | |
| String id = upsertedId.isString() ? upsertedId.asString().getValue() : upsertedId.asObjectId().getValue().toString(); |
...undle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongo.java
Outdated
Show resolved
Hide resolved
dan-s1
reviewed
Apr 19, 2024
...nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoHelper.java
Outdated
Show resolved
Hide resolved
These changes will allow the processor to use Mongo updateMany operation in update mode. A different name for update mode property is used in PutMongo than PutMongoRecord since the property name "Update Mode" is already used in PutMongo Test cases for `PutMongo` updated to use Map and Document classes instead of string based json input. Signed-off-by: Umar Hussain <umarhussain.work@gmail.com>
umarhussain15
force-pushed
the
NIFI-12224-PutMongo-Add-support-for-updateMany-operation-with-operators-enabled-option
branch
from
96fc996
to
98179f7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These changes will allow the processor to use Mongo updateMany operation in update mode.
PutMongo processor was only doing
updateOnein mongo operator mode. Now it has an additional configuration to select betweenupdateOneandupdateMany, which will help in clarifying the behavior of the processor to the user.A different name for update mode property is used in PutMongo than PutMongoRecord since the property name "Update Mode" is already used in PutMongo
Test cases for
PutMongoupdated to use Map and Document classes instead of string based json input.Summary
NIFI-12224
Tracking
Please complete the following tracking steps prior to pull request creation.
Issue Tracking
Pull Request Tracking
NIFI-00000NIFI-00000Pull Request Formatting
mainbranchVerification
Please indicate the verification steps performed prior to pull request creation.
Build
mvn clean install -P contrib-checkLicensing
LICENSEandNOTICEfilesDocumentation