Author: drew
Date: Thu Jun 27 18:33:01 2013
New Revision: 1497486
URL: http://svn.apache.org/r1497486
Log:
Bare minimum to get Wikisearch to compile under 1.5.0-SNAPSHOT and
maven-sort-plugin
Modified:
accumulo/contrib/wikisearch/trunk/ingest/pom.xml
accumulo/contrib/wikisearch/trunk/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
accumulo/contrib/wikisearch/trunk/pom.xml
accumulo/contrib/wikisearch/trunk/query-war/pom.xml
accumulo/contrib/wikisearch/trunk/query/pom.xml
accumulo/contrib/wikisearch/trunk/query/src/test/java/org/apache/accumulo/examples/wikisearch/logic/TestQueryLogic.java
Modified: accumulo/contrib/wikisearch/trunk/ingest/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/contrib/wikisearch/trunk/ingest/pom.xml?rev=1497486&r1=1497485&r2=1497486&view=diff
==============================================================================
--- accumulo/contrib/wikisearch/trunk/ingest/pom.xml (original)
+++ accumulo/contrib/wikisearch/trunk/ingest/pom.xml Thu Jun 27 18:33:01 2013
@@ -18,53 +18,50 @@
<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/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>accumulo-wikisearch</artifactId>
<groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-wikisearch</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
-
<artifactId>wikisearch-ingest</artifactId>
<name>wikisearch-ingest</name>
-
<dependencies>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-core</artifactId>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-wikipedia</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
</dependency>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-wikipedia</artifactId>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -73,10 +70,10 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>process-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>process-resources</phase>
<configuration>
<outputDirectory>lib</outputDirectory>
<!-- just grab the non-provided runtime dependencies -->
@@ -97,5 +94,4 @@
</plugin>
</plugins>
</build>
-
-</project>
\ No newline at end of file
+</project>
Modified:
accumulo/contrib/wikisearch/trunk/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
URL:
http://svn.apache.org/viewvc/accumulo/contrib/wikisearch/trunk/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java?rev=1497486&r1=1497485&r2=1497486&view=diff
==============================================================================
---
accumulo/contrib/wikisearch/trunk/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
(original)
+++
accumulo/contrib/wikisearch/trunk/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
Thu Jun 27 18:33:01 2013
@@ -31,12 +31,12 @@ import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathExpression;
import javax.xml.xpath.XPathFactory;
-import org.apache.accumulo.core.util.ContextFactory;
import
org.apache.accumulo.examples.wikisearch.ingest.WikipediaInputFormat.WikipediaInputSplit;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.hadoop.mapreduce.TaskAttemptID;
import org.apache.hadoop.mapreduce.lib.input.FileSplit;
import org.junit.Before;
import org.junit.Test;
@@ -97,7 +97,8 @@ public class AggregatingRecordReaderTest
conf.set(AggregatingRecordReader.START_TOKEN, "<doc");
conf.set(AggregatingRecordReader.END_TOKEN, "</doc>");
conf.set(AggregatingRecordReader.RETURN_PARTIAL_MATCHES,
Boolean.toString(true));
- ctx = ContextFactory.createTaskAttemptContext(conf);
+ TaskAttemptID id = new TaskAttemptID();
+ ctx = new TaskAttemptContext(conf, id);
XPath xp = xpFactory.newXPath();
EXPR_A = xp.compile("/doc/a");
EXPR_B = xp.compile("/doc/b");
Modified: accumulo/contrib/wikisearch/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/contrib/wikisearch/trunk/pom.xml?rev=1497486&r1=1497485&r2=1497486&view=diff
==============================================================================
--- accumulo/contrib/wikisearch/trunk/pom.xml (original)
+++ accumulo/contrib/wikisearch/trunk/pom.xml Thu Jun 27 18:33:01 2013
@@ -18,41 +18,122 @@
<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>
- <artifactId>accumulo-examples</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.5.0-SNAPSHOT</version>
+ <artifactId>accumulo-examples</artifactId>
+ <version>1.4.3</version>
</parent>
<artifactId>accumulo-wikisearch</artifactId>
<packaging>pom</packaging>
<name>accumulo-wikisearch</name>
-
<modules>
<module>ingest</module>
<module>query</module>
<module>query-war</module>
</modules>
-
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <version.accumulo>${project.version}</version.accumulo>
+ <version.commons-codec>1.5</version.commons-codec>
+ <version.commons-jexl>2.0.1</version.commons-jexl>
+ <version.commons-lang>2.4</version.commons-lang>
+ <version.ejb-spec-api>1.0.1.Final</version.ejb-spec-api>
+ <version.googlecollections>1.0</version.googlecollections>
+ <version.jaxrs>2.1.0.GA</version.jaxrs>
+ <version.kryo>1.04</version.kryo>
+ <version.libthrift>0.6.1</version.libthrift>
+ <version.log4j>1.2.16</version.log4j>
+ <version.log4j-extras>1.0</version.log4j-extras>
+ <version.lucene>3.0.2</version.lucene>
+ <version.lucene-analyzers>3.0.2</version.lucene-analyzers>
+ <version.lucene-wikipedia>3.0.2</version.lucene-wikipedia>
+ <version.minlog>1.2</version.minlog>
+ <version.protobuf>2.3.0</version.protobuf>
+ <version.zookeeper>3.3.1</version.zookeeper>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ <version>${version.googlecollections}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${version.protobuf}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode</groupId>
+ <artifactId>kryo</artifactId>
+ <version>${version.kryo}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode</groupId>
+ <artifactId>minlog</artifactId>
+ <version>${version.minlog}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ <version>1.11</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>1.11</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${version.commons-codec}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${version.commons-lang}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <version>${version.commons-jexl}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers</artifactId>
+ <version>${version.lucene-analyzers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${version.lucene}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-wikipedia</artifactId>
+ <version>${version.lucene-wikipedia}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<repositories>
<repository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
<id>central</id>
<name>Maven Repository Switchboard</name>
- <layout>default</layout>
<url>http://repo1.maven.org/maven2</url>
+ <layout>default</layout>
+ </repository>
+ <repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
- </repository>
- <repository>
<id>java.net</id>
<name>java.net</name>
- <layout>default</layout>
<url>https://maven.java.net/content/groups/public</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
+ <layout>default</layout>
</repository>
</repositories>
-
<build>
<defaultGoal>package</defaultGoal>
<plugins>
@@ -126,16 +207,16 @@
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
- <inherited>false</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
+ <inherited>false</inherited>
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>process-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>process-resources</phase>
<configuration>
<outputDirectory>../../lib</outputDirectory>
<!-- just grab the non-provided runtime dependencies -->
@@ -148,90 +229,4 @@
</plugin>
</plugins>
</build>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.commons-lang>2.4</version.commons-lang>
- <version.accumulo>${project.version}</version.accumulo>
- <version.commons-jexl>2.0.1</version.commons-jexl>
- <version.commons-codec>1.5</version.commons-codec>
- <version.ejb-spec-api>1.0.1.Final</version.ejb-spec-api>
- <version.jaxrs>2.1.0.GA</version.jaxrs>
- <version.kryo>1.04</version.kryo>
- <version.log4j>1.2.16</version.log4j>
- <version.log4j-extras>1.0</version.log4j-extras>
- <version.lucene>3.0.2</version.lucene>
- <version.lucene-analyzers>3.0.2</version.lucene-analyzers>
- <version.lucene-wikipedia>3.0.2</version.lucene-wikipedia>
- <version.protobuf>2.3.0</version.protobuf>
- <version.googlecollections>1.0</version.googlecollections>
- <version.libthrift>0.6.1</version.libthrift>
- <version.zookeeper>3.3.1</version.zookeeper>
- <version.minlog>1.2</version.minlog>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${version.commons-codec}</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${version.commons-lang}</version>
- </dependency>
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>${version.googlecollections}</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode</groupId>
- <artifactId>kryo</artifactId>
- <version>${version.kryo}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>${version.lucene}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-wikipedia</artifactId>
- <version>${version.lucene-wikipedia}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers</artifactId>
- <version>${version.lucene-analyzers}</version>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${version.protobuf}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jexl</artifactId>
- <version>${version.commons-jexl}</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode</groupId>
- <artifactId>minlog</artifactId>
- <version>${version.minlog}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>1.11</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- <version>1.11</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
</project>
Modified: accumulo/contrib/wikisearch/trunk/query-war/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/contrib/wikisearch/trunk/query-war/pom.xml?rev=1497486&r1=1497485&r2=1497486&view=diff
==============================================================================
--- accumulo/contrib/wikisearch/trunk/query-war/pom.xml (original)
+++ accumulo/contrib/wikisearch/trunk/query-war/pom.xml Thu Jun 27 18:33:01 2013
@@ -18,15 +18,13 @@
<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>
- <artifactId>accumulo-wikisearch</artifactId>
<groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-wikisearch</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
-
<artifactId>wikisearch-query-war</artifactId>
<packaging>war</packaging>
<name>wikisearch-query-war</name>
-
<build>
<plugins>
<plugin>
@@ -47,5 +45,4 @@
</plugin>
</plugins>
</build>
-
</project>
Modified: accumulo/contrib/wikisearch/trunk/query/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/contrib/wikisearch/trunk/query/pom.xml?rev=1497486&r1=1497485&r2=1497486&view=diff
==============================================================================
--- accumulo/contrib/wikisearch/trunk/query/pom.xml (original)
+++ accumulo/contrib/wikisearch/trunk/query/pom.xml Thu Jun 27 18:33:01 2013
@@ -16,75 +16,75 @@
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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>accumulo-wikisearch</artifactId>
<groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-wikisearch</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
-
<artifactId>wikisearch-query</artifactId>
<packaging>ejb</packaging>
<name>wikisearch-query</name>
<dependencies>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-core</artifactId>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
</dependency>
<dependency>
- <groupId>javaee</groupId>
- <artifactId>javaee-api</artifactId>
- <version>5</version>
- <scope>provided</scope>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
+ <groupId>com.googlecode</groupId>
+ <artifactId>kryo</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jexl</artifactId>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</dependency>
<dependency>
- <groupId>com.googlecode</groupId>
- <artifactId>kryo</artifactId>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>wikisearch-ingest</artifactId>
- <version>${project.version}</version>
+ <artifactId>accumulo-core</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>wikisearch-ingest</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jexl</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>javaee</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>5</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
@@ -95,10 +95,10 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>process-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>process-resources</phase>
<configuration>
<outputDirectory>lib</outputDirectory>
<!-- just grab the non-provided runtime dependencies -->
@@ -135,5 +135,4 @@
</plugin>
</plugins>
</build>
- <modelVersion>4.0.0</modelVersion>
</project>
Modified:
accumulo/contrib/wikisearch/trunk/query/src/test/java/org/apache/accumulo/examples/wikisearch/logic/TestQueryLogic.java
URL:
http://svn.apache.org/viewvc/accumulo/contrib/wikisearch/trunk/query/src/test/java/org/apache/accumulo/examples/wikisearch/logic/TestQueryLogic.java?rev=1497486&r1=1497485&r2=1497486&view=diff
==============================================================================
---
accumulo/contrib/wikisearch/trunk/query/src/test/java/org/apache/accumulo/examples/wikisearch/logic/TestQueryLogic.java
(original)
+++
accumulo/contrib/wikisearch/trunk/query/src/test/java/org/apache/accumulo/examples/wikisearch/logic/TestQueryLogic.java
Thu Jun 27 18:33:01 2013
@@ -34,12 +34,12 @@ import org.apache.accumulo.core.client.C
import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.mock.MockInstance;
+import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.util.ContextFactory;
import org.apache.accumulo.examples.wikisearch.ingest.WikipediaConfiguration;
import org.apache.accumulo.examples.wikisearch.ingest.WikipediaIngester;
import
org.apache.accumulo.examples.wikisearch.ingest.WikipediaInputFormat.WikipediaInputSplit;
@@ -58,6 +58,7 @@ import org.apache.hadoop.mapreduce.Mappe
import org.apache.hadoop.mapreduce.OutputCommitter;
import org.apache.hadoop.mapreduce.RecordWriter;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.hadoop.mapreduce.TaskAttemptID;
import org.apache.hadoop.mapreduce.lib.input.FileSplit;
import org.apache.hadoop.mapreduce.lib.output.FileOutputCommitter;
import org.apache.log4j.Level;
@@ -120,14 +121,15 @@ public class TestQueryLogic {
conf.set(WikipediaConfiguration.NUM_GROUPS, "1");
MockInstance i = new MockInstance();
- c = i.getConnector("root", "pass");
+ c = i.getConnector("root", new PasswordToken(""));
WikipediaIngester.createTables(c.tableOperations(), TABLE_NAME, false);
for (String table : TABLE_NAMES) {
writerMap.put(new Text(table), c.createBatchWriter(table, 1000L, 1000L,
1));
}
- TaskAttemptContext context = ContextFactory.createTaskAttemptContext(conf);
-
+ TaskAttemptID id = new TaskAttemptID();
+ TaskAttemptContext context = new TaskAttemptContext(conf, id);
+
RawLocalFileSystem fs = new RawLocalFileSystem();
fs.setConf(conf);
@@ -148,7 +150,7 @@ public class TestQueryLogic {
WikipediaMapper mapper = new WikipediaMapper();
// Load data into Mock Accumulo
- Mapper<LongWritable,Text,Text,Mutation>.Context con =
ContextFactory.createMapContext(mapper, context, rr, rw, oc, sr, split);
+ Mapper<LongWritable,Text,Text,Mutation>.Context con = mapper.new
Context(conf, id, rr, rw, oc, sr, split);
mapper.run(con);
// Flush and close record writers.
