incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [20/47] git commit: Merge branch 'master' of git://github.com/nearinfinity/blur
Date Mon, 03 Sep 2012 00:32:19 GMT
Merge branch 'master' of git://github.com/nearinfinity/blur

Conflicts:
	src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurShardServer.java
	src/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/3e7ea7fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/3e7ea7fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/3e7ea7fa

Branch: refs/heads/master
Commit: 3e7ea7fab8fa513bf6e4715a031369443fc6129b
Parents: d5ab56b 5244512
Author: gbarton <garrett.barton@gmail.com>
Authored: Sun Aug 26 10:49:38 2012 -0400
Committer: gbarton <garrett.barton@gmail.com>
Committed: Sun Aug 26 10:49:38 2012 -0400

----------------------------------------------------------------------
 .../lucene/index/TimeBasedIndexDeletionPolicy.java |   55 ---
 .../blur/lucene/search/SuperQuery.java             |   34 +-
 .../nearinfinity/blur/manager/IndexManager.java    |   35 ++-
 .../blur/manager/stats/LoadFactorProcessor.java    |   26 +-
 .../blur/manager/stats/WeightedAvg.java            |   36 ++-
 .../manager/writer/DirectoryReferenceCounter.java  |    8 -
 .../blur/manager/writer/TransactionRecorder.java   |   22 +-
 .../nearinfinity/blur/thrift/BlurShardServer.java  |    3 +
 .../blur/thrift/ThriftBlurShardServer.java         |    6 +-
 .../index/TimeBasedIndexDeletionPolicyTest.java    |   58 ---
 .../blur/manager/IndexManagerTest.java             |   34 ++-
 .../writer/DirectoryReferenceCounterTest.java      |  324 +++++++++++++++
 .../nearinfinity/blur/lucene/LuceneConstant.java   |    2 +-
 .../apache/lucene/index/WarmUpByFieldBounds.java   |    3 +-
 .../src/main/resources/blur-default.properties     |    1 -
 src/pom.xml                                        |    2 +
 16 files changed, 480 insertions(+), 169 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/3e7ea7fa/src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurShardServer.java
----------------------------------------------------------------------
diff --cc src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurShardServer.java
index 5fb88d7,bb1243d..d98606c
--- a/src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurShardServer.java
+++ b/src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurShardServer.java
@@@ -16,10 -16,7 +16,11 @@@
  
  package com.nearinfinity.blur.thrift;
  
 +import static com.nearinfinity.blur.utils.BlurConstants.*;
 +import static com.nearinfinity.blur.utils.BlurConstants.BLUR_CONTROLLER_BIND_PORT;
 +import static com.nearinfinity.blur.utils.BlurConstants.BLUR_GUI_CONTROLLER_PORT;
 +import static com.nearinfinity.blur.utils.BlurConstants.BLUR_GUI_SHARD_PORT;
+ import static com.nearinfinity.blur.utils.BlurConstants.BLUR_CLUSTER_NAME;
  import static com.nearinfinity.blur.utils.BlurConstants.BLUR_INDEXMANAGER_SEARCH_THREAD_COUNT;
  import static com.nearinfinity.blur.utils.BlurConstants.BLUR_MAX_CLAUSE_COUNT;
  import static com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_BIND_ADDRESS;
@@@ -53,10 -50,8 +54,9 @@@ import org.apache.zookeeper.ZooKeeper
  import com.nearinfinity.blur.BlurConfiguration;
  import com.nearinfinity.blur.concurrent.SimpleUncaughtExceptionHandler;
  import com.nearinfinity.blur.concurrent.ThreadWatcher;
 +import com.nearinfinity.blur.gui.HttpJettyServer;
  import com.nearinfinity.blur.log.Log;
  import com.nearinfinity.blur.log.LogFactory;
- import com.nearinfinity.blur.lucene.index.TimeBasedIndexDeletionPolicy;
  import com.nearinfinity.blur.manager.BlurFilterCache;
  import com.nearinfinity.blur.manager.BlurQueryChecker;
  import com.nearinfinity.blur.manager.DefaultBlurFilterCache;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/3e7ea7fa/src/blur-util/src/main/resources/blur-default.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/3e7ea7fa/src/pom.xml
----------------------------------------------------------------------
diff --cc src/pom.xml
index dee176a,c48402a..0d9600b
--- a/src/pom.xml
+++ b/src/pom.xml
@@@ -14,7 -14,8 +14,9 @@@
  		<module>blur-store</module>
  		<module>blur-mapred</module>
  		<module>blur-util</module>
 +		<module>blur-gui</module>
+ 		<module>blur-jdbc</module>
+                 <module>blur-testsuite</module>
  	</modules>
  	
  	<dependencies>


Mime
View raw message