Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi 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/43b2f040 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/43b2f040 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/43b2f040 Branch: refs/heads/NIFI-292 Commit: 43b2f040bcb181abc435e4f8f1c5da0591141254 Parents: 21209b2 384b2ac Author: joewitt <[email protected]> Authored: Mon Apr 27 14:26:26 2015 -0400 Committer: joewitt <[email protected]> Committed: Mon Apr 27 14:26:26 2015 -0400 ---------------------------------------------------------------------- .../nifi/provenance/IndexConfiguration.java | 12 +- .../PersistentProvenanceRepository.java | 612 +++++++------- .../provenance/RepositoryConfiguration.java | 106 +-- .../nifi/provenance/StandardRecordReader.java | 246 +++--- .../nifi/provenance/StandardRecordWriter.java | 138 ++-- .../provenance/expiration/ExpirationAction.java | 6 +- .../provenance/lucene/DeleteIndexAction.java | 12 +- .../nifi/provenance/lucene/DocsReader.java | 79 +- .../nifi/provenance/lucene/IndexManager.java | 820 +++++++++---------- .../nifi/provenance/lucene/IndexSearch.java | 38 +- .../nifi/provenance/lucene/IndexingAction.java | 119 +-- .../nifi/provenance/lucene/LineageQuery.java | 6 +- .../nifi/provenance/lucene/LuceneUtil.java | 38 +- .../provenance/rollover/CompressionAction.java | 59 -- .../provenance/rollover/RolloverAction.java | 35 - .../provenance/serialization/RecordReader.java | 57 +- .../provenance/serialization/RecordReaders.java | 136 +-- .../provenance/serialization/RecordWriter.java | 23 +- .../provenance/serialization/RecordWriters.java | 8 +- .../nifi/provenance/toc/StandardTocReader.java | 44 +- .../nifi/provenance/toc/StandardTocWriter.java | 35 +- .../apache/nifi/provenance/toc/TocReader.java | 20 +- .../org/apache/nifi/provenance/toc/TocUtil.java | 27 +- .../apache/nifi/provenance/toc/TocWriter.java | 16 +- .../TestPersistentProvenanceRepository.java | 118 +-- .../TestStandardRecordReaderWriter.java | 162 ++-- .../org/apache/nifi/provenance/TestUtil.java | 2 +- .../provenance/toc/TestStandardTocReader.java | 20 +- .../provenance/toc/TestStandardTocWriter.java | 4 +- 29 files changed, 1391 insertions(+), 1607 deletions(-) ----------------------------------------------------------------------
