Merge pull request #5 from DataSketches/shade-core
include shaded sketches-core into this jar, javadoc fixes
diff --git a/pom.xml b/pom.xml
index d72e608..6ab3ec4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,6 +123,36 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.4.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>com.yahoo.datasketches:sketches-core</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>com.yahoo.sketches</pattern>
+ <shadedPattern>shaded.com.yahoo.sketches</shadedPattern>
+ <excludes>
+ <exclude>com.yahoo.sketches.pig.**</exclude>
+ </excludes>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions>
diff --git a/src/main/java/com/yahoo/sketches/pig/tuple/DataToDoubleSummarySketch.java b/src/main/java/com/yahoo/sketches/pig/tuple/DataToDoubleSummarySketch.java
index 53ea621..3190668 100644
--- a/src/main/java/com/yahoo/sketches/pig/tuple/DataToDoubleSummarySketch.java
+++ b/src/main/java/com/yahoo/sketches/pig/tuple/DataToDoubleSummarySketch.java
@@ -10,7 +10,7 @@
import com.yahoo.sketches.tuple.DoubleSummaryFactory;
/**
- * This UDF creates a Sketch<DoubleSummary> from raw data.
+ * This UDF creates a Sketch<DoubleSummary> from raw data.
* It supports all three ways: exec(), Accumulator and Algebraic.
*/
public class DataToDoubleSummarySketch extends DataToSketch<Double, DoubleSummary> implements Algebraic {
diff --git a/src/main/java/com/yahoo/sketches/pig/tuple/DoubleSummarySketchToEstimates.java b/src/main/java/com/yahoo/sketches/pig/tuple/DoubleSummarySketchToEstimates.java
index 1b4b7b6..a6a2b6e 100644
--- a/src/main/java/com/yahoo/sketches/pig/tuple/DoubleSummarySketchToEstimates.java
+++ b/src/main/java/com/yahoo/sketches/pig/tuple/DoubleSummarySketchToEstimates.java
@@ -18,7 +18,7 @@
import com.yahoo.sketches.tuple.Sketches;
/**
- * This UDF converts a Sketch<DoubleSummary> to estimates.
+ * This UDF converts a Sketch<DoubleSummary> to estimates.
* The first estimate is the estimate of the number of unique
* keys in the original population.
* The second is the estimate of the sum of the parameter
diff --git a/src/main/java/com/yahoo/sketches/pig/tuple/DoubleSummarySketchToPercentile.java b/src/main/java/com/yahoo/sketches/pig/tuple/DoubleSummarySketchToPercentile.java
index 7de3e90..7ffc771 100644
--- a/src/main/java/com/yahoo/sketches/pig/tuple/DoubleSummarySketchToPercentile.java
+++ b/src/main/java/com/yahoo/sketches/pig/tuple/DoubleSummarySketchToPercentile.java
@@ -20,7 +20,7 @@
import com.yahoo.sketches.tuple.Sketches;
/**
- * This UDF is to get a percentile value from a Sketch<DoubleSummary>.
+ * This UDF is to get a percentile value from a Sketch<DoubleSummary>.
* The values from DoubleSummary objects in the sketch are extracted,
* and a single value with the given rank is returned. The rank is in
* percent. For example, 50th percentile is the median value of the
diff --git a/src/main/java/com/yahoo/sketches/pig/tuple/MergeArrayOfDoublesSketchAlgebraicIntermediateFinal.java b/src/main/java/com/yahoo/sketches/pig/tuple/MergeArrayOfDoublesSketchAlgebraicIntermediateFinal.java
index cfd5e3e..d7b8bed 100644
--- a/src/main/java/com/yahoo/sketches/pig/tuple/MergeArrayOfDoublesSketchAlgebraicIntermediateFinal.java
+++ b/src/main/java/com/yahoo/sketches/pig/tuple/MergeArrayOfDoublesSketchAlgebraicIntermediateFinal.java
@@ -20,13 +20,8 @@
* This is to calculate the intermediate pass (combiner) or the final pass
* (reducer) of an Algebraic sketch operation. This may be called multiple times
* (from the mapper and from the reducer). It will receive a bag of values
- * returned by either the Intermediate stage or the {@link Initial} stages, so
+ * returned by either the Intermediate or the Initial stages, so
* it needs to be able to differentiate between and interpret both types.
- *
- * <p>
- * The basic algorithm here is to leverage the Accumulate Union methods of the
- * {@link SetOperations} class.
- *
*/
abstract class MergeArrayOfDoublesSketchAlgebraicIntermediateFinal extends EvalFunc<Tuple> {
private int sketchSize_;
diff --git a/src/main/java/com/yahoo/sketches/pig/tuple/MergeDoubleSummarySketch.java b/src/main/java/com/yahoo/sketches/pig/tuple/MergeDoubleSummarySketch.java
index c58acd2..20cbb37 100644
--- a/src/main/java/com/yahoo/sketches/pig/tuple/MergeDoubleSummarySketch.java
+++ b/src/main/java/com/yahoo/sketches/pig/tuple/MergeDoubleSummarySketch.java
@@ -10,7 +10,7 @@
import com.yahoo.sketches.tuple.DoubleSummaryFactory;
/**
- * This is to merge Sketch<DoubleSummary>.
+ * This is to merge Sketch<DoubleSummary>.
* It supports all three ways: exec(), Accumulator and Algebraic
*/
public class MergeDoubleSummarySketch extends MergeSketch<DoubleSummary> implements Algebraic {
diff --git a/src/main/java/com/yahoo/sketches/pig/tuple/MergeSketchAlgebraicIntermediateFinal.java b/src/main/java/com/yahoo/sketches/pig/tuple/MergeSketchAlgebraicIntermediateFinal.java
index 35bf154..8ca7c5b 100644
--- a/src/main/java/com/yahoo/sketches/pig/tuple/MergeSketchAlgebraicIntermediateFinal.java
+++ b/src/main/java/com/yahoo/sketches/pig/tuple/MergeSketchAlgebraicIntermediateFinal.java
@@ -21,12 +21,8 @@
* This is to calculate the intermediate pass (combiner) or the final pass
* (reducer) of an Algebraic sketch operation. This may be called multiple times
* (from the mapper and from the reducer). It will receive a bag of values
- * returned by either the Intermediate stage or the {@link Initial} stages, so
+ * returned by either the Intermediate or the Initial stages, so
* it needs to be able to differentiate between and interpret both types.
- *
- * <p>
- * The basic algorithm here is to leverage the Accumulate Union methods of the
- * {@link SetOperations} class.
*
* @param <S> Type of Summary
*/
