incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [13/39] git commit: Merge branch 'master' into 0.2.0-newtypesystem
Date Mon, 12 Aug 2013 15:48:52 GMT
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/ccf87cea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/ccf87cea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/ccf87cea

Branch: refs/heads/master
Commit: ccf87cea5af9e6604927754e2fe316b1719c7a88
Parents: 416c6e2 84eb05a
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Mon Jul 15 14:46:30 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Mon Jul 15 14:46:30 2013 -0400

----------------------------------------------------------------------
 blur-core/pom.xml                               | 52 +++++++++++--
 .../indexserver/DistributedIndexServer.java     | 10 ++-
 .../blur/thrift/ThriftBlurShardServer.java      |  2 +-
 .../utils/TableShardCountCollapserTest.java     |  2 +-
 blur-gui/pom.xml                                |  2 +-
 .../apache/blur/gui/JSONReporterServlet.java    | 40 ++++++++++
 blur-jdbc/pom.xml                               |  2 +-
 blur-mapred/pom.xml                             | 37 ++++++++--
 blur-query/pom.xml                              |  2 +-
 blur-shell/pom.xml                              |  2 +-
 blur-store/pom.xml                              |  2 +-
 .../apache/blur/store/hdfs/HdfsDirectory.java   |  1 +
 blur-thrift/pom.xml                             |  2 +-
 blur-util/pom.xml                               | 34 +++++++--
 .../blur/metrics/JSONReporterServlet.java       | 38 ----------
 distribution/pom.xml                            | 12 +--
 distribution/src/main/scripts/bin/start-all.sh  |  2 +-
 distribution/src/main/scripts/bin/stop-all.sh   |  2 +-
 .../src/main/scripts/conf/default_zoo.cfg       | 14 ++++
 distribution/src/main/scripts/conf/zookeepers   |  2 +
 pom.xml                                         | 78 +++++++-------------
 21 files changed, 204 insertions(+), 134 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ccf87cea/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 9cd4803,71a4ee0..aaed5c2
--- 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
@@@ -96,7 -97,10 +96,9 @@@ 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>();


Mime
View raw message