incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [45/45] git commit: Merge branch 'master' into apache-blur-0.2
Date Sat, 28 Sep 2013 02:12:31 GMT
Merge branch 'master' into apache-blur-0.2

Conflicts:
	blur-core/pom.xml
	blur-gui/pom.xml
	blur-jdbc/pom.xml
	blur-mapred/pom.xml
	blur-query/pom.xml
	blur-shell/pom.xml
	blur-store/pom.xml
	blur-thrift/pom.xml
	blur-util/pom.xml
	contrib/blur-console/blur-agent/pom.xml
	distribution/pom.xml
	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/6a934338
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/6a934338
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/6a934338

Branch: refs/heads/apache-blur-0.2
Commit: 6a9343389d220cd6dc09873ebb8d4287b55e598c
Parents: 1925af6 25fb703
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Fri Sep 27 22:11:13 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Fri Sep 27 22:11:13 2013 -0400

----------------------------------------------------------------------
 blur-core/pom.xml                               |   9 +-
 .../org/apache/blur/manager/IndexManager.java   |  45 +--
 .../blur/manager/writer/BlurIndexReader.java    |   1 -
 .../manager/writer/SharedMergeScheduler.java    |   8 +-
 .../manager/writer/TransactionRecorder.java     |   7 +
 .../blur/thrift/BlurControllerServer.java       |  19 +-
 .../blur/thrift/ThriftBlurControllerServer.java |  22 +-
 .../blur/thrift/ThriftBlurShardServer.java      |  95 +++--
 .../org/apache/blur/thrift/ThriftServer.java    |  51 ++-
 blur-core/src/main/resources/log4j.properties   |  51 ---
 .../test/java/org/apache/blur/MiniCluster.java  | 293 ++++++--------
 .../apache/blur/manager/IndexManagerTest.java   |  62 ++-
 .../ZookeeperClusterStatusTest.java             |  90 +++--
 .../blur/manager/indexserver/SafeModeTest.java  |  62 ++-
 .../manager/writer/BlurIndexReaderTest.java     |   1 +
 .../manager/writer/TransactionRecorderTest.java |  39 +-
 .../org/apache/blur/thrift/BlurClusterTest.java |  76 ++--
 blur-gui/pom.xml                                |   2 +-
 blur-jdbc/pom.xml                               |   2 +-
 blur-mapred/pom.xml                             |   2 +-
 .../mapreduce/lib/BlurOutputFormatTest.java     |   2 +-
 blur-query/pom.xml                              |   2 +-
 .../type/DoubleFieldTypeDefinition.java         |  14 +-
 .../analysis/type/FloatFieldTypeDefinition.java |  13 +-
 .../analysis/type/IntFieldTypeDefinition.java   |  14 +-
 .../analysis/type/LongFieldTypeDefinition.java  |  14 +-
 .../type/NumericFieldTypeDefinition.java        |   3 +
 blur-shell/pom.xml                              |   2 +-
 .../blur/shell/CreateSnapshotCommand.java       |  55 +++
 .../apache/blur/shell/ListSnapshotsCommand.java |  70 ++++
 .../main/java/org/apache/blur/shell/Main.java   |   6 +-
 .../blur/shell/RemoveSnapshotCommand.java       |  53 +++
 .../org/apache/blur/shell/TermsDataCommand.java | 147 +++++++
 blur-store/pom.xml                              |   2 +-
 .../apache/blur/lucene/warmup/IndexWarmup.java  |  63 +--
 .../store/BlockCacheDirectoryFactoryV2.java     |  70 ++++
 .../blur/store/blockcache_v2/BaseCache.java     | 210 ++++++++++
 .../apache/blur/store/blockcache_v2/Cache.java  | 138 +++++++
 .../store/blockcache_v2/CacheDirectory.java     | 147 +++++++
 .../store/blockcache_v2/CacheIndexInput.java    | 174 ++++++++
 .../store/blockcache_v2/CacheIndexOutput.java   | 138 +++++++
 .../blur/store/blockcache_v2/CacheKey.java      |  89 ++++
 .../blur/store/blockcache_v2/CacheValue.java    |  93 +++++
 .../store/blockcache_v2/FileNameBlockSize.java  |  24 ++
 .../store/blockcache_v2/FileNameFilter.java     |  24 ++
 .../cachevalue/BaseCacheValue.java              |  83 ++++
 .../cachevalue/ByteArrayCacheValue.java         |  55 +++
 .../cachevalue/UnsafeCacheValue.java            | 106 +++++
 .../apache/blur/store/hdfs/HdfsDirectory.java   | 294 ++++++--------
 .../apache/blur/store/hdfs/HdfsIndexInput.java  | 107 +++++
 .../apache/blur/store/hdfs/MetricsGroup.java    |  35 ++
 .../blur/store/hdfs/SoftlinkHdfsDirectory.java  | 201 +++++++++
 .../blur/store/BaseDirectoryTestSuite.java      | 375 +++++++++++++++++
 .../blur/store/CacheDirectoryTestSuite.java     |  69 ++++
 .../store/CacheDirectoryTestSuiteOffHeap.java   |  33 ++
 .../store/CacheDirectoryTestSuiteOnHeap.java    |  33 ++
 .../apache/blur/store/HdfsDirectoryTest.java    | 206 ----------
 .../blur/store/HdfsDirectoryTestSuite.java      |  41 ++
 .../store/SoftlinkHdfsDirectoryTestSuite.java   |  43 ++
 .../blur/store/blockcache/BlockCacheTest.java   |   4 +-
 .../store/blockcache_v2/CacheDirectoryTest.java | 164 ++++++++
 .../blockcache_v2/CacheIndexInputTest.java      | 208 ++++++++++
 .../blockcache_v2/CacheIndexOutputTest.java     | 104 +++++
 .../cachevalue/ByteArrayCacheValueTest.java     |  68 ++++
 .../cachevalue/UnsafeCacheValueTest.java        |  68 ++++
 blur-thrift/pom.xml                             |   2 +-
 .../transport/TNonblockingServerSocket.java     |  20 +-
 blur-util/pom.xml                               |  14 +-
 .../apache/blur/zookeeper/ZkMiniCluster.java    | 192 +++++++++
 .../org/apache/blur/zookeeper/ZkUtilsTest.java  |  27 +-
 contrib/blur-console/blur-agent/pom.xml         |  22 +-
 contrib/blur-titan/pom.xml                      |  80 ++++
 .../java/org/apache/blur/titan/BlurIndex.java   | 404 +++++++++++++++++++
 distribution/pom.xml                            |   2 +-
 docs/data-model.html                            |  22 +-
 pom.xml                                         |   3 +-
 76 files changed, 4694 insertions(+), 895 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/6a934338/blur-core/pom.xml
