incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [3/3] git commit: Small cleanup before starting the larger task of adding the input/outputformats in the mapred and mapreduce packages.
Date Fri, 14 Sep 2012 12:50:46 GMT
Small cleanup before starting the larger task of adding the input/outputformats in the mapred
and mapreduce packages.


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

Branch: refs/heads/master
Commit: 7952e6ea2cc3472f5929877dffa8a51e57986b75
Parents: 8901ad6
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Fri Sep 14 08:48:03 2012 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Fri Sep 14 08:48:03 2012 -0400

----------------------------------------------------------------------
 src/blur-mapred/pom.xml                            |   46 +++++++++------
 .../example/BlurExampleIndexerUpdate.java          |    6 --
 2 files changed, 28 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7952e6ea/src/blur-mapred/pom.xml
----------------------------------------------------------------------
diff --git a/src/blur-mapred/pom.xml b/src/blur-mapred/pom.xml
index 9eb37fa..81546c3 100644
--- a/src/blur-mapred/pom.xml
+++ b/src/blur-mapred/pom.xml
@@ -1,22 +1,14 @@
 <?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.
--->
+<!-- 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">
 	<parent>
@@ -127,6 +119,24 @@ under the License.
 					</execution>
 				</executions>
 			</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>
 	</build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7952e6ea/src/blur-mapred/src/main/java/org/apache/blur/mapreduce/example/BlurExampleIndexerUpdate.java
----------------------------------------------------------------------
diff --git a/src/blur-mapred/src/main/java/org/apache/blur/mapreduce/example/BlurExampleIndexerUpdate.java
b/src/blur-mapred/src/main/java/org/apache/blur/mapreduce/example/BlurExampleIndexerUpdate.java
index 6ffe837..87cb59d 100644
--- a/src/blur-mapred/src/main/java/org/apache/blur/mapreduce/example/BlurExampleIndexerUpdate.java
+++ b/src/blur-mapred/src/main/java/org/apache/blur/mapreduce/example/BlurExampleIndexerUpdate.java
@@ -21,8 +21,6 @@ import java.io.IOException;
 import org.apache.blur.manager.clusterstatus.ZookeeperClusterStatus;
 import org.apache.blur.mapreduce.BlurTask;
 import org.apache.blur.mapreduce.BlurTask.INDEXING_TYPE;
-import org.apache.blur.thrift.generated.AnalyzerDefinition;
-import org.apache.blur.thrift.generated.ColumnDefinition;
 import org.apache.blur.thrift.generated.TableDescriptor;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
@@ -32,7 +30,6 @@ import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
 import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
 import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat;
 import org.apache.hadoop.util.GenericOptionsParser;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
 
 
 public class BlurExampleIndexerUpdate {
@@ -45,9 +42,6 @@ public class BlurExampleIndexerUpdate {
       System.exit(2);
     }
 
-    AnalyzerDefinition ad = new AnalyzerDefinition();
-    ad.defaultDefinition = new ColumnDefinition(StandardAnalyzer.class.getName(), true, null);
-
     ZookeeperClusterStatus status = new ZookeeperClusterStatus("localhost");
     TableDescriptor descriptor = status.getTableDescriptor(false, "default", "test-table");
 


Mime
View raw message