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 2019/10/16 16:57:08 UTC
[incubator-datasketches-characterization] branch LicenseSwap
created (now fd0996e)
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a change to branch LicenseSwap
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-characterization.git.
at fd0996e The big license and directory swap
This branch includes the following new commits:
new fd0996e The big license and directory swap
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[incubator-datasketches-characterization] 01/01: The big license
and directory swap
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch LicenseSwap
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-characterization.git
commit fd0996ec3a33dd9ac8c11c21175e52056704c5d9
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Wed Oct 16 09:56:45 2019 -0700
The big license and directory swap
---
src/main/java/com/yahoo/sketches/DoublePair.java | 23 -------
src/main/java/com/yahoo/sketches/LongPair.java | 23 -------
src/main/java/com/yahoo/sketches/ProcessLine.java | 12 ----
.../characterization/concurrent/package-info.java | 10 ---
.../cpc/CpcMergingValidationProfile.java | 59 -----------------
.../cpc/CpcQuickMergingValidationProfile.java | 55 ----------------
.../cpc/CpcStreamingValidationProfile.java | 53 ----------------
.../cpc/CpcUpdateSpeedProfile.java | 35 -----------
.../characterization/cpc/package-info.java | 10 ---
.../characterization/fdt/package-info.java | 10 ---
.../characterization/frequencies/package-info.java | 10 ---
.../characterization/hash/package-info.java | 10 ---
.../characterization/hll/package-info.java | 10 ---
.../characterization/memory/package-info.java | 10 ---
.../sketches/characterization/package-info.java | 10 ---
.../characterization/quantiles/package-info.java | 10 ---
.../LockBasedThetaUpdateSpeedProfile.java | 29 ---------
.../theta/concurrent/package-info.java | 10 ---
.../characterization/theta/package-info.java | 10 ---
.../characterization/uniquecount/package-info.java | 10 ---
src/main/java/com/yahoo/sketches/package-info.java | 10 ---
.../apache/datasketches}/AccuracyStats.java | 26 ++++++--
.../apache/datasketches}/ArrayListFile.java | 30 ++++++---
.../apache/datasketches}/ByteArrayBuilder.java | 20 +++++-
.../apache/datasketches}/DirectoryWalker.java | 20 +++++-
.../java/org/apache/datasketches/DoublePair.java | 37 +++++++++++
.../apache/datasketches}/Files.java | 20 +++++-
.../sketches => org/apache/datasketches}/Job.java | 26 ++++++--
.../apache/datasketches}/JobProfile.java | 20 +++++-
.../apache/datasketches}/LineReader.java | 20 +++++-
.../java/org/apache/datasketches/LongPair.java | 37 +++++++++++
.../apache/datasketches}/PerformanceUtil.java | 22 +++++--
.../apache/datasketches}/PowerLawGenerator.java | 20 +++++-
.../java/org/apache/datasketches/ProcessLine.java | 26 ++++++++
.../apache/datasketches}/Properties.java | 20 +++++-
.../datasketches}/RandomPowerLawGenerator.java | 20 +++++-
.../apache/datasketches}/TestingUtil2.java | 20 +++++-
.../apache/datasketches}/UnzipFiles.java | 20 +++++-
.../apache/datasketches}/ZipFiles.java | 20 +++++-
.../characterization/ZipfDistribution.java | 24 ++++---
.../concurrent/ConcurrentTestContext.java | 20 +++++-
.../concurrent/ConcurrentTestThread.java | 20 +++++-
.../characterization/concurrent/package-info.java | 24 +++++++
.../cpc/CpcCompressionCharacterizationProfile.java | 28 ++++++---
.../cpc/CpcMergingValidationProfile.java | 73 ++++++++++++++++++++++
.../cpc/CpcQuickMergingValidationProfile.java | 69 ++++++++++++++++++++
.../characterization/cpc/CpcSerDeProfile.java | 24 +++++--
.../cpc/CpcStreamingValidationProfile.java | 67 ++++++++++++++++++++
.../cpc/CpcUpdateSpeedProfile.java | 49 +++++++++++++++
.../characterization/cpc/package-info.java | 24 +++++++
.../characterization/fdt/FdtAccuracyProfile.java | 44 ++++++++-----
.../characterization/fdt/TestGroup.java | 27 +++++---
.../characterization/fdt/package-info.java | 24 +++++++
.../frequencies/BaseFrequenciesSpeedProfile.java | 33 +++++++---
.../frequencies/LongsSketchSpeedProfile.java | 29 +++++++--
.../characterization/frequencies/package-info.java | 24 +++++++
.../hash/BaseHashSpeedProfile.java | 28 ++++++---
.../hash/HashBytesSpeedProfile.java | 28 ++++++---
.../hash/HashLongsSpeedProfile.java | 26 ++++++--
.../characterization/hash/package-info.java | 24 +++++++
.../hll/DruidHllAccuracyProfile.java | 24 +++++--
.../hll/DruidHllMergeAccuracyProfile.java | 24 +++++--
.../characterization/hll/HllAccuracyProfile.java | 30 ++++++---
.../hll/HllMergeAccuracyProfile.java | 28 ++++++---
.../characterization/hll/HllSerDeProfile.java | 30 ++++++---
.../hll/HllUpdateSpeedProfile.java | 28 ++++++---
.../characterization/hll/package-info.java | 24 +++++++
.../characterization/memory/BaseSpeedProfile.java | 28 ++++++---
.../memory/BaseUtf8SpeedProfile.java | 30 ++++++---
.../characterization/memory/HeapSpeedProfile.java | 20 +++++-
.../memory/HeapUtf8SpeedProfile.java | 26 ++++++--
.../memory/MemoryDirectSpeedProfile.java | 24 +++++--
.../memory/UnsafeDirectSpeedProfile.java | 22 +++++--
.../characterization/memory/package-info.java | 24 +++++++
.../characterization/package-info.java | 24 +++++++
.../quantiles/BaseQuantilesAccuracyProfile.java | 41 ++++++++----
.../quantiles/BaseQuantilesSpeedProfile.java | 33 +++++++---
.../quantiles/DoublesSketchAccuracyProfile.java | 29 +++++++--
.../quantiles/DoublesSketchSpeedProfile.java | 33 +++++++---
.../quantiles/DruidAppHistStreamAProfile.java | 34 +++++++---
.../quantiles/ExactStreamAProfile.java | 36 +++++++----
.../quantiles/ItemsSketchAccuracyProfile.java | 25 +++++++-
.../quantiles/ItemsSketchSpeedProfile.java | 31 +++++++--
.../quantiles/KllFloatsSketchAccuracyProfile.java | 25 +++++++-
.../quantiles/KllFloatsSketchSpeedProfile.java | 27 ++++++--
.../quantiles/MSketchStreamAProfile.java | 32 +++++++---
.../characterization/quantiles/ProfileUtil.java | 26 ++++++--
.../quantiles/QuantilesStreamAProfile.java | 38 +++++++----
.../characterization/quantiles/package-info.java | 24 +++++++
.../theta/ThetaAccuracyProfile.java | 36 +++++++----
.../characterization/theta/ThetaSerDeProfile.java | 36 +++++++----
.../theta/ThetaUnionAccuracyProfile.java | 34 +++++++---
.../theta/ThetaUnionAccuracyProfile2.java | 40 ++++++++----
.../theta/ThetaUpdateSpeedProfile.java | 34 +++++++---
.../concurrent/ConcurrentThetaAccuracyProfile.java | 36 +++++++----
.../ConcurrentThetaMultithreadedSpeedProfile.java | 38 +++++++----
.../ConcurrentThetaUpdateSpeedProfile.java | 34 +++++++---
.../LockBasedThetaUpdateSpeedProfile.java | 48 ++++++++++++++
.../theta/concurrent/package-info.java | 24 +++++++
.../characterization/theta/package-info.java | 24 +++++++
.../uniquecount/BaseAccuracyProfile.java | 38 +++++++----
.../uniquecount/BaseSerDeProfile.java | 28 ++++++---
.../uniquecount/BaseUpdateSpeedProfile.java | 28 ++++++---
.../characterization/uniquecount/package-info.java | 24 +++++++
.../java/org/apache/datasketches/package-info.java | 24 +++++++
.../cpc/CpcCompressionCharacterizationJob.conf | 19 +++++-
.../resources/cpc/CpcCrossLangValidationJob.conf | 19 +++++-
.../resources/cpc/CpcMergingValidationJob.conf | 19 +++++-
.../cpc/CpcQuickMergingValidationJob.conf | 19 +++++-
src/main/resources/cpc/CpcSerDeJob.conf | 21 ++++++-
.../resources/cpc/CpcStreamingValidationJob.conf | 19 +++++-
src/main/resources/cpc/CpcUpdateSpeedJob.conf | 19 +++++-
src/main/resources/fdt/FdtAccuracyJob.conf | 19 +++++-
.../resources/frequencies/LongsSketchSpeedJob.conf | 19 +++++-
src/main/resources/hash/HashBytesSpeedJob.conf | 19 +++++-
src/main/resources/hash/HashLongsSpeedJob.conf | 19 +++++-
src/main/resources/hll/HllAccuracyJob.conf | 21 ++++++-
src/main/resources/hll/HllMergeAccuracyJob.conf | 19 +++++-
src/main/resources/hll/HllSerDeJob.conf | 21 ++++++-
src/main/resources/hll/HllSpeedJob.conf | 21 ++++++-
.../hll/druidhll/DruidHllAccuracyJob.conf | 19 +++++-
.../hll/druidhll/DruidHllMergeAccuracyJob.conf | 19 +++++-
src/main/resources/memory/HeapSpeedJob.conf | 19 +++++-
src/main/resources/memory/HeapUtf8SpeedJob.conf | 19 +++++-
.../resources/memory/MemoryDirectSpeedJob.conf | 19 +++++-
.../resources/memory/UnsafeDirectSpeedJob.conf | 19 +++++-
.../quantiles/DoublesSketchAccuracyJob.conf | 19 +++++-
.../resources/quantiles/DoublesSketchSpeedJob.conf | 19 +++++-
.../resources/quantiles/DruidAHStreamAJob.conf | 19 +++++-
src/main/resources/quantiles/ExactStreamAJob.conf | 21 ++++++-
.../quantiles/ItemsSketchAccuracyJob.conf | 19 +++++-
.../resources/quantiles/ItemsSketchSpeedJob.conf | 19 +++++-
.../quantiles/KllFloatsSketchAccuracyJob.conf | 19 +++++-
.../quantiles/KllFloatsSketchSpeedJob.conf | 19 +++++-
.../resources/quantiles/MSketchStreamAJob.conf | 21 ++++++-
.../quantiles/QuantilesK256StreamAJob.conf | 19 +++++-
.../quantiles/QuantilesK32StreamAJob.conf | 21 ++++++-
src/main/resources/theta/ThetaAccuracyJob.conf | 19 +++++-
src/main/resources/theta/ThetaSerDeJob.conf | 21 ++++++-
src/main/resources/theta/ThetaSpeedJob.conf | 19 +++++-
.../resources/theta/ThetaUnionAccuracyJob.conf | 21 ++++++-
.../resources/theta/ThetaUnionAccuracyJob2.conf | 21 ++++++-
.../concurrent/ConcurrentThetaAccuracyJob.conf | 19 +++++-
.../ConcurrentThetaMultiThreadedSpeedJob.conf | 19 +++++-
.../theta/concurrent/ConcurrentThetaSpeedJob.conf | 19 +++++-
.../theta/concurrent/LockBasedThetaSpeedJob.conf | 19 +++++-
src/test/java/com/yahoo/sketches/ZipFilesTest.java | 29 ---------
.../apache/datasketches}/LicenseSwap.java | 32 +++++++---
.../datasketches}/PowerLawGeneratorTest.java | 22 +++++--
.../apache/datasketches}/PropertiesTest.java | 22 +++++--
.../java/org/apache/datasketches/ZipFilesTest.java | 43 +++++++++++++
151 files changed, 2910 insertions(+), 935 deletions(-)
diff --git a/src/main/java/com/yahoo/sketches/DoublePair.java b/src/main/java/com/yahoo/sketches/DoublePair.java
deleted file mode 100644
index c816203..0000000
--- a/src/main/java/com/yahoo/sketches/DoublePair.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-package com.yahoo.sketches;
-
-import java.util.Comparator;
-
-public class DoublePair implements Comparator<DoublePair> {
- public double x;
- public double y;
-
- public DoublePair(final double x, final double y) {
- this.x = x;
- this.y = y;
- }
-
- @Override
- public int compare(final DoublePair p1, final DoublePair p2) {
- return Double.compare(p1.x, p2.x); // handles NaN, +/- 0, etc.
- }
-}
diff --git a/src/main/java/com/yahoo/sketches/LongPair.java b/src/main/java/com/yahoo/sketches/LongPair.java
deleted file mode 100644
index 1ba85df..0000000
--- a/src/main/java/com/yahoo/sketches/LongPair.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-package com.yahoo.sketches;
-
-import java.util.Comparator;
-
-public class LongPair implements Comparator<LongPair> {
- public long x;
- public long y;
-
- public LongPair(final long x, final long y) {
- this.x = x;
- this.y = y;
- }
-
- @Override
- public int compare(final LongPair p1, final LongPair p2) {
- return (p1.x < p2.x) ? -1 : (p1.x > p2.x) ? 1 : 0;
- }
-}
diff --git a/src/main/java/com/yahoo/sketches/ProcessLine.java b/src/main/java/com/yahoo/sketches/ProcessLine.java
deleted file mode 100644
index a859860..0000000
--- a/src/main/java/com/yahoo/sketches/ProcessLine.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-package com.yahoo.sketches;
-
-public interface ProcessLine {
-
- void process(String line, int lineNo);
-
-}
diff --git a/src/main/java/com/yahoo/sketches/characterization/concurrent/package-info.java b/src/main/java/com/yahoo/sketches/characterization/concurrent/package-info.java
deleted file mode 100644
index 348fbbd..0000000
--- a/src/main/java/com/yahoo/sketches/characterization/concurrent/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-/**
- * @author Lee Rhodes
- */
-
-package com.yahoo.sketches.characterization.concurrent;
diff --git a/src/main/java/com/yahoo/sketches/characterization/cpc/CpcMergingValidationProfile.java b/src/main/java/com/yahoo/sketches/characterization/cpc/CpcMergingValidationProfile.java
deleted file mode 100644
index 8bc5727..0000000
--- a/src/main/java/com/yahoo/sketches/characterization/cpc/CpcMergingValidationProfile.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-package com.yahoo.sketches.characterization.cpc;
-
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.cpc.MergingValidation;
-
-/**
- * @author Lee Rhodes
- */
-public class CpcMergingValidationProfile implements JobProfile {
- Job job;
- Properties prop;
-
- int lgMinK;
- int lgMaxK; //inclusive
- int lgMulK;
- int uPPO;
- int incLgK;
- PrintStream ps;
- PrintWriter pw;
-
- @Override
- public void start(final Job job) {
- this.job = job;
- prop = job.getProperties();
-
- lgMinK = Integer.parseInt(prop.mustGet("lgMinK"));
- lgMaxK = Integer.parseInt(prop.mustGet("lgMaxK"));
- lgMulK = Integer.parseInt(prop.mustGet("lgMulK"));
- uPPO = Integer.parseInt(prop.mustGet("uPPO"));
- incLgK = Integer.parseInt(prop.mustGet("incLgK"));
-
- ps = System.out;
- pw = job.getPrintWriter();
-
- final MergingValidation mv = new MergingValidation(
- lgMinK, lgMaxK, lgMulK, uPPO, incLgK, ps, pw);
- mv.start();
- }
-
- @Override
- public void shutdown() {}
-
- @Override
- public void cleanup() {}
-
- @Override
- public void println(final String s) {}
-
-}
diff --git a/src/main/java/com/yahoo/sketches/characterization/cpc/CpcQuickMergingValidationProfile.java b/src/main/java/com/yahoo/sketches/characterization/cpc/CpcQuickMergingValidationProfile.java
deleted file mode 100644
index aaa2417..0000000
--- a/src/main/java/com/yahoo/sketches/characterization/cpc/CpcQuickMergingValidationProfile.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-package com.yahoo.sketches.characterization.cpc;
-
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.cpc.QuickMergingValidation;
-
-/**
- * @author Lee Rhodes
- */
-public class CpcQuickMergingValidationProfile implements JobProfile {
-
- Job job;
- Properties prop;
-
- int lgMinK;
- int lgMaxK; //inclusive
- int incLgK;
- PrintStream ps;
- PrintWriter pw;
-
- @Override
- public void start(final Job job) {
- this.job = job;
- prop = job.getProperties();
-
- lgMinK = Integer.parseInt(prop.mustGet("lgMinK"));
- lgMaxK = Integer.parseInt(prop.mustGet("lgMaxK"));
- incLgK = Integer.parseInt(prop.mustGet("incLgK"));
-
- ps = System.out;
- pw = job.getPrintWriter();
-
- final QuickMergingValidation mv = new QuickMergingValidation(
- lgMinK, lgMaxK, incLgK, ps, pw);
- mv.start();
- }
-
- @Override
- public void shutdown() {}
-
- @Override
- public void cleanup() {}
-
- @Override
- public void println(final String s) {}
-}
diff --git a/src/main/java/com/yahoo/sketches/characterization/cpc/CpcStreamingValidationProfile.java b/src/main/java/com/yahoo/sketches/characterization/cpc/CpcStreamingValidationProfile.java
deleted file mode 100644
index ed69c2b..0000000
--- a/src/main/java/com/yahoo/sketches/characterization/cpc/CpcStreamingValidationProfile.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-package com.yahoo.sketches.characterization.cpc;
-
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.cpc.StreamingValidation;
-
-/**
- * @author Lee Rhodes
- */
-public class CpcStreamingValidationProfile implements JobProfile {
- Job job;
- Properties prop;
-
- int lgMinK; //For each K to
- int lgMaxK;
- int trials;
- int ppoN;
- PrintStream ps;
- PrintWriter pw;
-
- @Override
- public void start(final Job job) {
- this.job = job;
- pw = job.getPrintWriter();
- ps = System.out;
- prop = job.getProperties();
- lgMinK = Integer.parseInt(prop.mustGet("lgMinK"));
- lgMaxK = Integer.parseInt(prop.mustGet("lgMaxK"));
- trials = Integer.parseInt(prop.mustGet("trials"));
- ppoN = Integer.parseInt(prop.mustGet("ppoN"));
- final StreamingValidation sVal = new StreamingValidation(lgMinK, lgMaxK, trials, ppoN, ps, pw);
- sVal.start();
- }
-
- @Override
- public void shutdown() {}
-
- @Override
- public void cleanup() {}
-
- @Override
- public void println(final String s) {}
-
-}
diff --git a/src/main/java/com/yahoo/sketches/characterization/cpc/CpcUpdateSpeedProfile.java b/src/main/java/com/yahoo/sketches/characterization/cpc/CpcUpdateSpeedProfile.java
deleted file mode 100644
index 33ab5eb..0000000
--- a/src/main/java/com/yahoo/sketches/characterization/cpc/CpcUpdateSpeedProfile.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-package com.yahoo.sketches.characterization.cpc;
-
-import com.yahoo.sketches.characterization.uniquecount.BaseUpdateSpeedProfile;
-import com.yahoo.sketches.cpc.CpcSketch;
-
-/**
- * @author Lee Rhodes
- */
-public class CpcUpdateSpeedProfile extends BaseUpdateSpeedProfile {
- private CpcSketch sketch;
-
- @Override
- public void configure() {
- final int lgK = Integer.parseInt(prop.mustGet("LgK"));
- sketch = new CpcSketch(lgK);
- }
-
- @Override
- public double doTrial(final int uPerTrial) {
- sketch.reset(); // reuse the same sketch
- final long startUpdateTime_nS = System.nanoTime();
-
- for (int u = uPerTrial; u-- > 0;) {
- sketch.update(++vIn);
- }
- final long updateTime_nS = System.nanoTime() - startUpdateTime_nS;
- return (double) updateTime_nS / uPerTrial;
- }
-
-}
diff --git a/src/main/java/com/yahoo/sketches/characterization/cpc/package-info.java b/src/main/java/com/yahoo/sketches/characterization/cpc/package-info.java
deleted file mode 100644
index e859470..0000000
--- a/src/main/java/com/yahoo/sketches/characterization/cpc/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-/**
- * @author Lee Rhodes
- */
-
-package com.yahoo.sketches.characterization.cpc;
diff --git a/src/main/java/com/yahoo/sketches/characterization/fdt/package-info.java b/src/main/java/com/yahoo/sketches/characterization/fdt/package-info.java
deleted file mode 100644
index 8d9a96f..0000000
--- a/src/main/java/com/yahoo/sketches/characterization/fdt/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-/**
- * @author Lee Rhodes
- */
-
-package com.yahoo.sketches.characterization.fdt;
diff --git a/src/main/java/com/yahoo/sketches/characterization/frequencies/package-info.java b/src/main/java/com/yahoo/sketches/characterization/frequencies/package-info.java
deleted file mode 100644
index 08ba3f6..0000000
--- a/src/main/java/com/yahoo/sketches/characterization/frequencies/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-/**
- * @author Lee Rhodes
- */
-
-package com.yahoo.sketches.characterization.frequencies;
diff --git a/src/main/java/com/yahoo/sketches/characterization/hash/package-info.java b/src/main/java/com/yahoo/sketches/characterization/hash/package-info.java
deleted file mode 100644
index db52d65..0000000
--- a/src/main/java/com/yahoo/sketches/characterization/hash/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-/**
- * @author Lee Rhodes
- */
-
-package com.yahoo.sketches.characterization.hash;
diff --git a/src/main/java/com/yahoo/sketches/characterization/hll/package-info.java b/src/main/java/com/yahoo/sketches/characterization/hll/package-info.java
deleted file mode 100644
index de48cf9..0000000
--- a/src/main/java/com/yahoo/sketches/characterization/hll/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-/**
- * @author Lee Rhodes
- */
-
-package com.yahoo.sketches.characterization.hll;
diff --git a/src/main/java/com/yahoo/sketches/characterization/memory/package-info.java b/src/main/java/com/yahoo/sketches/characterization/memory/package-info.java
deleted file mode 100644
index 3b9c78c..0000000
--- a/src/main/java/com/yahoo/sketches/characterization/memory/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-/**
- * @author Lee Rhodes
- */
-
-package com.yahoo.sketches.characterization.memory;
diff --git a/src/main/java/com/yahoo/sketches/characterization/package-info.java b/src/main/java/com/yahoo/sketches/characterization/package-info.java
deleted file mode 100644
index 7afc359..0000000
--- a/src/main/java/com/yahoo/sketches/characterization/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-/**
- * @author Lee Rhodes
- */
-
-package com.yahoo.sketches.characterization;
diff --git a/src/main/java/com/yahoo/sketches/characterization/quantiles/package-info.java b/src/main/java/com/yahoo/sketches/characterization/quantiles/package-info.java
deleted file mode 100644
index e23ad22..0000000
--- a/src/main/java/com/yahoo/sketches/characterization/quantiles/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-/**
- * @author Lee Rhodes
- */
-
-package com.yahoo.sketches.characterization.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/characterization/theta/concurrent/LockBasedThetaUpdateSpeedProfile.java b/src/main/java/com/yahoo/sketches/characterization/theta/concurrent/LockBasedThetaUpdateSpeedProfile.java
deleted file mode 100644
index 91a9c7d..0000000
--- a/src/main/java/com/yahoo/sketches/characterization/theta/concurrent/LockBasedThetaUpdateSpeedProfile.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.yahoo.sketches.characterization.theta.concurrent;
-
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import com.yahoo.sketches.characterization.theta.ThetaUpdateSpeedProfile;
-
-/**
- * @author eshcar
- */
-public class LockBasedThetaUpdateSpeedProfile extends ThetaUpdateSpeedProfile {
- private ReentrantReadWriteLock lock_ = new ReentrantReadWriteLock();
-
- @Override
- public double doTrial(final int uPerTrial) {
- sketch.reset(); // reuse the same sketch
- final long startUpdateTime_nS = System.nanoTime();
-
- for (int u = uPerTrial; u-- > 0;) {
- try {
- lock_.writeLock().lock();
- sketch.update(++vIn);
- } finally {
- lock_.writeLock().unlock();
- }
- }
- final long updateTime_nS = System.nanoTime() - startUpdateTime_nS;
- return (double) updateTime_nS / uPerTrial;
- }
-}
diff --git a/src/main/java/com/yahoo/sketches/characterization/theta/concurrent/package-info.java b/src/main/java/com/yahoo/sketches/characterization/theta/concurrent/package-info.java
deleted file mode 100644
index fb67635..0000000
--- a/src/main/java/com/yahoo/sketches/characterization/theta/concurrent/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-/**
- * @author Lee Rhodes
- */
-
-package com.yahoo.sketches.characterization.theta.concurrent;
diff --git a/src/main/java/com/yahoo/sketches/characterization/theta/package-info.java b/src/main/java/com/yahoo/sketches/characterization/theta/package-info.java
deleted file mode 100644
index f224a60..0000000
--- a/src/main/java/com/yahoo/sketches/characterization/theta/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-/**
- * @author Lee Rhodes
- */
-
-package com.yahoo.sketches.characterization.theta;
diff --git a/src/main/java/com/yahoo/sketches/characterization/uniquecount/package-info.java b/src/main/java/com/yahoo/sketches/characterization/uniquecount/package-info.java
deleted file mode 100644
index c51e14b..0000000
--- a/src/main/java/com/yahoo/sketches/characterization/uniquecount/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-/**
- * @author Lee Rhodes
- */
-
-package com.yahoo.sketches.characterization.uniquecount;
diff --git a/src/main/java/com/yahoo/sketches/package-info.java b/src/main/java/com/yahoo/sketches/package-info.java
deleted file mode 100644
index c9d5305..0000000
--- a/src/main/java/com/yahoo/sketches/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-/**
- * @author Lee Rhodes
- */
-
-package com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/AccuracyStats.java b/src/main/java/org/apache/datasketches/AccuracyStats.java
similarity index 62%
rename from src/main/java/com/yahoo/sketches/AccuracyStats.java
rename to src/main/java/org/apache/datasketches/AccuracyStats.java
index 4b4cbb9..87b972e 100644
--- a/src/main/java/com/yahoo/sketches/AccuracyStats.java
+++ b/src/main/java/org/apache/datasketches/AccuracyStats.java
@@ -1,14 +1,28 @@
/*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
-import static com.yahoo.sketches.Util.pwr2LawNext;
+import static org.apache.datasketches.Util.pwr2LawNext;
-import com.yahoo.sketches.quantiles.DoublesSketchBuilder;
-import com.yahoo.sketches.quantiles.UpdateDoublesSketch;
+import org.apache.datasketches.quantiles.DoublesSketchBuilder;
+import org.apache.datasketches.quantiles.UpdateDoublesSketch;
/**
* Holds key metrics from a single accuracy trial
diff --git a/src/main/java/com/yahoo/sketches/ArrayListFile.java b/src/main/java/org/apache/datasketches/ArrayListFile.java
old mode 100755
new mode 100644
similarity index 74%
rename from src/main/java/com/yahoo/sketches/ArrayListFile.java
rename to src/main/java/org/apache/datasketches/ArrayListFile.java
index 474a5bc..fc88edb
--- a/src/main/java/com/yahoo/sketches/ArrayListFile.java
+++ b/src/main/java/org/apache/datasketches/ArrayListFile.java
@@ -1,15 +1,29 @@
/*
- * Copyright 2015, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
-import static com.yahoo.sketches.Files.append;
-import static com.yahoo.sketches.Files.getExistingFile;
-import static com.yahoo.sketches.Files.getMappedByteBuffer;
-import static com.yahoo.sketches.Files.openRandomAccessFile;
-import static com.yahoo.sketches.Files.readLine;
+import static org.apache.datasketches.Files.append;
+import static org.apache.datasketches.Files.getExistingFile;
+import static org.apache.datasketches.Files.getMappedByteBuffer;
+import static org.apache.datasketches.Files.openRandomAccessFile;
+import static org.apache.datasketches.Files.readLine;
import java.io.File;
import java.io.IOException;
diff --git a/src/main/java/com/yahoo/sketches/ByteArrayBuilder.java b/src/main/java/org/apache/datasketches/ByteArrayBuilder.java
old mode 100755
new mode 100644
similarity index 87%
rename from src/main/java/com/yahoo/sketches/ByteArrayBuilder.java
rename to src/main/java/org/apache/datasketches/ByteArrayBuilder.java
index c161c90..930bdbb
--- a/src/main/java/com/yahoo/sketches/ByteArrayBuilder.java
+++ b/src/main/java/org/apache/datasketches/ByteArrayBuilder.java
@@ -1,9 +1,23 @@
/*
- * Copyright 2015, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
import java.util.Arrays;
diff --git a/src/main/java/com/yahoo/sketches/DirectoryWalker.java b/src/main/java/org/apache/datasketches/DirectoryWalker.java
similarity index 84%
rename from src/main/java/com/yahoo/sketches/DirectoryWalker.java
rename to src/main/java/org/apache/datasketches/DirectoryWalker.java
index 53b8e30..c167cde 100644
--- a/src/main/java/com/yahoo/sketches/DirectoryWalker.java
+++ b/src/main/java/org/apache/datasketches/DirectoryWalker.java
@@ -1,9 +1,23 @@
/*
- * Copyright 2015, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
import java.io.File;
import java.util.ArrayList;
diff --git a/src/main/java/org/apache/datasketches/DoublePair.java b/src/main/java/org/apache/datasketches/DoublePair.java
new file mode 100644
index 0000000..3b14a67
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/DoublePair.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches;
+
+import java.util.Comparator;
+
+public class DoublePair implements Comparator<DoublePair> {
+ public double x;
+ public double y;
+
+ public DoublePair(final double x, final double y) {
+ this.x = x;
+ this.y = y;
+ }
+
+ @Override
+ public int compare(final DoublePair p1, final DoublePair p2) {
+ return Double.compare(p1.x, p2.x); // handles NaN, +/- 0, etc.
+ }
+}
diff --git a/src/main/java/com/yahoo/sketches/Files.java b/src/main/java/org/apache/datasketches/Files.java
old mode 100755
new mode 100644
similarity index 97%
rename from src/main/java/com/yahoo/sketches/Files.java
rename to src/main/java/org/apache/datasketches/Files.java
index 8dd4556..0f10cff
--- a/src/main/java/com/yahoo/sketches/Files.java
+++ b/src/main/java/org/apache/datasketches/Files.java
@@ -1,9 +1,23 @@
/*
- * Copyright 2015, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
import static java.nio.channels.FileChannel.MapMode.READ_ONLY;
diff --git a/src/main/java/com/yahoo/sketches/Job.java b/src/main/java/org/apache/datasketches/Job.java
similarity index 87%
rename from src/main/java/com/yahoo/sketches/Job.java
rename to src/main/java/org/apache/datasketches/Job.java
index af73c26..f2df64d 100644
--- a/src/main/java/com/yahoo/sketches/Job.java
+++ b/src/main/java/org/apache/datasketches/Job.java
@@ -1,13 +1,27 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
-import static com.yahoo.sketches.Files.isFileValid;
-import static com.yahoo.sketches.Files.openPrintWriter;
-import static com.yahoo.sketches.Util.milliSecToString;
+import static org.apache.datasketches.Files.isFileValid;
+import static org.apache.datasketches.Files.openPrintWriter;
+import static org.apache.datasketches.Util.milliSecToString;
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
diff --git a/src/main/java/com/yahoo/sketches/JobProfile.java b/src/main/java/org/apache/datasketches/JobProfile.java
similarity index 50%
rename from src/main/java/com/yahoo/sketches/JobProfile.java
rename to src/main/java/org/apache/datasketches/JobProfile.java
index 87227dc..bd5d90e 100644
--- a/src/main/java/com/yahoo/sketches/JobProfile.java
+++ b/src/main/java/org/apache/datasketches/JobProfile.java
@@ -1,9 +1,23 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
import static java.lang.Math.log;
diff --git a/src/main/java/com/yahoo/sketches/LineReader.java b/src/main/java/org/apache/datasketches/LineReader.java
similarity index 70%
rename from src/main/java/com/yahoo/sketches/LineReader.java
rename to src/main/java/org/apache/datasketches/LineReader.java
index 1123324..13a9f29 100644
--- a/src/main/java/com/yahoo/sketches/LineReader.java
+++ b/src/main/java/org/apache/datasketches/LineReader.java
@@ -1,9 +1,23 @@
/*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
import java.io.BufferedReader;
import java.io.FileReader;
diff --git a/src/main/java/org/apache/datasketches/LongPair.java b/src/main/java/org/apache/datasketches/LongPair.java
new file mode 100644
index 0000000..cfd170e
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/LongPair.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches;
+
+import java.util.Comparator;
+
+public class LongPair implements Comparator<LongPair> {
+ public long x;
+ public long y;
+
+ public LongPair(final long x, final long y) {
+ this.x = x;
+ this.y = y;
+ }
+
+ @Override
+ public int compare(final LongPair p1, final LongPair p2) {
+ return (p1.x < p2.x) ? -1 : (p1.x > p2.x) ? 1 : 0;
+ }
+}
diff --git a/src/main/java/com/yahoo/sketches/PerformanceUtil.java b/src/main/java/org/apache/datasketches/PerformanceUtil.java
similarity index 66%
rename from src/main/java/com/yahoo/sketches/PerformanceUtil.java
rename to src/main/java/org/apache/datasketches/PerformanceUtil.java
index cfdbfd6..cbf872c 100644
--- a/src/main/java/com/yahoo/sketches/PerformanceUtil.java
+++ b/src/main/java/org/apache/datasketches/PerformanceUtil.java
@@ -1,11 +1,25 @@
/*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
-import static com.yahoo.sketches.Util.pwr2LawNext;
+import static org.apache.datasketches.Util.pwr2LawNext;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/PowerLawGenerator.java b/src/main/java/org/apache/datasketches/PowerLawGenerator.java
similarity index 91%
rename from src/main/java/com/yahoo/sketches/PowerLawGenerator.java
rename to src/main/java/org/apache/datasketches/PowerLawGenerator.java
index 51af3a7..8035c2c 100644
--- a/src/main/java/com/yahoo/sketches/PowerLawGenerator.java
+++ b/src/main/java/org/apache/datasketches/PowerLawGenerator.java
@@ -1,9 +1,23 @@
/*
- * Copyright 2015, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
import static java.lang.Math.abs;
import static java.lang.Math.log;
diff --git a/src/main/java/org/apache/datasketches/ProcessLine.java b/src/main/java/org/apache/datasketches/ProcessLine.java
new file mode 100644
index 0000000..4ff38df
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/ProcessLine.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches;
+
+public interface ProcessLine {
+
+ void process(String line, int lineNo);
+
+}
diff --git a/src/main/java/com/yahoo/sketches/Properties.java b/src/main/java/org/apache/datasketches/Properties.java
similarity index 83%
rename from src/main/java/com/yahoo/sketches/Properties.java
rename to src/main/java/org/apache/datasketches/Properties.java
index f3f2a3c..0c995f3 100644
--- a/src/main/java/com/yahoo/sketches/Properties.java
+++ b/src/main/java/org/apache/datasketches/Properties.java
@@ -1,9 +1,23 @@
/*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
import java.util.ArrayList;
import java.util.Comparator;
diff --git a/src/main/java/com/yahoo/sketches/RandomPowerLawGenerator.java b/src/main/java/org/apache/datasketches/RandomPowerLawGenerator.java
similarity index 91%
rename from src/main/java/com/yahoo/sketches/RandomPowerLawGenerator.java
rename to src/main/java/org/apache/datasketches/RandomPowerLawGenerator.java
index c33ad43..10741a0 100644
--- a/src/main/java/com/yahoo/sketches/RandomPowerLawGenerator.java
+++ b/src/main/java/org/apache/datasketches/RandomPowerLawGenerator.java
@@ -1,9 +1,23 @@
/*
- * Copyright 2015, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
import static java.lang.Math.abs;
import static java.lang.Math.exp;
diff --git a/src/main/java/com/yahoo/sketches/TestingUtil2.java b/src/main/java/org/apache/datasketches/TestingUtil2.java
similarity index 79%
rename from src/main/java/com/yahoo/sketches/TestingUtil2.java
rename to src/main/java/org/apache/datasketches/TestingUtil2.java
index 3f92721..504d7d2 100644
--- a/src/main/java/com/yahoo/sketches/TestingUtil2.java
+++ b/src/main/java/org/apache/datasketches/TestingUtil2.java
@@ -1,9 +1,23 @@
/*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
import static java.lang.Math.abs;
import static java.lang.Math.exp;
diff --git a/src/main/java/com/yahoo/sketches/UnzipFiles.java b/src/main/java/org/apache/datasketches/UnzipFiles.java
similarity index 67%
rename from src/main/java/com/yahoo/sketches/UnzipFiles.java
rename to src/main/java/org/apache/datasketches/UnzipFiles.java
index abcaf3c..daecc08 100644
--- a/src/main/java/com/yahoo/sketches/UnzipFiles.java
+++ b/src/main/java/org/apache/datasketches/UnzipFiles.java
@@ -1,9 +1,23 @@
/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
import java.io.File;
import java.io.FileInputStream;
diff --git a/src/main/java/com/yahoo/sketches/ZipFiles.java b/src/main/java/org/apache/datasketches/ZipFiles.java
similarity index 80%
rename from src/main/java/com/yahoo/sketches/ZipFiles.java
rename to src/main/java/org/apache/datasketches/ZipFiles.java
index 985b7e1..81c170d 100644
--- a/src/main/java/com/yahoo/sketches/ZipFiles.java
+++ b/src/main/java/org/apache/datasketches/ZipFiles.java
@@ -1,9 +1,23 @@
/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
import java.io.File;
import java.io.FileInputStream;
diff --git a/src/main/java/com/yahoo/sketches/characterization/ZipfDistribution.java b/src/main/java/org/apache/datasketches/characterization/ZipfDistribution.java
similarity index 73%
rename from src/main/java/com/yahoo/sketches/characterization/ZipfDistribution.java
rename to src/main/java/org/apache/datasketches/characterization/ZipfDistribution.java
index b9acaf2..9252541 100644
--- a/src/main/java/com/yahoo/sketches/characterization/ZipfDistribution.java
+++ b/src/main/java/org/apache/datasketches/characterization/ZipfDistribution.java
@@ -1,13 +1,23 @@
/*
- * Copyright 2019, Verizon Media.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-// Based on the following implementation:
-// https://github.com/apache/commons-statistics/blob/master/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ZipfDistribution.java
-// https://github.com/apache/commons-rng/blob/master/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/RejectionInversionZipfSampler.java
-
-package com.yahoo.sketches.characterization;
+package org.apache.datasketches.characterization;
import java.util.Random;
diff --git a/src/main/java/com/yahoo/sketches/characterization/concurrent/ConcurrentTestContext.java b/src/main/java/org/apache/datasketches/characterization/concurrent/ConcurrentTestContext.java
similarity index 82%
rename from src/main/java/com/yahoo/sketches/characterization/concurrent/ConcurrentTestContext.java
rename to src/main/java/org/apache/datasketches/characterization/concurrent/ConcurrentTestContext.java
index c23509b..da293c6 100644
--- a/src/main/java/com/yahoo/sketches/characterization/concurrent/ConcurrentTestContext.java
+++ b/src/main/java/org/apache/datasketches/characterization/concurrent/ConcurrentTestContext.java
@@ -1,9 +1,23 @@
/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.concurrent;
+package org.apache.datasketches.characterization.concurrent;
import java.util.HashSet;
import java.util.Set;
diff --git a/src/main/java/com/yahoo/sketches/characterization/concurrent/ConcurrentTestThread.java b/src/main/java/org/apache/datasketches/characterization/concurrent/ConcurrentTestThread.java
similarity index 63%
rename from src/main/java/com/yahoo/sketches/characterization/concurrent/ConcurrentTestThread.java
rename to src/main/java/org/apache/datasketches/characterization/concurrent/ConcurrentTestThread.java
index 7372814..86783ec 100644
--- a/src/main/java/com/yahoo/sketches/characterization/concurrent/ConcurrentTestThread.java
+++ b/src/main/java/org/apache/datasketches/characterization/concurrent/ConcurrentTestThread.java
@@ -1,9 +1,23 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.concurrent;
+package org.apache.datasketches.characterization.concurrent;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
diff --git a/src/main/java/org/apache/datasketches/characterization/concurrent/package-info.java b/src/main/java/org/apache/datasketches/characterization/concurrent/package-info.java
new file mode 100644
index 0000000..61243c2
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/characterization/concurrent/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * @author Lee Rhodes
+ */
+
+package org.apache.datasketches.characterization.concurrent;
diff --git a/src/main/java/com/yahoo/sketches/characterization/cpc/CpcCompressionCharacterizationProfile.java b/src/main/java/org/apache/datasketches/characterization/cpc/CpcCompressionCharacterizationProfile.java
similarity index 53%
rename from src/main/java/com/yahoo/sketches/characterization/cpc/CpcCompressionCharacterizationProfile.java
rename to src/main/java/org/apache/datasketches/characterization/cpc/CpcCompressionCharacterizationProfile.java
index be2093c..129678a 100644
--- a/src/main/java/com/yahoo/sketches/characterization/cpc/CpcCompressionCharacterizationProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/cpc/CpcCompressionCharacterizationProfile.java
@@ -1,17 +1,31 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.cpc;
+package org.apache.datasketches.characterization.cpc;
import java.io.PrintStream;
import java.io.PrintWriter;
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.cpc.CompressionCharacterization;
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.cpc.CompressionCharacterization;
/**
* @author Lee Rhodes
diff --git a/src/main/java/org/apache/datasketches/characterization/cpc/CpcMergingValidationProfile.java b/src/main/java/org/apache/datasketches/characterization/cpc/CpcMergingValidationProfile.java
new file mode 100644
index 0000000..f66bc83
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/characterization/cpc/CpcMergingValidationProfile.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches.characterization.cpc;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.cpc.MergingValidation;
+
+/**
+ * @author Lee Rhodes
+ */
+public class CpcMergingValidationProfile implements JobProfile {
+ Job job;
+ Properties prop;
+
+ int lgMinK;
+ int lgMaxK; //inclusive
+ int lgMulK;
+ int uPPO;
+ int incLgK;
+ PrintStream ps;
+ PrintWriter pw;
+
+ @Override
+ public void start(final Job job) {
+ this.job = job;
+ prop = job.getProperties();
+
+ lgMinK = Integer.parseInt(prop.mustGet("lgMinK"));
+ lgMaxK = Integer.parseInt(prop.mustGet("lgMaxK"));
+ lgMulK = Integer.parseInt(prop.mustGet("lgMulK"));
+ uPPO = Integer.parseInt(prop.mustGet("uPPO"));
+ incLgK = Integer.parseInt(prop.mustGet("incLgK"));
+
+ ps = System.out;
+ pw = job.getPrintWriter();
+
+ final MergingValidation mv = new MergingValidation(
+ lgMinK, lgMaxK, lgMulK, uPPO, incLgK, ps, pw);
+ mv.start();
+ }
+
+ @Override
+ public void shutdown() {}
+
+ @Override
+ public void cleanup() {}
+
+ @Override
+ public void println(final String s) {}
+
+}
diff --git a/src/main/java/org/apache/datasketches/characterization/cpc/CpcQuickMergingValidationProfile.java b/src/main/java/org/apache/datasketches/characterization/cpc/CpcQuickMergingValidationProfile.java
new file mode 100644
index 0000000..a6e35be
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/characterization/cpc/CpcQuickMergingValidationProfile.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches.characterization.cpc;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.cpc.QuickMergingValidation;
+
+/**
+ * @author Lee Rhodes
+ */
+public class CpcQuickMergingValidationProfile implements JobProfile {
+
+ Job job;
+ Properties prop;
+
+ int lgMinK;
+ int lgMaxK; //inclusive
+ int incLgK;
+ PrintStream ps;
+ PrintWriter pw;
+
+ @Override
+ public void start(final Job job) {
+ this.job = job;
+ prop = job.getProperties();
+
+ lgMinK = Integer.parseInt(prop.mustGet("lgMinK"));
+ lgMaxK = Integer.parseInt(prop.mustGet("lgMaxK"));
+ incLgK = Integer.parseInt(prop.mustGet("incLgK"));
+
+ ps = System.out;
+ pw = job.getPrintWriter();
+
+ final QuickMergingValidation mv = new QuickMergingValidation(
+ lgMinK, lgMaxK, incLgK, ps, pw);
+ mv.start();
+ }
+
+ @Override
+ public void shutdown() {}
+
+ @Override
+ public void cleanup() {}
+
+ @Override
+ public void println(final String s) {}
+}
diff --git a/src/main/java/com/yahoo/sketches/characterization/cpc/CpcSerDeProfile.java b/src/main/java/org/apache/datasketches/characterization/cpc/CpcSerDeProfile.java
similarity index 51%
rename from src/main/java/com/yahoo/sketches/characterization/cpc/CpcSerDeProfile.java
rename to src/main/java/org/apache/datasketches/characterization/cpc/CpcSerDeProfile.java
index 698e930..a7c67bf 100644
--- a/src/main/java/com/yahoo/sketches/characterization/cpc/CpcSerDeProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/cpc/CpcSerDeProfile.java
@@ -1,12 +1,26 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.cpc;
+package org.apache.datasketches.characterization.cpc;
-import com.yahoo.sketches.characterization.uniquecount.BaseSerDeProfile;
-import com.yahoo.sketches.cpc.CpcSketch;
+import org.apache.datasketches.characterization.uniquecount.BaseSerDeProfile;
+import org.apache.datasketches.cpc.CpcSketch;
/**
* @author Lee Rhodes
diff --git a/src/main/java/org/apache/datasketches/characterization/cpc/CpcStreamingValidationProfile.java b/src/main/java/org/apache/datasketches/characterization/cpc/CpcStreamingValidationProfile.java
new file mode 100644
index 0000000..35d4450
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/characterization/cpc/CpcStreamingValidationProfile.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches.characterization.cpc;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.cpc.StreamingValidation;
+
+/**
+ * @author Lee Rhodes
+ */
+public class CpcStreamingValidationProfile implements JobProfile {
+ Job job;
+ Properties prop;
+
+ int lgMinK; //For each K to
+ int lgMaxK;
+ int trials;
+ int ppoN;
+ PrintStream ps;
+ PrintWriter pw;
+
+ @Override
+ public void start(final Job job) {
+ this.job = job;
+ pw = job.getPrintWriter();
+ ps = System.out;
+ prop = job.getProperties();
+ lgMinK = Integer.parseInt(prop.mustGet("lgMinK"));
+ lgMaxK = Integer.parseInt(prop.mustGet("lgMaxK"));
+ trials = Integer.parseInt(prop.mustGet("trials"));
+ ppoN = Integer.parseInt(prop.mustGet("ppoN"));
+ final StreamingValidation sVal = new StreamingValidation(lgMinK, lgMaxK, trials, ppoN, ps, pw);
+ sVal.start();
+ }
+
+ @Override
+ public void shutdown() {}
+
+ @Override
+ public void cleanup() {}
+
+ @Override
+ public void println(final String s) {}
+
+}
diff --git a/src/main/java/org/apache/datasketches/characterization/cpc/CpcUpdateSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/cpc/CpcUpdateSpeedProfile.java
new file mode 100644
index 0000000..2f1ffcf
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/characterization/cpc/CpcUpdateSpeedProfile.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches.characterization.cpc;
+
+import org.apache.datasketches.characterization.uniquecount.BaseUpdateSpeedProfile;
+import org.apache.datasketches.cpc.CpcSketch;
+
+/**
+ * @author Lee Rhodes
+ */
+public class CpcUpdateSpeedProfile extends BaseUpdateSpeedProfile {
+ private CpcSketch sketch;
+
+ @Override
+ public void configure() {
+ final int lgK = Integer.parseInt(prop.mustGet("LgK"));
+ sketch = new CpcSketch(lgK);
+ }
+
+ @Override
+ public double doTrial(final int uPerTrial) {
+ sketch.reset(); // reuse the same sketch
+ final long startUpdateTime_nS = System.nanoTime();
+
+ for (int u = uPerTrial; u-- > 0;) {
+ sketch.update(++vIn);
+ }
+ final long updateTime_nS = System.nanoTime() - startUpdateTime_nS;
+ return (double) updateTime_nS / uPerTrial;
+ }
+
+}
diff --git a/src/main/java/org/apache/datasketches/characterization/cpc/package-info.java b/src/main/java/org/apache/datasketches/characterization/cpc/package-info.java
new file mode 100644
index 0000000..05aae3d
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/characterization/cpc/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * @author Lee Rhodes
+ */
+
+package org.apache.datasketches.characterization.cpc;
diff --git a/src/main/java/com/yahoo/sketches/characterization/fdt/FdtAccuracyProfile.java b/src/main/java/org/apache/datasketches/characterization/fdt/FdtAccuracyProfile.java
similarity index 84%
rename from src/main/java/com/yahoo/sketches/characterization/fdt/FdtAccuracyProfile.java
rename to src/main/java/org/apache/datasketches/characterization/fdt/FdtAccuracyProfile.java
index 30e69dd..f2f1d1a 100644
--- a/src/main/java/com/yahoo/sketches/characterization/fdt/FdtAccuracyProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/fdt/FdtAccuracyProfile.java
@@ -1,14 +1,28 @@
/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.fdt;
+package org.apache.datasketches.characterization.fdt;
-import static com.yahoo.sketches.PerformanceUtil.FRACTIONS;
-import static com.yahoo.sketches.PowerLawGenerator.getSlope;
-import static com.yahoo.sketches.PowerLawGenerator.getY;
-import static com.yahoo.sketches.Util.pwr2LawNext;
+import static org.apache.datasketches.PerformanceUtil.FRACTIONS;
+import static org.apache.datasketches.PowerLawGenerator.getSlope;
+import static org.apache.datasketches.PowerLawGenerator.getY;
+import static org.apache.datasketches.Util.pwr2LawNext;
import java.io.PrintWriter;
import java.util.ArrayList;
@@ -20,14 +34,14 @@ import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
-import com.yahoo.sketches.AccuracyStats;
-import com.yahoo.sketches.DoublePair;
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.fdt.FdtSketch;
-import com.yahoo.sketches.fdt.Group;
-import com.yahoo.sketches.fdt.PostProcessor;
+import org.apache.datasketches.AccuracyStats;
+import org.apache.datasketches.DoublePair;
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.fdt.FdtSketch;
+import org.apache.datasketches.fdt.Group;
+import org.apache.datasketches.fdt.PostProcessor;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/fdt/TestGroup.java b/src/main/java/org/apache/datasketches/characterization/fdt/TestGroup.java
similarity index 76%
rename from src/main/java/com/yahoo/sketches/characterization/fdt/TestGroup.java
rename to src/main/java/org/apache/datasketches/characterization/fdt/TestGroup.java
index dfb2bd1..24a3644 100644
--- a/src/main/java/com/yahoo/sketches/characterization/fdt/TestGroup.java
+++ b/src/main/java/org/apache/datasketches/characterization/fdt/TestGroup.java
@@ -1,13 +1,27 @@
/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.fdt;
+package org.apache.datasketches.characterization.fdt;
import java.util.regex.Pattern;
-import com.yahoo.sketches.fdt.Group;
+import org.apache.datasketches.fdt.Group;
/**
* Note: this class has a natural ordering that is inconsistent with equals.
@@ -32,11 +46,6 @@ public class TestGroup extends Group {
public TestGroup() { }
@Override
- public TestGroup copy() {
- return new TestGroup();
- }
-
- @Override
public TestGroup init(final String priKey, final int count, final double estimate, final double ub,
final double lb, final double fraction, final double rse) {
super.init(priKey, count, estimate, ub, lb, fraction, rse);
diff --git a/src/main/java/org/apache/datasketches/characterization/fdt/package-info.java b/src/main/java/org/apache/datasketches/characterization/fdt/package-info.java
new file mode 100644
index 0000000..49346ec
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/characterization/fdt/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * @author Lee Rhodes
+ */
+
+package org.apache.datasketches.characterization.fdt;
diff --git a/src/main/java/com/yahoo/sketches/characterization/frequencies/BaseFrequenciesSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/frequencies/BaseFrequenciesSpeedProfile.java
similarity index 66%
rename from src/main/java/com/yahoo/sketches/characterization/frequencies/BaseFrequenciesSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/frequencies/BaseFrequenciesSpeedProfile.java
index 7e1ca8b..0f11398 100644
--- a/src/main/java/com/yahoo/sketches/characterization/frequencies/BaseFrequenciesSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/frequencies/BaseFrequenciesSpeedProfile.java
@@ -1,10 +1,29 @@
-package com.yahoo.sketches.characterization.frequencies;
-
-import static com.yahoo.sketches.Util.pwr2LawNext;
-
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.Properties;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches.characterization.frequencies;
+
+import static org.apache.datasketches.Util.pwr2LawNext;
+
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.Properties;
public abstract class BaseFrequenciesSpeedProfile implements JobProfile {
diff --git a/src/main/java/com/yahoo/sketches/characterization/frequencies/LongsSketchSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/frequencies/LongsSketchSpeedProfile.java
similarity index 70%
rename from src/main/java/com/yahoo/sketches/characterization/frequencies/LongsSketchSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/frequencies/LongsSketchSpeedProfile.java
index 1746540..d93e9ee 100644
--- a/src/main/java/com/yahoo/sketches/characterization/frequencies/LongsSketchSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/frequencies/LongsSketchSpeedProfile.java
@@ -1,9 +1,28 @@
-package com.yahoo.sketches.characterization.frequencies;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
-import com.yahoo.memory.Memory;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.characterization.ZipfDistribution;
-import com.yahoo.sketches.frequencies.LongsSketch;
+package org.apache.datasketches.characterization.frequencies;
+
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.characterization.ZipfDistribution;
+import org.apache.datasketches.frequencies.LongsSketch;
public class LongsSketchSpeedProfile extends BaseFrequenciesSpeedProfile {
diff --git a/src/main/java/org/apache/datasketches/characterization/frequencies/package-info.java b/src/main/java/org/apache/datasketches/characterization/frequencies/package-info.java
new file mode 100644
index 0000000..a054fef
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/characterization/frequencies/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * @author Lee Rhodes
+ */
+
+package org.apache.datasketches.characterization.frequencies;
diff --git a/src/main/java/com/yahoo/sketches/characterization/hash/BaseHashSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/hash/BaseHashSpeedProfile.java
similarity index 74%
rename from src/main/java/com/yahoo/sketches/characterization/hash/BaseHashSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/hash/BaseHashSpeedProfile.java
index d5bc125..eab65bb 100644
--- a/src/main/java/com/yahoo/sketches/characterization/hash/BaseHashSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/hash/BaseHashSpeedProfile.java
@@ -1,17 +1,31 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.hash;
+package org.apache.datasketches.characterization.hash;
-import static com.yahoo.sketches.Util.pwr2LawNext;
+import static org.apache.datasketches.Util.pwr2LawNext;
import static java.lang.Math.log;
import static java.lang.Math.pow;
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.Properties;
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.Properties;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/hash/HashBytesSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/hash/HashBytesSpeedProfile.java
similarity index 81%
rename from src/main/java/com/yahoo/sketches/characterization/hash/HashBytesSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/hash/HashBytesSpeedProfile.java
index 5fc2af7..5d0b78e 100644
--- a/src/main/java/com/yahoo/sketches/characterization/hash/HashBytesSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/hash/HashBytesSpeedProfile.java
@@ -1,15 +1,29 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.hash;
+package org.apache.datasketches.characterization.hash;
-import static com.yahoo.memory.UnsafeUtil.unsafe;
+import static org.apache.datasketches.memory.UnsafeUtil.unsafe;
-import com.yahoo.memory.WritableMemory;
-import com.yahoo.sketches.hash.MurmurHash3v2;
-import com.yahoo.sketches.hash.XxHash;
+import org.apache.datasketches.memory.WritableMemory;
+import org.apache.datasketches.hash.MurmurHash3v2;
+import org.apache.datasketches.hash.XxHash;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/hash/HashLongsSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/hash/HashLongsSpeedProfile.java
similarity index 76%
rename from src/main/java/com/yahoo/sketches/characterization/hash/HashLongsSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/hash/HashLongsSpeedProfile.java
index ae3576f..9d4deee 100644
--- a/src/main/java/com/yahoo/sketches/characterization/hash/HashLongsSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/hash/HashLongsSpeedProfile.java
@@ -1,13 +1,27 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.hash;
+package org.apache.datasketches.characterization.hash;
-import com.yahoo.sketches.hash.MurmurHash3;
-import com.yahoo.sketches.hash.MurmurHash3v2;
-import com.yahoo.sketches.hash.XxHash;
+import org.apache.datasketches.hash.MurmurHash3;
+import org.apache.datasketches.hash.MurmurHash3v2;
+import org.apache.datasketches.hash.XxHash;
/**
* @author Lee Rhodes
diff --git a/src/main/java/org/apache/datasketches/characterization/hash/package-info.java b/src/main/java/org/apache/datasketches/characterization/hash/package-info.java
new file mode 100644
index 0000000..0374702
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/characterization/hash/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * @author Lee Rhodes
+ */
+
+package org.apache.datasketches.characterization.hash;
diff --git a/src/main/java/com/yahoo/sketches/characterization/hll/DruidHllAccuracyProfile.java b/src/main/java/org/apache/datasketches/characterization/hll/DruidHllAccuracyProfile.java
similarity index 60%
rename from src/main/java/com/yahoo/sketches/characterization/hll/DruidHllAccuracyProfile.java
rename to src/main/java/org/apache/datasketches/characterization/hll/DruidHllAccuracyProfile.java
index 036ebca..f11319d 100644
--- a/src/main/java/com/yahoo/sketches/characterization/hll/DruidHllAccuracyProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/hll/DruidHllAccuracyProfile.java
@@ -1,15 +1,29 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.hll;
+package org.apache.datasketches.characterization.hll;
import org.apache.druid.hll.HyperLogLogCollector;
import org.apache.druid.hll.HyperLogLogHash;
-import com.yahoo.sketches.AccuracyStats;
-import com.yahoo.sketches.characterization.uniquecount.BaseAccuracyProfile;
+import org.apache.datasketches.AccuracyStats;
+import org.apache.datasketches.characterization.uniquecount.BaseAccuracyProfile;
public class DruidHllAccuracyProfile extends BaseAccuracyProfile {
diff --git a/src/main/java/com/yahoo/sketches/characterization/hll/DruidHllMergeAccuracyProfile.java b/src/main/java/org/apache/datasketches/characterization/hll/DruidHllMergeAccuracyProfile.java
similarity index 71%
rename from src/main/java/com/yahoo/sketches/characterization/hll/DruidHllMergeAccuracyProfile.java
rename to src/main/java/org/apache/datasketches/characterization/hll/DruidHllMergeAccuracyProfile.java
index dfabd5a..fb22a2e 100644
--- a/src/main/java/com/yahoo/sketches/characterization/hll/DruidHllMergeAccuracyProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/hll/DruidHllMergeAccuracyProfile.java
@@ -1,17 +1,31 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.hll;
+package org.apache.datasketches.characterization.hll;
import java.util.Random;
import org.apache.druid.hll.HyperLogLogCollector;
import org.apache.druid.hll.HyperLogLogHash;
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
public class DruidHllMergeAccuracyProfile implements JobProfile {
diff --git a/src/main/java/com/yahoo/sketches/characterization/hll/HllAccuracyProfile.java b/src/main/java/org/apache/datasketches/characterization/hll/HllAccuracyProfile.java
similarity index 76%
rename from src/main/java/com/yahoo/sketches/characterization/hll/HllAccuracyProfile.java
rename to src/main/java/org/apache/datasketches/characterization/hll/HllAccuracyProfile.java
index c971ba7..c757dc1 100644
--- a/src/main/java/com/yahoo/sketches/characterization/hll/HllAccuracyProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/hll/HllAccuracyProfile.java
@@ -1,15 +1,29 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.hll;
+package org.apache.datasketches.characterization.hll;
-import com.yahoo.memory.WritableMemory;
-import com.yahoo.sketches.AccuracyStats;
-import com.yahoo.sketches.characterization.uniquecount.BaseAccuracyProfile;
-import com.yahoo.sketches.hll.HllSketch;
-import com.yahoo.sketches.hll.TgtHllType;
+import org.apache.datasketches.memory.WritableMemory;
+import org.apache.datasketches.AccuracyStats;
+import org.apache.datasketches.characterization.uniquecount.BaseAccuracyProfile;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.TgtHllType;
public class HllAccuracyProfile extends BaseAccuracyProfile {
private HllSketch sketch;
diff --git a/src/main/java/com/yahoo/sketches/characterization/hll/HllMergeAccuracyProfile.java b/src/main/java/org/apache/datasketches/characterization/hll/HllMergeAccuracyProfile.java
similarity index 66%
rename from src/main/java/com/yahoo/sketches/characterization/hll/HllMergeAccuracyProfile.java
rename to src/main/java/org/apache/datasketches/characterization/hll/HllMergeAccuracyProfile.java
index 2be233f..e3f71aa 100644
--- a/src/main/java/com/yahoo/sketches/characterization/hll/HllMergeAccuracyProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/hll/HllMergeAccuracyProfile.java
@@ -1,16 +1,30 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.hll;
+package org.apache.datasketches.characterization.hll;
import java.util.Random;
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.hll.HllSketch;
-import com.yahoo.sketches.hll.Union;
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.Union;
public class HllMergeAccuracyProfile implements JobProfile {
diff --git a/src/main/java/com/yahoo/sketches/characterization/hll/HllSerDeProfile.java b/src/main/java/org/apache/datasketches/characterization/hll/HllSerDeProfile.java
similarity index 66%
rename from src/main/java/com/yahoo/sketches/characterization/hll/HllSerDeProfile.java
rename to src/main/java/org/apache/datasketches/characterization/hll/HllSerDeProfile.java
index 1bf43eb..80e8ee4 100644
--- a/src/main/java/com/yahoo/sketches/characterization/hll/HllSerDeProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/hll/HllSerDeProfile.java
@@ -1,15 +1,29 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.hll;
+package org.apache.datasketches.characterization.hll;
-import com.yahoo.memory.Memory;
-import com.yahoo.memory.WritableMemory;
-import com.yahoo.sketches.characterization.uniquecount.BaseSerDeProfile;
-import com.yahoo.sketches.hll.HllSketch;
-import com.yahoo.sketches.hll.TgtHllType;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.WritableMemory;
+import org.apache.datasketches.characterization.uniquecount.BaseSerDeProfile;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.TgtHllType;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/hll/HllUpdateSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/hll/HllUpdateSpeedProfile.java
similarity index 53%
rename from src/main/java/com/yahoo/sketches/characterization/hll/HllUpdateSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/hll/HllUpdateSpeedProfile.java
index ac23ee7..ac4fbb4 100644
--- a/src/main/java/com/yahoo/sketches/characterization/hll/HllUpdateSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/hll/HllUpdateSpeedProfile.java
@@ -1,14 +1,28 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.hll;
+package org.apache.datasketches.characterization.hll;
-import com.yahoo.memory.WritableMemory;
-import com.yahoo.sketches.characterization.uniquecount.BaseUpdateSpeedProfile;
-import com.yahoo.sketches.hll.HllSketch;
-import com.yahoo.sketches.hll.TgtHllType;
+import org.apache.datasketches.memory.WritableMemory;
+import org.apache.datasketches.characterization.uniquecount.BaseUpdateSpeedProfile;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.TgtHllType;
/**
* @author Lee Rhodes
diff --git a/src/main/java/org/apache/datasketches/characterization/hll/package-info.java b/src/main/java/org/apache/datasketches/characterization/hll/package-info.java
new file mode 100644
index 0000000..b751288
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/characterization/hll/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * @author Lee Rhodes
+ */
+
+package org.apache.datasketches.characterization.hll;
diff --git a/src/main/java/com/yahoo/sketches/characterization/memory/BaseSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/memory/BaseSpeedProfile.java
similarity index 79%
rename from src/main/java/com/yahoo/sketches/characterization/memory/BaseSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/memory/BaseSpeedProfile.java
index 881b52f..d845843 100644
--- a/src/main/java/com/yahoo/sketches/characterization/memory/BaseSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/memory/BaseSpeedProfile.java
@@ -1,17 +1,31 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.memory;
+package org.apache.datasketches.characterization.memory;
-import static com.yahoo.sketches.Util.pwr2LawNext;
+import static org.apache.datasketches.Util.pwr2LawNext;
import static java.lang.Math.log;
import static java.lang.Math.pow;
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.Properties;
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.Properties;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/memory/BaseUtf8SpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/memory/BaseUtf8SpeedProfile.java
similarity index 85%
rename from src/main/java/com/yahoo/sketches/characterization/memory/BaseUtf8SpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/memory/BaseUtf8SpeedProfile.java
index 27dd1ca..b849b08 100644
--- a/src/main/java/com/yahoo/sketches/characterization/memory/BaseUtf8SpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/memory/BaseUtf8SpeedProfile.java
@@ -1,11 +1,25 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.memory;
+package org.apache.datasketches.characterization.memory;
-import static com.yahoo.sketches.Util.pwr2LawNext;
+import static org.apache.datasketches.Util.pwr2LawNext;
import static java.lang.Math.log;
import static java.lang.Math.pow;
import static org.testng.Assert.fail;
@@ -13,10 +27,10 @@ import static org.testng.Assert.fail;
import java.util.ArrayList;
import java.util.List;
-import com.yahoo.memory.Memory;
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.Properties;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.Properties;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/memory/HeapSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/memory/HeapSpeedProfile.java
similarity index 52%
rename from src/main/java/com/yahoo/sketches/characterization/memory/HeapSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/memory/HeapSpeedProfile.java
index 9fec2a4..e8472c5 100644
--- a/src/main/java/com/yahoo/sketches/characterization/memory/HeapSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/memory/HeapSpeedProfile.java
@@ -1,9 +1,23 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.memory;
+package org.apache.datasketches.characterization.memory;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/memory/HeapUtf8SpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/memory/HeapUtf8SpeedProfile.java
similarity index 65%
rename from src/main/java/com/yahoo/sketches/characterization/memory/HeapUtf8SpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/memory/HeapUtf8SpeedProfile.java
index b27e9ff..f585ddd 100644
--- a/src/main/java/com/yahoo/sketches/characterization/memory/HeapUtf8SpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/memory/HeapUtf8SpeedProfile.java
@@ -1,15 +1,29 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.memory;
+package org.apache.datasketches.characterization.memory;
import static java.nio.charset.StandardCharsets.UTF_8;
-import com.yahoo.memory.Memory;
-import com.yahoo.memory.Util.RandomCodePoints;
-import com.yahoo.memory.WritableMemory;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.Util.RandomCodePoints;
+import org.apache.datasketches.memory.WritableMemory;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/memory/MemoryDirectSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/memory/MemoryDirectSpeedProfile.java
similarity index 53%
rename from src/main/java/com/yahoo/sketches/characterization/memory/MemoryDirectSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/memory/MemoryDirectSpeedProfile.java
index 71d7f9b..5fed9c2 100644
--- a/src/main/java/com/yahoo/sketches/characterization/memory/MemoryDirectSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/memory/MemoryDirectSpeedProfile.java
@@ -1,12 +1,26 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.memory;
+package org.apache.datasketches.characterization.memory;
-import com.yahoo.memory.WritableDirectHandle;
-import com.yahoo.memory.WritableMemory;
+import org.apache.datasketches.memory.WritableDirectHandle;
+import org.apache.datasketches.memory.WritableMemory;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/memory/UnsafeDirectSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/memory/UnsafeDirectSpeedProfile.java
similarity index 54%
rename from src/main/java/com/yahoo/sketches/characterization/memory/UnsafeDirectSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/memory/UnsafeDirectSpeedProfile.java
index c26a351..db95147 100644
--- a/src/main/java/com/yahoo/sketches/characterization/memory/UnsafeDirectSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/memory/UnsafeDirectSpeedProfile.java
@@ -1,11 +1,25 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.memory;
+package org.apache.datasketches.characterization.memory;
-import static com.yahoo.memory.UnsafeUtil.unsafe;
+import static org.apache.datasketches.memory.UnsafeUtil.unsafe;
/**
* @author Lee Rhodes
diff --git a/src/main/java/org/apache/datasketches/characterization/memory/package-info.java b/src/main/java/org/apache/datasketches/characterization/memory/package-info.java
new file mode 100644
index 0000000..3e85d03
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/characterization/memory/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * @author Lee Rhodes
+ */
+
+package org.apache.datasketches.characterization.memory;
diff --git a/src/main/java/org/apache/datasketches/characterization/package-info.java b/src/main/java/org/apache/datasketches/characterization/package-info.java
new file mode 100644
index 0000000..fd6c2c9
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/characterization/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * @author Lee Rhodes
+ */
+
+package org.apache.datasketches.characterization;
diff --git a/src/main/java/com/yahoo/sketches/characterization/quantiles/BaseQuantilesAccuracyProfile.java b/src/main/java/org/apache/datasketches/characterization/quantiles/BaseQuantilesAccuracyProfile.java
similarity index 58%
rename from src/main/java/com/yahoo/sketches/characterization/quantiles/BaseQuantilesAccuracyProfile.java
rename to src/main/java/org/apache/datasketches/characterization/quantiles/BaseQuantilesAccuracyProfile.java
index 94c9a1d..4ea043f 100644
--- a/src/main/java/com/yahoo/sketches/characterization/quantiles/BaseQuantilesAccuracyProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/quantiles/BaseQuantilesAccuracyProfile.java
@@ -1,14 +1,33 @@
-package com.yahoo.sketches.characterization.quantiles;
-
-import static com.yahoo.sketches.Util.pwr2LawNext;
-
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.PerformanceUtil;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.quantiles.DoublesSketch;
-import com.yahoo.sketches.quantiles.DoublesSketchBuilder;
-import com.yahoo.sketches.quantiles.UpdateDoublesSketch;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches.characterization.quantiles;
+
+import static org.apache.datasketches.Util.pwr2LawNext;
+
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.PerformanceUtil;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.quantiles.DoublesSketch;
+import org.apache.datasketches.quantiles.DoublesSketchBuilder;
+import org.apache.datasketches.quantiles.UpdateDoublesSketch;
public abstract class BaseQuantilesAccuracyProfile implements JobProfile {
diff --git a/src/main/java/com/yahoo/sketches/characterization/quantiles/BaseQuantilesSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/quantiles/BaseQuantilesSpeedProfile.java
similarity index 68%
rename from src/main/java/com/yahoo/sketches/characterization/quantiles/BaseQuantilesSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/quantiles/BaseQuantilesSpeedProfile.java
index 90734f8..d0b489e 100644
--- a/src/main/java/com/yahoo/sketches/characterization/quantiles/BaseQuantilesSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/quantiles/BaseQuantilesSpeedProfile.java
@@ -1,10 +1,29 @@
-package com.yahoo.sketches.characterization.quantiles;
-
-import static com.yahoo.sketches.Util.pwr2LawNext;
-
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.Properties;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches.characterization.quantiles;
+
+import static org.apache.datasketches.Util.pwr2LawNext;
+
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.Properties;
public abstract class BaseQuantilesSpeedProfile implements JobProfile {
diff --git a/src/main/java/com/yahoo/sketches/characterization/quantiles/DoublesSketchAccuracyProfile.java b/src/main/java/org/apache/datasketches/characterization/quantiles/DoublesSketchAccuracyProfile.java
similarity index 69%
rename from src/main/java/com/yahoo/sketches/characterization/quantiles/DoublesSketchAccuracyProfile.java
rename to src/main/java/org/apache/datasketches/characterization/quantiles/DoublesSketchAccuracyProfile.java
index 75794e2..733a4d4 100644
--- a/src/main/java/com/yahoo/sketches/characterization/quantiles/DoublesSketchAccuracyProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/quantiles/DoublesSketchAccuracyProfile.java
@@ -1,11 +1,30 @@
-package com.yahoo.sketches.characterization.quantiles;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches.characterization.quantiles;
import java.util.Random;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.quantiles.DoublesSketch;
-import com.yahoo.sketches.quantiles.DoublesSketchBuilder;
-import com.yahoo.sketches.quantiles.UpdateDoublesSketch;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.quantiles.DoublesSketch;
+import org.apache.datasketches.quantiles.DoublesSketchBuilder;
+import org.apache.datasketches.quantiles.UpdateDoublesSketch;
public class DoublesSketchAccuracyProfile extends BaseQuantilesAccuracyProfile {
diff --git a/src/main/java/com/yahoo/sketches/characterization/quantiles/DoublesSketchSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/quantiles/DoublesSketchSpeedProfile.java
similarity index 86%
rename from src/main/java/com/yahoo/sketches/characterization/quantiles/DoublesSketchSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/quantiles/DoublesSketchSpeedProfile.java
index b552c4f..15f47f4 100644
--- a/src/main/java/com/yahoo/sketches/characterization/quantiles/DoublesSketchSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/quantiles/DoublesSketchSpeedProfile.java
@@ -1,14 +1,33 @@
-package com.yahoo.sketches.characterization.quantiles;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches.characterization.quantiles;
import java.util.Arrays;
import java.util.Random;
-import com.yahoo.memory.Memory;
-import com.yahoo.memory.WritableMemory;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.quantiles.DoublesSketch;
-import com.yahoo.sketches.quantiles.DoublesSketchBuilder;
-import com.yahoo.sketches.quantiles.UpdateDoublesSketch;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.WritableMemory;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.quantiles.DoublesSketch;
+import org.apache.datasketches.quantiles.DoublesSketchBuilder;
+import org.apache.datasketches.quantiles.UpdateDoublesSketch;
public class DoublesSketchSpeedProfile extends BaseQuantilesSpeedProfile {
diff --git a/src/main/java/com/yahoo/sketches/characterization/quantiles/DruidAppHistStreamAProfile.java b/src/main/java/org/apache/datasketches/characterization/quantiles/DruidAppHistStreamAProfile.java
similarity index 84%
rename from src/main/java/com/yahoo/sketches/characterization/quantiles/DruidAppHistStreamAProfile.java
rename to src/main/java/org/apache/datasketches/characterization/quantiles/DruidAppHistStreamAProfile.java
index 39ab8e1..42450e5 100644
--- a/src/main/java/com/yahoo/sketches/characterization/quantiles/DruidAppHistStreamAProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/quantiles/DruidAppHistStreamAProfile.java
@@ -1,11 +1,25 @@
/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.quantiles;
+package org.apache.datasketches.characterization.quantiles;
-import static com.yahoo.sketches.characterization.quantiles.ProfileUtil.buildSplitPointsArr;
+import static org.apache.datasketches.characterization.quantiles.ProfileUtil.buildSplitPointsArr;
import java.io.File;
@@ -13,12 +27,12 @@ import org.apache.druid.query.aggregation.histogram.ApproximateHistogram;
import org.apache.druid.query.aggregation.histogram.Histogram;
import org.testng.annotations.Test;
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.LineReader;
-import com.yahoo.sketches.ProcessLine;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.UnzipFiles;
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.LineReader;
+import org.apache.datasketches.ProcessLine;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.UnzipFiles;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/quantiles/ExactStreamAProfile.java b/src/main/java/org/apache/datasketches/characterization/quantiles/ExactStreamAProfile.java
similarity index 83%
rename from src/main/java/com/yahoo/sketches/characterization/quantiles/ExactStreamAProfile.java
rename to src/main/java/org/apache/datasketches/characterization/quantiles/ExactStreamAProfile.java
index 36514ba..870ec63 100644
--- a/src/main/java/com/yahoo/sketches/characterization/quantiles/ExactStreamAProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/quantiles/ExactStreamAProfile.java
@@ -1,24 +1,38 @@
/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.quantiles;
+package org.apache.datasketches.characterization.quantiles;
-import static com.yahoo.sketches.characterization.quantiles.ProfileUtil.buildSplitPointsArr;
-import static com.yahoo.sketches.characterization.quantiles.ProfileUtil.checkMonotonic;
+import static org.apache.datasketches.characterization.quantiles.ProfileUtil.buildSplitPointsArr;
+import static org.apache.datasketches.characterization.quantiles.ProfileUtil.checkMonotonic;
import java.io.File;
import java.util.Arrays;
import org.testng.annotations.Test;
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.LineReader;
-import com.yahoo.sketches.ProcessLine;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.UnzipFiles;
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.LineReader;
+import org.apache.datasketches.ProcessLine;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.UnzipFiles;
/**
* Computes exact quantiles using brute-force methods.
diff --git a/src/main/java/com/yahoo/sketches/characterization/quantiles/ItemsSketchAccuracyProfile.java b/src/main/java/org/apache/datasketches/characterization/quantiles/ItemsSketchAccuracyProfile.java
similarity index 69%
rename from src/main/java/com/yahoo/sketches/characterization/quantiles/ItemsSketchAccuracyProfile.java
rename to src/main/java/org/apache/datasketches/characterization/quantiles/ItemsSketchAccuracyProfile.java
index 1ae6ad6..1090ff1 100644
--- a/src/main/java/com/yahoo/sketches/characterization/quantiles/ItemsSketchAccuracyProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/quantiles/ItemsSketchAccuracyProfile.java
@@ -1,10 +1,29 @@
-package com.yahoo.sketches.characterization.quantiles;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches.characterization.quantiles;
import java.util.Comparator;
import java.util.Random;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.quantiles.ItemsSketch;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.quantiles.ItemsSketch;
public class ItemsSketchAccuracyProfile extends BaseQuantilesAccuracyProfile {
diff --git a/src/main/java/com/yahoo/sketches/characterization/quantiles/ItemsSketchSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/quantiles/ItemsSketchSpeedProfile.java
similarity index 79%
rename from src/main/java/com/yahoo/sketches/characterization/quantiles/ItemsSketchSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/quantiles/ItemsSketchSpeedProfile.java
index d2d977a..b77194d 100644
--- a/src/main/java/com/yahoo/sketches/characterization/quantiles/ItemsSketchSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/quantiles/ItemsSketchSpeedProfile.java
@@ -1,14 +1,33 @@
-package com.yahoo.sketches.characterization.quantiles;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches.characterization.quantiles;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Random;
-import com.yahoo.memory.WritableMemory;
-import com.yahoo.sketches.ArrayOfDoublesSerDe;
-import com.yahoo.sketches.ArrayOfItemsSerDe;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.quantiles.ItemsSketch;
+import org.apache.datasketches.memory.WritableMemory;
+import org.apache.datasketches.ArrayOfDoublesSerDe;
+import org.apache.datasketches.ArrayOfItemsSerDe;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.quantiles.ItemsSketch;
public class ItemsSketchSpeedProfile extends BaseQuantilesSpeedProfile {
diff --git a/src/main/java/com/yahoo/sketches/characterization/quantiles/KllFloatsSketchAccuracyProfile.java b/src/main/java/org/apache/datasketches/characterization/quantiles/KllFloatsSketchAccuracyProfile.java
similarity index 68%
rename from src/main/java/com/yahoo/sketches/characterization/quantiles/KllFloatsSketchAccuracyProfile.java
rename to src/main/java/org/apache/datasketches/characterization/quantiles/KllFloatsSketchAccuracyProfile.java
index e220c65..bbef68c 100644
--- a/src/main/java/com/yahoo/sketches/characterization/quantiles/KllFloatsSketchAccuracyProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/quantiles/KllFloatsSketchAccuracyProfile.java
@@ -1,9 +1,28 @@
-package com.yahoo.sketches.characterization.quantiles;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches.characterization.quantiles;
import java.util.Random;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.kll.KllFloatsSketch;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.kll.KllFloatsSketch;
public class KllFloatsSketchAccuracyProfile extends BaseQuantilesAccuracyProfile {
diff --git a/src/main/java/com/yahoo/sketches/characterization/quantiles/KllFloatsSketchSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/quantiles/KllFloatsSketchSpeedProfile.java
similarity index 82%
rename from src/main/java/com/yahoo/sketches/characterization/quantiles/KllFloatsSketchSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/quantiles/KllFloatsSketchSpeedProfile.java
index cca77fe..6ec8f3b 100644
--- a/src/main/java/com/yahoo/sketches/characterization/quantiles/KllFloatsSketchSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/quantiles/KllFloatsSketchSpeedProfile.java
@@ -1,11 +1,30 @@
-package com.yahoo.sketches.characterization.quantiles;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches.characterization.quantiles;
import java.util.Arrays;
import java.util.Random;
-import com.yahoo.memory.Memory;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.kll.KllFloatsSketch;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.kll.KllFloatsSketch;
public class KllFloatsSketchSpeedProfile extends BaseQuantilesSpeedProfile {
diff --git a/src/main/java/com/yahoo/sketches/characterization/quantiles/MSketchStreamAProfile.java b/src/main/java/org/apache/datasketches/characterization/quantiles/MSketchStreamAProfile.java
similarity index 82%
rename from src/main/java/com/yahoo/sketches/characterization/quantiles/MSketchStreamAProfile.java
rename to src/main/java/org/apache/datasketches/characterization/quantiles/MSketchStreamAProfile.java
index b371e2f..0ac6114 100644
--- a/src/main/java/com/yahoo/sketches/characterization/quantiles/MSketchStreamAProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/quantiles/MSketchStreamAProfile.java
@@ -1,9 +1,23 @@
/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.quantiles;
+package org.apache.datasketches.characterization.quantiles;
import static java.lang.Math.rint;
@@ -11,12 +25,12 @@ import java.io.File;
import org.apache.druid.query.aggregation.momentsketch.MomentSketchWrapper;
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.LineReader;
-import com.yahoo.sketches.ProcessLine;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.UnzipFiles;
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.LineReader;
+import org.apache.datasketches.ProcessLine;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.UnzipFiles;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/quantiles/ProfileUtil.java b/src/main/java/org/apache/datasketches/characterization/quantiles/ProfileUtil.java
similarity index 68%
rename from src/main/java/com/yahoo/sketches/characterization/quantiles/ProfileUtil.java
rename to src/main/java/org/apache/datasketches/characterization/quantiles/ProfileUtil.java
index 79e2863..7c94f95 100644
--- a/src/main/java/com/yahoo/sketches/characterization/quantiles/ProfileUtil.java
+++ b/src/main/java/org/apache/datasketches/characterization/quantiles/ProfileUtil.java
@@ -1,13 +1,27 @@
/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.quantiles;
+package org.apache.datasketches.characterization.quantiles;
-import static com.yahoo.sketches.Util.ceilingPowerOfBdouble;
-import static com.yahoo.sketches.Util.logB;
-import static com.yahoo.sketches.Util.pwrLawNextDouble;
+import static org.apache.datasketches.Util.ceilingPowerOfBdouble;
+import static org.apache.datasketches.Util.logB;
+import static org.apache.datasketches.Util.pwrLawNextDouble;
import static java.lang.Math.ceil;
import static java.lang.Math.max;
diff --git a/src/main/java/com/yahoo/sketches/characterization/quantiles/QuantilesStreamAProfile.java b/src/main/java/org/apache/datasketches/characterization/quantiles/QuantilesStreamAProfile.java
similarity index 81%
rename from src/main/java/com/yahoo/sketches/characterization/quantiles/QuantilesStreamAProfile.java
rename to src/main/java/org/apache/datasketches/characterization/quantiles/QuantilesStreamAProfile.java
index 4593074..8fbfb5f 100644
--- a/src/main/java/com/yahoo/sketches/characterization/quantiles/QuantilesStreamAProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/quantiles/QuantilesStreamAProfile.java
@@ -1,23 +1,37 @@
/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.quantiles;
+package org.apache.datasketches.characterization.quantiles;
-import static com.yahoo.sketches.characterization.quantiles.ProfileUtil.buildSplitPointsArr;
+import static org.apache.datasketches.characterization.quantiles.ProfileUtil.buildSplitPointsArr;
import static java.lang.Math.rint;
import java.io.File;
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.LineReader;
-import com.yahoo.sketches.ProcessLine;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.UnzipFiles;
-import com.yahoo.sketches.quantiles.DoublesSketch;
-import com.yahoo.sketches.quantiles.UpdateDoublesSketch;
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.LineReader;
+import org.apache.datasketches.ProcessLine;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.UnzipFiles;
+import org.apache.datasketches.quantiles.DoublesSketch;
+import org.apache.datasketches.quantiles.UpdateDoublesSketch;
/**
* @author Lee Rhodes
diff --git a/src/main/java/org/apache/datasketches/characterization/quantiles/package-info.java b/src/main/java/org/apache/datasketches/characterization/quantiles/package-info.java
new file mode 100644
index 0000000..ca64cdb
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/characterization/quantiles/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * @author Lee Rhodes
+ */
+
+package org.apache.datasketches.characterization.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/characterization/theta/ThetaAccuracyProfile.java b/src/main/java/org/apache/datasketches/characterization/theta/ThetaAccuracyProfile.java
similarity index 56%
rename from src/main/java/com/yahoo/sketches/characterization/theta/ThetaAccuracyProfile.java
rename to src/main/java/org/apache/datasketches/characterization/theta/ThetaAccuracyProfile.java
index 408b3a5..b9c9a7c 100644
--- a/src/main/java/com/yahoo/sketches/characterization/theta/ThetaAccuracyProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/theta/ThetaAccuracyProfile.java
@@ -1,18 +1,32 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.theta;
+package org.apache.datasketches.characterization.theta;
-import com.yahoo.memory.WritableMemory;
-import com.yahoo.sketches.AccuracyStats;
-import com.yahoo.sketches.Family;
-import com.yahoo.sketches.ResizeFactor;
-import com.yahoo.sketches.characterization.uniquecount.BaseAccuracyProfile;
-import com.yahoo.sketches.theta.Sketch;
-import com.yahoo.sketches.theta.UpdateSketch;
-import com.yahoo.sketches.theta.UpdateSketchBuilder;
+import org.apache.datasketches.memory.WritableMemory;
+import org.apache.datasketches.AccuracyStats;
+import org.apache.datasketches.Family;
+import org.apache.datasketches.ResizeFactor;
+import org.apache.datasketches.characterization.uniquecount.BaseAccuracyProfile;
+import org.apache.datasketches.theta.Sketch;
+import org.apache.datasketches.theta.UpdateSketch;
+import org.apache.datasketches.theta.UpdateSketchBuilder;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/theta/ThetaSerDeProfile.java b/src/main/java/org/apache/datasketches/characterization/theta/ThetaSerDeProfile.java
similarity index 57%
rename from src/main/java/com/yahoo/sketches/characterization/theta/ThetaSerDeProfile.java
rename to src/main/java/org/apache/datasketches/characterization/theta/ThetaSerDeProfile.java
index faac0fd..e250963 100644
--- a/src/main/java/com/yahoo/sketches/characterization/theta/ThetaSerDeProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/theta/ThetaSerDeProfile.java
@@ -1,18 +1,32 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.theta;
+package org.apache.datasketches.characterization.theta;
-import com.yahoo.memory.Memory;
-import com.yahoo.memory.WritableMemory;
-import com.yahoo.sketches.Family;
-import com.yahoo.sketches.ResizeFactor;
-import com.yahoo.sketches.characterization.uniquecount.BaseSerDeProfile;
-import com.yahoo.sketches.theta.Sketch;
-import com.yahoo.sketches.theta.UpdateSketch;
-import com.yahoo.sketches.theta.UpdateSketchBuilder;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.WritableMemory;
+import org.apache.datasketches.Family;
+import org.apache.datasketches.ResizeFactor;
+import org.apache.datasketches.characterization.uniquecount.BaseSerDeProfile;
+import org.apache.datasketches.theta.Sketch;
+import org.apache.datasketches.theta.UpdateSketch;
+import org.apache.datasketches.theta.UpdateSketchBuilder;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/theta/ThetaUnionAccuracyProfile.java b/src/main/java/org/apache/datasketches/characterization/theta/ThetaUnionAccuracyProfile.java
similarity index 54%
rename from src/main/java/com/yahoo/sketches/characterization/theta/ThetaUnionAccuracyProfile.java
rename to src/main/java/org/apache/datasketches/characterization/theta/ThetaUnionAccuracyProfile.java
index 6165b28..411d56e 100644
--- a/src/main/java/com/yahoo/sketches/characterization/theta/ThetaUnionAccuracyProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/theta/ThetaUnionAccuracyProfile.java
@@ -1,17 +1,31 @@
/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.theta;
+package org.apache.datasketches.characterization.theta;
-import com.yahoo.memory.WritableMemory;
-import com.yahoo.sketches.AccuracyStats;
-import com.yahoo.sketches.ResizeFactor;
-import com.yahoo.sketches.characterization.uniquecount.BaseAccuracyProfile;
-import com.yahoo.sketches.theta.SetOperationBuilder;
-import com.yahoo.sketches.theta.Sketches;
-import com.yahoo.sketches.theta.Union;
+import org.apache.datasketches.memory.WritableMemory;
+import org.apache.datasketches.AccuracyStats;
+import org.apache.datasketches.ResizeFactor;
+import org.apache.datasketches.characterization.uniquecount.BaseAccuracyProfile;
+import org.apache.datasketches.theta.SetOperationBuilder;
+import org.apache.datasketches.theta.Sketches;
+import org.apache.datasketches.theta.Union;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/theta/ThetaUnionAccuracyProfile2.java b/src/main/java/org/apache/datasketches/characterization/theta/ThetaUnionAccuracyProfile2.java
similarity index 60%
rename from src/main/java/com/yahoo/sketches/characterization/theta/ThetaUnionAccuracyProfile2.java
rename to src/main/java/org/apache/datasketches/characterization/theta/ThetaUnionAccuracyProfile2.java
index d3cae28..ef5652d 100644
--- a/src/main/java/com/yahoo/sketches/characterization/theta/ThetaUnionAccuracyProfile2.java
+++ b/src/main/java/org/apache/datasketches/characterization/theta/ThetaUnionAccuracyProfile2.java
@@ -1,20 +1,34 @@
/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.theta;
+package org.apache.datasketches.characterization.theta;
-import com.yahoo.memory.WritableMemory;
-import com.yahoo.sketches.AccuracyStats;
-import com.yahoo.sketches.Family;
-import com.yahoo.sketches.ResizeFactor;
-import com.yahoo.sketches.characterization.uniquecount.BaseAccuracyProfile;
-import com.yahoo.sketches.theta.SetOperationBuilder;
-import com.yahoo.sketches.theta.Sketches;
-import com.yahoo.sketches.theta.Union;
-import com.yahoo.sketches.theta.UpdateSketch;
-import com.yahoo.sketches.theta.UpdateSketchBuilder;
+import org.apache.datasketches.memory.WritableMemory;
+import org.apache.datasketches.AccuracyStats;
+import org.apache.datasketches.Family;
+import org.apache.datasketches.ResizeFactor;
+import org.apache.datasketches.characterization.uniquecount.BaseAccuracyProfile;
+import org.apache.datasketches.theta.SetOperationBuilder;
+import org.apache.datasketches.theta.Sketches;
+import org.apache.datasketches.theta.Union;
+import org.apache.datasketches.theta.UpdateSketch;
+import org.apache.datasketches.theta.UpdateSketchBuilder;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/theta/ThetaUpdateSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/theta/ThetaUpdateSpeedProfile.java
similarity index 53%
rename from src/main/java/com/yahoo/sketches/characterization/theta/ThetaUpdateSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/theta/ThetaUpdateSpeedProfile.java
index 1f1f3c5..4e89944 100644
--- a/src/main/java/com/yahoo/sketches/characterization/theta/ThetaUpdateSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/theta/ThetaUpdateSpeedProfile.java
@@ -1,17 +1,31 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.theta;
+package org.apache.datasketches.characterization.theta;
-import com.yahoo.memory.WritableMemory;
-import com.yahoo.sketches.Family;
-import com.yahoo.sketches.ResizeFactor;
-import com.yahoo.sketches.characterization.uniquecount.BaseUpdateSpeedProfile;
-import com.yahoo.sketches.theta.Sketch;
-import com.yahoo.sketches.theta.UpdateSketch;
-import com.yahoo.sketches.theta.UpdateSketchBuilder;
+import org.apache.datasketches.memory.WritableMemory;
+import org.apache.datasketches.Family;
+import org.apache.datasketches.ResizeFactor;
+import org.apache.datasketches.characterization.uniquecount.BaseUpdateSpeedProfile;
+import org.apache.datasketches.theta.Sketch;
+import org.apache.datasketches.theta.UpdateSketch;
+import org.apache.datasketches.theta.UpdateSketchBuilder;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/theta/concurrent/ConcurrentThetaAccuracyProfile.java b/src/main/java/org/apache/datasketches/characterization/theta/concurrent/ConcurrentThetaAccuracyProfile.java
similarity index 68%
rename from src/main/java/com/yahoo/sketches/characterization/theta/concurrent/ConcurrentThetaAccuracyProfile.java
rename to src/main/java/org/apache/datasketches/characterization/theta/concurrent/ConcurrentThetaAccuracyProfile.java
index 806f784..00328a3 100644
--- a/src/main/java/com/yahoo/sketches/characterization/theta/concurrent/ConcurrentThetaAccuracyProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/theta/concurrent/ConcurrentThetaAccuracyProfile.java
@@ -1,19 +1,33 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.theta.concurrent;
+package org.apache.datasketches.characterization.theta.concurrent;
-import static com.yahoo.sketches.Util.DEFAULT_UPDATE_SEED;
+import static org.apache.datasketches.Util.DEFAULT_UPDATE_SEED;
-import com.yahoo.memory.WritableDirectHandle;
-import com.yahoo.memory.WritableMemory;
-import com.yahoo.sketches.AccuracyStats;
-import com.yahoo.sketches.characterization.uniquecount.BaseAccuracyProfile;
-import com.yahoo.sketches.theta.Sketch;
-import com.yahoo.sketches.theta.UpdateSketch;
-import com.yahoo.sketches.theta.UpdateSketchBuilder;
+import org.apache.datasketches.memory.WritableDirectHandle;
+import org.apache.datasketches.memory.WritableMemory;
+import org.apache.datasketches.AccuracyStats;
+import org.apache.datasketches.characterization.uniquecount.BaseAccuracyProfile;
+import org.apache.datasketches.theta.Sketch;
+import org.apache.datasketches.theta.UpdateSketch;
+import org.apache.datasketches.theta.UpdateSketchBuilder;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/theta/concurrent/ConcurrentThetaMultithreadedSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/theta/concurrent/ConcurrentThetaMultithreadedSpeedProfile.java
similarity index 86%
rename from src/main/java/com/yahoo/sketches/characterization/theta/concurrent/ConcurrentThetaMultithreadedSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/theta/concurrent/ConcurrentThetaMultithreadedSpeedProfile.java
index 4e096ac..e354dcd 100644
--- a/src/main/java/com/yahoo/sketches/characterization/theta/concurrent/ConcurrentThetaMultithreadedSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/theta/concurrent/ConcurrentThetaMultithreadedSpeedProfile.java
@@ -1,22 +1,36 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.theta.concurrent;
+package org.apache.datasketches.characterization.theta.concurrent;
-import static com.yahoo.sketches.Util.DEFAULT_UPDATE_SEED;
+import static org.apache.datasketches.Util.DEFAULT_UPDATE_SEED;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import com.yahoo.memory.WritableDirectHandle;
-import com.yahoo.memory.WritableMemory;
-import com.yahoo.sketches.characterization.concurrent.ConcurrentTestContext;
-import com.yahoo.sketches.characterization.concurrent.ConcurrentTestThread;
-import com.yahoo.sketches.characterization.uniquecount.BaseUpdateSpeedProfile;
-import com.yahoo.sketches.theta.Sketch;
-import com.yahoo.sketches.theta.UpdateSketch;
-import com.yahoo.sketches.theta.UpdateSketchBuilder;
+import org.apache.datasketches.memory.WritableDirectHandle;
+import org.apache.datasketches.memory.WritableMemory;
+import org.apache.datasketches.characterization.concurrent.ConcurrentTestContext;
+import org.apache.datasketches.characterization.concurrent.ConcurrentTestThread;
+import org.apache.datasketches.characterization.uniquecount.BaseUpdateSpeedProfile;
+import org.apache.datasketches.theta.Sketch;
+import org.apache.datasketches.theta.UpdateSketch;
+import org.apache.datasketches.theta.UpdateSketchBuilder;
/**
* Test scalability of concurrent theta sketch - test with multiple writers/readers
diff --git a/src/main/java/com/yahoo/sketches/characterization/theta/concurrent/ConcurrentThetaUpdateSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/theta/concurrent/ConcurrentThetaUpdateSpeedProfile.java
similarity index 67%
rename from src/main/java/com/yahoo/sketches/characterization/theta/concurrent/ConcurrentThetaUpdateSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/theta/concurrent/ConcurrentThetaUpdateSpeedProfile.java
index e4340ba..c3301a1 100644
--- a/src/main/java/com/yahoo/sketches/characterization/theta/concurrent/ConcurrentThetaUpdateSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/theta/concurrent/ConcurrentThetaUpdateSpeedProfile.java
@@ -1,18 +1,32 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.theta.concurrent;
+package org.apache.datasketches.characterization.theta.concurrent;
-import static com.yahoo.sketches.Util.DEFAULT_UPDATE_SEED;
+import static org.apache.datasketches.Util.DEFAULT_UPDATE_SEED;
-import com.yahoo.memory.WritableDirectHandle;
-import com.yahoo.memory.WritableMemory;
-import com.yahoo.sketches.characterization.uniquecount.BaseUpdateSpeedProfile;
-import com.yahoo.sketches.theta.Sketch;
-import com.yahoo.sketches.theta.UpdateSketch;
-import com.yahoo.sketches.theta.UpdateSketchBuilder;
+import org.apache.datasketches.memory.WritableDirectHandle;
+import org.apache.datasketches.memory.WritableMemory;
+import org.apache.datasketches.characterization.uniquecount.BaseUpdateSpeedProfile;
+import org.apache.datasketches.theta.Sketch;
+import org.apache.datasketches.theta.UpdateSketch;
+import org.apache.datasketches.theta.UpdateSketchBuilder;
/**
* @author eshcar
diff --git a/src/main/java/org/apache/datasketches/characterization/theta/concurrent/LockBasedThetaUpdateSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/theta/concurrent/LockBasedThetaUpdateSpeedProfile.java
new file mode 100644
index 0000000..e503004
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/characterization/theta/concurrent/LockBasedThetaUpdateSpeedProfile.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches.characterization.theta.concurrent;
+
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import org.apache.datasketches.characterization.theta.ThetaUpdateSpeedProfile;
+
+/**
+ * @author eshcar
+ */
+public class LockBasedThetaUpdateSpeedProfile extends ThetaUpdateSpeedProfile {
+ private ReentrantReadWriteLock lock_ = new ReentrantReadWriteLock();
+
+ @Override
+ public double doTrial(final int uPerTrial) {
+ sketch.reset(); // reuse the same sketch
+ final long startUpdateTime_nS = System.nanoTime();
+
+ for (int u = uPerTrial; u-- > 0;) {
+ try {
+ lock_.writeLock().lock();
+ sketch.update(++vIn);
+ } finally {
+ lock_.writeLock().unlock();
+ }
+ }
+ final long updateTime_nS = System.nanoTime() - startUpdateTime_nS;
+ return (double) updateTime_nS / uPerTrial;
+ }
+}
diff --git a/src/main/java/org/apache/datasketches/characterization/theta/concurrent/package-info.java b/src/main/java/org/apache/datasketches/characterization/theta/concurrent/package-info.java
new file mode 100644
index 0000000..abfec6a
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/characterization/theta/concurrent/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * @author Lee Rhodes
+ */
+
+package org.apache.datasketches.characterization.theta.concurrent;
diff --git a/src/main/java/org/apache/datasketches/characterization/theta/package-info.java b/src/main/java/org/apache/datasketches/characterization/theta/package-info.java
new file mode 100644
index 0000000..b1278c9
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/characterization/theta/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * @author Lee Rhodes
+ */
+
+package org.apache.datasketches.characterization.theta;
diff --git a/src/main/java/com/yahoo/sketches/characterization/uniquecount/BaseAccuracyProfile.java b/src/main/java/org/apache/datasketches/characterization/uniquecount/BaseAccuracyProfile.java
similarity index 87%
rename from src/main/java/com/yahoo/sketches/characterization/uniquecount/BaseAccuracyProfile.java
rename to src/main/java/org/apache/datasketches/characterization/uniquecount/BaseAccuracyProfile.java
index ca5e9c0..c925edc 100644
--- a/src/main/java/com/yahoo/sketches/characterization/uniquecount/BaseAccuracyProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/uniquecount/BaseAccuracyProfile.java
@@ -1,22 +1,36 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.uniquecount;
+package org.apache.datasketches.characterization.uniquecount;
-import static com.yahoo.sketches.PerformanceUtil.FRACTIONS;
-import static com.yahoo.sketches.PerformanceUtil.FRACT_LEN;
-import static com.yahoo.sketches.Util.milliSecToString;
-import static com.yahoo.sketches.Util.pwr2LawNext;
+import static org.apache.datasketches.PerformanceUtil.FRACTIONS;
+import static org.apache.datasketches.PerformanceUtil.FRACT_LEN;
+import static org.apache.datasketches.Util.milliSecToString;
+import static org.apache.datasketches.Util.pwr2LawNext;
import java.io.PrintWriter;
-import com.yahoo.sketches.AccuracyStats;
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.Properties;
-import com.yahoo.sketches.quantiles.DoublesSketch;
+import org.apache.datasketches.AccuracyStats;
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.Properties;
+import org.apache.datasketches.quantiles.DoublesSketch;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/uniquecount/BaseSerDeProfile.java b/src/main/java/org/apache/datasketches/characterization/uniquecount/BaseSerDeProfile.java
similarity index 80%
rename from src/main/java/com/yahoo/sketches/characterization/uniquecount/BaseSerDeProfile.java
rename to src/main/java/org/apache/datasketches/characterization/uniquecount/BaseSerDeProfile.java
index d7d58cf..3531fa7 100644
--- a/src/main/java/com/yahoo/sketches/characterization/uniquecount/BaseSerDeProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/uniquecount/BaseSerDeProfile.java
@@ -1,17 +1,31 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.uniquecount;
+package org.apache.datasketches.characterization.uniquecount;
-import static com.yahoo.sketches.Util.pwr2LawNext;
+import static org.apache.datasketches.Util.pwr2LawNext;
import static java.lang.Math.log;
import static java.lang.Math.pow;
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.Properties;
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.Properties;
/**
* @author Lee Rhodes
diff --git a/src/main/java/com/yahoo/sketches/characterization/uniquecount/BaseUpdateSpeedProfile.java b/src/main/java/org/apache/datasketches/characterization/uniquecount/BaseUpdateSpeedProfile.java
similarity index 80%
rename from src/main/java/com/yahoo/sketches/characterization/uniquecount/BaseUpdateSpeedProfile.java
rename to src/main/java/org/apache/datasketches/characterization/uniquecount/BaseUpdateSpeedProfile.java
index 679b39d..2382207 100644
--- a/src/main/java/com/yahoo/sketches/characterization/uniquecount/BaseUpdateSpeedProfile.java
+++ b/src/main/java/org/apache/datasketches/characterization/uniquecount/BaseUpdateSpeedProfile.java
@@ -1,17 +1,31 @@
/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches.characterization.uniquecount;
+package org.apache.datasketches.characterization.uniquecount;
-import static com.yahoo.sketches.Util.pwr2LawNext;
+import static org.apache.datasketches.Util.pwr2LawNext;
import static java.lang.Math.log;
import static java.lang.Math.pow;
-import com.yahoo.sketches.Job;
-import com.yahoo.sketches.JobProfile;
-import com.yahoo.sketches.Properties;
+import org.apache.datasketches.Job;
+import org.apache.datasketches.JobProfile;
+import org.apache.datasketches.Properties;
/**
* @author Lee Rhodes
diff --git a/src/main/java/org/apache/datasketches/characterization/uniquecount/package-info.java b/src/main/java/org/apache/datasketches/characterization/uniquecount/package-info.java
new file mode 100644
index 0000000..1248f51
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/characterization/uniquecount/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * @author Lee Rhodes
+ */
+
+package org.apache.datasketches.characterization.uniquecount;
diff --git a/src/main/java/org/apache/datasketches/package-info.java b/src/main/java/org/apache/datasketches/package-info.java
new file mode 100644
index 0000000..0aee5bc
--- /dev/null
+++ b/src/main/java/org/apache/datasketches/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * @author Lee Rhodes
+ */
+
+package org.apache.datasketches;
diff --git a/src/main/resources/cpc/CpcCompressionCharacterizationJob.conf b/src/main/resources/cpc/CpcCompressionCharacterizationJob.conf
index 8826502..37a0893 100644
--- a/src/main/resources/cpc/CpcCompressionCharacterizationJob.conf
+++ b/src/main/resources/cpc/CpcCompressionCharacterizationJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
lgMinK=10 #Min lgK Inclusive
@@ -18,4 +35,4 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.cpc.CpcCompressionCharacterizationProfile
\ No newline at end of file
+JobProfile=org.apache.datasketches.characterization.cpc.CpcCompressionCharacterizationProfile
diff --git a/src/main/resources/cpc/CpcCrossLangValidationJob.conf b/src/main/resources/cpc/CpcCrossLangValidationJob.conf
index 8e9f367..1baacd3 100644
--- a/src/main/resources/cpc/CpcCrossLangValidationJob.conf
+++ b/src/main/resources/cpc/CpcCrossLangValidationJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
lgMinK=10 #Min lgK Inclusive
@@ -16,4 +33,4 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.cpc.CpcCrossLangValidationProfile
\ No newline at end of file
+JobProfile=org.apache.datasketches.characterization.cpc.CpcCrossLangValidationProfile
diff --git a/src/main/resources/cpc/CpcMergingValidationJob.conf b/src/main/resources/cpc/CpcMergingValidationJob.conf
index 9554f28..68ecf88 100644
--- a/src/main/resources/cpc/CpcMergingValidationJob.conf
+++ b/src/main/resources/cpc/CpcMergingValidationJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
lgMinK=10 #Min lgK Inclusive
@@ -14,4 +31,4 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.cpc.CpcMergingValidationProfile
\ No newline at end of file
+JobProfile=org.apache.datasketches.characterization.cpc.CpcMergingValidationProfile
diff --git a/src/main/resources/cpc/CpcQuickMergingValidationJob.conf b/src/main/resources/cpc/CpcQuickMergingValidationJob.conf
index dc8975b..9e87764 100644
--- a/src/main/resources/cpc/CpcQuickMergingValidationJob.conf
+++ b/src/main/resources/cpc/CpcQuickMergingValidationJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
lgMinK=10 #Min lgK Inclusive
@@ -11,4 +28,4 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.cpc.CpcQuickMergingValidationProfile
\ No newline at end of file
+JobProfile=org.apache.datasketches.characterization.cpc.CpcQuickMergingValidationProfile
diff --git a/src/main/resources/cpc/CpcSerDeJob.conf b/src/main/resources/cpc/CpcSerDeJob.conf
index 1d98ca6..5e98681 100644
--- a/src/main/resources/cpc/CpcSerDeJob.conf
+++ b/src/main/resources/cpc/CpcSerDeJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
#Uniques Profile
@@ -20,5 +37,5 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.cpc.CpcSerDeProfile
-LgK=11
\ No newline at end of file
+JobProfile=org.apache.datasketches.characterization.cpc.CpcSerDeProfile
+LgK=11
diff --git a/src/main/resources/cpc/CpcStreamingValidationJob.conf b/src/main/resources/cpc/CpcStreamingValidationJob.conf
index dfa6781..ae5542a 100644
--- a/src/main/resources/cpc/CpcStreamingValidationJob.conf
+++ b/src/main/resources/cpc/CpcStreamingValidationJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
lgMinK=10 #Min lgK Inclusive
@@ -12,4 +29,4 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.cpc.CpcStreamingValidationProfile
\ No newline at end of file
+JobProfile=org.apache.datasketches.characterization.cpc.CpcStreamingValidationProfile
diff --git a/src/main/resources/cpc/CpcUpdateSpeedJob.conf b/src/main/resources/cpc/CpcUpdateSpeedJob.conf
index f219d88..d15c3f0 100644
--- a/src/main/resources/cpc/CpcUpdateSpeedJob.conf
+++ b/src/main/resources/cpc/CpcUpdateSpeedJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
#Uniques Profile
@@ -20,5 +37,5 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.cpc.CpcUpdateSpeedProfile
+JobProfile=org.apache.datasketches.characterization.cpc.CpcUpdateSpeedProfile
LgK=11
diff --git a/src/main/resources/fdt/FdtAccuracyJob.conf b/src/main/resources/fdt/FdtAccuracyJob.conf
index faef0ce..37819c9 100644
--- a/src/main/resources/fdt/FdtAccuracyJob.conf
+++ b/src/main/resources/fdt/FdtAccuracyJob.conf
@@ -1,7 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
#Job Profile, used by Job.java
-JobProfile=com.yahoo.sketches.characterization.fdt.FdtAccuracyProfile
+JobProfile=org.apache.datasketches.characterization.fdt.FdtAccuracyProfile
# Date-Time Profile, used by Job.java
TimeZone=PST
diff --git a/src/main/resources/frequencies/LongsSketchSpeedJob.conf b/src/main/resources/frequencies/LongsSketchSpeedJob.conf
index 84ecb58..5c2f1b9 100644
--- a/src/main/resources/frequencies/LongsSketchSpeedJob.conf
+++ b/src/main/resources/frequencies/LongsSketchSpeedJob.conf
@@ -1,4 +1,21 @@
-JobProfile=com.yahoo.sketches.characterization.frequencies.LongsSketchSpeedProfile
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+JobProfile=org.apache.datasketches.characterization.frequencies.LongsSketchSpeedProfile
k=1024 # sketch size and accuracy parameter
zipfRange = 8192
zipfExponent = 1.1
diff --git a/src/main/resources/hash/HashBytesSpeedJob.conf b/src/main/resources/hash/HashBytesSpeedJob.conf
index 541396a..8139220 100644
--- a/src/main/resources/hash/HashBytesSpeedJob.conf
+++ b/src/main/resources/hash/HashBytesSpeedJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
#X Number Iterations Profile
@@ -20,4 +37,4 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.hash.HashBytesSpeedProfile
\ No newline at end of file
+JobProfile=org.apache.datasketches.characterization.hash.HashBytesSpeedProfile
diff --git a/src/main/resources/hash/HashLongsSpeedJob.conf b/src/main/resources/hash/HashLongsSpeedJob.conf
index 9a8b6c9..049a54d 100644
--- a/src/main/resources/hash/HashLongsSpeedJob.conf
+++ b/src/main/resources/hash/HashLongsSpeedJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
#X Number Iterations Profile
@@ -20,4 +37,4 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.hash.HashLongsSpeedProfile
\ No newline at end of file
+JobProfile=org.apache.datasketches.characterization.hash.HashLongsSpeedProfile
diff --git a/src/main/resources/hll/HllAccuracyJob.conf b/src/main/resources/hll/HllAccuracyJob.conf
index 3d8d13e..82cd0f8 100644
--- a/src/main/resources/hll/HllAccuracyJob.conf
+++ b/src/main/resources/hll/HllAccuracyJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
#Uniques Profile
@@ -23,10 +40,10 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.hll.HllAccuracyProfile
+JobProfile=org.apache.datasketches.characterization.hll.HllAccuracyProfile
LgK=12
HLL_direct=false #only for Theta, HLL. See javadocs.
HLL_tgtHllType=HLL8
HLL_useComposite=false
HLL_compact=true
-HLL_wrap=false
\ No newline at end of file
+HLL_wrap=false
diff --git a/src/main/resources/hll/HllMergeAccuracyJob.conf b/src/main/resources/hll/HllMergeAccuracyJob.conf
index ff6b3cf..f70bd94 100644
--- a/src/main/resources/hll/HllMergeAccuracyJob.conf
+++ b/src/main/resources/hll/HllMergeAccuracyJob.conf
@@ -1,4 +1,21 @@
-JobProfile=com.yahoo.sketches.characterization.hll.HllMergeAccuracyProfile
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+JobProfile=org.apache.datasketches.characterization.hll.HllMergeAccuracyProfile
lgK=11
numTrials=100
diff --git a/src/main/resources/hll/HllSerDeJob.conf b/src/main/resources/hll/HllSerDeJob.conf
index b3e05cc..b9612a9 100644
--- a/src/main/resources/hll/HllSerDeJob.conf
+++ b/src/main/resources/hll/HllSerDeJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
#Uniques Profile
@@ -20,10 +37,10 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.hll.HllSerDeProfile
+JobProfile=org.apache.datasketches.characterization.hll.HllSerDeProfile
LgK=12
HLL_direct=false
HLL_tgtHllType=HLL4
HLL_useComposite=false
HLL_compact=false
-HLL_wrap=false
\ No newline at end of file
+HLL_wrap=false
diff --git a/src/main/resources/hll/HllSpeedJob.conf b/src/main/resources/hll/HllSpeedJob.conf
index f24047a..949c414 100644
--- a/src/main/resources/hll/HllSpeedJob.conf
+++ b/src/main/resources/hll/HllSpeedJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
#Uniques Profile
@@ -20,10 +37,10 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.hll.HllUpdateSpeedProfile
+JobProfile=org.apache.datasketches.characterization.hll.HllUpdateSpeedProfile
LgK=12
HLL_direct=false #only for Theta, HLL. See javadocs.
HLL_tgtHllType=HLL4
HLL_useComposite=false
HLL_compact=true
-HLL_wrap=false
\ No newline at end of file
+HLL_wrap=false
diff --git a/src/main/resources/hll/druidhll/DruidHllAccuracyJob.conf b/src/main/resources/hll/druidhll/DruidHllAccuracyJob.conf
index 6bb50e5..830c276 100644
--- a/src/main/resources/hll/druidhll/DruidHllAccuracyJob.conf
+++ b/src/main/resources/hll/druidhll/DruidHllAccuracyJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
#Uniques Profile
@@ -23,5 +40,5 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.hll.druidhll.DruidHllAccuracyProfile
+JobProfile=org.apache.datasketches.characterization.hll.druidhll.DruidHllAccuracyProfile
LgK=0 # not used by Druid HLL
diff --git a/src/main/resources/hll/druidhll/DruidHllMergeAccuracyJob.conf b/src/main/resources/hll/druidhll/DruidHllMergeAccuracyJob.conf
index 7c692dc..f005188 100644
--- a/src/main/resources/hll/druidhll/DruidHllMergeAccuracyJob.conf
+++ b/src/main/resources/hll/druidhll/DruidHllMergeAccuracyJob.conf
@@ -1,4 +1,21 @@
-JobProfile=com.yahoo.sketches.characterization.hll.DruidHll.MergeAccuracyProfile
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+JobProfile=org.apache.datasketches.characterization.hll.DruidHll.MergeAccuracyProfile
numTrials=100
numSketches=8192
diff --git a/src/main/resources/memory/HeapSpeedJob.conf b/src/main/resources/memory/HeapSpeedJob.conf
index 40f37f9..c17e6f6 100644
--- a/src/main/resources/memory/HeapSpeedJob.conf
+++ b/src/main/resources/memory/HeapSpeedJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
#X Array-size Profile
@@ -20,4 +37,4 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.memory.HeapSpeedProfile
+JobProfile=org.apache.datasketches.characterization.memory.HeapSpeedProfile
diff --git a/src/main/resources/memory/HeapUtf8SpeedJob.conf b/src/main/resources/memory/HeapUtf8SpeedJob.conf
index 7f9a0c1..cc019dd 100644
--- a/src/main/resources/memory/HeapUtf8SpeedJob.conf
+++ b/src/main/resources/memory/HeapUtf8SpeedJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
#X Array-size Profile
@@ -20,4 +37,4 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.memory.HeapUtf8SpeedProfile
+JobProfile=org.apache.datasketches.characterization.memory.HeapUtf8SpeedProfile
diff --git a/src/main/resources/memory/MemoryDirectSpeedJob.conf b/src/main/resources/memory/MemoryDirectSpeedJob.conf
index fd6287e..ac8d8fa 100644
--- a/src/main/resources/memory/MemoryDirectSpeedJob.conf
+++ b/src/main/resources/memory/MemoryDirectSpeedJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
#X Array-size Profile
@@ -20,4 +37,4 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.memory.MemoryDirectSpeedProfile
+JobProfile=org.apache.datasketches.characterization.memory.MemoryDirectSpeedProfile
diff --git a/src/main/resources/memory/UnsafeDirectSpeedJob.conf b/src/main/resources/memory/UnsafeDirectSpeedJob.conf
index 8745ac8..ceb91e3 100644
--- a/src/main/resources/memory/UnsafeDirectSpeedJob.conf
+++ b/src/main/resources/memory/UnsafeDirectSpeedJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
#X Array-size Profile
@@ -20,4 +37,4 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.memory.UnsafeDirectSpeedProfile
+JobProfile=org.apache.datasketches.characterization.memory.UnsafeDirectSpeedProfile
diff --git a/src/main/resources/quantiles/DoublesSketchAccuracyJob.conf b/src/main/resources/quantiles/DoublesSketchAccuracyJob.conf
index f7e567d..57b4b45 100644
--- a/src/main/resources/quantiles/DoublesSketchAccuracyJob.conf
+++ b/src/main/resources/quantiles/DoublesSketchAccuracyJob.conf
@@ -1,4 +1,21 @@
-JobProfile=com.yahoo.sketches.characterization.quantiles.DoublesSketchAccuracyProfile
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+JobProfile=org.apache.datasketches.characterization.quantiles.DoublesSketchAccuracyProfile
lgK=7 # sketch size and accuracy parameter
useCompact=true # convert sketch to compact before querying ranks
useBulk=true # query ranks using getCDF() instead of separate getRank() for each value
diff --git a/src/main/resources/quantiles/DoublesSketchSpeedJob.conf b/src/main/resources/quantiles/DoublesSketchSpeedJob.conf
index 25c31fe..e733c3f 100644
--- a/src/main/resources/quantiles/DoublesSketchSpeedJob.conf
+++ b/src/main/resources/quantiles/DoublesSketchSpeedJob.conf
@@ -1,4 +1,21 @@
-JobProfile=com.yahoo.sketches.characterization.quantiles.DoublesSketchSpeedProfile
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+JobProfile=org.apache.datasketches.characterization.quantiles.DoublesSketchSpeedProfile
K=128 # sketch size and accuracy parameter
numQueryValues=20 # number of values for getQuantiles(), getCDF() and getRank()
useDirect=true # true for on-heap, false for off-heap
diff --git a/src/main/resources/quantiles/DruidAHStreamAJob.conf b/src/main/resources/quantiles/DruidAHStreamAJob.conf
index 0b93f68..ad6e428 100644
--- a/src/main/resources/quantiles/DruidAHStreamAJob.conf
+++ b/src/main/resources/quantiles/DruidAHStreamAJob.conf
@@ -1,5 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.quantiles.DruidAppHistStreamAProfile
+JobProfile=org.apache.datasketches.characterization.quantiles.DruidAppHistStreamAProfile
FileName=/Users/lrhodes/dev/git/characterization/streamA.txt
ReportInterval=10000000
diff --git a/src/main/resources/quantiles/ExactStreamAJob.conf b/src/main/resources/quantiles/ExactStreamAJob.conf
index bd37be0..a4122ef 100644
--- a/src/main/resources/quantiles/ExactStreamAJob.conf
+++ b/src/main/resources/quantiles/ExactStreamAJob.conf
@@ -1,5 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.quantiles.ExactStreamAProfile
+JobProfile=org.apache.datasketches.characterization.quantiles.ExactStreamAProfile
FileName=/Users/lrhodes/dev/git/characterization/src/main/resources/quantiles/streamA.txt
ReportInterval=10000000
@@ -17,4 +34,4 @@ PdfFmt=%6d\t%16.6f\t%16d
TimeZone=PST
TimeZoneOffset=-28800000 # offset in millisec
FileNameDateFormat=yyyyMMdd'_'HHmmssz
-ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
\ No newline at end of file
+ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
diff --git a/src/main/resources/quantiles/ItemsSketchAccuracyJob.conf b/src/main/resources/quantiles/ItemsSketchAccuracyJob.conf
index 1eeb10e..055c2dc 100644
--- a/src/main/resources/quantiles/ItemsSketchAccuracyJob.conf
+++ b/src/main/resources/quantiles/ItemsSketchAccuracyJob.conf
@@ -1,4 +1,21 @@
-JobProfile=com.yahoo.sketches.characterization.quantiles.ItemsSketchAccuracyProfile
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+JobProfile=org.apache.datasketches.characterization.quantiles.ItemsSketchAccuracyProfile
lgK=128 # sketch size and accuracy parameter
useBulk=true # query ranks using getCDF() instead of separate getRank() for each value
errLgK=10 # parameter for the rank error distribution sketch
diff --git a/src/main/resources/quantiles/ItemsSketchSpeedJob.conf b/src/main/resources/quantiles/ItemsSketchSpeedJob.conf
index 2c5d642..dbb6276 100644
--- a/src/main/resources/quantiles/ItemsSketchSpeedJob.conf
+++ b/src/main/resources/quantiles/ItemsSketchSpeedJob.conf
@@ -1,4 +1,21 @@
-JobProfile=com.yahoo.sketches.characterization.quantiles.ItemsSketchSpeedProfile
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+JobProfile=org.apache.datasketches.characterization.quantiles.ItemsSketchSpeedProfile
K=128 # sketch size and accuracy parameter
numQueryValues=20 # number of values for getQuantiles(), getCDF() and getRank()
diff --git a/src/main/resources/quantiles/KllFloatsSketchAccuracyJob.conf b/src/main/resources/quantiles/KllFloatsSketchAccuracyJob.conf
index b3e3336..434db56 100644
--- a/src/main/resources/quantiles/KllFloatsSketchAccuracyJob.conf
+++ b/src/main/resources/quantiles/KllFloatsSketchAccuracyJob.conf
@@ -1,4 +1,21 @@
-JobProfile=com.yahoo.sketches.characterization.quantiles.KllFloatsSketchAccuracyProfile
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+JobProfile=org.apache.datasketches.characterization.quantiles.KllFloatsSketchAccuracyProfile
K=200 # sketch size and accuracy parameter
useBulk=true # query ranks using getCDF() instead of separate getRank() for each value
errLgK=10 # parameter for the rank error distribution sketch
diff --git a/src/main/resources/quantiles/KllFloatsSketchSpeedJob.conf b/src/main/resources/quantiles/KllFloatsSketchSpeedJob.conf
index 8136ecd..c310a0b 100644
--- a/src/main/resources/quantiles/KllFloatsSketchSpeedJob.conf
+++ b/src/main/resources/quantiles/KllFloatsSketchSpeedJob.conf
@@ -1,4 +1,21 @@
-JobProfile=com.yahoo.sketches.characterization.quantiles.KllFloatsSketchSpeedProfile
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+JobProfile=org.apache.datasketches.characterization.quantiles.KllFloatsSketchSpeedProfile
K=200 # sketch size and accuracy parameter
numQueryValues=20 # number of values for getQuantiles(), getCDF() and getRank()
diff --git a/src/main/resources/quantiles/MSketchStreamAJob.conf b/src/main/resources/quantiles/MSketchStreamAJob.conf
index e525520..5c18570 100644
--- a/src/main/resources/quantiles/MSketchStreamAJob.conf
+++ b/src/main/resources/quantiles/MSketchStreamAJob.conf
@@ -1,5 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.quantiles.MSketchStreamAProfile
+JobProfile=org.apache.datasketches.characterization.quantiles.MSketchStreamAProfile
FileName=/Users/lrhodes/dev/git/characterization/streamA.txt
ReportInterval=10000000
@@ -19,4 +36,4 @@ PdfFmt=%6d\t%16.6f\t%16.0f
TimeZone=PST
TimeZoneOffset=-28800000 # offset in millisec
FileNameDateFormat=yyyyMMdd'_'HHmmssz
-ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
\ No newline at end of file
+ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
diff --git a/src/main/resources/quantiles/QuantilesK256StreamAJob.conf b/src/main/resources/quantiles/QuantilesK256StreamAJob.conf
index 2b91904..fad13a1 100644
--- a/src/main/resources/quantiles/QuantilesK256StreamAJob.conf
+++ b/src/main/resources/quantiles/QuantilesK256StreamAJob.conf
@@ -1,5 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.quantiles.QuantilesStreamAProfile
+JobProfile=org.apache.datasketches.characterization.quantiles.QuantilesStreamAProfile
FileName=/Users/lrhodes/dev/git/characterization/streamA.txt
ReportInterval=10000000
diff --git a/src/main/resources/quantiles/QuantilesK32StreamAJob.conf b/src/main/resources/quantiles/QuantilesK32StreamAJob.conf
index 2ecfe6f..6ff3399 100644
--- a/src/main/resources/quantiles/QuantilesK32StreamAJob.conf
+++ b/src/main/resources/quantiles/QuantilesK32StreamAJob.conf
@@ -1,5 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.quantiles.QuantilesStreamAProfile
+JobProfile=org.apache.datasketches.characterization.quantiles.QuantilesStreamAProfile
FileName=/Users/lrhodes/dev/git/characterization/streamA.txt
ReportInterval=10000000
@@ -19,4 +36,4 @@ PdfFmt=%6d\t%16.6f\t%16.0f
TimeZone=PST
TimeZoneOffset=-28800000 # offset in millisec
FileNameDateFormat=yyyyMMdd'_'HHmmssz
-ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
\ No newline at end of file
+ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
diff --git a/src/main/resources/theta/ThetaAccuracyJob.conf b/src/main/resources/theta/ThetaAccuracyJob.conf
index 92ee40a..8b9ffc7 100644
--- a/src/main/resources/theta/ThetaAccuracyJob.conf
+++ b/src/main/resources/theta/ThetaAccuracyJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
#Uniques Profile
@@ -22,7 +39,7 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.theta.ThetaAccuracyProfile
+JobProfile=org.apache.datasketches.characterization.theta.ThetaAccuracyProfile
LgK=12
THETA_lgRF=0 #set the log resize factor to 0 (RF = 1)
THETA_famName=QUICKSELECT #QUICKSELECT Cannot use ALPHA until 0.10.4
diff --git a/src/main/resources/theta/ThetaSerDeJob.conf b/src/main/resources/theta/ThetaSerDeJob.conf
index 6355e34..fada400 100644
--- a/src/main/resources/theta/ThetaSerDeJob.conf
+++ b/src/main/resources/theta/ThetaSerDeJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
#Uniques Profile
@@ -20,10 +37,10 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.theta.ThetaSerDeProfile
+JobProfile=org.apache.datasketches.characterization.theta.ThetaSerDeProfile
LgK=12
THETA_lgRF=0 #set the log resize factor to 0 (RF = 1)
THETA_famName=ALPHA #QUICKSELECT Cannot use ALPHA until 0.10.4
THETA_p=1.0
THETA_direct=false
-THETA_rebuild=false
\ No newline at end of file
+THETA_rebuild=false
diff --git a/src/main/resources/theta/ThetaSpeedJob.conf b/src/main/resources/theta/ThetaSpeedJob.conf
index 602062d..68ccb9b 100644
--- a/src/main/resources/theta/ThetaSpeedJob.conf
+++ b/src/main/resources/theta/ThetaSpeedJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
# Uniques Profile
@@ -20,7 +37,7 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.theta.ThetaUpdateSpeedProfile
+JobProfile=org.apache.datasketches.characterization.theta.ThetaUpdateSpeedProfile
LgK=12
THETA_lgRF=0 #set the log resize factor to 0 (RF = 1)
THETA_famName=ALPHA #QUICKSELECT Cannot use ALPHA until 0.10.4
diff --git a/src/main/resources/theta/ThetaUnionAccuracyJob.conf b/src/main/resources/theta/ThetaUnionAccuracyJob.conf
index c3f8c71..b788162 100644
--- a/src/main/resources/theta/ThetaUnionAccuracyJob.conf
+++ b/src/main/resources/theta/ThetaUnionAccuracyJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job Union as UpdateSketch
#Uniques Profile
@@ -22,10 +39,10 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.theta.ThetaUnionAccuracyProfile
+JobProfile=org.apache.datasketches.characterization.theta.ThetaUnionAccuracyProfile
LgK=12
THETA_lgRF=0 #set the log resize factor to 0 (RF = 1)
THETA_famName=QUICKSELECT #QUICKSELECT Cannot use ALPHA until 0.10.4
THETA_p=1.0
THETA_direct=true
-THETA_rebuild=false
\ No newline at end of file
+THETA_rebuild=false
diff --git a/src/main/resources/theta/ThetaUnionAccuracyJob2.conf b/src/main/resources/theta/ThetaUnionAccuracyJob2.conf
index 6e6761f..0347016 100644
--- a/src/main/resources/theta/ThetaUnionAccuracyJob2.conf
+++ b/src/main/resources/theta/ThetaUnionAccuracyJob2.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job Union as UpdateSketch
#Uniques Profile
@@ -22,10 +39,10 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.theta.ThetaUnionAccuracyProfile2
+JobProfile=org.apache.datasketches.characterization.theta.ThetaUnionAccuracyProfile2
LgK=12
THETA_lgRF=0 #set the log resize factor to 0 (RF = 1)
THETA_famName=QUICKSELECT #QUICKSELECT Cannot use ALPHA until 0.10.4
THETA_p=1.0
THETA_direct=true
-THETA_rebuild=false
\ No newline at end of file
+THETA_rebuild=false
diff --git a/src/main/resources/theta/concurrent/ConcurrentThetaAccuracyJob.conf b/src/main/resources/theta/concurrent/ConcurrentThetaAccuracyJob.conf
index f806fd3..6417e90 100644
--- a/src/main/resources/theta/concurrent/ConcurrentThetaAccuracyJob.conf
+++ b/src/main/resources/theta/concurrent/ConcurrentThetaAccuracyJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
#Uniques Profile
@@ -22,7 +39,7 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.theta.concurrent.ConcurrentThetaAccuracyProfile
+JobProfile=org.apache.datasketches.characterization.theta.concurrent.ConcurrentThetaAccuracyProfile
LgK=12 #shared sketch
CONCURRENT_THETA_localLgK=4
CONCURRENT_THETA_maxConcurrencyError=0.04
diff --git a/src/main/resources/theta/concurrent/ConcurrentThetaMultiThreadedSpeedJob.conf b/src/main/resources/theta/concurrent/ConcurrentThetaMultiThreadedSpeedJob.conf
index 16176e7..f6a42be 100644
--- a/src/main/resources/theta/concurrent/ConcurrentThetaMultiThreadedSpeedJob.conf
+++ b/src/main/resources/theta/concurrent/ConcurrentThetaMultiThreadedSpeedJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
# Uniques Profile
@@ -20,7 +37,7 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.theta.concurrent.ConcurrentThetaMultithreadedSpeedProfile
+JobProfile=org.apache.datasketches.characterization.theta.concurrent.ConcurrentThetaMultithreadedSpeedProfile
LgK=12 #shared sketch
THETA_lgRF=0 #set the log resize factor to 0 (RF = 1)
THETA_famName=QUICKSELECT #ALPHA #QUICKSELECT Cannot use ALPHA until 0.10.4
diff --git a/src/main/resources/theta/concurrent/ConcurrentThetaSpeedJob.conf b/src/main/resources/theta/concurrent/ConcurrentThetaSpeedJob.conf
index 0c3a94f..85ab8d6 100644
--- a/src/main/resources/theta/concurrent/ConcurrentThetaSpeedJob.conf
+++ b/src/main/resources/theta/concurrent/ConcurrentThetaSpeedJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
# Uniques Profile
@@ -20,7 +37,7 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.theta.concurrent.ConcurrentThetaUpdateSpeedProfile
+JobProfile=org.apache.datasketches.characterization.theta.concurrent.ConcurrentThetaUpdateSpeedProfile
LgK=12 #shared sketch
THETA_lgRF=0 #set the log resize factor to 0 (RF = 1)
THETA_famName=QUICKSELECT #ALPHA #QUICKSELECT Cannot use ALPHA until 0.10.4
diff --git a/src/main/resources/theta/concurrent/LockBasedThetaSpeedJob.conf b/src/main/resources/theta/concurrent/LockBasedThetaSpeedJob.conf
index cb48f7c..2dfb00d 100644
--- a/src/main/resources/theta/concurrent/LockBasedThetaSpeedJob.conf
+++ b/src/main/resources/theta/concurrent/LockBasedThetaSpeedJob.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Job
# Uniques Profile
@@ -20,7 +37,7 @@ FileNameDateFormat=yyyyMMdd'_'HHmmssz
ReadableDateFormat=yyyy/MM/dd HH:mm:ss z
#Job Profile
-JobProfile=com.yahoo.sketches.characterization.theta.concurrent.LockBasedThetaUpdateSpeedProfile
+JobProfile=org.apache.datasketches.characterization.theta.concurrent.LockBasedThetaUpdateSpeedProfile
LgK=12
THETA_lgRF=0 #set the log resize factor to 0 (RF = 1)
THETA_famName=QUICKSELECT #ALPHA #QUICKSELECT Cannot use ALPHA until 0.10.4
diff --git a/src/test/java/com/yahoo/sketches/ZipFilesTest.java b/src/test/java/com/yahoo/sketches/ZipFilesTest.java
deleted file mode 100644
index 11e5a2b..0000000
--- a/src/test/java/com/yahoo/sketches/ZipFilesTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
- */
-
-package com.yahoo.sketches;
-
-import java.io.File;
-
-import org.testng.annotations.Test;
-
-import com.yahoo.sketches.ZipFiles;
-import com.yahoo.sketches.UnzipFiles;
-
-/**
- * @author Lee Rhodes
- */
-public class ZipFilesTest {
- final File srcDir = new File("/Users/lrhodes/dev/git/characterization/src/main/resources");
- final String dstZipDirFile = "/Users/lrhodes/dev/git/characterization/local/test.zip";
- final String srcZipFile = dstZipDirFile;
- final String dstDir = "/Users/lrhodes/dev/git/characterization/local/testUnzipedDir";
-
- @Test
- public void checkZipping() {
- ZipFiles.zipDirectory(srcDir, dstZipDirFile);
- UnzipFiles.unzip(srcZipFile, dstDir);
- }
-}
diff --git a/src/test/java/com/yahoo/sketches/LicenseSwap.java b/src/test/java/org/apache/datasketches/LicenseSwap.java
similarity index 78%
rename from src/test/java/com/yahoo/sketches/LicenseSwap.java
rename to src/test/java/org/apache/datasketches/LicenseSwap.java
index f83a671..5400558 100644
--- a/src/test/java/com/yahoo/sketches/LicenseSwap.java
+++ b/src/test/java/org/apache/datasketches/LicenseSwap.java
@@ -1,22 +1,36 @@
/*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
import java.util.List;
import org.testng.annotations.Test;
-import com.yahoo.sketches.DirectoryWalker;
+import org.apache.datasketches.DirectoryWalker;
import static java.lang.Math.*;
import java.io.File;
/**
- * sketches-core-perf/src/test/java/com.yahoo.sketches/LicenseSwap
+ * sketches-core-perf/src/test/java/org.apache.datasketches/LicenseSwap
* @author Lee Rhodes
*/
@SuppressWarnings("unused")
@@ -72,10 +86,10 @@ public class LicenseSwap {
private static void replaceStrings(String pathFile) {
String fileStr = Files.fileToString(pathFile); //entire contents of file
//first change the references to memory
- String fileStr2 = fileStr.replace("com.yahoo.memory", "org.apache.datasketches.memory");
+ String fileStr2 = fileStr.replace("org.apache.datasketches.memory", "org.apache.datasketches.memory");
String fileStr3 = fileStr2.replace("com/yahoo/memory", "org/apache/datasketches/memory");
//then change the the rest of the strings
- String fileStr4 = fileStr3.replace("com.yahoo.sketches", "org.apache.datasketches");
+ String fileStr4 = fileStr3.replace("org.apache.datasketches", "org.apache.datasketches");
String fileStr5 = fileStr4.replace("com/yahoo/sketches", "org/apache/datasketches");
Files.stringToFile(fileStr5, pathFile);
}
@@ -83,9 +97,9 @@ public class LicenseSwap {
private static void replacePackage(String pathFile) {
String fileStr = Files.fileToString(pathFile); //entire contents of file
//first change the references to memory
- String fileStr2 = fileStr.replace("com.yahoo.memory", "org.apache.datasketches.memory");
+ String fileStr2 = fileStr.replace("org.apache.datasketches.memory", "org.apache.datasketches.memory");
//then change the the rest of the hierarchy
- String fileStr3 = fileStr2.replace("com.yahoo.sketches", "org.apache.datasketches");
+ String fileStr3 = fileStr2.replace("org.apache.datasketches", "org.apache.datasketches");
//now restore in new directory
int idx = pathFile.lastIndexOf("/") + 1;
String path = pathFile.substring(0, idx); //with the slash
diff --git a/src/test/java/com/yahoo/sketches/PowerLawGeneratorTest.java b/src/test/java/org/apache/datasketches/PowerLawGeneratorTest.java
similarity index 85%
rename from src/test/java/com/yahoo/sketches/PowerLawGeneratorTest.java
rename to src/test/java/org/apache/datasketches/PowerLawGeneratorTest.java
index 558c941..1312061 100644
--- a/src/test/java/com/yahoo/sketches/PowerLawGeneratorTest.java
+++ b/src/test/java/org/apache/datasketches/PowerLawGeneratorTest.java
@@ -1,14 +1,28 @@
/*
- * Copyright 2015, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
//import org.testng.Assert;
import org.testng.annotations.Test;
-//import com.yahoo.sketches.PowerLawGenerator.Pair;
+//import org.apache.datasketches.PowerLawGenerator.Pair;
/**
* This provides sample code that generates tables of values that can be used
diff --git a/src/test/java/com/yahoo/sketches/PropertiesTest.java b/src/test/java/org/apache/datasketches/PropertiesTest.java
similarity index 57%
rename from src/test/java/com/yahoo/sketches/PropertiesTest.java
rename to src/test/java/org/apache/datasketches/PropertiesTest.java
index faf7629..ea3de5a 100644
--- a/src/test/java/com/yahoo/sketches/PropertiesTest.java
+++ b/src/test/java/org/apache/datasketches/PropertiesTest.java
@@ -1,15 +1,29 @@
/*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
*/
-package com.yahoo.sketches;
+package org.apache.datasketches;
import static org.testng.Assert.assertTrue;
import org.testng.annotations.Test;
-import com.yahoo.sketches.Properties;
+import org.apache.datasketches.Properties;
/**
* @author Lee Rhodes
diff --git a/src/test/java/org/apache/datasketches/ZipFilesTest.java b/src/test/java/org/apache/datasketches/ZipFilesTest.java
new file mode 100644
index 0000000..fc7ed85
--- /dev/null
+++ b/src/test/java/org/apache/datasketches/ZipFilesTest.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.datasketches;
+
+import java.io.File;
+
+import org.testng.annotations.Test;
+
+import org.apache.datasketches.ZipFiles;
+import org.apache.datasketches.UnzipFiles;
+
+/**
+ * @author Lee Rhodes
+ */
+public class ZipFilesTest {
+ final File srcDir = new File("/Users/lrhodes/dev/git/characterization/src/main/resources");
+ final String dstZipDirFile = "/Users/lrhodes/dev/git/characterization/local/test.zip";
+ final String srcZipFile = dstZipDirFile;
+ final String dstDir = "/Users/lrhodes/dev/git/characterization/local/testUnzipedDir";
+
+ @Test
+ public void checkZipping() {
+ ZipFiles.zipDirectory(srcDir, dstZipDirFile);
+ UnzipFiles.unzip(srcZipFile, dstDir);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org