Updates due to astralway org rename
* Updated fluo-recipes to 1.0.0-incubating-SNAPSHOT
* Fixed markdown style in README
* Removed license header
diff --git a/.travis.yml b/.travis.yml
index 23028a3..e36964e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,3 @@
-# Copyright 2015 Fluo authors (see AUTHORS)
-#
-# Licensed 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.
language: java
jdk:
- oraclejdk8
diff --git a/README.md b/README.md
index fd5b9a2..74a6509 100644
--- a/README.md
+++ b/README.md
@@ -1,31 +1,26 @@
-Phrase Count
-============
+# Phrase Count
-[](https://travis-ci.org/fluo-io/phrasecount)
+[](https://travis-ci.org/astralway/phrasecount)
-An example application that computes phrase counts for unique documents using
-Fluo. Each unique document that is added causes phrase counts to be
-incremented. Unique documents have reference counts based on the number of
-locations that point to them. When a unique document is no longer referenced
-by any location, then the phrase counts will be decremented appropriately.
+An example application that computes phrase counts for unique documents using Apache Fluo. Each
+unique document that is added causes phrase counts to be incremented. Unique documents have
+reference counts based on the number of locations that point to them. When a unique document is no
+longer referenced by any location, then the phrase counts will be decremented appropriately.
-After phrase counts are incremented, export transactions send phrase counts to
-an Accumulo table. The purpose of exporting data is to make it available for
-query. Percolator is not designed to support queries, because its transactions
-are designed for throughput and not responsiveness.
+After phrase counts are incremented, export transactions send phrase counts to an Accumulo table.
+The purpose of exporting data is to make it available for query. Percolator is not designed to
+support queries, because its transactions are designed for throughput and not responsiveness.
-This example uses the Collistion Free Map and Export Queue from
-[Fluo Recipes][11]. A Collision Free Map is used to calculate phrase counts.
-An Export Queue is used to update the external Accumulo table in a fault
-tolerant manner. Before using Fluo Recipes this example was quite complex.
-Switching to Fluo Recipes dramatically simplified this example.
+This example uses the Collision Free Map and Export Queue from [Apache Fluo Recipes][11]. A
+Collision Free Map is used to calculate phrase counts. An Export Queue is used to update the
+external Accumulo table in a fault tolerant manner. Before using Fluo Recipes, this example was
+quite complex. Switching to Fluo Recipes dramatically simplified this example.
-Schema
-------
+## Schema
### Fluo Table Schema
-This example uses the following schema for the table used by Fluo.
+This example uses the following schema for the table used by Apache Fluo.
Row | Column | Value | Purpose
-------------|---------------|-------------------|---------------------------------------------------------------------
@@ -52,8 +47,7 @@
[PhraseCountTable][14] encapsulates all of the code for interacting with this
external table.
-Code Overview
--------------
+## Code Overview
Documents are loaded into the Fluo table by [DocumentLoader][1] which is
executed by [Load][2]. [DocumentLoader][1] handles reference counting of
@@ -69,8 +63,7 @@
All observers and recipes are configured by code in [Application][10]. All
observers are run by the Fluo worker processes when notifications trigger them.
-Building
---------
+## Building
After cloning this repository, build with following command.
@@ -78,8 +71,7 @@
mvn package
```
-Running via Maven
------------------
+## Running via Maven
If you do not have Accumulo, Hadoop, Zookeeper, and Fluo setup, then you can
start an MiniFluo instance with the [mini.sh](bin/mini.sh) script. This script
@@ -133,8 +125,7 @@
pkill -f phrasecount.cmd.Mini
```
-Deploying example
------------------
+## Deploying example
The following script can run this example on a cluster using the Fluo
distribution and serves as executable documentation for deployment. The
@@ -144,11 +135,10 @@
* [run.sh] (bin/run.sh) : Runs this example with YARN using the Fluo tar
distribution. Running in this way requires setting up Hadoop, Zookeeper,
- and Accumulo instances separately. The [fluo-dev][8] and [Zetten][9]
+ and Accumulo instances separately. The [Uno][8] and [Muchos][9]
projects were created to ease setting up these external dependencies.
-Generating data
----------------
+## Generating data
Need some data? Use `elinks` to generate text files from web pages.
@@ -165,10 +155,10 @@
[4]: src/main/java/phrasecount/PhraseMap.java
[5]: src/main/java/phrasecount/PhraseExporter.java
[7]: src/test/resources/log4j.properties
-[8]: https://github.com/fluo-io/fluo-dev
-[9]: https://github.com/fluo-io/zetten
+[8]: https://github.com/astralway/uno
+[9]: https://github.com/astralway/muchos
[10]: src/main/java/phrasecount/Application.java
-[11]: https://github.com/fluo-io/fluo-recipes
+[11]: https://github.com/apache/fluo-recipes
[12]: src/main/java/phrasecount/cmd/Mini.java
[13]: src/main/java/phrasecount/cmd/Print.java
[14]: src/main/java/phrasecount/query/PhraseCountTable.java
diff --git a/pom.xml b/pom.xml
index 12f5487..447445c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,19 +2,19 @@
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>
- <groupId>org.apache.fluo</groupId>
+ <groupId>io.github.astralway</groupId>
<artifactId>phrasecount</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>phrasecount</name>
- <url>https://github.com/fluo-io/phrasecount</url>
+ <url>https://github.com/astralway/phrasecount</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<accumulo.version>1.6.1</accumulo.version>
<fluo.version>1.0.0-incubating-SNAPSHOT</fluo.version>
- <fluo-recipes.version>1.0.0-beta-3-SNAPSHOT</fluo-recipes.version>
+ <fluo-recipes.version>1.0.0-incubating-SNAPSHOT</fluo-recipes.version>
</properties>
<build>
@@ -78,7 +78,6 @@
<artifactId>fluo-recipes-kryo</artifactId>
<version>${fluo-recipes.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
diff --git a/src/main/java/phrasecount/cmd/Mini.java b/src/main/java/phrasecount/cmd/Mini.java
index 40ff010..e43c1f5 100644
--- a/src/main/java/phrasecount/cmd/Mini.java
+++ b/src/main/java/phrasecount/cmd/Mini.java
@@ -13,7 +13,7 @@
import org.apache.accumulo.minicluster.MiniAccumuloCluster;
import org.apache.accumulo.minicluster.MiniAccumuloConfig;
import org.apache.accumulo.minicluster.ServerType;
-import org.apache.fluo.api.client.FluoAdmin.InitOpts;
+import org.apache.fluo.api.client.FluoAdmin.InitializationOptions;
import org.apache.fluo.api.client.FluoFactory;
import org.apache.fluo.api.config.FluoConfiguration;
import org.apache.fluo.api.mini.MiniFluo;
@@ -85,7 +85,7 @@
Application.configure(fluoConfig, new Application.Options(17, 17, cluster.getInstanceName(),
cluster.getZooKeepers(), "root", "secret", "pcExport"));
- FluoFactory.newAdmin(fluoConfig).initialize(new InitOpts());
+ FluoFactory.newAdmin(fluoConfig).initialize(new InitializationOptions());
MiniFluo miniFluo = FluoFactory.newMiniFluo(fluoConfig);
diff --git a/src/test/java/phrasecount/PhraseCounterTest.java b/src/test/java/phrasecount/PhraseCounterTest.java
index bd56d14..5815883 100644
--- a/src/test/java/phrasecount/PhraseCounterTest.java
+++ b/src/test/java/phrasecount/PhraseCounterTest.java
@@ -7,7 +7,7 @@
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.minicluster.MiniAccumuloCluster;
import org.apache.accumulo.minicluster.MiniAccumuloConfig;
-import org.apache.fluo.api.client.FluoAdmin.InitOpts;
+import org.apache.fluo.api.client.FluoAdmin.InitializationOptions;
import org.apache.fluo.api.client.FluoClient;
import org.apache.fluo.api.client.FluoFactory;
import org.apache.fluo.api.client.LoaderExecutor;
@@ -83,7 +83,7 @@
cluster.getZooKeepers(), "root", "secret", queryTable));
FluoFactory.newAdmin(props)
- .initialize(new InitOpts().setClearTable(true).setClearZookeeper(true));
+ .initialize(new InitializationOptions().setClearTable(true).setClearZookeeper(true));
miniFluo = FluoFactory.newMiniFluo(props);
}
