You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2021/02/17 22:15:23 UTC
[datasketches-characterization] 01/02: Merge branch 'master' into
ReqExperiment
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch ReqExperiment
in repository https://gitbox.apache.org/repos/asf/datasketches-characterization.git
commit dca9a87753a2343d8f2ef62ff0e0019360359663
Merge: b456bf0 ede9772
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Wed Feb 17 12:39:49 2021 -0800
Merge branch 'master' into ReqExperiment
.asf.yaml | 15 --
DISCLAIMER-WIP | 26 ---
NOTICE | 2 +-
README.md | 14 +-
pom.xml | 179 ++++++++++++---------
.../java/org/apache/datasketches/SpacedPoints.java | 166 +++++++++++++++++++
.../theta/ThetaUnionAccuracyProfile2.java | 2 +-
.../theta/ThetaUnionUpdateSpeedProfile.java | 2 +-
.../resources/quantiles/ReqSketchAccuracy2Job.conf | 2 +-
.../resources/quantiles/ReqSketchAccuracyJob.conf | 2 +-
.../resources/quantiles/ReqSketchSizeSpeedJob.conf | 2 +-
11 files changed, 277 insertions(+), 135 deletions(-)
diff --cc pom.xml
index 79b84c7,1eede0d..283a35f
--- a/pom.xml
+++ b/pom.xml
@@@ -17,55 -18,30 +18,28 @@@ KIND, either express or implied. See t
specific language governing permissions and limitations
under the License.
-->
- <project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
+ <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>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
+ <version>23</version>
</parent>
- <groupId>org.apache.datasketches</groupId>
- <!-- UNIQUE FOR THIS JAVA COMPONENT -->
+ <groupId>org.apache.datasketches</groupId>
-
- <!-- UNIQUE FOR THIS JAVA COMPONENT -->
<artifactId>datasketches-characterization</artifactId>
- <version>1.0.0-incubating-SNAPSHOT</version>
- <description>Characterization code for the DataSketches library.</description>
- <!-- END: UNIQUE FOR THIS JAVA COMPONENT -->
+ <version>1.0.0-SNAPSHOT</version>
- <description>Characterization code for the DataSketches library.</description>
- <!-- END: UNIQUE FOR THIS JAVA COMPONENT -->
++ <packaging>jar</packaging>
-- <url>https://datasketches.apache.org/</url>
<name>${project.artifactId}</name>
++ <description>Characterization code for the DataSketches library.</description>
++ <url>https://datasketches.apache.org/</url>
<inceptionYear>2015</inceptionYear>
- <packaging>jar</packaging>
- <!-- jar is the default -->
- <!-- With the 3.6.1 version of Maven this causes a warning to obsolete this in
- favor of using the enforcer plugin (which we do). But removing this
- causes the command "mvn versions:display-plugin-updates" to issue an error
- and not work properly. So this will stay for the time being.
- -->
- <prerequisites>
- <maven>3.2.0</maven>
- </prerequisites>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>https://www.apache.org/licenses/LICENSE-2.0</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <scm>
- <connection>scm:git:ssh://git@github.com/apache/incubator-${project.artifactId}.git</connection>
- <developerConnection>scm:git:ssh://git@github.com/apache/incubator-${project.artifactId}.git</developerConnection>
- <url>https://github.com/apache/incubator-${project.artifactId}</url>
- <tag>HEAD</tag>
- </scm>
- <issueManagement>
- <!-- <system>jira</system>
- <url>https://issues.apache.org/jira/browse/DATASKETCHES</url> -->
- <system>GitHub</system>
- <url>https://github.com/apache/incubator-${project.artifactId}/issues</url>
- </issueManagement>
- <packaging>jar</packaging> <!-- jar is the default -->
+
<mailingLists>
<mailingList>
<name>DataSketches Developers</name>
@@@ -91,11 -82,11 +80,11 @@@
<organizationUrl>http://www.apache.org</organizationUrl>
</developer>
</developers>
- <properties>
+ <properties>
<!-- UNIQUE FOR THIS JAVA COMPONENT -->
-- <datasketches-memory.version>1.2.0-incubating</datasketches-memory.version>
- <datasketches-java.version>1.2.0-incubating</datasketches-java.version>
- <datasketches-java.version>1.3.0-incubating</datasketches-java.version>
++ <datasketches-memory.version>1.3.0</datasketches-memory.version>
++ <datasketches-java.version>2.0.0</datasketches-java.version>
<druid-momentsketch.version>0.16.0-incubating</druid-momentsketch.version>
<druid-histogram.version>0.16.0-incubating</druid-histogram.version>
<druid-hll.version>0.16.0-incubating</druid-hll.version>
@@@ -104,35 -95,38 +93,42 @@@
<!-- END:UNIQUE FOR THIS JAVA COMPONENT -->
<!-- Test -->
- <testng.version>6.14.3</testng.version>
+ <testng.version>7.1.0</testng.version>
+
<!-- System-wide properties -->
- <maven.version>3.0.0</maven.version>
++ <maven.version>3.5.0</maven.version>
+ <java.version>1.8</java.version>
+ <maven.compiler.source>${java.version}</maven.compiler.source>
+ <maven.compiler.target>${java.version}</maven.compiler.target>
<argLine>-Xmx4g -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8</argLine>
<charset.encoding>UTF-8</charset.encoding>
<project.build.sourceEncoding>${charset.encoding}</project.build.sourceEncoding>
<project.build.resourceEncoding>${charset.encoding}</project.build.resourceEncoding>
<project.reporting.outputEncoding>${charset.encoding}</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
- <maven.compiler.source>${java.version}</maven.compiler.source>
- <maven.compiler.target>${java.version}</maven.compiler.target>
- <!-- org.codehaus.plexus used for strict profile testing-->
+
- <!-- org.codehaus.plexus used for strict profile testing-->
- <plexus-compiler-javac-errorprone.version>2.8.8</plexus-compiler-javac-errorprone.version>
++ <!-- org.codehaus plugins -->
++ <!-- used for strict profile testing-->
+ <plexus-compiler-javac-errorprone.version>2.8.5</plexus-compiler-javac-errorprone.version>
++ <versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
++
<!-- Maven Plugins -->
- <maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
- <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
- <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
- <maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
- <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
- <maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
- <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
- <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
- <maven-remote-resources-plugin.version>[1.0,)</maven-remote-resources-plugin.version>
- <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
- <maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
+ <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version> <!-- overrides parent -->
+ <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> <!-- overrides parent -->
+ <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version> <!-- overrides parent -->
+ <maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version> <!-- overrides parent -->
+ <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version> <!-- overrides parent -->
+ <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version> <!-- overrides parent -->
+ <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version> <!-- overrides parent -->
+ <maven-release-plugin.version>3.0.0-M1</maven-release-plugin.version> <!-- overrides parent -->
+ <maven-remote-resources-plugin.version>[1.7.0,)</maven-remote-resources-plugin.version> <!-- overrides parent -->
+ <maven-source-plugin.version>3.2.1</maven-source-plugin.version> <!-- overrides parent -->
+ <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version> <!-- overrides parent -->
<!-- Apache Plugins -->
- <apache-rat-plugin.version>0.13</apache-rat-plugin.version>
+ <apache-rat-plugin.version>0.13</apache-rat-plugin.version> <!-- overrides parent -->
<!-- org.jacoco Maven Plugins -->
- <jacoco-maven-plugin.version>0.8.4</jacoco-maven-plugin.version>
+ <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
<!-- org.eluder Maven Plugins -->
++ <coveralls-repo-token></coveralls-repo-token>
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
<!-- other -->
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
@@@ -233,6 -227,6 +229,13 @@@
<build>
<pluginManagement>
<plugins>
++
++ <plugin>
++ <groupId>org.codehaus.mojo</groupId>
++ <artifactId>versions-maven-plugin</artifactId>
++ <version>${versions-maven-plugin.version}</version>
++ </plugin>
++
<plugin>
<!-- We want to deploy the artifacts to a staging location for perusal -->
<!-- Apache Parent pom: apache-release profile -->
@@@ -244,12 -238,12 +247,14 @@@
<!-- see maven-install-plugin -->
</configuration>
</plugin>
++
<plugin>
<!-- Apache Parent pom, pluginManagement-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release-plugin.version}</version>
</plugin>
++
<plugin>
<!-- Extends Apache Parent pom, pluginManagement-->
<groupId>org.apache.maven.plugins</groupId>
@@@ -258,18 -252,18 +263,21 @@@
<executions>
<execution>
<id>default-jar</id>
++ <phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
<execution>
<id>default-test-jar</id>
++ <phase>package</phase>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
++
<plugin>
<!-- Extends Apache Parent pom, apache-release profile -->
<groupId>org.apache.maven.plugins</groupId>
@@@ -287,6 -281,6 +295,7 @@@
</execution>
</executions>
</plugin>
++
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@@ -317,6 -311,6 +326,7 @@@
</execution>
</executions>
</plugin>
++
<plugin>
<!-- Apache Parent pom, pluginManagement-->
<groupId>org.apache.rat</groupId>
@@@ -336,12 -330,13 +346,16 @@@
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<!-- rat uses .gitignore for excludes by default -->
++ <exclude>**/*.yaml</exclude>
++ <exclude>**/*.yml</exclude>
++ <exclude>**/.*</exclude>
+ <exclude>**/test/resources/**/*.txt</exclude>
- <exclude>.asf.yaml</exclude>
<exclude>LICENSE</exclude>
<exclude>NOTICE</exclude>
- <exclude>DISCLAIMER-WIP</exclude>
</excludes>
</configuration>
</plugin>
++
<plugin>
<!-- Extends Apache Parent pom, apache-release profile -->
<groupId>org.apache.maven.plugins</groupId>
@@@ -364,6 -359,6 +378,7 @@@
</execution>
</executions>
</plugin>
++
<plugin>
<!-- Apache Parent pom, pluginManagement-->
<groupId>org.apache.maven.plugins</groupId>
@@@ -375,6 -370,6 +390,7 @@@
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
++
<plugin>
<!-- Generates code coverage report from website. -->
<groupId>org.jacoco</groupId>
@@@ -382,22 -377,22 +398,30 @@@
<version>${jacoco-maven-plugin.version}</version>
<executions>
<execution>
-- <id>prepare-agent</id>
++ <id>default-prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
++ <execution>
++ <id>default-report</id>
++ <goals>
++ <goal>report</goal>
++ </goals>
++ </execution>
</executions>
</plugin>
++
<plugin>
<!-- Submit code coverage report to Coveralls.io. -->
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>${coveralls-maven-plugin.version}</version>
<configuration>
-- <!-- Since we use Travis CI we do not have to put a Coveralls token here. -->
++ <repoToken>${coveralls-repo-token}</repoToken>
</configuration>
</plugin>
++
</plugins>
</pluginManagement>
<plugins>
diff --cc src/main/resources/quantiles/ReqSketchAccuracyJob.conf
index ee9416a,2c28438..65872b6
--- a/src/main/resources/quantiles/ReqSketchAccuracyJob.conf
+++ b/src/main/resources/quantiles/ReqSketchAccuracyJob.conf
@@@ -15,10 -15,10 +15,10 @@@
# specific language governing permissions and limitations
# under the License.
- JobProfile=org.apache.datasketches.characterization.quantiles.ReqSketchAccuracyProfile
+ JobProfile=org.apache.datasketches.req.ReqSketchAccuracyProfile
# Stream Pattern
-Pattern=Sorted # Sorted, Reversed, Zoomin, Zoomout, Random, Sqrt, FlipFlop
+Pattern=Random # Sorted, Reversed, Zoomin, Zoomout, Random, Sqrt, FlipFlop, ZoominSqrt
Offset=1 #0 for min value of 0; 1 for min value of 1
## Stream lengths
diff --cc src/main/resources/quantiles/ReqSketchSizeSpeedJob.conf
index c0f6ccc,814cd75..6828781
--- a/src/main/resources/quantiles/ReqSketchSizeSpeedJob.conf
+++ b/src/main/resources/quantiles/ReqSketchSizeSpeedJob.conf
@@@ -15,10 -15,10 +15,10 @@@
# specific language governing permissions and limitations
# under the License.
- JobProfile=org.apache.datasketches.characterization.quantiles.ReqSketchSizeSpeedProfile
+ JobProfile=org.apache.datasketches.req.ReqSketchSizeSpeedProfile
# Trials config (indep of sketch)
-LgMinT=4
+LgMinT=0
LgMaxT=12
## Stream lengths
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org