----------------------------------------------------------------------
diff --cc blur-core/pom.xml
index d11963a,e5792e3..cc54d0b
--- a/blur-core/pom.xml
+++ b/blur-core/pom.xml
@@@ -23,7 -23,7 +23,7 @@@ under the License
  	<parent>
  		<groupId>org.apache.blur</groupId>
  		<artifactId>blur</artifactId>
- 		<version>0.2.0-incubating</version>
 -		<version>0.3.0-incubating-SNAPSHOT</version>
++		<version>0.2.1-incubating-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
  	</parent>
  	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/6a934338/blur-gui/pom.xml
----------------------------------------------------------------------
diff --cc blur-gui/pom.xml
index d3582b7,21a07c5..355bd69
--- a/blur-gui/pom.xml
+++ b/blur-gui/pom.xml
@@@ -23,7 -23,7 +23,7 @@@ under the License
  	<parent>
  		<groupId>org.apache.blur</groupId>
  		<artifactId>blur</artifactId>
- 		<version>0.2.0-incubating</version>
 -		<version>0.3.0-incubating-SNAPSHOT</version>
++		<version>0.2.1-incubating-SNAPSHOT</version>
  		<relativePath>../pom.xml</relativePath>
  	</parent>
  	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/6a934338/blur-jdbc/pom.xml
----------------------------------------------------------------------
diff --cc blur-jdbc/pom.xml
index 9286358,d66ce21..0d34d95
--- a/blur-jdbc/pom.xml
+++ b/blur-jdbc/pom.xml
@@@ -22,7 -22,7 +22,7 @@@ under the License
  	<parent>
  		<groupId>org.apache.blur</groupId>
  		<artifactId>blur</artifactId>
- 		<version>0.2.0-incubating</version>
 -		<version>0.3.0-incubating-SNAPSHOT</version>
++		<version>0.2.1-incubating-SNAPSHOT</version>
  		<relativePath>../pom.xml</relativePath>
  	</parent>
  	<modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/6a934338/blur-mapred/pom.xml
----------------------------------------------------------------------
diff --cc blur-mapred/pom.xml
index 8da0e5e,6cefdd4..dbf7522
--- a/blur-mapred/pom.xml
+++ b/blur-mapred/pom.xml
@@@ -23,7 -23,7 +23,7 @@@ under the License
  	<parent>
  		<groupId>org.apache.blur</groupId>
  		<artifactId>blur</artifactId>
- 		<version>0.2.0-incubating</version>
 -		<version>0.3.0-incubating-SNAPSHOT</version>
++		<version>0.2.1-incubating-SNAPSHOT</version>
  		<relativePath>../pom.xml</relativePath>
  	</parent>
  	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/6a934338/blur-query/pom.xml
