Merge branch 'apache-blur-0.2' of https://git-wip-us.apache.org/repos/asf/incubator-blur into apache-blur-0.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/fc0e03fe Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/fc0e03fe Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/fc0e03fe Branch: refs/heads/apache-blur-0.2 Commit: fc0e03fea4956f83a030ab4c190cfe759abfcc60 Parents: c83cba5 721db2a Author: Chris Rohr <[email protected]> Authored: Thu Jul 10 11:30:27 2014 -0400 Committer: Chris Rohr <[email protected]> Committed: Thu Jul 10 11:30:27 2014 -0400 ---------------------------------------------------------------------- .../org/apache/blur/manager/IndexManager.java | 5 ++ .../results/BlurResultIterableClient.java | 19 +++++--- .../results/BlurResultIterableMultiple.java | 27 +++++++---- .../blur/manager/results/PeekableIterator.java | 14 ++++-- .../blur/trace/hdfs/HdfsTraceStorage.java | 25 +++++++--- .../java/org/apache/blur/utils/BlurUtil.java | 10 ++++ .../apache/blur/utils/IteratorConverter.java | 17 ++++--- .../apache/blur/manager/IndexManagerTest.java | 7 ++- .../writer/BlurIndexSimpleWriterTest.java | 7 ++- .../blur/trace/hdfs/HdfsTraceStorageTest.java | 14 +++--- .../mapreduce/lib/GenericBlurRecordWriter.java | 22 +++++---- .../mapreduce/lib/GenericBlurRecordWriter.java | 22 +++++---- .../blur/lucene/search/IterablePaging.java | 7 ++- blur-shell/pom.xml | 5 ++ .../org/apache/blur/shell/QueryCommand.java | 11 ++++- .../org/apache/blur/trace/LogTraceStorage.java | 12 +++-- .../main/java/org/apache/blur/trace/Trace.java | 12 +++-- .../org/apache/blur/trace/TraceCollector.java | 27 ++++++----- .../java/org/apache/blur/trace/TracerImpl.java | 51 ++++++++------------ .../org/apache/blur/utils/BlurIterator.java | 2 + .../java/org/apache/blur/trace/TraceTest.java | 7 ++- 21 files changed, 209 insertions(+), 114 deletions(-) ----------------------------------------------------------------------
