[
https://issues.apache.org/jira/browse/NIFI-322?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14382543#comment-14382543
]
Toivo Adams commented on NIFI-322:
----------------------------------
I had many commits over the time.
toivo@oPlex:~/git/incubator-nifi$ git status
# On branch develop
# Your branch is ahead of 'origin/develop' by 16 commits.
And just git pull would not try to resolve possible conflicts.
(even worse, you won't see any warnings either)
But next command will show conflicts:
toivo@oPlex:~/git/incubator-nifi$ git pull --rebase
First, rewinding head to replay your work on top of it...
Applying: Initial Database connection pooling service implementation NIFI-322
Using index info to reconstruct a base tree...
<stdin>:35: trailing whitespace.
<stdin>:36: trailing whitespace.
<stdin>:92: trailing whitespace.
<stdin>:126: trailing whitespace.
<stdin>:127: trailing whitespace.
warning: squelched 110 whitespace errors
warning: 115 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging nifi/nifi-nar-bundles/nifi-standard-services/pom.xml
Auto-merging
nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
CONFLICT (content): Merge conflict in
nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
Failed to merge in the changes.
Patch failed at 0001 Initial Database connection pooling service implementation
NIFI-322
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".
toivo@oPlex:~/git/incubator-nifi$
Now, it's just pure fun to correct manually conflicts one by one.
(I used Eclipse merge view ja add to index)
And continue with next one
toivo@oPlex:~/git/incubator-nifi$ git rebase --continue
Applying: Initial Database connection pooling service implementation NIFI-322
Applying: remove derby.log NIFI-322
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging
nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
CONFLICT (content): Merge conflict in
nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
Failed to merge in the changes.
Patch failed at 0002 remove derby.log NIFI-322
. . .
I wonder how people spent their time before software development?
> New Database Connection Pooling Controller Service
> --------------------------------------------------
>
> Key: NIFI-322
> URL: https://issues.apache.org/jira/browse/NIFI-322
> Project: Apache NiFi
> Issue Type: New Feature
> Components: Extensions
> Reporter: Toivo Adams
> Assignee: Mark Payne
> Priority: Minor
> Labels: controller
> Attachments: DBCPServiceApacheDBCP14.java, DBCPServiceTest.java,
> DatabaseSystemDescriptor.java, DatabaseSystems.java,
> NIFI-322_01mar2015.patch, NIFI-322_03mar2015.patch, NIFI-322_08mar2015.patch,
> NIFI-322_14mar2015.patch, NIFI-322_22mar2015.patch, NIFI-322_24mar2015.patch,
> NIFI-322_26mar2015.patch, TestDatabaseSystems.java, TestProcessor.java
>
>
> Often DataFlows contain many processors which deal with database - select,
> update or delete different data in different tables.
> Yet database is same and connection pooling helps to speed up connecting to
> database (open connection is fairly expensive). Also configuration must be
> done only in one place.
> Database Connection Pooling Controller Service helps to solve this in
> consistent way.
> related
> https://issues.apache.org/jira/browse/NIFI-293 : Add a JDBC Processor for
> executing arbitrary SQL queries.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
