Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

migrated to Solr 4.0.0-BETA

  • Loading branch information...
commit c3d9e8fb28c2a079008ab9edb57dc38c3f67b03a 1 parent 81c56e2
Eric Palacios authored
View
7 CHANGES.txt
@@ -1,7 +1,12 @@
Pangool Change Log
====================
-Pangool 0.43.3 (development)
+Pangool 0.43.4 (development)
+
+ CHANGES
+ - 2012-10-09 - Migrated to Solr 4.0.0-BETA
+
+Pangool 0.43.3 (2012-10-01)
IMPROVEMENTS
- 2012-10-1 - Solved bug in TupleSolrOutputFormat inherited from SolrOutputFormat where Hadoop Temp folder was not deleted if it existed
View
26 core/pom.xml
@@ -27,6 +27,7 @@
</parent>
<artifactId>pangool-core</artifactId>
<properties>
+ <!-- hadoop.version>0.20.205.0</hadoop.version-->
<hadoop.version>0.20.2</hadoop.version>
<jackson.version>1.7.9</jackson.version>
<avro.version>1.6.3</avro.version>
@@ -34,11 +35,11 @@
</properties>
<dependencies>
- <dependency>
+ <dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>2.3</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>colt</groupId>
<artifactId>colt</artifactId>
@@ -96,6 +97,12 @@
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>0.6.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Xerces for XML parsing -->
<dependency>
@@ -162,17 +169,7 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
- <version>3.3.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </exclusion>
- </exclusions>
+ <version>4.0.0-BETA</version>
</dependency>
</dependencies>
@@ -320,7 +317,4 @@
</build>
</profile> -->
</profiles>
-
-
- <!-- ///////////////// -->
</project>
View
4 core/src/test/java/com/datasalt/pangool/solr/TupleSolrOutputFormatExample.java
@@ -27,6 +27,7 @@
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
+import com.datasalt.pangool.PangoolRuntimeException;
import com.datasalt.pangool.io.Fields;
import com.datasalt.pangool.io.ITuple;
import com.datasalt.pangool.io.Schema;
@@ -86,6 +87,9 @@ public void map(LongWritable key, Text value, TupleMRContext context, Collector
job.setOutput(new Path(output), new TupleSolrOutputFormat(new File("src/test/resources/solr-en"), conf), ITuple.class, NullWritable.class);
Job hadoopJob = job.createJob();
hadoopJob.waitForCompletion(true);
+ if (!hadoopJob.isSuccessful()){
+ throw new PangoolRuntimeException("Job was not sucessfull");
+ }
return 0;
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.