Skip to content
This repository
Browse code

migrated to Solr 4.0.0-BETA

  • Loading branch information...
commit c3d9e8fb28c2a079008ab9edb57dc38c3f67b03a 1 parent 81c56e2
Eric Palacios authored
7 CHANGES.txt
... ... @@ -1,7 +1,12 @@
1 1 Pangool Change Log
2 2 ====================
3 3
4   -Pangool 0.43.3 (development)
  4 +Pangool 0.43.4 (development)
  5 +
  6 + CHANGES
  7 + - 2012-10-09 - Migrated to Solr 4.0.0-BETA
  8 +
  9 +Pangool 0.43.3 (2012-10-01)
5 10
6 11 IMPROVEMENTS
7 12 - 2012-10-1 - Solved bug in TupleSolrOutputFormat inherited from SolrOutputFormat where Hadoop Temp folder was not deleted if it existed
26 core/pom.xml
@@ -27,6 +27,7 @@
27 27 </parent>
28 28 <artifactId>pangool-core</artifactId>
29 29 <properties>
  30 + <!-- hadoop.version>0.20.205.0</hadoop.version-->
30 31 <hadoop.version>0.20.2</hadoop.version>
31 32 <jackson.version>1.7.9</jackson.version>
32 33 <avro.version>1.6.3</avro.version>
@@ -34,11 +35,11 @@
34 35 </properties>
35 36
36 37 <dependencies>
37   - <dependency>
  38 + <dependency>
38 39 <groupId>net.sf.opencsv</groupId>
39 40 <artifactId>opencsv</artifactId>
40 41 <version>2.3</version>
41   - </dependency>
  42 + </dependency>
42 43 <dependency>
43 44 <groupId>colt</groupId>
44 45 <artifactId>colt</artifactId>
@@ -96,6 +97,12 @@
96 97 <groupId>org.apache.thrift</groupId>
97 98 <artifactId>libthrift</artifactId>
98 99 <version>0.6.1</version>
  100 + <exclusions>
  101 + <exclusion>
  102 + <artifactId>httpclient</artifactId>
  103 + <groupId>org.apache.httpcomponents</groupId>
  104 + </exclusion>
  105 + </exclusions>
99 106 </dependency>
100 107 <!-- Xerces for XML parsing -->
101 108 <dependency>
@@ -162,17 +169,7 @@
162 169 <dependency>
163 170 <groupId>org.apache.solr</groupId>
164 171 <artifactId>solr-core</artifactId>
165   - <version>3.3.0</version>
166   - <exclusions>
167   - <exclusion>
168   - <groupId>org.apache.zookeeper</groupId>
169   - <artifactId>zookeeper</artifactId>
170   - </exclusion>
171   - <exclusion>
172   - <groupId>org.slf4j</groupId>
173   - <artifactId>slf4j-jdk14</artifactId>
174   - </exclusion>
175   - </exclusions>
  172 + <version>4.0.0-BETA</version>
176 173 </dependency>
177 174 </dependencies>
178 175
@@ -320,7 +317,4 @@
320 317 </build>
321 318 </profile> -->
322 319 </profiles>
323   -
324   -
325   - <!-- ///////////////// -->
326 320 </project>
4 core/src/test/java/com/datasalt/pangool/solr/TupleSolrOutputFormatExample.java
@@ -27,6 +27,7 @@
27 27 import org.apache.hadoop.mapreduce.Job;
28 28 import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
29 29
  30 +import com.datasalt.pangool.PangoolRuntimeException;
30 31 import com.datasalt.pangool.io.Fields;
31 32 import com.datasalt.pangool.io.ITuple;
32 33 import com.datasalt.pangool.io.Schema;
@@ -86,6 +87,9 @@ public void map(LongWritable key, Text value, TupleMRContext context, Collector
86 87 job.setOutput(new Path(output), new TupleSolrOutputFormat(new File("src/test/resources/solr-en"), conf), ITuple.class, NullWritable.class);
87 88 Job hadoopJob = job.createJob();
88 89 hadoopJob.waitForCompletion(true);
  90 + if (!hadoopJob.isSuccessful()){
  91 + throw new PangoolRuntimeException("Job was not sucessfull");
  92 + }
89 93 return 0;
90 94 }
91 95 }

0 comments on commit c3d9e8f

Please sign in to comment.
Something went wrong with that request. Please try again.