Merge branch 'NIFI-527' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/07596608 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/07596608 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/07596608 Branch: refs/heads/develop Commit: 0759660897a8ca9e91d02157ec434abd5e2a7d7e Parents: c10faca 7c41225 Author: Mark Payne <[email protected]> Authored: Mon Apr 27 10:47:38 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Mon Apr 27 10:47:38 2015 -0400 ---------------------------------------------------------------------- .../nifi/stream/io/ByteCountingInputStream.java | 5 + .../stream/io/ByteCountingOutputStream.java | 8 + .../nifi-framework/nifi-framework-core/pom.xml | 1 + .../PersistentProvenanceRepository.java | 592 ++++++++++--------- .../provenance/RepositoryConfiguration.java | 14 +- .../nifi/provenance/StandardRecordReader.java | 223 ++++++- .../nifi/provenance/StandardRecordWriter.java | 114 +++- .../provenance/lucene/DeleteIndexAction.java | 75 +-- .../nifi/provenance/lucene/DocsReader.java | 100 +++- .../nifi/provenance/lucene/FieldNames.java | 1 + .../nifi/provenance/lucene/IndexManager.java | 467 +++++++++++++++ .../nifi/provenance/lucene/IndexSearch.java | 71 ++- .../nifi/provenance/lucene/IndexingAction.java | 183 +++--- .../nifi/provenance/lucene/LuceneUtil.java | 26 +- .../provenance/serialization/RecordReader.java | 67 +++ .../provenance/serialization/RecordReaders.java | 139 ++--- .../provenance/serialization/RecordWriter.java | 6 + .../provenance/serialization/RecordWriters.java | 13 +- .../nifi/provenance/toc/StandardTocReader.java | 108 ++++ .../nifi/provenance/toc/StandardTocWriter.java | 120 ++++ .../apache/nifi/provenance/toc/TocReader.java | 58 ++ .../org/apache/nifi/provenance/toc/TocUtil.java | 37 ++ .../apache/nifi/provenance/toc/TocWriter.java | 52 ++ .../TestPersistentProvenanceRepository.java | 192 +++--- .../TestStandardRecordReaderWriter.java | 189 ++++++ .../org/apache/nifi/provenance/TestUtil.java | 82 +++ .../provenance/toc/TestStandardTocReader.java | 91 +++ .../provenance/toc/TestStandardTocWriter.java | 42 ++ .../nifi-standard-processors/pom.xml | 3 + 29 files changed, 2460 insertions(+), 619 deletions(-) ----------------------------------------------------------------------
