Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NIFI-11858 Configurable Column Name Normalization in PutDatabaseRecord and UpdateDatabaseTable #8995

Closed
wants to merge 73 commits into from

Conversation

ravinarayansingh
Copy link
Contributor

old PR link : NIFI-11858

Summary

NIFI-11858

Tracking

Please complete the following tracking steps prior to pull request creation.

Issue Tracking

Pull Request Tracking

  • Pull Request title starts with Apache NiFi Jira issue number, such as NIFI-00000
  • Pull Request commit message starts with Apache NiFi Jira issue number, as such NIFI-00000

Pull Request Formatting

  • Pull Request based on current revision of the main branch
  • Pull Request refers to a feature branch with one commit containing changes

Verification

Please indicate the verification steps performed prior to pull request creation.

Build

  • Build completed using mvn clean install -P contrib-check
    • JDK 21

Licensing

  • New dependencies are compatible with the Apache License 2.0 according to the License Policy
  • New dependencies are documented in applicable LICENSE and NOTICE files

Documentation

  • Documentation formatting appears as expected in rendered files

@ChrisSamo632 ChrisSamo632 changed the title NIFI-11858 new PR for Configurable Column Name Normalization in PutDatabaseRecord and UpdateDatabaseTable NIFI-11858 Configurable Column Name Normalization in PutDatabaseRecord and UpdateDatabaseTable Jun 23, 2024
# Conflicts:
#	nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
#	nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java
@mattyb149
Copy link
Contributor

There are merge conflicts here, I recommend not merging main into your feature branch but rather pulling down the latest main then checking out your feature branch and rebasing.

# Conflicts:
#	nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
#	nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordTest.java
@ravinarayansingh
Copy link
Contributor Author

There are merge conflicts here, I recommend not merging main into your feature branch but rather pulling down the latest main then checking out your feature branch and rebasing.

@mattyb149 I have resolved the conflict and rebased .

@ravinarayansingh
Copy link
Contributor Author

hi @mattyb149
let me know if any thing need to be done form my side

@mattyb149
Copy link
Contributor

I apologize for losing track of this, but now there are merge conflicts. Once the conflicts are resolved I will finish the review and hopefully it is ready for merging.

@ravinarayansingh
Copy link
Contributor Author

I apologize for losing track of this, but now there are merge conflicts. Once the conflicts are resolved I will finish the review and hopefully it is ready for merging.

Hi @mattyb149
I have resolved the conflict please have a look

markap14 and others added 12 commits October 1, 2024 09:22
…changes (apache#9316)

- Drained request InputStream
- Added try-with-resources for response OutputStream

Signed-off-by: David Handermann <[email protected]>
- Ensure NARs are loaded in parent-first order during restart
- Allow replacing a NAR when other NARs are dependent on it
- Improvements to catch Throwable in several places to handle NoClassDefFoundError

Signed-off-by: David Handermann <[email protected]>
…pache#9292)

- Transform input FlowFile instead of cloned FlowFile

Signed-off-by: David Handermann <[email protected]>
* NIFI-13721: Migrating additional details to markdown.

* NIFI-13721: Rebuilding documentation to generate mark up on the client.

* NIFI-13721: Removing old documentation approach.

* NIFI-13721: Rebase main and final fixing button colors.

* NIFI-13721: Fixing rat issues.

* NIFI-13721: Removing generated comonent documentation.
- Removing links and images from additional details markdown.

* NIFI-13721: Recreating package lock following rebase.

* NIFI-13721: Updating documentation for M3.

* NIFI-13721: Fixing broken test.

* NIFI-13721: Addressing review feedback.

* NIFI-13721: Addressing review feedback.

* NIFI-13721: Ensuring the selected item is visible after routing.

* NIFI-13721: Fixing reportingTaskTypes in finding extensions for a given type.

* NIFI-13721: Updating the see also component to handle when the referenced extension is not installed.

* NIFI-13721: Fixing expansion panel header styles.
- Only synchronize flow with the coordinator after getting cluster response

This closes apache#9317

Signed-off-by: David Handermann <[email protected]>
…with parent SSL Context Service. Parent SSL Context Service is added to root process group instead of managament controller services

Signed-off-by: Ferenc Erdei <[email protected]>
This closes apache#9268.
… exception when it fails to convert a value.

This closes apache#9327

Signed-off-by: Mike Thomsen <[email protected]>
@ravinarayansingh
Copy link
Contributor Author

I apologize for losing track of this, but now there are merge conflicts. Once the conflicts are resolved I will finish the review and hopefully it is ready for merging.

Hi @mattyb149 I have resolved the conflict please have a look

Hi @mattyb149
I have rebased

@mattyb149
Copy link
Contributor

Having 64 commits is usually the sign of a merge or rebase that didn't go smoothly. In general you'd have your own feature branch based on main, and when the PR says there are merge conflicts you'd checkout main instead, pull the latest, then check your feature branch out and rebase against main. That will allow your PR to have an up-to-date branch with only the changes you made on top of the latest main.

@ravinarayansingh
Copy link
Contributor Author

Having 64 commits is usually the sign of a merge or rebase that didn't go smoothly. In general you'd have your own feature branch based on main, and when the PR says there are merge conflicts you'd checkout main instead, pull the latest, then check your feature branch out and rebase against main. That will allow your PR to have an up-to-date branch with only the changes you made on top of the latest main.

Hi @mattyb149
following are the commands i have executed

git checkout main
git pull origin main
git checkout NIFI-11858-new
git rebase main

# Conflicts:
#	nifi-extension-bundles/nifi-airtable-bundle/nifi-airtable-processors/src/main/resources/docs/org.apache.nifi.processors.airtable.QueryAirtableTable/additionalDetails.md
#	nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/additional-details/additional-details.component.html
#	nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts
#	nifi-frontend/src/main/frontend/apps/nifi/src/styles.scss
#	nifi-frontend/src/main/frontend/libs/shared/src/assets/styles/_app.scss
#	nifi-frontend/src/main/frontend/libs/shared/src/assets/styles/_codemirror-theme.scss
#	nifi-frontend/src/main/frontend/package-lock.json
#	nifi-frontend/src/main/frontend/package.json
# Conflicts:
#	nifi-frontend/src/main/frontend/libs/shared/src/assets/styles/_app.scss
#	nifi-frontend/src/main/frontend/package-lock.json
@mattyb149
Copy link
Contributor

Unfortunately this PR is not in good shape to merge. Do you have a list of the commits you added as part of this PR vs the merge commits or any other change you didn't initiate? I can help put up a more viable PR with only your commits against the latest Apache NiFi main branch.

@ravinarayansingh
Copy link
Contributor Author

hi @mattyb149
i have create new PR #9382
please have a look we can close this

@exceptionfactory
Copy link
Contributor

Closing in favor of updated PR #9382.

ravinarayansingh added a commit to ravinarayansingh/nifi that referenced this pull request Nov 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.