----------------------------------------------------------------------
diff --cc blur-query/pom.xml
index b6c2907,a189aba..7c3625d
--- a/blur-query/pom.xml
+++ b/blur-query/pom.xml
@@@ -23,7 -23,7 +23,7 @@@ under the License
  	<parent>
  		<groupId>org.apache.blur</groupId>
  		<artifactId>blur</artifactId>
- 		<version>0.2.0-incubating</version>
 -		<version>0.3.0-incubating-SNAPSHOT</version>
++		<version>0.2.1-incubating-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
  	</parent>
  	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/6a934338/blur-shell/pom.xml
----------------------------------------------------------------------
diff --cc blur-shell/pom.xml
index cc52325,52bdf53..e61b0c8
--- a/blur-shell/pom.xml
+++ b/blur-shell/pom.xml
@@@ -23,7 -23,7 +23,7 @@@ under the License
  	<parent>
  		<groupId>org.apache.blur</groupId>
  		<artifactId>blur</artifactId>
- 		<version>0.2.0-incubating</version>
 -		<version>0.3.0-incubating-SNAPSHOT</version>
++		<version>0.2.1-incubating-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
  	</parent>
  	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/6a934338/blur-store/pom.xml
----------------------------------------------------------------------
diff --cc blur-store/pom.xml
index 3bd51f5,037ce3f..b2225e9
--- a/blur-store/pom.xml
+++ b/blur-store/pom.xml
@@@ -23,7 -23,7 +23,7 @@@ under the License
  	<parent>
  		<groupId>org.apache.blur</groupId>
  		<artifactId>blur</artifactId>
- 		<version>0.2.0-incubating</version>
 -		<version>0.3.0-incubating-SNAPSHOT</version>
++		<version>0.2.1-incubating-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
  	</parent>
  	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/6a934338/blur-thrift/pom.xml
----------------------------------------------------------------------
diff --cc blur-thrift/pom.xml
index 21753ec,cdec767..1cdfa10
--- a/blur-thrift/pom.xml
+++ b/blur-thrift/pom.xml
@@@ -23,7 -23,7 +23,7 @@@ under the License
  	<parent>
  		<groupId>org.apache.blur</groupId>
  		<artifactId>blur</artifactId>
- 		<version>0.2.0-incubating</version>
 -		<version>0.3.0-incubating-SNAPSHOT</version>
++		<version>0.2.1-incubating-SNAPSHOT</version>
  		<relativePath>../pom.xml</relativePath>
  	</parent>
  	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/6a934338/blur-util/pom.xml
----------------------------------------------------------------------
diff --cc blur-util/pom.xml
index 7628b4e,44f6274..94a050e
--- a/blur-util/pom.xml
+++ b/blur-util/pom.xml
@@@ -23,7 -23,7 +23,7 @@@ under the License
  	<parent>
  		<groupId>org.apache.blur</groupId>
  		<artifactId>blur</artifactId>
- 		<version>0.2.0-incubating</version>
 -		<version>0.3.0-incubating-SNAPSHOT</version>
++		<version>0.2.1-incubating-SNAPSHOT</version>
  		<relativePath>../pom.xml</relativePath>
  	</parent>
  	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/6a934338/contrib/blur-console/blur-agent/pom.xml
----------------------------------------------------------------------
diff --cc contrib/blur-console/blur-agent/pom.xml
index 6a3a84c,965655e..21ea899
--- a/contrib/blur-console/blur-agent/pom.xml
+++ b/contrib/blur-console/blur-agent/pom.xml
@@@ -23,7 -23,7 +23,7 @@@ under the License
  		<parent>
  		<groupId>org.apache.blur</groupId>
  		<artifactId>blur</artifactId>
- 		<version>0.2.0-incubating</version>
 -		<version>0.3.0-incubating-SNAPSHOT</version>
++		<version>0.2.1-incubating-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
  	</parent>
  	<groupId>org.apache.blur</groupId>
@@@ -77,12 -77,12 +77,20 @@@
  		<dependency>
  			<groupId>org.apache.blur</groupId>
  			<artifactId>blur-thrift</artifactId>
++<<<<<<< HEAD
 +			<version>0.2.0-incubating</version>
++=======
+ 			<version>0.3.0-incubating-SNAPSHOT</version>
++>>>>>>> master
  		</dependency>
  		<dependency>
  			<groupId>org.apache.blur</groupId>
  			<artifactId>blur-util</artifactId>
++<<<<<<< HEAD
 +			<version>0.2.0-incubating</version>
++=======
+ 			<version>0.3.0-incubating-SNAPSHOT</version>
++>>>>>>> master
  		</dependency>
  		<dependency>
  			<groupId>org.slf4j</groupId>
@@@ -128,13 -128,13 +136,21 @@@
  		<dependency>
  			<groupId>org.apache.blur</groupId>
  			<artifactId>blur-core</artifactId>
