svn commit: r27347 - in /dev/nifi/nifi-fds: ./ nifi-fds-0.1.0/
Author: scottyaslan Date: Fri Jun 8 23:31:16 2018 New Revision: 27347 Log: nifi-fds-0.1.0-RC1 source zip Added: dev/nifi/nifi-fds/ dev/nifi/nifi-fds/nifi-fds-0.1.0/ dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip (with props) dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip.asc dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip.sha1 dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip.sha256 dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip.sha512 Added: dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip == Binary file - no diff available. Propchange: dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip.asc == --- dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip.asc (added) +++ dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip.asc Fri Jun 8 23:31:16 2018 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJbGwlyAAoJEN1dWlR6jSKOBGIP/A4rH/lOESw/h42Gyi71kekf +BR5PmbbUbMTq0ecJLJipg+5C5nVz/wFheAWKrI3Dt27Bw+kwuIFySmLGaxokyyDx +uHSZDmY/6b6pxqC+9Z+vCAlVEGEFBkHFG93NJCBlWcj8akisYl38vRwzcj735Mus +U3vs160nVX5wBWR/ajROPs7E4FH51N/RWY6GQdBLpoHNKZpOrD2bYV3IXJEGuS2w +gAWoDBv3NdI1uNnWCJMwY74fJwuiupdqsEhK74Rv4d18MxQXGLjRtKDugNGA46in +4WJ8AZYsxYJom7uc/5cxeB/0EjnX1OVYkgNm6fTJu8cPVxj3yovCRulsZAC8VPq1 +YjUIdpmbkumv0o33iGYMYP5TibiONbEiLrmexSDov2XUuAulrvK6z7I+49L+dTuA +bpyKHUxv3lT9b4a3VqfsFQokc7LmiFYHP2VJaDPptQMw5Q3+mKdHpaE48nmB/5bW +dmAXn6rKsNh/XBuV5sKF8YJmhEssV84RNxJxb1/pKgbKsHOuy03bquedbIB7GSY1 +tZSeQrP+HMlyKYFg+VfUK9UinrjvojJ7g4vz0HLs2Sk/cF+YazqJrHPJnMADXYN8 +MzED9NO5El7wfSZwshqxSsXACsfbiRIciP+6ydd5e1S2VCJPoWEWshoE6ixH+9qQ +/ogor1/Dz6auToDowSOg +=ivb9 +-END PGP SIGNATURE- Added: dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip.sha1 == --- dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip.sha1 (added) +++ dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip.sha1 Fri Jun 8 23:31:16 2018 @@ -0,0 +1 @@ +389b7bda654cfb9a79efa5f893eb37b9f73caaf5 Added: dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip.sha256 == --- dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip.sha256 (added) +++ dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip.sha256 Fri Jun 8 23:31:16 2018 @@ -0,0 +1 @@ +b42de408e797df859ab8e11e39bd717c996df775179bfae82bf4392bb346a135 Added: dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip.sha512 == --- dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip.sha512 (added) +++ dev/nifi/nifi-fds/nifi-fds-0.1.0/nifi-fds-0.1.0-source-release.zip.sha512 Fri Jun 8 23:31:16 2018 @@ -0,0 +1 @@ +3b1cca1d5c3cd1786fb54deaa9e9761feb1b8bd2b365658ecef302ba617dd3fe66766513d76ad8686ce7f87a25d6d6152ccdae1bf2dfb3d5dba3e352d53a4122
[nifi-fds] Git Push Summary
Repository: nifi-fds Updated Tags: refs/tags/FDS-0.1.0 [deleted] 48d9dd07e
[nifi-fds] Git Push Summary
Repository: nifi-fds Updated Tags: refs/tags/nifi-registry-0.1.0-RC1 [deleted] b4c686785
nifi-fds git commit: [NIFI-5240-RC1] prepare release nifi-fds-0.1.0-RC1
Repository: nifi-fds
Updated Branches:
refs/heads/NIFI-5240-RC1 [created] 35423f267
Updated Tags: refs/tags/FDS-0.1.0 [created] 48d9dd07e
refs/tags/nifi-fds-0.1.0-RC1 [created] 253ba170f
refs/tags/nifi-registry-0.1.0-RC1 [created] b4c686785
refs/tags/rel/nifi-registry-0.1.0 [created] ca88f9f07
[NIFI-5240-RC1] prepare release nifi-fds-0.1.0-RC1
Project: http://git-wip-us.apache.org/repos/asf/nifi-fds/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-fds/commit/35423f26
Tree: http://git-wip-us.apache.org/repos/asf/nifi-fds/tree/35423f26
Diff: http://git-wip-us.apache.org/repos/asf/nifi-fds/diff/35423f26
Branch: refs/heads/NIFI-5240-RC1
Commit: 35423f267de0755087a274ece79c81ef1a4ee641
Parents: 1ea9c8e
Author: Scott Aslan
Authored: Fri Jun 8 18:27:46 2018 -0400
Committer: Scott Aslan
Committed: Fri Jun 8 18:27:46 2018 -0400
--
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/nifi-fds/blob/35423f26/package.json
--
diff --git a/package.json b/package.json
index a73ea81..24c9b5d 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
"//": "See the License for the specific language governing permissions and",
"//": "limitations under the License.",
"name": "nifi-fds",
- "version": "0.0.0",
+ "version": "0.1.0",
"scripts": {
"start": "./node_modules/http-server/bin/http-server .",
"build:demo-app": "./node_modules/grunt-cli/bin/grunt
compile-fds-demo-styles",
nifi git commit: NIFI-5200: Fixed issue with InputStream being closed when calling ProcessSession.read() twice against sequential Content Claims
Repository: nifi
Updated Branches:
refs/heads/master 4bccab7e0 -> 00a63d17a
NIFI-5200: Fixed issue with InputStream being closed when calling
ProcessSession.read() twice against sequential Content Claims
Signed-off-by: Matthew Burgess
This closes #2753
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/00a63d17
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/00a63d17
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/00a63d17
Branch: refs/heads/master
Commit: 00a63d17af3c82727b9119acb00fccfcf6639fc5
Parents: 4bccab7
Author: Mark Payne
Authored: Fri Jun 1 11:14:56 2018 -0400
Committer: Matthew Burgess
Committed: Fri Jun 8 16:47:28 2018 -0400
--
.../repository/StandardProcessSession.java | 10 +-
.../repository/TestStandardProcessSession.java | 19 +++
2 files changed, 24 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/nifi/blob/00a63d17/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
--
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
index 2750db6..12bcafd 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
@@ -2141,14 +2141,14 @@ public final class StandardProcessSession implements
ProcessSession, ProvenanceE
currentReadClaim = claim;
+currentReadClaimStream = new
ByteCountingInputStream(rawInStream);
+StreamUtils.skip(currentReadClaimStream, offset);
+
// Use a non-closeable stream because we want to keep it open
after the callback has finished so that we can
// reuse the same InputStream for the next FlowFile
-final InputStream disableOnClose = new
DisableOnCloseInputStream(rawInStream);
-
-currentReadClaimStream = new
ByteCountingInputStream(disableOnClose);
-StreamUtils.skip(currentReadClaimStream, offset);
+final InputStream disableOnClose = new
DisableOnCloseInputStream(currentReadClaimStream);
-return currentReadClaimStream;
+return disableOnClose;
} else {
claimCache.flush(claim);
final InputStream rawInStream =
context.getContentRepository().read(claim);
http://git-wip-us.apache.org/repos/asf/nifi/blob/00a63d17/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
--
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
index 55fa232..f47be4d 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
@@ -350,6 +350,25 @@ public class TestStandardProcessSession {
}
@Test
+public void testSequentialReads() throws IOException {
+FlowFile ff1 = session.write(session.create(), out -> out.write(new
byte[] {'A', 'B'}));
+FlowFile ff2 = session.write(session.create(), out -> out.write('C'));
+
+final byte[] buff1 = new byte[2];
+try (final InputStream in = session.read(ff1)) {
+StreamUtils.fillBuffer(in, buff1);
+}
+
+final byte[] buff2 = new byte[1];
+try (final InputStream in = session.read(ff2)) {
+StreamUtils.fillBuffer(in, buff2);
+}
+
+Assert.assertArrayEquals(new byte[] {'A', 'B'}, buff1);
+Assert.assertArrayEquals(new byte[] {'C'}, buff2);
+}
+
+@Test
public void testCloneOriginalDataLarger() throws IOException {
nifi-fds git commit: add flow_design_styles.css to demo-app index.html
Repository: nifi-fds Updated Branches: refs/heads/master 09e43612e -> 1ea9c8e18 add flow_design_styles.css to demo-app index.html This closes #5 Project: http://git-wip-us.apache.org/repos/asf/nifi-fds/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-fds/commit/1ea9c8e1 Tree: http://git-wip-us.apache.org/repos/asf/nifi-fds/tree/1ea9c8e1 Diff: http://git-wip-us.apache.org/repos/asf/nifi-fds/diff/1ea9c8e1 Branch: refs/heads/master Commit: 1ea9c8e180d0e57b68d14566b9ebc5f462dd6a11 Parents: 09e4361 Author: Scott Aslan Authored: Fri Jun 8 15:32:43 2018 -0400 Committer: Matt Gilman Committed: Fri Jun 8 15:49:22 2018 -0400 -- src/demo-app/index.html | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/nifi-fds/blob/1ea9c8e1/src/demo-app/index.html -- diff --git a/src/demo-app/index.html b/src/demo-app/index.html index ce269ea..680a275 100644 --- a/src/demo-app/index.html +++ b/src/demo-app/index.html @@ -21,6 +21,7 @@ +
svn commit: r27332 - /release/nifi/KEYS
Author: scottyaslan Date: Fri Jun 8 17:35:22 2018 New Revision: 27332 Log: adding signing key Modified: release/nifi/KEYS Modified: release/nifi/KEYS == --- release/nifi/KEYS (original) +++ release/nifi/KEYS Fri Jun 8 17:35:22 2018 @@ -1263,4 +1263,61 @@ y8gVDvB5hp0vezRp/ql7W56AsVi2DExcGB6fekxm 5BugXPuDKJm67KxyVEOQgGqMXnj2d8j76t6mydZVuM9Tc6Wr3AkJMAF5k2bUMzkJ +o6lD0oc0cjNpxCbOkGK01pQ =+4cC --END PGP PUBLIC KEY BLOCK- \ No newline at end of file +-END PGP PUBLIC KEY BLOCK-pub 4096R/7A8D228E 2018-06-08 +uid James Scott Aslan +sig 37A8D228E 2018-06-08 James Scott Aslan +sub 4096R/4D047BA8 2018-06-08 +sig 7A8D228E 2018-06-08 James Scott Aslan + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1 + +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 +WYVLW4kO81Y= +=9ayN +-END PGP PUBLIC KEY BLOCK-
svn commit: r27331 - /dev/nifi/KEYS
Author: scottyaslan Date: Fri Jun 8 17:17:00 2018 New Revision: 27331 Log: adding signing key Modified: dev/nifi/KEYS Modified: dev/nifi/KEYS == --- dev/nifi/KEYS (original) +++ dev/nifi/KEYS Fri Jun 8 17:17:00 2018 @@ -1264,3 +1264,61 @@ y8gVDvB5hp0vezRp/ql7W56AsVi2DExcGB6fekxm +o6lD0oc0cjNpxCbOkGK01pQ =+4cC -END PGP PUBLIC KEY BLOCK- +pub 4096R/7A8D228E 2018-06-08 +uid James Scott Aslan +sig 37A8D228E 2018-06-08 James Scott Aslan +sub 4096R/4D047BA8 2018-06-08 +sig 7A8D228E 2018-06-08 James Scott Aslan + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1 + +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 +WYVLW4kO81Y= +=9ayN +-END PGP PUBLIC KEY BLOCK-
nifi git commit: NIFI-4262 - MergeContent - option to add merged uuid in original flow files
Repository: nifi
Updated Branches:
refs/heads/master 6e067734d -> 05d7b6c6e
NIFI-4262 - MergeContent - option to add merged uuid in original flow files
This closes #2056
Signed-off-by: zenfenan
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/05d7b6c6
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/05d7b6c6
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/05d7b6c6
Branch: refs/heads/master
Commit: 05d7b6c6e7d640a300b580724e460d45eaed1938
Parents: 6e06773
Author: Pierre Villard
Authored: Thu Aug 3 23:40:48 2017 +0200
Committer: zenfenan
Committed: Fri Jun 8 20:54:47 2018 +0530
--
.../nifi/processor/util/bin/BinFiles.java | 11 ++--
.../processor/util/bin/BinProcessingResult.java | 65
.../nifi/processors/standard/MergeContent.java | 15 +++--
.../processors/standard/TestMergeContent.java | 8 +++
4 files changed, 89 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/nifi/blob/05d7b6c6/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
--
diff --git
a/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
b/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
index bad0ded..4ba4a96 100644
---
a/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
+++
b/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
@@ -157,7 +157,7 @@ public abstract class BinFiles extends
AbstractSessionFactoryProcessor {
* will be transferred to failure and the ProcessSession
provided by the 'session'
* argument rolled back
*/
-protected abstract boolean processBin(Bin unmodifiableBin, ProcessContext
context) throws ProcessException;
+protected abstract BinProcessingResult processBin(Bin unmodifiableBin,
ProcessContext context) throws ProcessException;
/**
* Allows additional custom validation to be done. This will be called
from the parent's customValidation method.
@@ -221,9 +221,9 @@ public abstract class BinFiles extends
AbstractSessionFactoryProcessor {
int processedBins = 0;
Bin bin;
while ((bin = readyBins.poll()) != null) {
-boolean binAlreadyCommitted;
+BinProcessingResult binProcessingResult;
try {
-binAlreadyCommitted = this.processBin(bin, context);
+binProcessingResult = this.processBin(bin, context);
} catch (final ProcessException e) {
logger.error("Failed to process bundle of {} files due to {}",
new Object[] {bin.getContents().size(), e});
@@ -241,8 +241,9 @@ public abstract class BinFiles extends
AbstractSessionFactoryProcessor {
}
// If this bin's session has been committed, move on.
-if (!binAlreadyCommitted) {
+if (!binProcessingResult.isCommitted()) {
final ProcessSession binSession = bin.getSession();
+bin.getContents().stream().forEach(ff ->
binSession.putAllAttributes(ff, binProcessingResult.getAttributes()));
binSession.transfer(bin.getContents(), REL_ORIGINAL);
binSession.commit();
}
@@ -361,4 +362,4 @@ public abstract class BinFiles extends
AbstractSessionFactoryProcessor {
return problems;
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/05d7b6c6/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/BinProcessingResult.java
--
diff --git
a/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/BinProcessingResult.java
b/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/BinProcessingResult.java
new file mode 100644
index 000..eb36b0c
--- /dev/null
+++
b/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/BinProcessingResult.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the
nifi git commit: NIFI-5264 - Added attribute for validation error message in ValidateCSV
Repository: nifi
Updated Branches:
refs/heads/master 49228aa5d -> 6e067734d
NIFI-5264 - Added attribute for validation error message in ValidateCSV
This closes #2769
Signed-off-by: zenfenan
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/6e067734
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/6e067734
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/6e067734
Branch: refs/heads/master
Commit: 6e067734d5bed7dbabc4af2dae1f23bb980e3957
Parents: 49228aa
Author: Pierre Villard
Authored: Thu Jun 7 15:03:16 2018 +0200
Committer: zenfenan
Committed: Fri Jun 8 19:16:20 2018 +0530
--
.../apache/nifi/processors/standard/ValidateCsv.java| 12 +++-
.../nifi/processors/standard/TestValidateCsv.java | 4
2 files changed, 15 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/nifi/blob/6e067734/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateCsv.java
--
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateCsv.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateCsv.java
index 667d4f9..9796822 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateCsv.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateCsv.java
@@ -92,7 +92,8 @@ import org.supercsv.prefs.CsvPreference;
@WritesAttributes({
@WritesAttribute(attribute="count.valid.lines", description="If line by
line validation, number of valid lines extracted from the source data"),
@WritesAttribute(attribute="count.invalid.lines", description="If line by
line validation, number of invalid lines extracted from the source data"),
-@WritesAttribute(attribute="count.total.lines", description="If line by
line validation, total number of lines in the source data")
+@WritesAttribute(attribute="count.total.lines", description="If line by
line validation, total number of lines in the source data"),
+@WritesAttribute(attribute="validation.error.message", description="For
flow files routed to invalid, message of the first validation error")
})
public class ValidateCsv extends AbstractProcessor {
@@ -455,6 +456,7 @@ public class ValidateCsv extends AbstractProcessor {
final AtomicReference totalCount = new
AtomicReference(0);
final AtomicReference invalidFF = new
AtomicReference(null);
final AtomicReference validFF = new
AtomicReference(null);
+final AtomicReference validationError = new
AtomicReference(null);
if(!isWholeFFValidation) {
invalidFF.set(session.create(flowFile));
@@ -514,6 +516,7 @@ public class ValidateCsv extends AbstractProcessor {
} catch (final SuperCsvException e) {
valid.set(false);
if(isWholeFFValidation) {
+validationError.set(e.getLocalizedMessage());
logger.debug("Failed to validate {} against
schema due to {}; routing to 'invalid'", new Object[]{flowFile}, e);
break;
} else {
@@ -528,6 +531,10 @@ public class ValidateCsv extends AbstractProcessor {
if(isFirstLineInvalid.get()) {
isFirstLineInvalid.set(false);
}
+
+if(validationError.get() == null) {
+
validationError.set(e.getLocalizedMessage());
+}
}
} finally {
if(!isWholeFFValidation) {
@@ -554,6 +561,7 @@ public class ValidateCsv extends AbstractProcessor {
session.transfer(flowFile, REL_VALID);
} else {
session.getProvenanceReporter().route(flowFile, REL_INVALID);
+session.putAttribute(flowFile, "validation.error.message",
validationError.get());
session.transfer(flowFile, REL_INVALID);
}
} else {
@@ -578,6 +586,7 @@ public class ValidateCsv extends AbstractProcessor {
session.getProvenanceReporter().route(invalidFF.get(),
REL_INVALID, (totalCount.get() - okCount.get()) + " invalid line(s)");
session.putAttribute(invalidFF.get(), "count.invalid.lines",
nifi git commit: NIFI-5281: If value is not valid according to the schema's CHOICE field, JSON Writer should write null value instead of throwing NullPointerException
Repository: nifi
Updated Branches:
refs/heads/master 0e09b98b0 -> 49228aa5d
NIFI-5281: If value is not valid according to the schema's CHOICE field, JSON
Writer should write null value instead of throwing NullPointerException
Signed-off-by: Pierre Villard
This closes #2772.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/49228aa5
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/49228aa5
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/49228aa5
Branch: refs/heads/master
Commit: 49228aa5dcbae5c4216310117daba586a63e6778
Parents: 0e09b98
Author: Mark Payne
Authored: Thu Jun 7 15:44:22 2018 -0400
Committer: Pierre Villard
Committed: Fri Jun 8 10:07:43 2018 +0200
--
.../main/java/org/apache/nifi/json/WriteJsonResult.java | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/nifi/blob/49228aa5/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/json/WriteJsonResult.java
--
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/json/WriteJsonResult.java
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/json/WriteJsonResult.java
index c596ae2..d113f8d 100755
---
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/json/WriteJsonResult.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/json/WriteJsonResult.java
@@ -55,7 +55,6 @@ public class WriteJsonResult extends AbstractRecordSetWriter
implements RecordSe
private final RecordSchema recordSchema;
private final JsonFactory factory = new JsonFactory();
private final JsonGenerator generator;
-private final OutputStream out;
private final NullSuppression nullSuppression;
private final OutputGrouping outputGrouping;
private final Supplier LAZY_DATE_FORMAT;
@@ -69,7 +68,6 @@ public class WriteJsonResult extends AbstractRecordSetWriter
implements RecordSe
this.logger = logger;
this.recordSchema = recordSchema;
this.schemaAccess = schemaAccess;
-this.out = out;
this.nullSuppression = nullSuppression;
this.outputGrouping = outputGrouping;
@@ -270,14 +268,19 @@ public class WriteJsonResult extends
AbstractRecordSetWriter implements RecordSe
}
@SuppressWarnings("unchecked")
-private void writeValue(final JsonGenerator generator, final Object value,
final String fieldName, final DataType dataType)
-throws JsonGenerationException, IOException {
+private void writeValue(final JsonGenerator generator, final Object value,
final String fieldName, final DataType dataType) throws
JsonGenerationException, IOException {
if (value == null) {
generator.writeNull();
return;
}
final DataType chosenDataType = dataType.getFieldType() ==
RecordFieldType.CHOICE ? DataTypeUtils.chooseDataType(value, (ChoiceDataType)
dataType) : dataType;
+if (chosenDataType == null) {
+logger.debug("Could not find a suitable field type in the CHOICE
for field {} and value {}; will use null value", new Object[] {fieldName,
value});
+generator.writeNull();
+return;
+}
+
final Object coercedValue = DataTypeUtils.convertType(value,
chosenDataType, LAZY_DATE_FORMAT, LAZY_TIME_FORMAT, LAZY_TIMESTAMP_FORMAT,
fieldName);
if (coercedValue == null) {
generator.writeNull();
nifi git commit: NIFI-5143: Initial work to support column values for paging results
Repository: nifi
Updated Branches:
refs/heads/master 729f8aa24 -> 0e09b98b0
NIFI-5143: Initial work to support column values for paging results
Signed-off-by: Pierre Villard
This closes #2728.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0e09b98b
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0e09b98b
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0e09b98b
Branch: refs/heads/master
Commit: 0e09b98b02bcfae21841cb7dda176c7c1c33f4d8
Parents: 729f8aa
Author: Matthew Burgess
Authored: Mon May 21 13:45:16 2018 -0400
Committer: Pierre Villard
Committed: Fri Jun 8 09:36:27 2018 +0200
--
.../processors/standard/GenerateTableFetch.java | 100 +---
.../processors/standard/db/DatabaseAdapter.java | 17 ++
.../db/impl/GenericDatabaseAdapter.java | 36 +++--
.../db/impl/MSSQL2008DatabaseAdapter.java | 27 +++-
.../standard/db/impl/MSSQLDatabaseAdapter.java | 43 --
.../db/impl/Oracle12DatabaseAdapter.java| 39 +++--
.../standard/db/impl/OracleDatabaseAdapter.java | 22 ++-
.../db/impl/PhoenixDatabaseAdapter.java | 40 +++--
.../additionalDetails.html | 69 +
.../standard/TestGenerateTableFetch.java| 154 +--
.../standard/db/impl/DerbyDatabaseAdapter.java | 41 +++--
.../db/impl/TestMSSQL2008DatabaseAdapter.java | 24 +++
.../db/impl/TestMSSQLDatabaseAdapter.java | 24 +++
.../db/impl/TestOracle12DatabaseAdapter.java| 53 +--
.../db/impl/TestOracleDatabaseAdapter.java | 101
15 files changed, 685 insertions(+), 105 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/nifi/blob/0e09b98b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateTableFetch.java
--
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateTableFetch.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateTableFetch.java
index a2d01e9..9842d6c 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateTableFetch.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateTableFetch.java
@@ -30,6 +30,7 @@ import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.annotation.lifecycle.OnStopped;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.state.Scope;
@@ -98,8 +99,8 @@ import java.util.stream.IntStream;
@WritesAttribute(attribute = "generatetablefetch.offset", description
= "Offset to be used to retrieve the corresponding partition.")
})
@DynamicProperty(name = "Initial Max Value", value = "Attribute Expression
Language",
- expressionLanguageScope = ExpressionLanguageScope.NONE,
description = "Specifies an initial "
- + "max value for max value columns. Properties should
be added in the format `initial.maxvalue.{max_value_column}`.")
+expressionLanguageScope = ExpressionLanguageScope.NONE, description =
"Specifies an initial "
++ "max value for max value columns. Properties should be added in the
format `initial.maxvalue.{max_value_column}`.")
public class GenerateTableFetch extends AbstractDatabaseFetchProcessor {
public static final PropertyDescriptor PARTITION_SIZE = new
PropertyDescriptor.Builder()
@@ -115,6 +116,19 @@ public class GenerateTableFetch extends
AbstractDatabaseFetchProcessor {
.addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR)
.build();
+static final PropertyDescriptor COLUMN_FOR_VALUE_PARTITIONING = new
PropertyDescriptor.Builder()
+.name("gen-table-column-for-val-partitioning")
+.displayName("Column for Value Partitioning")
+.description("The name of a column whose values will be used for
partitioning. The default behavior is to use row numbers on the result set for
partitioning into "
++ "'pages' to be fetched from the database, using an
offset/limit strategy. However for certain databases, it can be more efficient
under the right circumstances to use "
++ "the column values themselves to define the 'pages'.
This property should only be used
