Merge branch 'master' into 0.2.0-newtypesystem
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/5f77a2b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/5f77a2b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/5f77a2b1 Branch: refs/heads/master Commit: 5f77a2b12692417258d7beaa7aab2e512915aa43 Parents: fb0ece5 76bf31e Author: Aaron McCurry <[email protected]> Authored: Mon Aug 5 14:53:05 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Mon Aug 5 14:53:05 2013 -0400 ---------------------------------------------------------------------- .../indexserver/DistributedIndexServer.java | 40 +- .../apache/blur/manager/status/QueryStatus.java | 4 +- .../apache/blur/manager/writer/BlurIndex.java | 47 + .../blur/manager/writer/BlurNRTIndex.java | 5 +- .../blur/manager/writer/IndexImporter.java | 28 +- .../manager/writer/SharedMergeScheduler.java | 36 +- .../blur/thrift/BlurControllerServer.java | 37 +- .../java/org/apache/blur/utils/BlurUtil.java | 17 + .../org/apache/blur/utils/ClassNameFilter.java | 23 + .../apache/blur/utils/RamUsageEstimator.java | 856 +++++++++++++++++++ .../ResetableDocumentStoredFieldVisitor.java | 1 - .../blur/mapred/AbstractOutputCommitter.java | 34 +- .../blur/mapreduce/lib/BaseBlurMapper.java | 4 +- .../apache/blur/mapreduce/lib/BlurCounters.java | 2 +- .../blur/mapreduce/lib/BlurOutputFormat.java | 32 +- .../blur/mapreduce/lib/CsvBlurDriver.java | 278 +++++- .../lib/CsvBlurDriverFamilyPerInput.java | 73 -- .../blur/mapreduce/lib/CsvBlurMapper.java | 255 ++++-- .../apache/blur/mapreduce/lib/RateCounter.java | 2 +- .../mapreduce/lib/BlurOutputFormatTest.java | 52 ++ .../blur/mapreduce/lib/CsvBlurDriverTest.java | 98 +++ .../blur/mapreduce/lib/CsvBlurMapperTest.java | 48 +- .../main/java/org/apache/blur/shell/Main.java | 2 +- .../java/org/apache/blur/shell/TopCommand.java | 16 +- .../store/blockcache/BlockDirectoryTest.java | 34 +- .../apache/blur/thrift/BlurClientManager.java | 115 +-- .../java/org/apache/blur/thrift/ClientPool.java | 125 +++ pom.xml | 3 +- 28 files changed, 1894 insertions(+), 373 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5f77a2b1/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java ---------------------------------------------------------------------- diff --cc blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java index aaed5c2,be0067e..f85fb76 --- a/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java +++ b/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java @@@ -95,10 -94,9 +93,8 @@@ public class DistributedIndexServer ext private static final Log LOG = LogFactory.getLog(DistributedIndexServer.class); private static final long _delay = TimeUnit.SECONDS.toMillis(10); - private static final long CHECK_PERIOD = TimeUnit.SECONDS.toMillis(60); - private static final AtomicLong _pauseWarmup = new AtomicLong(); - private Map<String, BlurAnalyzer> _tableAnalyzers = new ConcurrentHashMap<String, BlurAnalyzer>(); private Map<String, TableDescriptor> _tableDescriptors = new ConcurrentHashMap<String, TableDescriptor>(); private Map<String, Similarity> _tableSimilarity = new ConcurrentHashMap<String, Similarity>(); private Map<String, DistributedLayoutManager> _layoutManagers = new ConcurrentHashMap<String, DistributedLayoutManager>(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5f77a2b1/blur-core/src/main/java/org/apache/blur/manager/writer/BlurNRTIndex.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5f77a2b1/blur-mapred/src/main/java/org/apache/blur/mapreduce/lib/BlurOutputFormat.java ---------------------------------------------------------------------- diff --cc blur-mapred/src/main/java/org/apache/blur/mapreduce/lib/BlurOutputFormat.java index 5d343d1,39d670b..f6269e4 --- a/blur-mapred/src/main/java/org/apache/blur/mapreduce/lib/BlurOutputFormat.java +++ b/blur-mapred/src/main/java/org/apache/blur/mapreduce/lib/BlurOutputFormat.java @@@ -363,12 -367,10 +366,10 @@@ public class BlurOutputFormat extends O private boolean _usingLocalTmpindex; private File _localTmpPath; private ProgressableDirectory _localTmpDir; - private Counter _rowOverFlowCount; private String _deletedRowId; - - private Counter _rowDeleteCount; + - public BlurRecordWriter(Configuration configuration, BlurAnalyzer blurAnalyzer, int attemptId, String tmpDirName) + public BlurRecordWriter(Configuration configuration, int attemptId, String tmpDirName) throws IOException { _indexLocally = BlurOutputFormat.isIndexLocally(configuration);