++<<<<<<< HEAD
 +			<version>0.2.0-incubating</version>
++=======
+ 			<version>0.3.0-incubating-SNAPSHOT</version>
++>>>>>>> master
  			<scope>test</scope>
  		</dependency>
  		<dependency>
  			<groupId>org.apache.blur</groupId>
  			<artifactId>blur-core</artifactId>
++<<<<<<< HEAD
 +			<version>0.2.0-incubating</version>
++=======
+ 			<version>0.3.0-incubating-SNAPSHOT</version>
++>>>>>>> master
  			<type>test-jar</type>
  			<scope>test</scope>
  		</dependency>
@@@ -147,7 -147,7 +163,11 @@@
  		<dependency>
  			<groupId>org.apache.blur</groupId>
  			<artifactId>blur-store</artifactId>
++<<<<<<< HEAD
 +			<version>0.2.0-incubating</version>
++=======
+ 			<version>0.3.0-incubating-SNAPSHOT</version>
++>>>>>>> master
  			<scope>test</scope>
  		</dependency>
  		<dependency>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/6a934338/contrib/blur-titan/pom.xml
----------------------------------------------------------------------
diff --cc contrib/blur-titan/pom.xml
index 0000000,7295ada..370bf85
mode 000000,100644..100644
--- a/contrib/blur-titan/pom.xml
+++ b/contrib/blur-titan/pom.xml
@@@ -1,0 -1,80 +1,80 @@@
+ <?xml version="1.0" encoding="UTF-8" ?>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ 	<modelVersion>4.0.0</modelVersion>
+ 	<parent>
+ 		<groupId>org.apache.blur</groupId>
+ 		<artifactId>blur</artifactId>
 -		<version>0.3.0-incubating-SNAPSHOT</version>
++		<version>0.2.1-incubating-SNAPSHOT</version>
+ 		<relativePath>../pom.xml</relativePath>
+ 	</parent>
+ 	<groupId>org.apache.blur</groupId>
+ 	<artifactId>blur-titan</artifactId>
+ 	<packaging>jar</packaging>
+ 	<name>Blur Titan</name>
+ 
+ 	<dependencies>
+        <dependency>
+           <groupId>org.apache.blur</groupId>
+           <artifactId>blur-thrift</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+        <dependency>
+           <groupId>com.thinkaurelius.titan</groupId>
+           <artifactId>titan-core</artifactId>
+           <version>0.3.2</version>
+           <scope>provided</scope>
+        </dependency>
+ 	</dependencies>
+ 
+ 	<build>
+ 		<pluginManagement>
+ 			<plugins>
+ 				<plugin>
+ 					<groupId>org.apache.maven.plugins</groupId>
+ 					<artifactId>maven-compiler-plugin</artifactId>
+ 					<configuration>
+ 						<source>1.6</source>
+ 						<target>1.6</target>
+ 					</configuration>
+ 				</plugin>
+ 				<plugin>
+ 					<artifactId>maven-assembly-plugin</artifactId>
+ 					<configuration>
+ 						<descriptorRefs>
+ 							<descriptorRef>jar-with-dependencies</descriptorRef>
+ 						</descriptorRefs>
+ 					</configuration>
+ 
+ 					<executions>
+ 						<execution>
+ 							<id>make-assembly</id>
+ 							<phase>package</phase>
+ 							<goals>
+ 								<goal>attached</goal>
+ 							</goals>
+ 						</execution>
+ 					</executions>
+ 				</plugin>
+ 			</plugins>
+ 		</pluginManagement>
+ 	</build>
+ </project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/6a934338/distribution/pom.xml
----------------------------------------------------------------------
diff --cc distribution/pom.xml
index 96fbae2,0f5275d..e940804
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@@ -23,7 -23,7 +23,7 @@@ under the License
  	<parent>
  		<groupId>org.apache.blur</groupId>
  		<artifactId>blur</artifactId>
- 		<version>0.2.0-incubating</version>
 -		<version>0.3.0-incubating-SNAPSHOT</version>
++		<version>0.2.1-incubating-SNAPSHOT</version>
  		<relativePath>../pom.xml</relativePath>
  	</parent>
  

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/6a934338/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0df2959,6b70353..9fff5bf
--- a/pom.xml
+++ b/pom.xml
@@@ -29,7 -29,7 +29,7 @@@ under the License
  
  	<groupId>org.apache.blur</groupId>
  	<artifactId>blur</artifactId>
- 	<version>0.2.0-incubating</version>
 -	<version>0.3.0-incubating-SNAPSHOT</version>
++	<version>0.2.1-incubating-SNAPSHOT</version>
  	<packaging>pom</packaging>
  
  	<name>Blur</name>


Mime
View raw message